diff options
Diffstat (limited to 'gamemode/client')
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 22 | ||||
| -rw-r--r-- | gamemode/client/qpanels/inventory.lua | 4 | ||||
| -rw-r--r-- | gamemode/client/qtabs/cl_qinventory.lua | 40 |
3 files changed, 33 insertions, 33 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 7fab07c..758f9b1 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -14,7 +14,7 @@ local itm = nrequire("core/inventory/common/items.lua") --local qpray = nrequire("cl_qprayers.lua") local inv = {} -print("Hello from cl_inventory.lua") +--print("Hello from cl_inventory.lua") --debug.Trace() local prayerequiped = { @@ -22,7 +22,7 @@ local prayerequiped = { } net.Receive("equiphelpprayer",function() - print("equiphelp received client side!") + --print("equiphelp received client side!") prayerequiped[4] = "Noob Help" end) @@ -39,17 +39,17 @@ local droppanel --Dpanel to drop things on when they are dropped, should be the local player_data --The data the player needs to show the q panel net.Receive("art_load_player_data",function() - print("Got player data") + --print("Got player data") player_data = net.ReadTable() - print("It was") - PrintTable(player_data) + --print("It was") + --PrintTable(player_data) credits = player_data.credits - if creditslabel then creditslabel:SetText(credits) end - print("Credits was", credits) + if creditslabel then creditslabel:SetText(credits or 0) end + --print("Credits was", credits) end) local function BuildInventory() - print("Building inventory") + --print("Building inventory") if qframe and IsValid(qframe) then return end if not player_data then print("no player data!") player_data = {credits = 0} end qframe = vgui.Create("DFrame") @@ -94,7 +94,7 @@ local function BuildInventory() end function inv.ShowInventory() - print("qframe is ", qframe) + --print("qframe is ", qframe) if not qframe then BuildInventory() else qframe:Show() end state.invopen = true @@ -105,9 +105,9 @@ function inv.ShowInventory() droppanel:SetAlpha(10) droppanel:Receiver("item",function(self,panels,dropped,_,_,_) if not dropped then return end - print("Dropedpanel had something dropped on it!") + --print("Dropedpanel had something dropped on it!") --Drop the item - print("Pnl:",pnl) + --print("Pnl:",pnl) local froment = panels[1].info.owner local fromid = panels[1].info.id local frompos = panels[1].info.pos diff --git a/gamemode/client/qpanels/inventory.lua b/gamemode/client/qpanels/inventory.lua index 2850e1d..b93fd7f 100644 --- a/gamemode/client/qpanels/inventory.lua +++ b/gamemode/client/qpanels/inventory.lua @@ -162,8 +162,8 @@ local invsheetfunc = function() if v.PaintEquiped then eqslot.Paint = v.PaintEquiped end - if v.DoOnEqupPanel then - v.DoOnEqupPanel(eqslot) + if v.DoOnEquipPanel then + v.DoOnEquipPanel(eqslot) end eqslot:Droppable("Inventory") eqslot.Item = v diff --git a/gamemode/client/qtabs/cl_qinventory.lua b/gamemode/client/qtabs/cl_qinventory.lua index e4dfaa8..6fc3d37 100644 --- a/gamemode/client/qtabs/cl_qinventory.lua +++ b/gamemode/client/qtabs/cl_qinventory.lua @@ -12,7 +12,7 @@ local inventory_frames = {} local invsheet local drawfloatinginventory = function(id, inventory) - print("Drawing a floating inventory!") + --print("Drawing a floating inventory!") local frame = vgui.Create("DFrame") frame:SetPos( 100, 100 ) frame:SetSize( 300, 200 ) @@ -28,8 +28,8 @@ local drawfloatinginventory = function(id, inventory) end frame:MakePopup() frame.OnClose = function(self) - print("Closeing chest id", id) - print("entity is", known_inventories[id].Owner) + --print("Closeing chest id", id) + --print("entity is", known_inventories[id].Owner) known_inventories[id]:RemoveObserver(self.id) net.Start("closechestinv") net.WriteEntity(known_inventories[id].Owner) @@ -40,20 +40,20 @@ local drawfloatinginventory = function(id, inventory) end local drawsheeton = function(id,inventory) - print("Drawing an inventory on a sheet!") + --print("Drawing an inventory on a sheet!") if invsheet == nil then return end local tpanel = vgui.Create( "DPanel", invsheet ) --tpanel.Paint = function( self, w, h ) -- draw.RoundedBox( 4, 0, 0, w, h, Color( 0, 128, 255 ) ) --end if inventory.DrawOnDPanel then - print("Has drawondpanel") + --print("Has drawondpanel") local prox = inventory:DrawOnDPanel(tpanel) - print("Prox returned was",prox) - PrintTable(prox) + --print("Prox returned was",prox) + --PrintTable(prox) known_inventories[id]:AddObserver(prox) - print("Oservers is now") - PrintTable(known_inventories[id].observers) + --print("Oservers is now") + --PrintTable(known_inventories[id].observers) end invsheet:AddSheet( inventory.Name, tpanel, "icon16/tab.png" ) end @@ -61,17 +61,17 @@ end net.Receive("art_ObserveInventory",function() local id = net.ReadUInt(32) local inv_type = net.ReadString() - print("Got inv type", inv_type,"id",id) + --print("Got inv type", inv_type,"id",id) local datalen = net.ReadUInt(32) local inital_data = net.ReadData(datalen) local ownent = net.ReadEntity() - print("Owning ent of this inventory is", ownent) + --print("Owning ent of this inventory is", ownent) assert(known_inventories[id] == nil, "Trying to observe the same inventory twice!",id) local tinv = inv.CreateInventoryFromData(inv_type,inital_data) tinv.Owner = ownent tinv.id = id - print("Created new inventory:") - PrintTable(tinv) + --print("Created new inventory:") + --PrintTable(tinv) known_inventories[id] = tinv if id > 10 then drawfloatinginventory(id,tinv) @@ -87,15 +87,15 @@ net.Receive("art_UpdateInventory",function() local position = net.ReadTable() if isput then local item_name = net.ReadString() - print("Putting ", item_name, "into inventory ",id, " at position") - PrintTable(position) + --print("Putting ", item_name, "into inventory ",id, " at position") + --PrintTable(position) local item_data = net.ReadData(net.ReadUInt(32)) local item = itm.GetItemFromData(item_name,item_data) known_inventories[id]:Put(position,item) - print("Inventorie's observers:") - PrintTable(known_inventories[id].observers) - print("Inventory is now") - PrintTable(known_inventories[id]) + --print("Inventorie's observers:") + --PrintTable(known_inventories[id].observers) + --print("Inventory is now") + --PrintTable(known_inventories[id]) else known_inventories[id]:Remove(position) end @@ -117,7 +117,7 @@ q.CreateInventorySheet = function(dpanel_parent) invsheet:Dock( FILL ) for k,v in pairs(known_inventories) do - print("This inventory id in known_inventories is", k) + --print("This inventory id in known_inventories is", k) if k <= 10 then drawsheeton(k,v) else |