diff --git a/CMakeLists.txt b/CMakeLists.txt index 8148bdb6e..9a52ff85f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2012,7 +2012,6 @@ set_src(GAME_SERVER GLOB_RECURSE src/game/server gamecontroller.h gamemodes/DDRace.cpp gamemodes/DDRace.h - gamemodes/gamemode.h gameworld.cpp gameworld.h player.cpp diff --git a/src/game/server/gamemodes/DDRace.cpp b/src/game/server/gamemodes/DDRace.cpp index 2f87fa158..5aee8d876 100644 --- a/src/game/server/gamemodes/DDRace.cpp +++ b/src/game/server/gamemodes/DDRace.cpp @@ -1,7 +1,7 @@ /* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */ /* Based on Race mod stuff and tweaked by GreYFoX@GTi and others to fit our DDRace needs. */ #include "DDRace.h" -#include "gamemode.h" + #include #include #include @@ -9,10 +9,13 @@ #include #include +#define GAME_TYPE_NAME "DDraceNetwork" +#define TEST_TYPE_NAME "TestDDraceNetwork" + CGameControllerDDRace::CGameControllerDDRace(class CGameContext *pGameServer) : IGameController(pGameServer), m_Teams(pGameServer), m_pInitResult(nullptr) { - m_pGameType = g_Config.m_SvTestingCommands ? TEST_NAME : GAME_NAME; + m_pGameType = g_Config.m_SvTestingCommands ? TEST_TYPE_NAME : GAME_TYPE_NAME; InitTeleporter(); } diff --git a/src/game/server/gamemodes/gamemode.h b/src/game/server/gamemodes/gamemode.h deleted file mode 100644 index 4d5dd0f8a..000000000 --- a/src/game/server/gamemodes/gamemode.h +++ /dev/null @@ -1,8 +0,0 @@ -/* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */ -/* This is used for all NONE Official Builds of DDRace, if you changed the source in anyway change this to something other than DDRace */ -#ifndef GAME_SERVER_GAMEMODES_GAMEMODE_H -#define GAME_SERVER_GAMEMODES_GAMEMODE_H - -#define GAME_NAME "DDraceNetwork" -#define TEST_NAME "TestDDraceNetwork" -#endif // GAME_SERVER_GAMEMODES_GAMEMODE_H