Merge branch 'master' of ssh://cogarr.net:43/home/git/gmsurvival

2 files changed, 35 insertions, 1 deletions

diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index 94690ac..7578609 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -25,6 +25,13 @@ local function createPanel()
   frame:SetTitle( "Inventory" )
   frame:MakePopup()
   frame:SetPos(scrx-invxsize,0)
+  frame:SetKeyboardInputEnabled(true)
+  frame:ShowCloseButton(false)
+  frame.OnKeyCodePressed = function(self, key)
+    if(key == KEY_Q) then
+      frame:Close()
+    end
+  end
 
   local tabsheet = vgui.Create("DPropertySheet", frame)
   tabsheet:Dock(FILL)
@@ -41,6 +48,7 @@ local function createPanel()
   end
 
   --Inventory
+
   local layout = vgui.Create( "DTileLayout", invtab )
   layout:SetBaseSize( 64 ) -- Tile size
   layout:Dock( FILL )
@@ -48,6 +56,9 @@ local function createPanel()
   layout:MakeDroppable( "unique_name" ) -- Allows us to rearrange children
   PrintTable(Resources)
   for k, v in SortedPairs( Resources ) do
+    if(v == 0) then
+      continue
+    end
     local selection = vgui.Create("DImageButton")
     if(GMS.Resources[k] == nil) then --This resource is not registered!
       selection:SetImage("vgui/avatar_default")
@@ -59,6 +70,7 @@ local function createPanel()
       continue
     else
       selection:SetImage(GMS.Resources[k].Icon)
+      selection:SetTooltip(GMS.Resources[k].Description)
     end
 
     selection:SetSize(64,64)
@@ -77,13 +89,34 @@ local function createPanel()
     end
     layout:Add( selection )
   end
+
+  return frame
 end
 
 local invpanel = nil
 function GM:OnSpawnMenuOpen()
-  print("Spawn menu hooked correctly")
+
+  if(invpanel == nil) then
+    invpanel = createPanel()
+    return
+  end
+  if(! invpanel:IsValid()) then
+    invpanel = createPanel()
+    return
+  end
+end
+
+function GM:ReloadSpawnMenu()
   if(invpanel == nil) then
+    return
+  end
+  if(!invpanel:IsValid()) then
+    return
+  end
+  if(invpanel != nil) then
+    invpanel:Close()
     invpanel = createPanel()
+    return
   end
 end
 
diff --git a/gamemode/client/cl_syncronize.lua b/gamemode/client/cl_syncronize.lua
index 32d667c..189dd08 100644
--- a/gamemode/client/cl_syncronize.lua
+++ b/gamemode/client/cl_syncronize.lua
@@ -21,6 +21,7 @@ net.Receive( "gms_SetResource", function( length, pl)
     Resources[name] = num
   end
   print("Finished resource get")
+  GAMEMODE:ReloadSpawnMenu()
 end)
 
 concommand.Add("gms_cl_printresources",function(ply,cmd,args)