X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=3881d202338a5d3ab1971a35cf080fab644b2241;hb=cdc3c940197937b0508a1eb7dcf44874951908b7;hp=8d8f8aae9ce92700e95e162f7003688a12586081;hpb=494b886d5c5041013ea361a12a07d7cd87551d52;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 8d8f8aae..3881d202 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -578,10 +578,18 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) char *rw_base_path = RW_BASE_PATH; char **options_left = &argv[1]; +#if !defined(PLATFORM_MACOSX) + /* if the program is configured to start from current directory (default), + determine program package directory (KDE/Konqueror does not do this by + itself and fails otherwise); on Mac OS X, the program binary is stored + in an application package directory -- do not try to use this directory + as the program data directory (Mac OS X handles this correctly anyway) */ + if (strcmp(ro_base_path, ".") == 0) ro_base_path = program.command_basepath; if (strcmp(rw_base_path, ".") == 0) rw_base_path = program.command_basepath; +#endif /* initialize global program options */ options.display_name = NULL;