cleaned up code structure a bit

11 files changed, 18 insertions, 22 deletions

diff --git a/src/game/server/data/createdir.txt b/src/game/server/data/createdir.txt
deleted file mode 100644
index 258b42d5..00000000
--- a/src/game/server/data/createdir.txt
+++ /dev/null
@@ -1 +0,0 @@
-this file is here to make sure that this directory gets created
diff --git a/src/game/server/game_server.h b/src/game/server/game_server.h
deleted file mode 100644
index 65ef58f4..00000000
--- a/src/game/server/game_server.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-
diff --git a/src/game/server/srv_common.cpp b/src/game/server/gs_common.cpp
index 83754780..dc0d5c05 100644
--- a/src/game/server/srv_common.cpp
+++ b/src/game/server/gs_common.cpp
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/config.h>
-#include "srv_common.h"
+#include <engine/e_config.h>
+#include "gs_common.h"
 #include <string.h>
 
 gameobject::gameobject()
diff --git a/src/game/server/srv_common.h b/src/game/server/gs_common.h
index b28d3066..93264f9f 100644
--- a/src/game/server/srv_common.h
+++ b/src/game/server/gs_common.h
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../game.h"
-#include "data.h"
+#include "../g_game.h"
+#include "../generated/gs_data.h"
 
 
 void create_sound_global(int sound, int target=-1);
diff --git a/src/game/server/srv_ctf.cpp b/src/game/server/gs_game_ctf.cpp
index 2ff4e2df..30d898d9 100644
--- a/src/game/server/srv_ctf.cpp
+++ b/src/game/server/gs_game_ctf.cpp
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "srv_common.h"
-#include "srv_ctf.h"
+#include "gs_common.h"
+#include "gs_game_ctf.h"
 
 gameobject_ctf::gameobject_ctf()
 {
diff --git a/src/game/server/srv_ctf.h b/src/game/server/gs_game_ctf.h
index 02acef37..02acef37 100644
--- a/src/game/server/srv_ctf.h
+++ b/src/game/server/gs_game_ctf.h
diff --git a/src/game/server/srv_dm.cpp b/src/game/server/gs_game_dm.cpp
index d5720856..98317578 100644
--- a/src/game/server/srv_dm.cpp
+++ b/src/game/server/gs_game_dm.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/config.h>
-#include "srv_common.h"
-#include "srv_dm.h"
+#include <engine/e_config.h>
+#include "gs_common.h"
+#include "gs_game_dm.h"
 
 void gameobject_dm::tick()
 {
diff --git a/src/game/server/srv_dm.h b/src/game/server/gs_game_dm.h
index 96bff3ae..96bff3ae 100644
--- a/src/game/server/srv_dm.h
+++ b/src/game/server/gs_game_dm.h
diff --git a/src/game/server/srv_tdm.cpp b/src/game/server/gs_game_tdm.cpp
index bcae397f..7aa12e2b 100644
--- a/src/game/server/srv_tdm.cpp
+++ b/src/game/server/gs_game_tdm.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/config.h>
-#include "srv_common.h"
-#include "srv_tdm.h"
+#include <engine/e_config.h>
+#include "gs_common.h"
+#include "gs_game_tdm.h"
 
 gameobject_tdm::gameobject_tdm()
 {
diff --git a/src/game/server/srv_tdm.h b/src/game/server/gs_game_tdm.h
index 70b4646e..70b4646e 100644
--- a/src/game/server/srv_tdm.h
+++ b/src/game/server/gs_game_tdm.h
diff --git a/src/game/server/game_server.cpp b/src/game/server/gs_server.cpp
index 658e72c9..65985371 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -2,13 +2,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <engine/config.h>
-#include "../version.h"
-#include "game_server.h"
-#include "srv_common.h"
-#include "srv_ctf.h"
-#include "srv_tdm.h"
-#include "srv_dm.h"
+#include <engine/e_config.h>
+#include "../g_version.h"
+#include "gs_common.h"
+#include "gs_game_ctf.h"
+#include "gs_game_tdm.h"
+#include "gs_game_dm.h"
 
 data_container *data = 0x0;