From 3705064b109580103a3d13f44693503da9927281 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Thu, 12 Jun 2008 12:09:34 +0000
Subject: renamed .h to .hpp in game because they are c++ headers

---
 src/game/server/gs_common.h     | 357 ----------------------------------------
 src/game/server/gs_common.hpp   | 357 ++++++++++++++++++++++++++++++++++++++++
 src/game/server/gs_game.cpp     |   4 +-
 src/game/server/gs_game_ctf.cpp |   6 +-
 src/game/server/gs_game_ctf.h   |  35 ----
 src/game/server/gs_game_ctf.hpp |  35 ++++
 src/game/server/gs_game_dm.cpp  |   4 +-
 src/game/server/gs_game_dm.h    |   7 -
 src/game/server/gs_game_dm.hpp  |   7 +
 src/game/server/gs_game_tdm.cpp |   4 +-
 src/game/server/gs_game_tdm.h   |  10 --
 src/game/server/gs_game_tdm.hpp |  10 ++
 src/game/server/gs_server.cpp   |  16 +-
 13 files changed, 426 insertions(+), 426 deletions(-)
 delete mode 100644 src/game/server/gs_common.h
 create mode 100644 src/game/server/gs_common.hpp
 delete mode 100644 src/game/server/gs_game_ctf.h
 create mode 100644 src/game/server/gs_game_ctf.hpp
 delete mode 100644 src/game/server/gs_game_dm.h
 create mode 100644 src/game/server/gs_game_dm.hpp
 delete mode 100644 src/game/server/gs_game_tdm.h
 create mode 100644 src/game/server/gs_game_tdm.hpp

(limited to 'src/game/server')

