diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/ec_client.c (renamed from src/engine/client/client.c) | 26 | ||||
| -rw-r--r-- | src/engine/client/ec_gfx.c (renamed from src/engine/client/gfx.c) | 10 | ||||
| -rw-r--r-- | src/engine/client/ec_inp.c (renamed from src/engine/client/inp.c) | 6 | ||||
| -rw-r--r-- | src/engine/client/ec_snd.c (renamed from src/engine/client/snd.c) | 6 | ||||
| -rw-r--r-- | src/engine/client/ec_srvbrowse.c (renamed from src/engine/client/srvbrowse.c) | 10 | ||||
| -rw-r--r-- | src/engine/client/ec_ui.c (renamed from src/engine/client/ui.c) | 8 | ||||
| -rw-r--r-- | src/engine/client/ec_ui.h (renamed from src/engine/client/ui.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_compression.c (renamed from src/engine/compression.c) | 2 | ||||
| -rw-r--r-- | src/engine/e_compression.h (renamed from src/engine/compression.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_config.c (renamed from src/engine/config.c) | 14 | ||||
| -rw-r--r-- | src/engine/e_config.h (renamed from src/engine/config.h) | 6 | ||||
| -rw-r--r-- | src/engine/e_config_variables.h (renamed from src/engine/config_variables.h) | 2 | ||||
| -rw-r--r-- | src/engine/e_datafile.c (renamed from src/engine/datafile.c) | 4 | ||||
| -rw-r--r-- | src/engine/e_datafile.h (renamed from src/engine/datafile.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_detect.h (renamed from src/engine/detect.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_engine.c (renamed from src/engine/engine.c) | 6 | ||||
| -rw-r--r-- | src/engine/e_engine.h (renamed from src/engine/engine.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_interface.h (renamed from src/engine/interface.h) | 2 | ||||
| -rw-r--r-- | src/engine/e_keynames.c (renamed from src/engine/keynames.c) | 0 | ||||
| -rw-r--r-- | src/engine/e_keys.h (renamed from src/engine/keys.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_map.c (renamed from src/engine/map.c) | 2 | ||||
| -rw-r--r-- | src/engine/e_memheap.c (renamed from src/engine/memheap.c) | 2 | ||||
| -rw-r--r-- | src/engine/e_memheap.h (renamed from src/engine/memheap.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_msg.c (renamed from src/engine/msg.c) | 4 | ||||
| -rw-r--r-- | src/engine/e_network.c (renamed from src/engine/network.c) | 6 | ||||
| -rw-r--r-- | src/engine/e_network.h (renamed from src/engine/network.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_packer.c (renamed from src/engine/packer.c) | 4 | ||||
| -rw-r--r-- | src/engine/e_packer.h (renamed from src/engine/packer.h) | 0 | ||||
| -rw-r--r-- | src/engine/e_protocol.h (renamed from src/engine/protocol.h) | 2 | ||||
| -rw-r--r-- | src/engine/e_snapshot.c (renamed from src/engine/snapshot.c) | 4 | ||||
| -rw-r--r-- | src/engine/e_snapshot.h (renamed from src/engine/snapshot.h) | 2 | ||||
| -rw-r--r-- | src/engine/e_system.c (renamed from src/engine/system.c) | 4 | ||||
| -rw-r--r-- | src/engine/e_system.h (renamed from src/engine/system.h) | 2 | ||||
| -rw-r--r-- | src/engine/external/pa.c | 2 | ||||
| -rw-r--r-- | src/engine/server/es_server.c (renamed from src/engine/server/server.c) | 22 |
35 files changed, 79 insertions, 79 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/ec_client.c index 646ca4b4..78e7877c 100644 --- a/src/engine/client/client.c +++ b/src/engine/client/ec_client.c @@ -6,19 +6,19 @@ #include <stdio.h> #include <math.h> -#include <engine/system.h> -#include <engine/engine.h> -#include <engine/interface.h> -#include "ui.h" - -#include <engine/protocol.h> -#include <engine/snapshot.h> -#include <engine/compression.h> -#include <engine/network.h> -#include <engine/config.h> -#include <engine/packer.h> -#include <engine/memheap.h> -#include <engine/datafile.h> +#include <engine/e_system.h> +#include <engine/e_engine.h> +#include <engine/e_interface.h> +#include "ec_ui.h" + +#include <engine/e_protocol.h> +#include <engine/e_snapshot.h> +#include <engine/e_compression.h> +#include <engine/e_network.h> +#include <engine/e_config.h> +#include <engine/e_packer.h> +#include <engine/e_memheap.h> +#include <engine/e_datafile.h> #include <mastersrv/mastersrv.h> diff --git a/src/engine/client/gfx.c b/src/engine/client/ec_gfx.c index c61f0cb1..cd1f690b 100644 --- a/src/engine/client/gfx.c +++ b/src/engine/client/ec_gfx.c @@ -2,11 +2,11 @@ #include <engine/external/glfw/include/GL/glfw.h> #include <engine/external/pnglite/pnglite.h> -#include <engine/system.h> -#include <engine/interface.h> -#include <engine/engine.h> -#include <engine/config.h> -#include <engine/keys.h> +#include <engine/e_system.h> +#include <engine/e_interface.h> +#include <engine/e_engine.h> +#include <engine/e_config.h> +#include <engine/e_keys.h> #include <string.h> #include <stdio.h> diff --git a/src/engine/client/inp.c b/src/engine/client/ec_inp.c index 7ffb7f3f..0366cff5 100644 --- a/src/engine/client/inp.c +++ b/src/engine/client/ec_inp.c @@ -2,9 +2,9 @@ #include <string.h> #include <engine/external/glfw/include/GL/glfw.h> -#include <engine/system.h> -#include <engine/interface.h> -#include <engine/config.h> +#include <engine/e_system.h> +#include <engine/e_interface.h> +#include <engine/e_config.h> static int keyboard_state[2][1024]; /* TODO: fix this!! */ static int keyboard_current = 0; diff --git a/src/engine/client/snd.c b/src/engine/client/ec_snd.c index aa155c0c..89e18cb8 100644 --- a/src/engine/client/snd.c +++ b/src/engine/client/ec_snd.c @@ -1,7 +1,7 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include <engine/system.h> -#include <engine/interface.h> -#include <engine/config.h> +#include <engine/e_system.h> +#include <engine/e_interface.h> +#include <engine/e_config.h> #include <engine/external/portaudio/portaudio.h> #include <engine/external/wavpack/wavpack.h> diff --git a/src/engine/client/srvbrowse.c b/src/engine/client/ec_srvbrowse.c index 9fbbc2a0..9fc5ec02 100644 --- a/src/engine/client/srvbrowse.c +++ b/src/engine/client/ec_srvbrowse.c @@ -1,9 +1,9 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include <engine/system.h> -#include <engine/network.h> -#include <engine/interface.h> -#include <engine/config.h> -#include <engine/memheap.h> +#include <engine/e_system.h> +#include <engine/e_network.h> +#include <engine/e_interface.h> +#include <engine/e_config.h> +#include <engine/e_memheap.h> #include <mastersrv/mastersrv.h> diff --git a/src/engine/client/ui.c b/src/engine/client/ec_ui.c index 9486b2c1..5ba9c0d9 100644 --- a/src/engine/client/ui.c +++ b/src/engine/client/ec_ui.c @@ -1,8 +1,8 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include <engine/system.h> -#include <engine/interface.h> -#include <engine/config.h> -#include "ui.h" +#include <engine/e_system.h> +#include <engine/e_interface.h> +#include <engine/e_config.h> +#include "ec_ui.h" /******************************************************** UI diff --git a/src/engine/client/ui.h b/src/engine/client/ec_ui.h index 15c63b90..15c63b90 100644 --- a/src/engine/client/ui.h +++ b/src/engine/client/ec_ui.h diff --git a/src/engine/compression.c b/src/engine/e_compression.c index d99624c0..fa7d7866 100644 --- a/src/engine/compression.c +++ b/src/engine/e_compression.c @@ -1,5 +1,5 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "system.h" +#include "e_system.h" #include <string.h> /* Format: ESDDDDDD EDDDDDDD EDD... Extended, Data, Sign */ diff --git a/src/engine/compression.h b/src/engine/e_compression.h index 39ffd596..39ffd596 100644 --- a/src/engine/compression.h +++ b/src/engine/e_compression.h diff --git a/src/engine/config.c b/src/engine/e_config.c index 3fa6f98d..a4c47ec1 100644 --- a/src/engine/config.c +++ b/src/engine/e_config.c @@ -4,8 +4,8 @@ #include <stdio.h> #include <stdlib.h> -#include "system.h" -#include "config.h" +#include "e_system.h" +#include "e_config.h" /* buffered stream for reading lines, should perhaps be something smaller */ @@ -86,7 +86,7 @@ void config_reset() #define MACRO_CONFIG_INT(name,def,min,max) config.name = def; #define MACRO_CONFIG_STR(name,len,def) strncpy(config.name, def, len); - #include "config_variables.h" + #include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR @@ -127,7 +127,7 @@ void config_set(const char *line) #define MACRO_CONFIG_INT(name,def,min,max) { if (strcmp(#name, var_str) == 0) config_set_ ## name (&config, atoi(val_str)); } #define MACRO_CONFIG_STR(name,len,def) { if (strcmp(#name, var_str) == 0) { config_set_ ## name (&config, val_str); } } - #include "config_variables.h" + #include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR @@ -172,7 +172,7 @@ void config_save(const char *filename) #define MACRO_CONFIG_INT(name,def,min,max) { char str[256]; sprintf(str, "%s=%i%s", #name, config.name, newline); io_write(file, str, strlen(str)); } #define MACRO_CONFIG_STR(name,len,def) { io_write(file, #name, strlen(#name)); io_write(file, "=", 1); io_write(file, config.name, strlen(config.name)); io_write(file, newline, newline_len); } - #include "config_variables.h" + #include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR @@ -185,12 +185,12 @@ void config_save(const char *filename) #define MACRO_CONFIG_INT(name,def,min,max) int config_get_ ## name (CONFIGURATION *c) { return c->name; } #define MACRO_CONFIG_STR(name,len,def) const char *config_get_ ## name (CONFIGURATION *c) { return c->name; } -#include "config_variables.h" +#include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR #define MACRO_CONFIG_INT(name,def,min,max) void config_set_ ## name (CONFIGURATION *c, int val) { if(min != max) { if (val < min) val = min; if (max != 0 && val > max) val = max; } c->name = val; } #define MACRO_CONFIG_STR(name,len,def) void config_set_ ## name (CONFIGURATION *c, const char *str) { strncpy(c->name, str, len-1); c->name[sizeof(c->name)-1] = 0; } -#include "config_variables.h" +#include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR diff --git a/src/engine/config.h b/src/engine/e_config.h index e01a7ec8..63933660 100644 --- a/src/engine/config.h +++ b/src/engine/e_config.h @@ -10,7 +10,7 @@ typedef struct { #define MACRO_CONFIG_INT(name,def,min,max) int name; #define MACRO_CONFIG_STR(name,len,def) char name[len]; - #include "config_variables.h" + #include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR } CONFIGURATION; @@ -24,13 +24,13 @@ void config_save(const char *filename); #define MACRO_CONFIG_INT(name,def,min,max) int config_get_ ## name (CONFIGURATION *c); #define MACRO_CONFIG_STR(name,len,def) const char *config_get_ ## name (CONFIGURATION *c); -#include "config_variables.h" +#include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR #define MACRO_CONFIG_INT(name,def,min,max) void config_set_ ## name (CONFIGURATION *c, int val); #define MACRO_CONFIG_STR(name,len,def) void config_set_ ## name (CONFIGURATION *c, const char *str); -#include "config_variables.h" +#include "e_config_variables.h" #undef MACRO_CONFIG_INT #undef MACRO_CONFIG_STR diff --git a/src/engine/config_variables.h b/src/engine/e_config_variables.h index 4a63e731..51ee7376 100644 --- a/src/engine/config_variables.h +++ b/src/engine/e_config_variables.h @@ -1,5 +1,5 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "../game/game_variables.h" +#include "../game/g_variables.h" MACRO_CONFIG_STR(player_name, 32, "nameless tee") diff --git a/src/engine/datafile.c b/src/engine/e_datafile.c index 7069044c..14138ed9 100644 --- a/src/engine/datafile.c +++ b/src/engine/e_datafile.c @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "system.h" -#include "datafile.h" +#include "e_system.h" +#include "e_datafile.h" #include "external/zlib/zlib.h" static const int DEBUG=0; diff --git a/src/engine/datafile.h b/src/engine/e_datafile.h index 7cc7b209..7cc7b209 100644 --- a/src/engine/datafile.h +++ b/src/engine/e_datafile.h diff --git a/src/engine/detect.h b/src/engine/e_detect.h index 04cca2d9..04cca2d9 100644 --- a/src/engine/detect.h +++ b/src/engine/e_detect.h diff --git a/src/engine/engine.c b/src/engine/e_engine.c index 08f13184..341bf936 100644 --- a/src/engine/engine.c +++ b/src/engine/e_engine.c @@ -2,9 +2,9 @@ #include <string.h> #include <stdio.h> -#include <engine/system.h> -#include <engine/interface.h> -#include <engine/config.h> +#include <engine/e_system.h> +#include <engine/e_interface.h> +#include <engine/e_config.h> static char application_save_path[512] = {0}; diff --git a/src/engine/engine.h b/src/engine/e_engine.h index 56fec20e..56fec20e 100644 --- a/src/engine/engine.h +++ b/src/engine/e_engine.h diff --git a/src/engine/interface.h b/src/engine/e_interface.h index 5cd8d604..67f8c78c 100644 --- a/src/engine/interface.h +++ b/src/engine/e_interface.h @@ -10,7 +10,7 @@ extern "C" { Title: Engine Interface */ -#include "keys.h" +#include "e_keys.h" enum { diff --git a/src/engine/keynames.c b/src/engine/e_keynames.c index fa87467d..fa87467d 100644 --- a/src/engine/keynames.c +++ b/src/engine/e_keynames.c diff --git a/src/engine/keys.h b/src/engine/e_keys.h index 77a52f58..77a52f58 100644 --- a/src/engine/keys.h +++ b/src/engine/e_keys.h diff --git a/src/engine/map.c b/src/engine/e_map.c index 921c05c7..6dfa4aa6 100644 --- a/src/engine/map.c +++ b/src/engine/e_map.c @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ #include <stdio.h> -#include "datafile.h" +#include "e_datafile.h" static DATAFILE *map = 0; diff --git a/src/engine/memheap.c b/src/engine/e_memheap.c index cb8ca664..6d117631 100644 --- a/src/engine/memheap.c +++ b/src/engine/e_memheap.c @@ -1,5 +1,5 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "system.h" +#include "e_system.h" typedef struct CHUNK_t { diff --git a/src/engine/memheap.h b/src/engine/e_memheap.h index 83082046..83082046 100644 --- a/src/engine/memheap.h +++ b/src/engine/e_memheap.h diff --git a/src/engine/msg.c b/src/engine/e_msg.c index d3f916fa..adfb1cd3 100644 --- a/src/engine/msg.c +++ b/src/engine/e_msg.c @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "interface.h" -#include "packer.h" +#include "e_interface.h" +#include "e_packer.h" /* message packing */ static PACKER msg_packer; diff --git a/src/engine/network.c b/src/engine/e_network.c index 85b4604f..b26e75f0 100644 --- a/src/engine/network.c +++ b/src/engine/e_network.c @@ -2,9 +2,9 @@ #include <string.h> #include <stdio.h> -#include "system.h" -#include "config.h" -#include "network.h" +#include "e_system.h" +#include "e_config.h" +#include "e_network.h" /* header (6 bytes) diff --git a/src/engine/network.h b/src/engine/e_network.h index 338c5982..338c5982 100644 --- a/src/engine/network.h +++ b/src/engine/e_network.h diff --git a/src/engine/packer.c b/src/engine/e_packer.c index 30cb6755..948db4ea 100644 --- a/src/engine/packer.c +++ b/src/engine/e_packer.c @@ -1,7 +1,7 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "packer.h" -#include "compression.h" +#include "e_packer.h" +#include "e_compression.h" void packer_reset(PACKER *p) { diff --git a/src/engine/packer.h b/src/engine/e_packer.h index 71b99ff7..71b99ff7 100644 --- a/src/engine/packer.h +++ b/src/engine/e_packer.h diff --git a/src/engine/protocol.h b/src/engine/e_protocol.h index e85ecf9f..0e8a63f4 100644 --- a/src/engine/protocol.h +++ b/src/engine/e_protocol.h @@ -1,5 +1,5 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "system.h" +#include "e_system.h" /* Connection diagram - How the initilization works. diff --git a/src/engine/snapshot.c b/src/engine/e_snapshot.c index 4db6ac26..91b7797b 100644 --- a/src/engine/snapshot.c +++ b/src/engine/e_snapshot.c @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#include "snapshot.h" -#include "compression.h" +#include "e_snapshot.h" +#include "e_compression.h" int *snapitem_data(SNAPSHOT_ITEM *item) { return (int *)(item+1); } diff --git a/src/engine/snapshot.h b/src/engine/e_snapshot.h index 60131d4f..0a74b0dc 100644 --- a/src/engine/snapshot.h +++ b/src/engine/e_snapshot.h @@ -2,7 +2,7 @@ #ifndef ENGINE_SNAPSHOT_H #define ENGINE_SNAPSHOT_H -#include "system.h" +#include "e_system.h" /* SNAPSHOT */ diff --git a/src/engine/system.c b/src/engine/e_system.c index 8e5bd8e5..90aeccc5 100644 --- a/src/engine/system.c +++ b/src/engine/e_system.c @@ -6,8 +6,8 @@ #include <ctype.h> #include <time.h> -#include "detect.h" -#include "system.h" +#include "e_detect.h" +#include "e_system.h" #if defined(CONF_FAMILY_UNIX) #include <sys/time.h> diff --git a/src/engine/system.h b/src/engine/e_system.h index e54af0f1..4802111f 100644 --- a/src/engine/system.h +++ b/src/engine/e_system.h @@ -2,7 +2,7 @@ #ifndef BASE_SYSTEM_H #define BASE_SYSTEM_H -#include "detect.h" +#include "e_detect.h" #ifdef __cplusplus extern "C" { diff --git a/src/engine/external/pa.c b/src/engine/external/pa.c index a417e9db..71afc065 100644 --- a/src/engine/external/pa.c +++ b/src/engine/external/pa.c @@ -1,5 +1,5 @@ /* Include the auto configuration */ -#include <engine/detect.h> +#include <engine/e_detect.h> /* common part */ #include "portaudio/pa_converters.c" diff --git a/src/engine/server/server.c b/src/engine/server/es_server.c index d2ef39ed..00100b10 100644 --- a/src/engine/server/server.c +++ b/src/engine/server/es_server.c @@ -3,20 +3,20 @@ #include <string.h> #include <stdlib.h> -#include <engine/system.h> -#include <engine/config.h> -#include <engine/engine.h> -#include <engine/interface.h> +#include <engine/e_system.h> +#include <engine/e_config.h> +#include <engine/e_engine.h> +#include <engine/e_interface.h> -#include <engine/protocol.h> -#include <engine/snapshot.h> +#include <engine/e_protocol.h> +#include <engine/e_snapshot.h> -#include <engine/compression.h> +#include <engine/e_compression.h> -#include <engine/network.h> -#include <engine/config.h> -#include <engine/packer.h> -#include <engine/datafile.h> +#include <engine/e_network.h> +#include <engine/e_config.h> +#include <engine/e_packer.h> +#include <engine/e_datafile.h> #include <mastersrv/mastersrv.h> |