Changed nrequire() to do the job of dataloader

As a side effect, this means that mods can now nrequire() from other
mods, and that the dataloader is depriciated.

4 files changed, 10 insertions, 5 deletions

diff --git a/gamemode/core/dataloader/cl_loadglobals.lua b/gamemode/core/dataloader/cl_loadglobals.lua
index c4837c8..d2d3950 100644
--- a/gamemode/core/dataloader/cl_loadglobals.lua
+++ b/gamemode/core/dataloader/cl_loadglobals.lua
@@ -1,3 +1,5 @@
+do return end
+
 local log = nrequire("log.lua")
 
 local function run_csfile(txt,name)
diff --git a/gamemode/core/dataloader/sv_loadglobals.lua b/gamemode/core/dataloader/sv_loadglobals.lua
index 84212e6..9621c5e 100644
--- a/gamemode/core/dataloader/sv_loadglobals.lua
+++ b/gamemode/core/dataloader/sv_loadglobals.lua
@@ -1,3 +1,5 @@
+do return end
+
 ---Loads code from the data directory.
 -- Simple data loader, loads code from the data directory, sv_* files only get loaded server side, cl_* files only get loaded client-side, other files are loaded shared
 --@server sv_loadglobals.lua
diff --git a/gamemode/core/inventory/cl_invtracker.lua b/gamemode/core/inventory/cl_invtracker.lua
index e808627..41c9eff 100644
--- a/gamemode/core/inventory/cl_invtracker.lua
+++ b/gamemode/core/inventory/cl_invtracker.lua
@@ -65,7 +65,6 @@ local drawsheeton = function(id,inventory,higharchy)
 end
 
 net.Receive("art_ObserveInventory",function()
-	print("Got call to observe inventory")
 	local id = net.ReadUInt(32)
 	local inv_type = net.ReadString()
 	local datalen = net.ReadUInt(32)
@@ -96,8 +95,6 @@ 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)
 		local item_data = net.ReadData(net.ReadUInt(32))
 		local item = itm.GetItemFromData(item_name,item_data)
 		known_inventories[id]:Put(position,item)
@@ -123,6 +120,7 @@ net.Receive("art_CloseInventory",function()
 end)
 
 concommand.Add("PrintKnownInventories",function(ply,cmd,args)
+	print("Printing known inventories")
 	PrintTable(known_inventories)
 end)
 
diff --git a/gamemode/core/inventory/inventory.lua b/gamemode/core/inventory/inventory.lua
index 9215a49..1fb3dba 100644
--- a/gamemode/core/inventory/inventory.lua
+++ b/gamemode/core/inventory/inventory.lua
@@ -85,14 +85,13 @@ local function DefaultRemoveObserver(self,observer_id)
 	end
 end
 local function SetDefaultObservers(tbl)
+	log.debug("Setting default observers on ", tbl.Name)
 	tbl.AddObserver = DefaultAddObserver
 	tbl.RemoveObserver = DefaultRemoveObserver
 	--Call the observer's puts as well as this inventory's put.
 	local oldput,oldremove = tbl.Put,tbl.Remove
 	tbl.Put = function(self,position,item)
 		for k,v in pairs(self.observers) do
-			--print("Calling put on observer:")
-			--PrintTable(v)
 			v:Put(position,item)
 		end
 		return oldput(self,position,item)
@@ -178,6 +177,10 @@ end
 concommand.Add("artery_printinventories", function(ply,cmd,args)
 	PrintTable(inventories)
 end)
+concommand.Add("artery_printmyinventories",function(ply,cmd,args)
+	print("Inventories of:",ply:Nick())
+	PrintTable(ply.data.inventories)
+end)
 
 ---To Be Depriciated.
 function inv.DeriveInventory(name)