diff --git a/src/game/server/gs_common.h b/src/game/server/gs_common.h
deleted file mode 100644
index 6b307cdf..00000000
--- a/src/game/server/gs_common.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_game.h"
-#include "../generated/gs_data.h"
-
-
-extern TUNING_PARAMS tuning;
-
-void create_sound_global(int sound, int target=-1);
-
-inline int cmask_all() { return -1; }
-inline int cmask_one(int cid) { return 1<<cid; }
-inline int cmask_all_except_one(int cid) { return 0x7fffffff^cmask_one(cid); }
-inline bool cmask_is_set(int mask, int cid) { return (mask&cmask_one(cid)) != 0; }
-
-//
-class EVENT_HANDLER
-{
-	static const int MAX_EVENTS = 128;
-	static const int MAX_DATASIZE = 128*64;
-
-	int types[MAX_EVENTS];  // TODO: remove some of these arrays
-	int offsets[MAX_EVENTS];
-	int sizes[MAX_EVENTS];
-	int client_masks[MAX_EVENTS];
-	char data[MAX_DATASIZE];
-	
-	int current_offset;
-	int num_events;
-public:
-	EVENT_HANDLER();
-	void *create(int type, int size, int mask = -1);
-	void clear();
-	void snap(int snapping_client);
-};
-
-extern EVENT_HANDLER events;
-
-// a basic entity
-class ENTITY
-{
-private:
-	friend class GAMEWORLD; // thy these?
-	friend class PLAYER;
-	ENTITY *prev_entity;
-	ENTITY *next_entity;
-
-	ENTITY *prev_type_entity;
-	ENTITY *next_type_entity;
-protected:
-	int id;
-public:
-	float proximity_radius;
-	unsigned flags;
-	int objtype;
-	vec2 pos;
-
-	enum
-	{
-		FLAG_DESTROY=0x00000001,
-		FLAG_PHYSICS=0x00000002,
-	};
-	
-	ENTITY(int objtype);
-	virtual ~ENTITY();
-	
-	virtual void reset() {}
-	virtual void post_reset() {}
-	
-	void set_flag(unsigned flag) { flags |= flag; }
-	void clear_flag(unsigned flag) { flags &= ~flag; }
-
-	virtual void destroy() { delete this; }
-	virtual void tick() {}
-	virtual void tick_defered() {}
-		
-	virtual void snap(int snapping_client) {}
-		
-	virtual bool take_damage(vec2 force, int dmg, int from, int weapon) { return true; }
-};
-
-
-class GAMEWORLD
-{
-	void reset();
-	void remove_entities();
-public:
-	enum
-	{
-		NUM_ENT_TYPES=10, // TODO: are more exact value perhaps? :)
-	};
-
-	// TODO: two lists seams kinda not good, shouldn't be needed
-	ENTITY *first_entity;
-	ENTITY *first_entity_types[NUM_ENT_TYPES];
-	bool paused;
-	bool reset_requested;
-	
-	WORLD_CORE core;
-	
-	GAMEWORLD();
-	~GAMEWORLD();
-	int find_entities(vec2 pos, float radius, ENTITY **ents, int max);
-	int find_entities(vec2 pos, float radius, ENTITY **ents, int max, const int* types, int maxtypes);
-
-	void insert_entity(ENTITY *ent);
-	void destroy_entity(ENTITY *ent);
-	void remove_entity(ENTITY *ent);
-	
-	//
-	void snap(int snapping_client);
-	void tick();
-};
-
-extern GAMEWORLD *world;
-
-// game object
-// TODO: should change name of this one
-class GAMECONTROLLER : public ENTITY
-{
-protected:
-	void cyclemap();
-	void resetgame();
-	
-	int round_start_tick;
-	int game_over_tick;
-	int sudden_death;
-	
-	int teamscore[2];
-	
-	int warmup;
-	int round_count;
-	
-	bool is_teamplay;
-	
-public:
-	int gametype;
-	GAMECONTROLLER();
-
-	void do_team_score_wincheck();
-	void do_player_score_wincheck();
-	
-	void do_warmup(int seconds);
-	
-	void startround();
-	void endround();
-	
-	bool is_friendly_fire(int cid1, int cid2);
-	
-	virtual bool on_entity(int index, vec2 pos);
-	
-	virtual void post_reset();
-	virtual void tick();
-	
-	virtual void on_player_spawn(class PLAYER *p) {}
-	virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
-	
-	virtual void on_player_info_change(class PLAYER *p);
-	
-	virtual void snap(int snapping_client);
-	virtual int get_auto_team(int notthisid);
-	virtual bool can_join_team(int team, int notthisid);
-	int clampteam(int team);
-};
-
-extern GAMECONTROLLER *gamecontroller;
-
-
-// TODO: move to seperate file
-class PICKUP : public ENTITY
-{
-public:
-	static const int phys_size = 14;
-	
-	int type;
-	int subtype; // weapon type for instance?
-	int spawntick;
-	PICKUP(int _type, int _subtype = 0);
-	
-	virtual void reset();
-	virtual void tick();
-	virtual void snap(int snapping_client);
-};
-
-// projectile entity
-class PROJECTILE : public ENTITY
-{
-public:
-	enum
-	{
-		PROJECTILE_FLAGS_EXPLODE = 1 << 0,
-	};
-	
-	vec2 direction;
-	ENTITY *powner; // this is nasty, could be removed when client quits
-	int lifespan;
-	int owner;
-	int type;
-	int flags;
-	int damage;
-	int sound_impact;
-	int weapon;
-	int bounce;
-	float force;
-	int start_tick;
-	
-	PROJECTILE(int type, int owner, vec2 pos, vec2 vel, int span, ENTITY* powner,
-		int damage, int flags, float force, int sound_impact, int weapon);
-
-	vec2 get_pos(float time);
-	void fill_info(NETOBJ_PROJECTILE *proj);
-
-	virtual void reset();
-	virtual void tick();
-	virtual void snap(int snapping_client);
-};
-
-class LASER : public ENTITY
-{
-	vec2 from;
-	vec2 dir;
-	float energy;
-	int bounces;
-	int eval_tick;
-	PLAYER *owner;
-	
-	bool hit_player(vec2 from, vec2 to);
-	void do_bounce();
-	
-public:
-	
-	LASER(vec2 pos, vec2 direction, float start_energy, PLAYER *owner);
-	
-	virtual void reset();
-	virtual void tick();
-	virtual void snap(int snapping_client);
-};
-
-// player entity
-class PLAYER : public ENTITY
-{
-public:
-	static const int phys_size = 28;
-
-	// weapon info
-	ENTITY *hitobjects[10];
-	int numobjectshit;
-	struct WEAPONSTAT
-	{
-		int ammoregenstart;
-		int ammo;
-		int ammocost;
-		bool got;
-	} weapons[NUM_WEAPONS];
-	
-	int active_weapon;
-	int last_weapon;
-	int queued_weapon;
-	
-	int reload_timer;
-	int attack_tick;
-	
-	int damage_taken;
-
-	int emote_type;
-	int emote_stop;
-
-	int last_action; // last tick that the player took any action ie some input
-	
-	//
-	int client_id;
-	char skin_name[64];
-	int use_custom_color;
-	int color_body;
-	int color_feet;
-
-	// these are non-heldback inputs
-	NETOBJ_PLAYER_INPUT latest_previnput;
-	NETOBJ_PLAYER_INPUT latest_input;
-
-	// input	
-	NETOBJ_PLAYER_INPUT previnput;
-	NETOBJ_PLAYER_INPUT input;
-	int num_inputs;
-	int jumped;
-	
-	int damage_taken_tick;
-
-	int health;
-	int armor;
-
-	// ninja
-	struct
-	{
-		vec2 activationdir;
-		int activationtick;
-		int currentcooldown;
-		int currentmovetime;
-	} ninja;
-
-	//
-	int score;
-	int team;
-	int player_state; // if the client is chatting, accessing a menu or so
-	
-	bool spawning;
-	bool dead;
-	int die_tick;
-	vec2 die_pos;
-	
-	// latency calculations
-	int latency_accum;
-	int latency_accum_min;
-	int latency_accum_max;
-	int latency_avg;
-	int latency_min;
-	int latency_max;
-
-	// the player core for the physics	
-	PLAYER_CORE core;
-	
-	//
-	int64 last_chat;
-
-	//
-	PLAYER();
-	void init();
-	virtual void reset();
-	virtual void destroy();
-		
-	void try_respawn();
-	void respawn();
-	
-	void set_team(int team);
-	
-	bool is_grounded();
-	
-	void set_weapon(int w);
-	
-	void handle_weaponswitch();
-	void do_weaponswitch();
-	
-	int handle_weapons();
-	int handle_ninja();
-	
-	void on_direct_input(NETOBJ_PLAYER_INPUT *input);
-	void fire_weapon();
-
-	virtual void tick();
-	virtual void tick_defered();
-	
-	void die(int killer, int weapon);
-	
-	virtual bool take_damage(vec2 force, int dmg, int from, int weapon);
-	virtual void snap(int snaping_client);
-};
-
-extern PLAYER *players;
diff --git a/src/game/server/gs_common.hpp b/src/game/server/gs_common.hpp
new file mode 100644
index 00000000..b6c809fa
--- /dev/null
+++ b/src/game/server/gs_common.hpp
@@ -0,0 +1,357 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include "../g_game.hpp"
+#include "../generated/gs_data.hpp"
+
+
+extern TUNING_PARAMS tuning;
+
+void create_sound_global(int sound, int target=-1);
+
+inline int cmask_all() { return -1; }
+inline int cmask_one(int cid) { return 1<<cid; }
+inline int cmask_all_except_one(int cid) { return 0x7fffffff^cmask_one(cid); }
+inline bool cmask_is_set(int mask, int cid) { return (mask&cmask_one(cid)) != 0; }
+
+//
+class EVENT_HANDLER
+{
+	static const int MAX_EVENTS = 128;
+	static const int MAX_DATASIZE = 128*64;
+
+	int types[MAX_EVENTS];  // TODO: remove some of these arrays
+	int offsets[MAX_EVENTS];
+	int sizes[MAX_EVENTS];
+	int client_masks[MAX_EVENTS];
+	char data[MAX_DATASIZE];
+	
+	int current_offset;
+	int num_events;
+public:
+	EVENT_HANDLER();
+	void *create(int type, int size, int mask = -1);
+	void clear();
+	void snap(int snapping_client);
+};
+
+extern EVENT_HANDLER events;
+
+// a basic entity
+class ENTITY
+{
+private:
+	friend class GAMEWORLD; // thy these?
+	friend class PLAYER;
+	ENTITY *prev_entity;
+	ENTITY *next_entity;
+
+	ENTITY *prev_type_entity;
+	ENTITY *next_type_entity;
+protected:
+	int id;
+public:
+	float proximity_radius;
+	unsigned flags;
+	int objtype;
+	vec2 pos;
+
+	enum
+	{
+		FLAG_DESTROY=0x00000001,
+		FLAG_PHYSICS=0x00000002,
+	};
+	
+	ENTITY(int objtype);
+	virtual ~ENTITY();
+	
+	virtual void reset() {}
+	virtual void post_reset() {}
+	
+	void set_flag(unsigned flag) { flags |= flag; }
+	void clear_flag(unsigned flag) { flags &= ~flag; }
+
+	virtual void destroy() { delete this; }
+	virtual void tick() {}
+	virtual void tick_defered() {}
+		
+	virtual void snap(int snapping_client) {}
+		
+	virtual bool take_damage(vec2 force, int dmg, int from, int weapon) { return true; }
+};
+
+
+class GAMEWORLD
+{
+	void reset();
+	void remove_entities();
+public:
+	enum
+	{
+		NUM_ENT_TYPES=10, // TODO: are more exact value perhaps? :)
+	};
+
+	// TODO: two lists seams kinda not good, shouldn't be needed
+	ENTITY *first_entity;
+	ENTITY *first_entity_types[NUM_ENT_TYPES];
+	bool paused;
+	bool reset_requested;
+	
+	WORLD_CORE core;
+	
+	GAMEWORLD();
+	~GAMEWORLD();
+	int find_entities(vec2 pos, float radius, ENTITY **ents, int max);
+	int find_entities(vec2 pos, float radius, ENTITY **ents, int max, const int* types, int maxtypes);
+
+	void insert_entity(ENTITY *ent);
+	void destroy_entity(ENTITY *ent);
+	void remove_entity(ENTITY *ent);
+	
+	//
+	void snap(int snapping_client);
+	void tick();
+};
+
+extern GAMEWORLD *world;
+
+// game object
+// TODO: should change name of this one
+class GAMECONTROLLER : public ENTITY
+{
+protected:
+	void cyclemap();
+	void resetgame();
+	
+	int round_start_tick;
+	int game_over_tick;
+	int sudden_death;
+	
+	int teamscore[2];
+	
+	int warmup;
+	int round_count;
+	
+	bool is_teamplay;
+	
+public:
+	int gametype;
+	GAMECONTROLLER();
+
+	void do_team_score_wincheck();
+	void do_player_score_wincheck();
+	
+	void do_warmup(int seconds);
+	
+	void startround();
+	void endround();
+	
+	bool is_friendly_fire(int cid1, int cid2);
+	
+	virtual bool on_entity(int index, vec2 pos);
+	
+	virtual void post_reset();
+	virtual void tick();
+	
+	virtual void on_player_spawn(class PLAYER *p) {}
+	virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
+	
+	virtual void on_player_info_change(class PLAYER *p);
+	
+	virtual void snap(int snapping_client);
+	virtual int get_auto_team(int notthisid);
+	virtual bool can_join_team(int team, int notthisid);
+	int clampteam(int team);
+};
+
+extern GAMECONTROLLER *gamecontroller;
+
+
+// TODO: move to seperate file
+class PICKUP : public ENTITY
+{
+public:
+	static const int phys_size = 14;
+	
+	int type;
+	int subtype; // weapon type for instance?
+	int spawntick;
+	PICKUP(int _type, int _subtype = 0);
+	
+	virtual void reset();
+	virtual void tick();
+	virtual void snap(int snapping_client);
+};
+
+// projectile entity
+class PROJECTILE : public ENTITY
+{
+public:
+	enum
+	{
+		PROJECTILE_FLAGS_EXPLODE = 1 << 0,
+	};
+	
+	vec2 direction;
+	ENTITY *powner; // this is nasty, could be removed when client quits
+	int lifespan;
+	int owner;
+	int type;
+	int flags;
+	int damage;
+	int sound_impact;
+	int weapon;
+	int bounce;
+	float force;
+	int start_tick;
+	
+	PROJECTILE(int type, int owner, vec2 pos, vec2 vel, int span, ENTITY* powner,
+		int damage, int flags, float force, int sound_impact, int weapon);
+
+	vec2 get_pos(float time);
+	void fill_info(NETOBJ_PROJECTILE *proj);
+
+	virtual void reset();
+	virtual void tick();
+	virtual void snap(int snapping_client);
+};
+
+class LASER : public ENTITY
+{
+	vec2 from;
+	vec2 dir;
+	float energy;
+	int bounces;
+	int eval_tick;
+	PLAYER *owner;
+	
+	bool hit_player(vec2 from, vec2 to);
+	void do_bounce();
+	
+public:
+	
+	LASER(vec2 pos, vec2 direction, float start_energy, PLAYER *owner);
+	
+	virtual void reset();
+	virtual void tick();
+	virtual void snap(int snapping_client);
+};
+
+// player entity
+class PLAYER : public ENTITY
+{
+public:
+	static const int phys_size = 28;
+
+	// weapon info
+	ENTITY *hitobjects[10];
+	int numobjectshit;
+	struct WEAPONSTAT
+	{
+		int ammoregenstart;
+		int ammo;
+		int ammocost;
+		bool got;
+	} weapons[NUM_WEAPONS];
+	
+	int active_weapon;
+	int last_weapon;
+	int queued_weapon;
+	
+	int reload_timer;
+	int attack_tick;
+	
+	int damage_taken;
+
+	int emote_type;
+	int emote_stop;
+
+	int last_action; // last tick that the player took any action ie some input
+	
+	//
+	int client_id;
+	char skin_name[64];
+	int use_custom_color;
+	int color_body;
+	int color_feet;
+
+	// these are non-heldback inputs
+	NETOBJ_PLAYER_INPUT latest_previnput;
+	NETOBJ_PLAYER_INPUT latest_input;
+
+	// input	
+	NETOBJ_PLAYER_INPUT previnput;
+	NETOBJ_PLAYER_INPUT input;
+	int num_inputs;
+	int jumped;
+	
+	int damage_taken_tick;
+
+	int health;
+	int armor;
+
+	// ninja
+	struct
+	{
+		vec2 activationdir;
+		int activationtick;
+		int currentcooldown;
+		int currentmovetime;
+	} ninja;
+
+	//
+	int score;
+	int team;
+	int player_state; // if the client is chatting, accessing a menu or so
+	
+	bool spawning;
+	bool dead;
+	int die_tick;
+	vec2 die_pos;
+	
+	// latency calculations
+	int latency_accum;
+	int latency_accum_min;
+	int latency_accum_max;
+	int latency_avg;
+	int latency_min;
+	int latency_max;
+
+	// the player core for the physics	
+	PLAYER_CORE core;
+	
+	//
+	int64 last_chat;
+
+	//
+	PLAYER();
+	void init();
+	virtual void reset();
+	virtual void destroy();
+		
+	void try_respawn();
+	void respawn();
+	
+	void set_team(int team);
+	
+	bool is_grounded();
+	
+	void set_weapon(int w);
+	
+	void handle_weaponswitch();
+	void do_weaponswitch();
+	
+	int handle_weapons();
+	int handle_ninja();
+	
+	void on_direct_input(NETOBJ_PLAYER_INPUT *input);
+	void fire_weapon();
+
+	virtual void tick();
+	virtual void tick_defered();
+	
+	void die(int killer, int weapon);
+	
+	virtual bool take_damage(vec2 force, int dmg, int from, int weapon);
+	virtual void snap(int snaping_client);
+};
+
+extern PLAYER *players;
diff --git a/src/game/server/gs_game.cpp b/src/game/server/gs_game.cpp
index 4a8aa9bd..55ffc288 100644
--- a/src/game/server/gs_game.cpp
+++ b/src/game/server/gs_game.cpp
@@ -2,8 +2,8 @@
 #include <string.h>
 #include <engine/e_config.h>
 #include <engine/e_server_interface.h>
