renamed .h to .hpp in game because they are c++ headers

datasrc/compile.py

@@ -57,9 +57,9 @@ if gen_client_content_header or gen_server_content_header:
 
 if gen_client_content_source or gen_server_content_source:
 	if gen_client_content_source:
-		print '#include "gc_data.h"'
+		print '#include "gc_data.hpp"'
 	if gen_server_content_source:
-		print '#include "gs_data.h"'
+		print '#include "gs_data.hpp"'
 	EmitDefinition(content.container, "datacontainer")
 	print 'DATACONTAINER *data = &datacontainer;';
 
@@ -99,7 +99,7 @@ if gen_network_source:
 	lines = []
 	
 	lines += ['#include <engine/e_common_interface.h>']
-	lines += ['#include "g_protocol.h"']
+	lines += ['#include "g_protocol.hpp"']
 
 	lines += ['const char *msg_failed_on = "";']
 	lines += ['const char *obj_corrected_on = "";']

datasrc/network.py

@@ -17,7 +17,7 @@ enum
 
 RawSource = '''
 #include <engine/e_common_interface.h>
-#include "g_protocol.h"
+#include "g_protocol.hpp"
 '''
 
 Enums = [

default.bam

@@ -93,11 +93,11 @@ end
 
 -- Content Compile
 network_source = ContentCompile("network_source", "src/game/generated/g_protocol.cpp")
-network_header = ContentCompile("network_header", "src/game/generated/g_protocol.h")
+network_header = ContentCompile("network_header", "src/game/generated/g_protocol.hpp")
 client_content_source = ContentCompile("client_content_source", "src/game/generated/gc_data.cpp")
-client_content_header = ContentCompile("client_content_header", "src/game/generated/gc_data.h")
+client_content_header = ContentCompile("client_content_header", "src/game/generated/gc_data.hpp")
 server_content_source = ContentCompile("server_content_source", "src/game/generated/gs_data.cpp")
-server_content_header = ContentCompile("server_content_header", "src/game/generated/gs_data.h")
+server_content_header = ContentCompile("server_content_header", "src/game/generated/gs_data.hpp")
 
 bam_add_dependency(network_source, network_header)
 bam_add_dependency(client_content_source, client_content_header)
@@ -106,8 +106,8 @@ bam_add_dependency(server_content_source, server_content_header)
 nethash = CHash(
 	"src/game/generated/nethash.c",
 	"src/engine/e_protocol.h",
-	"src/game/generated/g_protocol.h",
-	"src/game/g_tuning.h",
+	"src/game/generated/g_protocol.hpp",
+	"src/game/g_tuning.hpp",
 	"src/game/g_game.cpp", network_header)
 
 client_link_other = {}

src/engine/e_config_variables.h

@@ -1,5 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../game/g_variables.h"
+
+/* TODO: remove this */
+#include "../game/g_variables.hpp"
 
 
 MACRO_CONFIG_STR(player_name, 32, "nameless tee")

src/game/client/gc_client.cpp

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <game/g_math.h>
+#include <game/g_math.hpp>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -10,19 +10,19 @@ extern "C" {
 	#include <engine/e_client_interface.h>
 };
 
-#include "../g_game.h"
-#include "../g_version.h"
-#include "../g_layers.h"
-#include "../g_math.h"
-#include "gc_map_image.h"
-#include "../generated/gc_data.h"
-#include "gc_menu.h"
-#include "gc_skin.h"
-#include "gc_ui.h"
-#include "gc_client.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_console.h"
+#include "../g_game.hpp"
+#include "../g_version.hpp"
+#include "../g_layers.hpp"
+#include "../g_math.hpp"
+#include "gc_map_image.hpp"
+#include "../generated/gc_data.hpp"
+#include "gc_menu.hpp"
+#include "gc_skin.hpp"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_console.hpp"
 
 //struct data_container *data = 0;
 int64 debug_firedelay = 0;

src/game/client/gc_client.hpp

@@ -1,8 +1,8 @@
-#include <game/g_vmath.h>
-#include <game/g_protocol.h>
-#include <game/g_game.h>
+#include <game/g_vmath.hpp>
+#include <game/g_protocol.hpp>
+#include <game/g_game.hpp>
 
-#include <game/client/gc_render.h>
+#include <game/client/gc_render.hpp>
 
 // sound channels
 enum

src/game/client/gc_console.cpp

