edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of gamemode.h with confusing definitions

Browse source 
We also have GAME_NAME macro in game/version.h and the macros
from gamemode are not used anywhere else.
This commit is contained in:
Alexander Akulich 2021-01-11 20:02:10 +03:00
parent a6bdda60ed
commit b0c0fb316c
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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

7
src/game/server/gamemodes/DDRace.cpp
View file

@ -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 <engine/server.h>
#include <engine/shared/config.h>
#include <game/mapitems.h>
@ -9,10 +9,13 @@
#include <game/server/gamecontext.h>
#include <game/server/player.h>
#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();
}

8
src/game/server/gamemodes/gamemode.h
View file

@ -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