-#include <game/g_mapitems.h>
-#include "gs_common.h"
+#include <game/g_mapitems.hpp>
+#include "gs_common.hpp"
 
 GAMECONTROLLER::GAMECONTROLLER()
 : ENTITY(NETOBJTYPE_GAME)
diff --git a/src/game/server/gs_game_ctf.cpp b/src/game/server/gs_game_ctf.cpp
index 59ec3981..031be42a 100644
--- a/src/game/server/gs_game_ctf.cpp
+++ b/src/game/server/gs_game_ctf.cpp
@@ -1,8 +1,8 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_server_interface.h>
-#include <game/g_mapitems.h>
-#include "gs_common.h"
-#include "gs_game_ctf.h"
+#include <game/g_mapitems.hpp>
+#include "gs_common.hpp"
+#include "gs_game_ctf.hpp"
 
 GAMECONTROLLER_CTF::GAMECONTROLLER_CTF()
 {
diff --git a/src/game/server/gs_game_ctf.h b/src/game/server/gs_game_ctf.h
deleted file mode 100644
index 6d512815..00000000
--- a/src/game/server/gs_game_ctf.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-
-// game object
-class GAMECONTROLLER_CTF : public GAMECONTROLLER
-{
-public:
-	class FLAG *flags[2];
-	
-	GAMECONTROLLER_CTF();
-	virtual void tick();
-	
-	virtual bool on_entity(int index, vec2 pos);
-	
-	virtual void on_player_spawn(class PLAYER *p);
-	virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
-};
-
-// TODO: move to seperate file
-class FLAG : public ENTITY
-{
-public:
-	static const int phys_size = 14;
-	PLAYER *carrying_player;
-	vec2 vel;
-	vec2 stand_pos;
-	
-	int team;
-	int at_stand;
-	int drop_tick;
-	
-	FLAG(int _team);
-
-	virtual void reset();
-	virtual void snap(int snapping_client);
-};
diff --git a/src/game/server/gs_game_ctf.hpp b/src/game/server/gs_game_ctf.hpp
new file mode 100644
index 00000000..6d512815
--- /dev/null
+++ b/src/game/server/gs_game_ctf.hpp
@@ -0,0 +1,35 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+// game object
+class GAMECONTROLLER_CTF : public GAMECONTROLLER
+{
+public:
+	class FLAG *flags[2];
+	
+	GAMECONTROLLER_CTF();
+	virtual void tick();
+	
+	virtual bool on_entity(int index, vec2 pos);
+	
+	virtual void on_player_spawn(class PLAYER *p);
+	virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
+};
+
+// TODO: move to seperate file
+class FLAG : public ENTITY
+{
+public:
+	static const int phys_size = 14;
+	PLAYER *carrying_player;
+	vec2 vel;
+	vec2 stand_pos;
+	
+	int team;
+	int at_stand;
+	int drop_tick;
+	
+	FLAG(int _team);
+
+	virtual void reset();
+	virtual void snap(int snapping_client);
+};
diff --git a/src/game/server/gs_game_dm.cpp b/src/game/server/gs_game_dm.cpp
index 1d565372..264063bf 100644
--- a/src/game/server/gs_game_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/e_config.h>
-#include "gs_common.h"
-#include "gs_game_dm.h"
+#include "gs_common.hpp"
+#include "gs_game_dm.hpp"
 
 void GAMECONTROLLER_DM::tick()
 {
diff --git a/src/game/server/gs_game_dm.h b/src/game/server/gs_game_dm.h
deleted file mode 100644
index 99ceaec1..00000000
--- a/src/game/server/gs_game_dm.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-// game object
-class GAMECONTROLLER_DM : public GAMECONTROLLER
-{
-public:
-	virtual void tick();
-};
diff --git a/src/game/server/gs_game_dm.hpp b/src/game/server/gs_game_dm.hpp
new file mode 100644
index 00000000..99ceaec1
--- /dev/null
+++ b/src/game/server/gs_game_dm.hpp
@@ -0,0 +1,7 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+// game object
+class GAMECONTROLLER_DM : public GAMECONTROLLER
+{
+public:
+	virtual void tick();
+};
diff --git a/src/game/server/gs_game_tdm.cpp b/src/game/server/gs_game_tdm.cpp
index 10c5a7dc..c591b447 100644
--- a/src/game/server/gs_game_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/e_config.h>
-#include "gs_common.h"
-#include "gs_game_tdm.h"
+#include "gs_common.hpp"
+#include "gs_game_tdm.hpp"
 
 GAMECONTROLLER_TDM::GAMECONTROLLER_TDM()
 {
diff --git a/src/game/server/gs_game_tdm.h b/src/game/server/gs_game_tdm.h
deleted file mode 100644
index 516b581c..00000000
--- a/src/game/server/gs_game_tdm.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-// game object
-class GAMECONTROLLER_TDM : public GAMECONTROLLER
-{
-public:
-	GAMECONTROLLER_TDM();
-	
-	int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
-	virtual void tick();
-};
diff --git a/src/game/server/gs_game_tdm.hpp b/src/game/server/gs_game_tdm.hpp
new file mode 100644
index 00000000..516b581c
--- /dev/null
+++ b/src/game/server/gs_game_tdm.hpp
@@ -0,0 +1,10 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+// game object
+class GAMECONTROLLER_TDM : public GAMECONTROLLER
+{
+public:
+	GAMECONTROLLER_TDM();
+	
+	int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
+	virtual void tick();
+};
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 86d7fe32..4e7b4179 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -4,14 +4,14 @@
 #include <string.h>
 #include <engine/e_config.h>
 #include <engine/e_server_interface.h>
-#include <game/g_version.h>
-#include <game/g_collision.h>
-#include <game/g_layers.h>
-#include <game/g_math.h>
-#include "gs_common.h"
-#include "gs_game_ctf.h"
-#include "gs_game_tdm.h"
-#include "gs_game_dm.h"
+#include <game/g_version.hpp>
+#include <game/g_collision.hpp>
+#include <game/g_layers.hpp>
+#include <game/g_math.hpp>
+#include "gs_common.hpp"
+#include "gs_game_ctf.hpp"
+#include "gs_game_tdm.hpp"
+#include "gs_game_dm.hpp"
 
 TUNING_PARAMS tuning;
 
-- 
cgit 1.4.1