diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-17 08:52:24 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-17 08:52:24 +0000 |
| commit | d711dd190cac809a9bd278fba03ed974812bb863 (patch) | |
| tree | 00300227625894bcf1e162be2a15e30b77807542 /src/game/server | |
| parent | 16912026dbdd7dc9e238492d9d83e37270ae4f06 (diff) | |
| download | zcatch-d711dd190cac809a9bd278fba03ed974812bb863.tar.gz zcatch-d711dd190cac809a9bd278fba03ed974812bb863.zip | |
continued with clean up
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/character.hpp | 2 | ||||
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/gameworld.hpp | 2 | ||||
| -rw-r--r-- | src/game/server/hooks.cpp | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/game/server/entities/character.hpp b/src/game/server/entities/character.hpp index 6ceb987c..2536bb79 100644 --- a/src/game/server/entities/character.hpp +++ b/src/game/server/entities/character.hpp @@ -7,7 +7,7 @@ #include <game/generated/gs_data.hpp> #include <game/generated/g_protocol.hpp> -#include <game/g_game.hpp> +#include <game/gamecore.hpp> class CHARACTER : public ENTITY { diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 30cc6e78..b0a16cd6 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -2,7 +2,7 @@ #include <string.h> #include <engine/e_config.h> #include <engine/e_server_interface.h> -#include <game/g_mapitems.hpp> +#include <game/mapitems.hpp> #include <game/generated/g_protocol.hpp> diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index 4733ae82..8d1cdef8 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ #include <engine/e_server_interface.h> -#include <game/g_mapitems.hpp> +#include <game/mapitems.hpp> #include <game/server/entities/character.hpp> #include <game/server/player.hpp> #include <game/server/gamecontext.hpp> diff --git a/src/game/server/gameworld.hpp b/src/game/server/gameworld.hpp index de441f8d..4757ad67 100644 --- a/src/game/server/gameworld.hpp +++ b/src/game/server/gameworld.hpp @@ -1,7 +1,7 @@ #ifndef GAME_SERVER_GAMEWORLD_H #define GAME_SERVER_GAMEWORLD_H -#include <game/g_game.hpp> +#include <game/gamecore.hpp> class ENTITY; class CHARACTER; diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp index 43563483..328cfb4f 100644 --- a/src/game/server/hooks.cpp +++ b/src/game/server/hooks.cpp @@ -7,12 +7,12 @@ #include <engine/e_config.h> #include <engine/e_server_interface.h> -#include <game/g_version.hpp> -#include <game/g_collision.hpp> -#include <game/g_layers.hpp> +#include <game/version.hpp> +#include <game/collision.hpp> +#include <game/layers.hpp> -#include <game/g_game.hpp> +#include <game/gamecore.hpp> #include "gamecontext.hpp" #include "gamemodes/dm.hpp" |