setting of correct game type in game controller. fixed gametype filter in browser. various cleanups

5 files changed, 10 insertions, 1 deletions

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 76d003e7..ab24b7d4 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -14,7 +14,7 @@
 
 GAMECONTROLLER::GAMECONTROLLER()
 {
-	gametype = config.sv_gametype;
+	gametype = "unknown";
 	
 	//
 	do_warmup(config.sv_warmup);
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp
index ba8df237..94dac1da 100644
--- a/src/game/server/gamemodes/ctf.cpp
+++ b/src/game/server/gamemodes/ctf.cpp
@@ -10,6 +10,7 @@ GAMECONTROLLER_CTF::GAMECONTROLLER_CTF()
 {
 	flags[0] = 0;
 	flags[1] = 0;
+	gametype = "CTF";
 	game_flags = GAMEFLAG_TEAMS|GAMEFLAG_FLAGS;
 }
 
diff --git a/src/game/server/gamemodes/dm.cpp b/src/game/server/gamemodes/dm.cpp
index b38d18f6..15c0b987 100644
--- a/src/game/server/gamemodes/dm.cpp
+++ b/src/game/server/gamemodes/dm.cpp
@@ -1,6 +1,12 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "dm.hpp"
 
+
+GAMECONTROLLER_DM::GAMECONTROLLER_DM()
+{
+	gametype = "DM";
+}
+
 void GAMECONTROLLER_DM::tick()
 {
 	do_player_score_wincheck();
diff --git a/src/game/server/gamemodes/dm.hpp b/src/game/server/gamemodes/dm.hpp
index f57fe06d..6fb25f61 100644
--- a/src/game/server/gamemodes/dm.hpp
+++ b/src/game/server/gamemodes/dm.hpp
@@ -5,5 +5,6 @@
 class GAMECONTROLLER_DM : public GAMECONTROLLER
 {
 public:
+	GAMECONTROLLER_DM();
 	virtual void tick();
 };
diff --git a/src/game/server/gamemodes/tdm.cpp b/src/game/server/gamemodes/tdm.cpp
index 914bae08..a490907a 100644
--- a/src/game/server/gamemodes/tdm.cpp
+++ b/src/game/server/gamemodes/tdm.cpp
@@ -6,6 +6,7 @@
 
 GAMECONTROLLER_TDM::GAMECONTROLLER_TDM()
 {
+	gametype = "TDM";
 	game_flags = GAMEFLAG_TEAMS;
 }