From 9a50a5880f3d263cd351f4786c222ac7f0b78517 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Fri, 22 Apr 2016 14:03:19 -0400
Subject: Started work on createing furnace generic

---
 gamemode/cl_init.lua                 |  6 ++++--
 gamemode/configure_me.lua            |  3 +++
 gamemode/init.lua                    | 21 +++++++++++----------
 gamemode/server/entity_functions.lua |  3 +++
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 gamemode/configure_me.lua

(limited to 'gamemode')

diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua
index 3ab4040..6a17abc 100644
--- a/gamemode/cl_init.lua
+++ b/gamemode/cl_init.lua
@@ -1,3 +1,6 @@
+include( "configure_me.lua")
+include( "utility.lua")
+includeFolder("craftablesystem",true)
 
 include( "shared.lua" )
 
@@ -7,8 +10,7 @@ include( "cl_panels.lua" )
 include( "cl_hud.lua" )
 include( "cl_deathmenu.lua" )
 
-include( "utility.lua")
-includeFolder("craftablesystem",true)
+
 
 -- HUD Theme
 StrandedColorTheme = Color( 0, 0, 0, 240 )
diff --git a/gamemode/configure_me.lua b/gamemode/configure_me.lua
new file mode 100644
index 0000000..8b980fc
--- /dev/null
+++ b/gamemode/configure_me.lua
@@ -0,0 +1,3 @@
+GMS = {}
+print("Hello from configure_me.lua!")
+GM.GAMEMODE_FOLDER_NAME = "gmsurvival"
diff --git a/gamemode/init.lua b/gamemode/init.lua
index 26a60e1..80f2b0c 100644
--- a/gamemode/init.lua
+++ b/gamemode/init.lua
@@ -1,3 +1,12 @@
+include( "configure_me.lua")
+include( "utility.lua")
+include( "init_static.lua")
+AddCSLuaFolder("client",false)
+AddCSLuaFolder("craftablesystem",true)
+
+includeFolder("server",false)
+includeFolder("craftablesystem",true)
+
 
 -- Send clientside files
 AddCSLuaFile( "shared.lua" )
@@ -9,8 +18,8 @@ AddCSLuaFile( "cl_hud.lua" )
 AddCSLuaFile( "unlocks.lua" )
 AddCSLuaFile( "combinations.lua" )
 AddCSLuaFile( "combinations2.lua" )
-AddCSLuaFile( "combirenbuy.lua" )
-AddCSLuaFile( "combirensell.lua" )
+--AddCSLuaFile( "combirenbuy.lua" )
+--AddCSLuaFile( "combirensell.lua" )
 AddCSLuaFile( "time_weather.lua" )
 AddCSLuaFile( "cl_deathmenu.lua" )
 
@@ -19,14 +28,6 @@ include( "processes.lua" )
 include( "chatcommands.lua" )
 -- include( "resources.lua" )
 
-include( "utility.lua")
-include( "init_static.lua")
-AddCSLuaFolder("client",false)
-AddCSLuaFolder("craftablesystem",true)
-
-includeFolder("server",false)
-includeFolder("craftablesystem",true)
-
 --Vars
 GM.NextSaved = 0
 GM.NextLoaded = 0
diff --git a/gamemode/server/entity_functions.lua b/gamemode/server/entity_functions.lua
index 14b8df9..8f18383 100644
--- a/gamemode/server/entity_functions.lua
+++ b/gamemode/server/entity_functions.lua
@@ -85,6 +85,8 @@ end
 GMS.FadingOutProps = {}
 GMS.FadingInProps = {}
 
+print("GMS_FadingInProps initalized")
+
 function EntityMeta:Fadeout( speed )
 	if ( !IsValid( self ) ) then return end
 	local speed = speed or 1
@@ -114,6 +116,7 @@ function EntityMeta:Fadein( speed )
 end
 
 hook.Add( "Think", "gms_FadePropsThink", function()
+	if(GMS.FadingInProps == nil) then return end
 	for k, ent in pairs( GMS.FadingInProps ) do
 		if ( !ent or ent == NULL ) then
 			table.remove( GMS.FadingInProps, k )
-- 
cgit v1.2.3-70-g09d2