X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=2116630707fc7bcb423a8cf51a4844a52cadc638;hb=6c16bea069f29f30b85f060ce0fe032242967f1a;hp=3ff1f8aa9c269d18e84b4bcb8ecf9d806287acd3;hpb=1ae81bd84cbf998cdd03a118e881668ce5a23cf1;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 3ff1f8aa..21166307 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -696,41 +696,18 @@ char *getBasePath(char *filename)
   return basepath;
 }
 
-static char *getProgramMainDataPath()
+static char *getProgramMainDataPath(char *command_filename)
 {
-  char *main_data_path = getStringCopy(program.command_basepath);
+  char *main_data_path = getBasePath(command_filename);
 
 #if defined(PLATFORM_MACOSX)
-  static char *main_data_binary_subdir = NULL;
-  static char *main_data_files_subdir = NULL;
-
-  if (main_data_binary_subdir == NULL)
-  {
-    main_data_binary_subdir = checked_malloc(strlen(program.program_title) + 1 +
-					     strlen("app") + 1 +
-					     strlen(MAC_APP_BINARY_SUBDIR) + 1);
-
-    sprintf(main_data_binary_subdir, "%s.app/%s",
-	    program.program_title, MAC_APP_BINARY_SUBDIR);
-  }
-
-  if (main_data_files_subdir == NULL)
-  {
-    main_data_files_subdir = checked_malloc(strlen(program.program_title) + 1 +
-					    strlen("app") + 1 +
-					    strlen(MAC_APP_FILES_SUBDIR) + 1);
-
-    sprintf(main_data_files_subdir, "%s.app/%s",
-	    program.program_title, MAC_APP_FILES_SUBDIR);
-  }
-
-  if (strSuffix(main_data_path, main_data_binary_subdir))
+  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(main_data_binary_subdir)] = '\0';
+		   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, "/"))
@@ -741,7 +718,7 @@ static char *getProgramMainDataPath()
       main_data_path = ".";
 
     // add relative path to Mac OS X application resources directory to path
-    main_data_path = getPath2(main_data_path, main_data_files_subdir);
+    main_data_path = getPath2(main_data_path, MAC_APP_FILES_SUBDIR);
 
     free(main_data_path_old);
   }
@@ -978,9 +955,9 @@ void GetOptions(int argc, char *argv[],
      set the current working directory to the program package directory) */
 
   if (strEqual(ro_base_path, "."))
-    ro_base_path = getProgramMainDataPath();
+    ro_base_path = getProgramMainDataPath(argv[0]);
   if (strEqual(rw_base_path, "."))
-    rw_base_path = getProgramMainDataPath();
+    rw_base_path = getProgramMainDataPath(argv[0]);
 
   /* initialize global program options */
   options.server_host = NULL;