X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=701d38fb83b3b1c246aa375634f504538b9f0452;hb=97edb8ddb87d3abe1496a0fee11a20cf2830daf6;hp=7ac8d566362aef4a052b16909e9d1a3b3f92e963;hpb=9b34554bd70ce56386dd056e3a5eea96e5cabbd0;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 7ac8d566..701d38fb 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -696,45 +696,6 @@ char *getBasePath(char *filename) return basepath; } -static char *getProgramMainDataPath(char *command_filename, char *base_path) -{ - /* check if the program's main data base directory is configured */ - if (!strEqual(base_path, ".")) - return base_path; - - /* if the program is configured to start from current directory (default), - determine program package directory from program binary (some versions - of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not - set the current working directory to the program package directory) */ - char *main_data_path = getBasePath(command_filename); - -#if defined(PLATFORM_MACOSX) - if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR)) - { - char *main_data_path_old = main_data_path; - - // cut relative path to Mac OS X application binary directory from path - main_data_path[strlen(main_data_path) - - strlen(MAC_APP_BINARY_SUBDIR)] = '\0'; - - // cut trailing path separator from path (but not if path is root directory) - if (strSuffix(main_data_path, "/") && !strEqual(main_data_path, "/")) - main_data_path[strlen(main_data_path) - 1] = '\0'; - - // replace empty path with current directory - if (strEqual(main_data_path, "")) - main_data_path = "."; - - // add relative path to Mac OS X application resources directory to path - main_data_path = getPath2(main_data_path, MAC_APP_FILES_SUBDIR); - - free(main_data_path_old); - } -#endif - - return main_data_path; -} - /* ------------------------------------------------------------------------- */ /* various string functions */