summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gamemode/cl_init.lua10
-rw-r--r--gamemode/cl_panels.lua11
-rw-r--r--gamemode/craftablesystem/loadcraftables.lua27
-rw-r--r--gamemode/init.lua10
-rw-r--r--gamemode/init_static.lua4
-rw-r--r--gamemode/shared.lua9
-rw-r--r--gamemode/utility.lua8
7 files changed, 0 insertions, 79 deletions
diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua
index 94a8051..3ab4040 100644
--- a/gamemode/cl_init.lua
+++ b/gamemode/cl_init.lua
@@ -314,16 +314,6 @@ end )
usermessage.Hook( "gms_OpenCombiMenu", function( um )
- print("--------------In cl_init.lua's gms_OpenCombiMenu hook---------")
- for k,v in pairs(GMS.Combinations) do
- print("Recognize " .. k)
- if(k == "Structures") then
- for i,j in pairs(v) do
- print("\tFound: " .. i)
- end
- end
- end
-
if ( GAMEMODE.CombiMenu ) then GAMEMODE.CombiMenu:Remove() end
GAMEMODE.CombiMenu = vgui.Create( "GMS_CombinationWindow" )
GAMEMODE.CombiMenu:SetTable( um:ReadString() )
diff --git a/gamemode/cl_panels.lua b/gamemode/cl_panels.lua
index 215f7d9..43e133a 100644
--- a/gamemode/cl_panels.lua
+++ b/gamemode/cl_panels.lua
@@ -848,17 +848,6 @@ function PANEL:Init()
end
function PANEL:SetTable( str )
- --print("GMS.Combinations full:")
- --PrintTable(GMS.Combinations)
- print("----SetTable method-----")
- for k,v in pairs(GMS.Combinations) do
- print("Recognize " .. k)
- if(k == "Structures") then
- for i,j in pairs(v) do
- print("\tFound: " .. i)
- end
- end
- end
self:SetTitle( "#" .. str )
self.CombiGroupName = str
self.CombiGroup = GMS.Combinations[ str ]
diff --git a/gamemode/craftablesystem/loadcraftables.lua b/gamemode/craftablesystem/loadcraftables.lua
index 51b2e3e..f1b4a70 100644
--- a/gamemode/craftablesystem/loadcraftables.lua
+++ b/gamemode/craftablesystem/loadcraftables.lua
@@ -3,32 +3,5 @@
GMS.Combinations = {}
function GMS.RegisterCombi( tbl, group )
if ( !GMS.Combinations[ group ] ) then GMS.Combinations[ group ] = {} end
-
- if(group == "Structures") then
- print("Found a structure:")
- print(tbl.Name)
- end
-
GMS.Combinations[ group ][ string.Replace( tbl.Name, " ", "_" ) ] = tbl
end
-
-/*
-local folderpath = "gamemodes/" .. GM.GAMEMODE_FOLDER_NAME .. "/gamemode/craftablesystem/playermade/"
-print("Attempting to load folderpath " .. folderpath)
-local files, directories = file.Find(folderpath .. "*", "MOD")
-print("Files:")
-PrintTable(files)
-print("Directories:")
-PrintTable(directories)
-if(recursive) then
- for k,v in pairs(directories) do
- addResourceFolder(folderstring..v,recursive)
- end
-end
-for k,v in pairs(files) do
- include(folderstring .. "/".. v)
-end
-*/
---include("craftablesystem/playermade/concrete.lua")
---include("playermade/concrete.lua")
---includeFolder("craftablesystem/playermade",false)
diff --git a/gamemode/init.lua b/gamemode/init.lua
index 3605746..26a60e1 100644
--- a/gamemode/init.lua
+++ b/gamemode/init.lua
@@ -25,17 +25,7 @@ AddCSLuaFolder("client",false)
AddCSLuaFolder("craftablesystem",true)
includeFolder("server",false)
-print("-----Before includeing crafting system")
includeFolder("craftablesystem",true)
-print("-----After includeing crafting system")
-for k,v in pairs(GMS.Combinations) do
- print("Recognize " .. k)
- if(k == "Structures") then
- for i,j in pairs(v) do
- print("\tFound: " .. i)
- end
- end
-end
--Vars
GM.NextSaved = 0
diff --git a/gamemode/init_static.lua b/gamemode/init_static.lua
index c4b4c9a..5d5444f 100644
--- a/gamemode/init_static.lua
+++ b/gamemode/init_static.lua
@@ -1,5 +1,3 @@
-print("Hello from init_static.lua")
-
function loaddata(mapname, filename)
local data = {}
local filepath = "gamemodes/" .. GM.GAMEMODE_FOLDER_NAME .. "/content/data/map_static/" .. mapname .. "/" .. filename
@@ -16,11 +14,9 @@ function loaddata(mapname, filename)
end
function loadBarrows(mapname)
- print("Loading barrows")
return loaddata(mapname, "barrows")
end
function loadTrees(mapname)
- print("Loading trees")
return loaddata(mapname, "trees")
end
diff --git a/gamemode/shared.lua b/gamemode/shared.lua
index 8b11b2c..cf25565 100644
--- a/gamemode/shared.lua
+++ b/gamemode/shared.lua
@@ -29,15 +29,6 @@ GM.GAMEMODE_FOLDER_NAME = "gmstranded"
include( "utility.lua")
includeFolder("craftablesystem",true)
-print("-------In shared.lua--------")
-for k,v in pairs(GMS.Combinations) do
- print("Recognize " .. k)
- if(k == "Structures") then
- for i,j in pairs(v) do
- print("\tFound: " .. i)
- end
- end
-end
include( "spp/sh_spp.lua" )
diff --git a/gamemode/utility.lua b/gamemode/utility.lua
index 7810ac2..24c59b0 100644
--- a/gamemode/utility.lua
+++ b/gamemode/utility.lua
@@ -3,15 +3,7 @@
function findRecursive(folderstring,recursive,dofunction)
local folderpath = "gamemodes/" .. GM.GAMEMODE_FOLDER_NAME .. "/gamemode/" .. folderstring .. "/"
local files, directories = file.Find(folderpath .. "*", "MOD")
- /*
- print("viewing " .. folderpath)
- print("files:")
- PrintTable(files)
- print("directories:")
- PrintTable(directories)
- */
for k,v in pairs(files) do
- --print("Found file:" .. folderstring .. "/" .. v)
dofunction(folderstring .. "/".. v)
end
if(recursive) then