@@ -1,5 +1,5 @@
-#include "gc_console.h"
-#include "../generated/gc_data.h"
+#include "gc_console.hpp"
+#include "../generated/gc_data.hpp"
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -13,10 +13,10 @@ extern "C" {
 #include <cstring>
 #include <cstdio>
 
-#include "gc_ui.h"
-#include "gc_client.h"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
 
-#include "../g_version.h"
+#include "../g_version.hpp"
 
 enum
 {

src/game/client/gc_effects.cpp

@@ -1,7 +1,7 @@
 #include <engine/e_client_interface.h>
-#include "gc_client.h"
-#include "gc_skin.h"
-#include "../generated/gc_data.h"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
+#include "../generated/gc_data.hpp"
 
 static bool add_50hz = false;
 static bool add_100hz = false;

src/game/client/gc_flow.cpp

@@ -1,7 +1,7 @@
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include "gc_client.h"
-#include "../g_layers.h"
+#include "gc_client.hpp"
+#include "../g_layers.hpp"
 
 struct FLOWCELL
 {

src/game/client/gc_hooks.cpp

@@ -8,17 +8,17 @@ extern "C" {
 	#include <engine/e_console.h>
 };
 
-#include <game/generated/gc_data.h>
-#include <game/g_game.h>
-#include <game/g_version.h>
+#include <game/generated/gc_data.hpp>
+#include <game/g_game.hpp>
+#include <game/g_version.hpp>
 
-#include <game/g_layers.h>
+#include <game/g_layers.hpp>
 
-#include "gc_client.h"
-#include "gc_skin.h"
-#include "gc_render.h"
-#include "gc_map_image.h"
-#include "gc_console.h"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
+#include "gc_render.hpp"
+#include "gc_map_image.hpp"
+#include "gc_console.hpp"
 
 extern unsigned char internal_data[];
 

src/game/client/gc_map_image.cpp

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
-#include <game/g_mapitems.h>
-#include "gc_map_image.h"
+#include <game/g_mapitems.hpp>
+#include "gc_map_image.hpp"
 
 static int map_textures[64] = {0};
 static int count = 0;

src/game/client/gc_menu.cpp

@@ -4,8 +4,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <game/g_math.h>
-#include <game/g_vmath.h>
+#include <game/g_math.hpp>
+#include <game/g_vmath.hpp>
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -14,15 +14,15 @@ extern "C" {
 	#include <engine/client/ec_font.h>
 }
 
-#include "../g_version.h"
-#include "../g_protocol.h"
+#include "../g_version.hpp"
+#include "../g_protocol.hpp"
 
-#include "../generated/gc_data.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_skin.h"
-#include "gc_ui.h"
-#include "gc_client.h"
+#include "../generated/gc_data.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_skin.hpp"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
 #include <mastersrv/mastersrv.h>
 
 //extern data_container *data;

src/game/client/gc_particles.cpp

@@ -1,6 +1,6 @@
 #include <engine/e_client_interface.h>
-#include "gc_client.h"
-#include "../generated/gc_data.h"
+#include "gc_client.hpp"
+#include "../generated/gc_data.hpp"
 
 // NOTE: the way the particle system works isn't very cache friendly
 

src/game/client/gc_render.cpp

@@ -2,14 +2,14 @@
 #include <math.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include <game/generated/gc_data.h>
-#include <game/g_protocol.h>
-#include <game/g_math.h>
-#include <game/g_layers.h>
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_client.h"
-#include "gc_map_image.h"
+#include <game/generated/gc_data.hpp>
+#include <game/g_protocol.hpp>
+#include <game/g_math.hpp>
+#include <game/g_layers.hpp>
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_client.hpp"
+#include "gc_map_image.hpp"
 
 static float sprite_w_scale;
 static float sprite_h_scale;

src/game/client/gc_render.hpp

@@ -2,9 +2,9 @@
 #ifndef GAME_CLIENT_RENDER_H
 #define GAME_CLIENT_RENDER_H
 
-#include "../g_vmath.h"
-#include "../g_mapitems.h"
-#include "gc_ui.h"
+#include "../g_vmath.hpp"
+#include "../g_mapitems.hpp"
+#include "gc_ui.hpp"
 
 struct TEE_RENDER_INFO
 {

src/game/client/gc_render_map.cpp

@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_client_interface.h>
-#include "../g_math.h"
-#include "gc_client.h"
+#include "../g_math.hpp"
+#include "gc_client.hpp"
 
 void render_eval_envelope(ENVPOINT *points, int num_points, int channels, float time, float *result)
 {

src/game/client/gc_render_obj.cpp

@@ -3,13 +3,13 @@
 #include <stdio.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include "../generated/gc_data.h"
-#include "../g_protocol.h"
-#include "../g_math.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_client.h"
-#include "gc_skin.h"
+#include "../generated/gc_data.hpp"
+#include "../g_protocol.hpp"
+#include "../g_math.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
 
 
 void render_projectile(const NETOBJ_PROJECTILE *current, int itemid)

src/game/client/gc_skin.cpp

@@ -4,8 +4,8 @@
 #include <math.h>
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
-#include "gc_skin.h"
-#include "../g_math.h"
+#include "gc_skin.hpp"
+#include "../g_math.hpp"
 
 enum
 {

src/game/client/gc_skin.hpp

@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_vmath.h"
+#include "../g_vmath.hpp"
 
 // do this better and nicer
 typedef struct 

src/game/client/gc_ui.cpp

@@ -2,7 +2,7 @@
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include "gc_ui.h"
+#include "gc_ui.hpp"
 
 /********************************************************
  UI                                                      

src/game/editor/ed_editor.cpp

@@ -11,10 +11,10 @@ extern "C" {
 	#include <engine/e_config.h>
 }
 
-#include <game/client/gc_map_image.h>
-#include <game/client/gc_ui.h>
-#include <game/g_game.h>
-#include <game/client/gc_render.h>
+#include <game/client/gc_map_image.hpp>
+#include <game/client/gc_ui.hpp>
+#include <game/g_game.hpp>
+#include <game/client/gc_render.hpp>
 
 #include "ed_editor.hpp"
 

src/game/editor/ed_editor.hpp

@@ -2,10 +2,10 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "array.h"
-#include "../g_mapitems.h"
-#include "../g_math.h"
-#include "../client/gc_render.h"
+#include "array.hpp"
+#include "../g_mapitems.hpp"
+#include "../g_math.hpp"
+#include "../client/gc_render.hpp"
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -14,7 +14,7 @@ extern "C" {
 	#include <engine/e_config.h>
 }
 
-#include <game/client/gc_ui.h>
+#include <game/client/gc_ui.hpp>
 
 typedef void (*INDEX_MODIFY_FUNC)(int *index);
 

src/game/editor/ed_layer_quads.cpp

@@ -1,7 +1,7 @@
 #include "ed_editor.hpp"
-#include <game/g_math.h>
-#include <game/generated/gc_data.h>
-#include <game/client/gc_render.h>
+#include <game/g_math.hpp>
+#include <game/generated/gc_data.hpp>
+#include <game/client/gc_render.hpp>
 
 LAYER_QUADS::LAYER_QUADS()
 {

src/game/editor/ed_layer_tiles.cpp

@@ -1,6 +1,6 @@
-#include <game/g_math.h>
-#include <game/generated/gc_data.h>
-#include <game/client/gc_render.h>
+#include <game/g_math.hpp>
+#include <game/generated/gc_data.hpp>
+#include <game/client/gc_render.hpp>
 #include "ed_editor.hpp"
 
 LAYER_TILES::LAYER_TILES(int w, int h)

src/game/g_collision.cpp

@@ -1,11 +1,11 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_system.h>
-#include <game/g_vmath.h>
+#include <game/g_vmath.hpp>
 #include <math.h>
 #include <engine/e_common_interface.h>
-#include <game/g_math.h>
-#include <game/g_mapitems.h>
-#include <game/g_layers.h>
+#include <game/g_math.hpp>
+#include <game/g_mapitems.hpp>
+#include <game/g_layers.hpp>
 
 static TILE *tiles;
 static int width = 0;

src/game/g_collision.hpp

@@ -3,7 +3,7 @@
 #define GAME_MAPRES_COL_H
 
 
-#include <game/g_vmath.h>
+#include <game/g_vmath.hpp>
 
 int col_init();
 int col_is_solid(int x, int y);

src/game/g_game.cpp

@@ -1,11 +1,11 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
-#include "g_game.h"
+#include "g_game.hpp"
 
 const char *TUNING_PARAMS::names[] =
 {
 	#define MACRO_TUNING_PARAM(name,value) #name,
-	#include "g_tuning.h"
+	#include "g_tuning.hpp"
 	#undef MACRO_TUNING_PARAM
 };
 

src/game/g_game.hpp

@@ -5,9 +5,9 @@
 #include <engine/e_system.h>
 #include <engine/e_common_interface.h>
 #include <math.h>
-#include "g_math.h"
-#include "g_collision.h"
-#include "g_protocol.h"
+#include "g_math.hpp"
+#include "g_collision.hpp"
+#include "g_protocol.hpp"
 
 struct TUNING_PARAMS
 {
@@ -15,14 +15,14 @@ struct TUNING_PARAMS
 	{
 		const float ticks_per_second = 50.0f;
 		#define MACRO_TUNING_PARAM(name,value) name.set((int)(value*100.0f));
-		#include "g_tuning.h"
+		#include "g_tuning.hpp"
 		#undef MACRO_TUNING_PARAM
 	}
 
 	static const char *names[];
 	
 	#define MACRO_TUNING_PARAM(name,value) tune_param name;
-	#include "g_tuning.h"
+	#include "g_tuning.hpp"
 	#undef MACRO_TUNING_PARAM
 	
 	static int num() { return sizeof(TUNING_PARAMS)/sizeof(int); }

src/game/g_layers.cpp

@@ -1,5 +1,5 @@
 #include <engine/e_common_interface.h>
-#include "g_layers.h"
+#include "g_layers.hpp"
 
 static MAPITEM_LAYER_TILEMAP *game_layer = 0;
 static MAPITEM_GROUP *game_group = 0;

src/game/g_layers.hpp

@@ -1,4 +1,4 @@
-#include "g_mapitems.h"
+#include "g_mapitems.hpp"
 
 void layers_init();
 

src/game/g_protocol.hpp

@@ -4,7 +4,7 @@
 #ifndef GAME_PROTOCOL_H
 #define GAME_PROTOCOL_H
 
-#include <game/generated/g_protocol.h>
+#include <game/generated/g_protocol.hpp>
 
 // Network stuff
 /*

src/game/server/gs_common.hpp

@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_game.h"
-#include "../generated/gs_data.h"
+#include "../g_game.hpp"
+#include "../generated/gs_data.hpp"
 
 
 extern TUNING_PARAMS tuning;

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)

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()
 {

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()
 {

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()
 {

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;