From 5d77d8475af7aff27eb026a4b56065387c024165 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Sat, 4 Nov 2017 22:42:24 -0400
Subject: Massive changes

* New error messages for missing dependencies
* Removed useless art_serverchanger entity
* Added a sweet ascii logo
* Added Skills
* Minor fixes to cl_inventory tracker
* Changed a few prints to use logging module
---
 gamemode/core/inventory/cl_invtracker.lua            | 20 +++++++++++++-------
 .../inventory/common/animations/sh_swing_mele.lua    |  4 ++--
 gamemode/core/inventory/sv_invtracker.lua            |  3 +++
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'gamemode/core/inventory')

diff --git a/gamemode/core/inventory/cl_invtracker.lua b/gamemode/core/inventory/cl_invtracker.lua
index 258a271..1e75ef2 100644
--- a/gamemode/core/inventory/cl_invtracker.lua
+++ b/gamemode/core/inventory/cl_invtracker.lua
@@ -48,13 +48,13 @@ local drawsheeton = function(id,inventory,higharchy)
 	--	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
@@ -91,17 +91,23 @@ 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)
+		for k,v in pairs(known_inventories[id].observers) do
+			v:Put(position,item)
+		end
 		--print("Inventorie's observers:")
 		--PrintTable(known_inventories[id].observers)
 		--print("Inventory is now")
 		--PrintTable(known_inventories[id])
 	else
 		known_inventories[id]:Remove(position)
+		for k,v in pairs(known_inventories[id].observers) do
+			v:Remove(position)
+		end
 	end
 end)
 
diff --git a/gamemode/core/inventory/common/animations/sh_swing_mele.lua b/gamemode/core/inventory/common/animations/sh_swing_mele.lua
index 4521ddd..09f79e7 100644
--- a/gamemode/core/inventory/common/animations/sh_swing_mele.lua
+++ b/gamemode/core/inventory/common/animations/sh_swing_mele.lua
@@ -1,5 +1,5 @@
-print("Hello from sh_swing_mele.lua!")
-
+nrequire("sh_animations.lua")
+	
 RegisterLuaAnimation('swing_onehand_left', {
 	FrameData = {
 		{
diff --git a/gamemode/core/inventory/sv_invtracker.lua b/gamemode/core/inventory/sv_invtracker.lua
index 7df4175..f1f3c3d 100644
--- a/gamemode/core/inventory/sv_invtracker.lua
+++ b/gamemode/core/inventory/sv_invtracker.lua
@@ -226,8 +226,11 @@ function plymeta:GiveItem(tbl)
 		if type(p) == "table" then
 			v:Put(p,tbl)
 			return
+		else
+			log.debug("inventory " .. k .. " couldn't fit it...")
 		end
 	end
+	PrintTable(tbl)
 	error("Unable to find place to put item")
 end
 
-- 
cgit v1.2.3-70-g09d2