diff options
29 files changed, 36 insertions, 36 deletions
diff --git a/default.bam b/default.bam index 02c04077..bac5326f 100644 --- a/default.bam +++ b/default.bam @@ -107,8 +107,8 @@ nethash = CHash( "src/game/generated/nethash.c", "src/engine/e_protocol.h", "src/game/generated/g_protocol.hpp", - "src/game/g_tuning.hpp", - "src/game/g_game.cpp", network_header) + "src/game/tuning.hpp", + "src/game/gamecore.cpp", network_header) client_link_other = {} if config.compiler.value == "cl" then diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h index 8396aa88..bceda2fb 100644 --- a/src/engine/e_config_variables.h +++ b/src/engine/e_config_variables.h @@ -1,7 +1,7 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ /* TODO: remove this */ -#include "../game/g_variables.hpp" +#include "../game/variables.hpp" MACRO_CONFIG_STR(player_name, 32, "nameless tee") diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp index 2be38637..f9900ab3 100644 --- a/src/game/client/gc_client.cpp +++ b/src/game/client/gc_client.cpp @@ -11,9 +11,9 @@ extern "C" { #include <engine/e_client_interface.h> }; -#include "../g_game.hpp" -#include "../g_version.hpp" -#include "../g_layers.hpp" +#include "../gamecore.hpp" +#include "../version.hpp" +#include "../layers.hpp" #include "gc_map_image.hpp" #include "../generated/gc_data.hpp" #include "gc_menu.hpp" diff --git a/src/game/client/gc_client.hpp b/src/game/client/gc_client.hpp index 4634aa58..2b6ccd46 100644 --- a/src/game/client/gc_client.hpp +++ b/src/game/client/gc_client.hpp @@ -1,7 +1,7 @@ #include <base/vmath.hpp> #include <game/generated/g_protocol.hpp> -#include <game/g_game.hpp> +#include <game/gamecore.hpp> #include <game/client/gc_render.hpp> diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp index d1e517de..eb73ebc6 100644 --- a/src/game/client/gc_console.cpp +++ b/src/game/client/gc_console.cpp @@ -17,7 +17,7 @@ extern "C" { #include "gc_ui.hpp" #include "gc_client.hpp" -#include "../g_version.hpp" +#include "../version.hpp" enum { diff --git a/src/game/client/gc_flow.cpp b/src/game/client/gc_flow.cpp index 63e60617..b18a41e6 100644 --- a/src/game/client/gc_flow.cpp +++ b/src/game/client/gc_flow.cpp @@ -1,7 +1,7 @@ #include <engine/e_client_interface.h> #include <engine/e_config.h> #include "gc_client.hpp" -#include "../g_layers.hpp" +#include "../layers.hpp" struct FLOWCELL { diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp index 5d9570fb..8db0995f 100644 --- a/src/game/client/gc_hooks.cpp +++ b/src/game/client/gc_hooks.cpp @@ -9,10 +9,10 @@ extern "C" { }; #include <game/generated/gc_data.hpp> -#include <game/g_game.hpp> -#include <game/g_version.hpp> +#include <game/gamecore.hpp> +#include <game/version.hpp> -#include <game/g_layers.hpp> +#include <game/layers.hpp> #include "gc_client.hpp" #include "gc_skin.hpp" diff --git a/src/game/client/gc_map_image.cpp b/src/game/client/gc_map_image.cpp index b48b6b1d..ca16674a 100644 --- a/src/game/client/gc_map_image.cpp +++ b/src/game/client/gc_map_image.cpp @@ -3,7 +3,7 @@ #include <stdio.h> #include <engine/e_client_interface.h> -#include <game/g_mapitems.hpp> +#include <game/mapitems.hpp> #include "gc_map_image.hpp" static int map_textures[64] = {0}; diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp index c867720b..fb7c5437 100644 --- a/src/game/client/gc_menu.cpp +++ b/src/game/client/gc_menu.cpp @@ -15,7 +15,7 @@ extern "C" { #include <engine/client/ec_font.h> } -#include "../g_version.hpp" +#include "../version.hpp" #include <game/generated/g_protocol.hpp> #include "../generated/gc_data.hpp" diff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp index 28e16686..56e82c69 100644 --- a/src/game/client/gc_render.cpp +++ b/src/game/client/gc_render.cpp @@ -7,7 +7,7 @@ #include <engine/e_config.h> #include <game/generated/gc_data.hpp> #include <game/generated/g_protocol.hpp> -#include <game/g_layers.hpp> +#include <game/layers.hpp> #include "gc_render.hpp" #include "gc_anim.hpp" #include "gc_client.hpp" diff --git a/src/game/client/gc_render.hpp b/src/game/client/gc_render.hpp index faaff094..e48d0fcd 100644 --- a/src/game/client/gc_render.hpp +++ b/src/game/client/gc_render.hpp @@ -4,7 +4,7 @@ #include <base/vmath.hpp> -#include "../g_mapitems.hpp" +#include "../mapitems.hpp" #include "gc_ui.hpp" struct TEE_RENDER_INFO diff --git a/src/game/g_collision.cpp b/src/game/collision.cpp index 510cfba6..c1e08441 100644 --- a/src/game/g_collision.cpp +++ b/src/game/collision.cpp @@ -5,8 +5,8 @@ #include <math.h> #include <engine/e_common_interface.h> -#include <game/g_mapitems.hpp> -#include <game/g_layers.hpp> +#include <game/mapitems.hpp> +#include <game/layers.hpp> static TILE *tiles; static int width = 0; diff --git a/src/game/g_collision.hpp b/src/game/collision.hpp index 735e26c5..735e26c5 100644 --- a/src/game/g_collision.hpp +++ b/src/game/collision.hpp diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 429c88db..c474d16a 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -14,7 +14,7 @@ extern "C" { #include <game/client/gc_map_image.hpp> #include <game/client/gc_ui.hpp> -#include <game/g_game.hpp> +#include <game/gamecore.hpp> #include <game/client/gc_render.hpp> #include "ed_editor.hpp" diff --git a/src/game/editor/ed_editor.hpp b/src/game/editor/ed_editor.hpp index a8e8815b..e32b5cb7 100644 --- a/src/game/editor/ed_editor.hpp +++ b/src/game/editor/ed_editor.hpp @@ -6,7 +6,7 @@ #include <stdlib.h> #include <math.h> #include "array.hpp" -#include "../g_mapitems.hpp" +#include "../mapitems.hpp" #include "../client/gc_render.hpp" extern "C" { diff --git a/src/game/g_game.cpp b/src/game/gamecore.cpp index 2f14b25f..7c8dabe0 100644 --- a/src/game/g_game.cpp +++ b/src/game/gamecore.cpp @@ -1,11 +1,11 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ #include <string.h> -#include "g_game.hpp" +#include "gamecore.hpp" const char *TUNING_PARAMS::names[] = { #define MACRO_TUNING_PARAM(name,value) #name, - #include "g_tuning.hpp" + #include "tuning.hpp" #undef MACRO_TUNING_PARAM }; diff --git a/src/game/g_game.hpp b/src/game/gamecore.hpp index 29c948b9..1f9dda81 100644 --- a/src/game/g_game.hpp +++ b/src/game/gamecore.hpp @@ -7,7 +7,7 @@ #include <engine/e_common_interface.h> #include <math.h> -#include "g_collision.hpp" +#include "collision.hpp" #include <game/generated/g_protocol.hpp> struct TUNING_PARAMS @@ -16,14 +16,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.hpp" + #include "tuning.hpp" #undef MACRO_TUNING_PARAM } static const char *names[]; #define MACRO_TUNING_PARAM(name,value) tune_param name; - #include "g_tuning.hpp" + #include "tuning.hpp" #undef MACRO_TUNING_PARAM static int num() { return sizeof(TUNING_PARAMS)/sizeof(int); } diff --git a/src/game/g_layers.cpp b/src/game/layers.cpp index 254bc083..832dc766 100644 --- a/src/game/g_layers.cpp +++ b/src/game/layers.cpp @@ -1,5 +1,5 @@ #include <engine/e_common_interface.h> -#include "g_layers.hpp" +#include "layers.hpp" static MAPITEM_LAYER_TILEMAP *game_layer = 0; static MAPITEM_GROUP *game_group = 0; diff --git a/src/game/g_layers.hpp b/src/game/layers.hpp index f977bd65..cb18419b 100644 --- a/src/game/g_layers.hpp +++ b/src/game/layers.hpp @@ -1,4 +1,4 @@ -#include "g_mapitems.hpp" +#include "mapitems.hpp" void layers_init(); diff --git a/src/game/g_mapitems.hpp b/src/game/mapitems.hpp index 8093435a..8093435a 100644 --- a/src/game/g_mapitems.hpp +++ b/src/game/mapitems.hpp 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" diff --git a/src/game/g_tuning.hpp b/src/game/tuning.hpp index d35ef148..d35ef148 100644 --- a/src/game/g_tuning.hpp +++ b/src/game/tuning.hpp diff --git a/src/game/g_variables.hpp b/src/game/variables.hpp index c0852bc4..c0852bc4 100644 --- a/src/game/g_variables.hpp +++ b/src/game/variables.hpp diff --git a/src/game/g_version.hpp b/src/game/version.hpp index 7472c783..7472c783 100644 --- a/src/game/g_version.hpp +++ b/src/game/version.hpp diff --git a/src/tools/fake_server.c b/src/tools/fake_server.c index 602617ad..1ea999fe 100644 --- a/src/tools/fake_server.c +++ b/src/tools/fake_server.c @@ -180,7 +180,7 @@ int main(int argc, char **argv) if(strcmp(*argv, "-m") == 0) { argc--; argv++; - net_host_lookup(*argv, 0, &master_servers[num_masters]); + net_host_lookup(*argv, &master_servers[num_masters], NETTYPE_IPV4); argc--; argv++; master_servers[num_masters].port = atoi(*argv); num_masters++; |