diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-15 12:49:54 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-15 12:49:54 +0000 |
| commit | aa69a5452811b086f521cffd9d1f79beff3caf5d (patch) | |
| tree | 0f6dc7c8797db8bf9d1fe28dac8cb288727572e3 /src/engine/e_engine.c | |
| parent | 1ba4e8d4ef42c26ce1dd496658bf6e48893ca4f4 (diff) | |
| download | zcatch-aa69a5452811b086f521cffd9d1f79beff3caf5d.tar.gz zcatch-aa69a5452811b086f521cffd9d1f79beff3caf5d.zip | |
fixed config loading. some compile warnings
Diffstat (limited to 'src/engine/e_engine.c')
| -rw-r--r-- | src/engine/e_engine.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/e_engine.c b/src/engine/e_engine.c index 341bf936..998621e8 100644 --- a/src/engine/e_engine.c +++ b/src/engine/e_engine.c @@ -37,6 +37,7 @@ void engine_init(const char *appname, int argc, char **argv) /* load the configuration */ { int i; + int abs = 0; const char *config_filename = "default.cfg"; char buf[1024]; for(i = 1; i < argc; i++) @@ -44,11 +45,15 @@ void engine_init(const char *appname, int argc, char **argv) if(argv[i][0] == '-' && argv[i][1] == 'f' && argv[i][2] == 0 && argc - i > 1) { config_filename = argv[i+1]; + abs = 1; i++; } } - config_load(engine_savepath(config_filename, buf, sizeof(buf))); + if(abs) + config_load(config_filename); + else + config_load(engine_savepath(config_filename, buf, sizeof(buf))); } /* search arguments for overrides */ |