moved code to check for file in level directories to separate function

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 65f0eec425d1fecfa890714d67c86f71196a4e32..53659bddbe8a2840e8b514e7f878d5d5119d10ce 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -797,6 +797,32 @@ char *getEditorSetupFilename(void)
   return filename;
 }
 
+char *getFilenameFromCurrentLevelDirUpward(char *basename)
+{
+  // global variable "leveldir_current" must be modified in the loop below
+  LevelDirTree *leveldir_current_last = leveldir_current;
+  static char *filename = NULL;
+
+  // check for filename in path from current to topmost tree node
+
+  while (leveldir_current != NULL)
+  {
+    checked_free(filename);
+
+    filename = getPath2(getCurrentLevelDir(), basename);
+
+    if (fileExists(filename))
+      break;
+
+    leveldir_current = leveldir_current->node_parent;
+  }
+
+  // restore global variable "leveldir_current" modified in above loop
+  leveldir_current = leveldir_current_last;
+
+  return filename;
+}
+
 char *getHelpAnimFilename(void)
 {
   static char *filename = NULL;
@@ -4883,7 +4909,7 @@ char *getSetupValue(int type, void *value)
       break;
 
     case TYPE_ECS_AGA:
-      strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS"));
+      strcpy(value_string, (*(boolean *)value ? "new" : "old"));
       break;
 
     case TYPE_KEY: