X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=701d38fb83b3b1c246aa375634f504538b9f0452;hb=97edb8ddb87d3abe1496a0fee11a20cf2830daf6;hp=b1d0d96bda910307bc80259b8f741cea0c021632;hpb=58edf10f5b07ac0e3c2536ed5e3a3bb996c8fc31;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index b1d0d96b..701d38fb 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -696,37 +696,6 @@ char *getBasePath(char *filename)
   return basepath;
 }
 
-static char *getProgramMainDataPath()
-{
-  char *main_data_path = getStringCopy(program.command_basepath);
-
-#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                                                  */
@@ -940,8 +909,8 @@ void GetOptions(int argc, char *argv[],
 		void (*print_usage_function)(void),
 		void (*print_version_function)(void))
 {
-  char *ro_base_path = RO_BASE_PATH;
-  char *rw_base_path = RW_BASE_PATH;
+  char *ro_base_path = getProgramMainDataPath(argv[0], RO_BASE_PATH);
+  char *rw_base_path = getProgramMainDataPath(argv[0], RW_BASE_PATH);
   char **argvplus = checked_calloc((argc + 1) * sizeof(char **));
   char **options_left = &argvplus[1];
 
@@ -949,16 +918,6 @@ void GetOptions(int argc, char *argv[],
   while (argc--)
     argvplus[argc] = argv[argc];
 
-  /* 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) */
-
-  if (strEqual(ro_base_path, "."))
-    ro_base_path = getProgramMainDataPath();
-  if (strEqual(rw_base_path, "."))
-    rw_base_path = getProgramMainDataPath();
-
   /* initialize global program options */
   options.server_host = NULL;
   options.server_port = 0;