summaryrefslogtreecommitdiff
path: root/gamemode
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-05-15 15:02:38 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-05-15 15:02:38 -0400
commit55bf96319e587bc199eb8dd126ec1ccc1b085ecc (patch)
tree4f91d82bedfa9d53c89a8a66ee08f0778f81c192 /gamemode
parent724a99a20a9c533eb038266f13c42fb47d075ea4 (diff)
downloadgmstranded-55bf96319e587bc199eb8dd126ec1ccc1b085ecc.tar.gz
gmstranded-55bf96319e587bc199eb8dd126ec1ccc1b085ecc.tar.bz2
gmstranded-55bf96319e587bc199eb8dd126ec1ccc1b085ecc.zip
More debugging
Diffstat (limited to 'gamemode')
-rw-r--r--gamemode/cl_init.lua2
-rw-r--r--gamemode/init.lua11
-rw-r--r--gamemode/utility.lua2
3 files changed, 8 insertions, 7 deletions
diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua
index a2a4b66..8a71c39 100644
--- a/gamemode/cl_init.lua
+++ b/gamemode/cl_init.lua
@@ -1,6 +1,8 @@
print("Included cl_init.lua")
include( "configure_me.lua")
+print("About to include utility.lua")
include( "utility.lua")
+print("Finished includeing utility.lua")
includeFolder("craftablesystem",true)
includeFolder("itemsystem",true)
includeFolder("client",true)
diff --git a/gamemode/init.lua b/gamemode/init.lua
index d8c860b..e5743cb 100644
--- a/gamemode/init.lua
+++ b/gamemode/init.lua
@@ -2,18 +2,17 @@ print("Included init.lua")
include( "configure_me.lua")
include( "utility.lua")
include( "init_static.lua")
-AddCSLuaFolder("client",false)
-AddCSLuaFolder("craftablesystem",true)
-AddCSLuaFolder("itemsystem",true)
-AddCSLuaFolder("shared",true)
-
includeFolder("server",false)
includeFolder("craftablesystem",true)
includeFolder("itemsystem",true)
includeFolder("shared",true)
+
AddCSLuaFile( "configure_me.lua" )
AddCSLuaFile( "utility.lua" )
-
+AddCSLuaFolder("client",false)
+AddCSLuaFolder("craftablesystem",true)
+AddCSLuaFolder("itemsystem",true)
+AddCSLuaFolder("shared",true)
-- Send clientside files
AddCSLuaFile( "shared.lua" )
diff --git a/gamemode/utility.lua b/gamemode/utility.lua
index d11797b..be9ae0f 100644
--- a/gamemode/utility.lua
+++ b/gamemode/utility.lua
@@ -2,7 +2,7 @@
print("Utility.lua included!")
function findRecursive(folderstring,recursive,dofunction)
- local folderpath = "gamemodes/" .. GM.GAMEMODE_FOLDER_NAME .. "/gamemode/" .. folderstring .. "/"
+ local folderpath = "gamemodes/" .. GAMEMODE.GAMEMODE_FOLDER_NAME .. "/gamemode/" .. folderstring .. "/"
local files, directories = file.Find(folderpath .. "*", "MOD")
for k,v in pairs(files) do
dofunction(folderstring .. "/".. v)