diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-21 18:05:06 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-21 18:05:06 +0000 |
| commit | 9acb3e5e713d1ab6b2312aa4cdc7946f85f875d0 (patch) | |
| tree | 93189cbe6fc70c2ca1b5e374a2114156d55e371a /src/engine/e_console.c | |
| parent | 142b5ad5143ddcfc9d7fee2563bee753a968f011 (diff) | |
| download | zcatch-9acb3e5e713d1ab6b2312aa4cdc7946f85f875d0.tar.gz zcatch-9acb3e5e713d1ab6b2312aa4cdc7946f85f875d0.zip | |
continued on ban support. cleaned up settings a bit. reworked the datadir autodetection. introduced engine_openfile, engine_getpath and engine_listdir. never use fs_listdir or io_open directly
Diffstat (limited to 'src/engine/e_console.c')
| -rw-r--r-- | src/engine/e_console.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/e_console.c b/src/engine/e_console.c index 2879e75b..1c68c2e7 100644 --- a/src/engine/e_console.c +++ b/src/engine/e_console.c @@ -2,6 +2,7 @@ #include "e_if_other.h" #include "e_console.h" #include "e_config.h" +#include "e_engine.h" #include "e_linereader.h" #include <stdio.h> #include <string.h> @@ -299,7 +300,7 @@ void console_execute_line(const char *str) static void console_execute_file_real(const char *filename) { IOHANDLE file; - file = io_open(filename, IOFLAG_READ); + file = engine_openfile(filename, IOFLAG_READ); if(file) { @@ -406,8 +407,8 @@ void console_init() MACRO_REGISTER_COMMAND("echo", "r", con_echo, 0x0); MACRO_REGISTER_COMMAND("exec", "r", con_exec, 0x0); - #define MACRO_CONFIG_INT(name,def,min,max) { static INT_VARIABLE_DATA data = { &config_get_ ## name, &config_set_ ## name }; MACRO_REGISTER_COMMAND(#name, "?i", int_variable_command, &data) } - #define MACRO_CONFIG_STR(name,len,def) { static STR_VARIABLE_DATA data = { &config_get_ ## name, &config_set_ ## name }; MACRO_REGISTER_COMMAND(#name, "?r", str_variable_command, &data) } + #define MACRO_CONFIG_INT(name,def,min,max,flags,desc) { static INT_VARIABLE_DATA data = { &config_get_ ## name, &config_set_ ## name }; MACRO_REGISTER_COMMAND(#name, "?i", int_variable_command, &data) } + #define MACRO_CONFIG_STR(name,len,def,flags,desc) { static STR_VARIABLE_DATA data = { &config_get_ ## name, &config_set_ ## name }; MACRO_REGISTER_COMMAND(#name, "?r", str_variable_command, &data) } #include "e_config_variables.h" |