X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a7238908437ca22db1bd06af9266af1ce6b4e600;hb=0c27626bae90cb1eeea4939de0130a49b9aac507;hp=d3e85c3f1417f0fd713d6011d047e1e623c1bb68;hpb=78ec772d11cb8823d8dca05c227b472da8708a07;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index d3e85c3f..a7238908 100644
--- a/src/files.c
+++ b/src/files.c
@@ -116,11 +116,6 @@
 static void SaveUserLevelInfo();		/* for 'InitUserLevelDir()' */
 static char *getSetupLine(char *, int);		/* for 'SaveUserLevelInfo()' */
 
-static char *getGlobalDataDir()
-{
-  return GAME_DIR;
-}
-
 char *getUserDataDir()
 {
   static char *userdata_dir = NULL;
@@ -178,7 +173,7 @@ static char *getTapeDir(char *level_subdir)
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
-  char *data_dir = getGlobalDataDir();
+  char *data_dir = options.rw_base_directory;
   char *score_subdir = SCORES_DIRECTORY;
 
   if (score_dir)
@@ -493,6 +488,9 @@ void LoadLevel(int level_nr)
     Error(ERR_WARN, "using high speed movement for player");
     level.double_speed = TRUE;
   }
+
+  /* determine border element for this level */
+  SetBorderElement();
 }
 
 void SaveLevel(int level_nr)