diff options
| -rw-r--r-- | src/editor/editor.cpp | 5 | ||||
| -rw-r--r-- | src/engine/client/client.cpp | 6 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 6 | ||||
| -rw-r--r-- | src/game/client/menu.cpp | 4 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp index e6409650..1ca1c197 100644 --- a/src/editor/editor.cpp +++ b/src/editor/editor.cpp @@ -1240,8 +1240,11 @@ extern void modmenu_init(); int editor_main(int argc, char **argv) { dbg_msg("editor", "starting..."); - +#ifdef CONF_PLATFORM_MACOSX + config_load("~/teewars"); +#else config_load("default.cfg"); +#endif // parse arguments for(int i = 1; i < argc; i++) diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index e864a24f..2eb8ff81 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -943,7 +943,11 @@ int main(int argc, char **argv) dbg_msg("client", "starting..."); config_reset(); - config_load("default.cfg"); +#ifdef CONF_PLATFORM_MACOSX + config_load("~/.teewars"); +#else + config_load("default.cfg"); +#endif const char *direct_connect_server = 0x0; snd_set_master_volume(config.volume / 255.0f); diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 36dd6db3..7417054e 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -585,7 +585,11 @@ int main(int argc, char **argv) dbg_msg("server", "starting..."); config_reset(); - config_load("default.cfg"); +#ifdef CONF_PLATFORM_MACOSX + config_load("~/.teewars"); +#else + config_load("default.cfg"); +#endif const char *mapname = "dm1"; diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index 805da622..3066819c 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -992,7 +992,11 @@ static int settings_render() if (ui_do_button(&save_button, "Save", 0, 482, 490, 128, 48, draw_teewars_button)) { config = config_copy; +#ifdef CONF_PLATFORM_MACOSX + config_save("~/.teewars"); +#else config_save("default.cfg"); +#endif screen = SCREEN_MAIN; } |