about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/gamecontext.cpp3
-rw-r--r--src/game/server/hooks.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 287fe767..5c1c0486 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -9,7 +9,8 @@ GAMECONTEXT::GAMECONTEXT()
 {
 	for(int i = 0; i < MAX_CLIENTS; i++)
 		players[i] = 0;
-		
+	
+	controller = 0;
 	vote_closetime = 0;
 }
 
diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp
index d557f99f..951e6e67 100644
--- a/src/game/server/hooks.cpp
+++ b/src/game/server/hooks.cpp
@@ -27,6 +27,10 @@ TUNING_PARAMS tuning;
 
 static void check_pure_tuning()
 {
+	// might not be created yet during start up
+	if(!game.controller)
+		return;
+	
 	if(	strcmp(game.controller->gametype, "DM")==0 ||
 		strcmp(game.controller->gametype, "TDM")==0 ||
 		strcmp(game.controller->gametype, "CTF")==0)