From f18df70e53edd1c58406e41ee25cbfc0bd8012e0 Mon Sep 17 00:00:00 2001 From: Jakob Fries Date: Fri, 1 Jun 2007 12:24:13 +0000 Subject: --- src/engine/config.cpp | 6 ++++++ src/engine/config.h | 6 ++++++ src/engine/config_variables.h | 2 +- src/game/config_variables.h | 8 -------- src/game/game_variables.h | 8 ++++++++ 5 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 src/game/config_variables.h create mode 100644 src/game/game_variables.h diff --git a/src/engine/config.cpp b/src/engine/config.cpp index b1bbdab9..c7235b05 100644 --- a/src/engine/config.cpp +++ b/src/engine/config.cpp @@ -76,6 +76,12 @@ void config_save(const char *filename) file.close(); } +#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" +#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 (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" diff --git a/src/engine/config.h b/src/engine/config.h index 7cfe2ea5..116ad9b4 100644 --- a/src/engine/config.h +++ b/src/engine/config.h @@ -16,6 +16,12 @@ void config_reset(); void config_load(const char *filename); 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" +#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" diff --git a/src/engine/config_variables.h b/src/engine/config_variables.h index 7ed54a06..852d26a9 100644 --- a/src/engine/config_variables.h +++ b/src/engine/config_variables.h @@ -1,2 +1,2 @@ -#include "../game/config_variables.h" +#include "../game/game_variables.h" diff --git a/src/game/config_variables.h b/src/game/config_variables.h deleted file mode 100644 index 0b1fed7e..00000000 --- a/src/game/config_variables.h +++ /dev/null @@ -1,8 +0,0 @@ -MACRO_CONFIG_INT(screen_width, 800, 0, 0) -MACRO_CONFIG_INT(screen_height, 600, 0, 0) -MACRO_CONFIG_STR(player_name, 32, "nameless tee") -MACRO_CONFIG_INT(key_move_left, 65, 32, 127) -MACRO_CONFIG_INT(key_move_right, 68, 32, 127) -MACRO_CONFIG_INT(key_jump, 32, 32, 127) -MACRO_CONFIG_INT(key_fire, 33, 32, 127) -MACRO_CONFIG_INT(key_hook, 34, 32, 127) diff --git a/src/game/game_variables.h b/src/game/game_variables.h new file mode 100644 index 00000000..0b1fed7e --- /dev/null +++ b/src/game/game_variables.h @@ -0,0 +1,8 @@ +MACRO_CONFIG_INT(screen_width, 800, 0, 0) +MACRO_CONFIG_INT(screen_height, 600, 0, 0) +MACRO_CONFIG_STR(player_name, 32, "nameless tee") +MACRO_CONFIG_INT(key_move_left, 65, 32, 127) +MACRO_CONFIG_INT(key_move_right, 68, 32, 127) +MACRO_CONFIG_INT(key_jump, 32, 32, 127) +MACRO_CONFIG_INT(key_fire, 33, 32, 127) +MACRO_CONFIG_INT(key_hook, 34, 32, 127) -- cgit 1.4.1