diff options
| -rw-r--r-- | src/engine/config.cpp | 6 | ||||
| -rw-r--r-- | src/engine/config.h | 6 | ||||
| -rw-r--r-- | src/engine/config_variables.h | 2 | ||||
| -rw-r--r-- | src/game/game_variables.h (renamed from src/game/config_variables.h) | 0 |
4 files changed, 13 insertions, 1 deletions
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/game_variables.h index 0b1fed7e..0b1fed7e 100644 --- a/src/game/config_variables.h +++ b/src/game/game_variables.h |