From d711dd190cac809a9bd278fba03ed974812bb863 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Sun, 17 Aug 2008 08:52:24 +0000
Subject: continued with clean up

---
 src/game/server/entities/character.hpp | 2 +-
 src/game/server/gamecontroller.cpp     | 2 +-
 src/game/server/gamemodes/ctf.cpp      | 2 +-
 src/game/server/gameworld.hpp          | 2 +-
 src/game/server/hooks.cpp              | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/game/server')

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"
-- 
cgit 1.4.1