From: Holger Schemel <info@artsoft.org>
Date: Tue, 7 Nov 2017 22:08:54 +0000 (+0100)
Subject: removed reference to (potentially undefined) global variable from function
X-Git-Tag: 4.1.0.0~61
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=6c16bea069f29f30b85f060ce0fe032242967f1a;p=rocksndiamonds.git

removed reference to (potentially undefined) global variable from function
---

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index b1d0d96b..21166307 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -696,9 +696,9 @@ 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)
   if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
@@ -955,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;