From 70dea7e39874b662bd1855c0038671622df89b7d Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 12 Jan 2009 21:44:13 +0000 Subject: fixed bug that crashes the server if settings tunings in the server config --- src/game/server/gamecontext.cpp | 3 ++- src/game/server/hooks.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') 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) -- cgit 1.4.1