rnd-20030305-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 902b3b890889fdb6d30e812d43ce7f60c2987c38..d9d927b7d77ae2220bad90aed4c4628e99cc2fb0 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -90,7 +90,7 @@ static void setLevelInfoToDefaults()
        level.yam_content[i][x][y] =
          (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
 
-  Feld[0][0] = Ur[0][0] = EL_PLAYER1;
+  Feld[0][0] = Ur[0][0] = EL_PLAYER_1;
   Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
     Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
 
@@ -143,9 +143,9 @@ static int checkLevelElement(int element)
     element = EL_CHAR_QUESTION;
   }
   else if (element == EL_PLAYER_OBSOLETE)
-    element = EL_PLAYER1;
+    element = EL_PLAYER_1;
   else if (element == EL_KEY_OBSOLETE)
-    element = EL_KEY1;
+    element = EL_KEY_1;
 
   return element;
 }
@@ -1493,7 +1493,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->editor.el_diamond_caves = TRUE;
   si->editor.el_dx_boulderdash = TRUE;
   si->editor.el_chars = TRUE;
-  si->editor.el_custom = FALSE;
+  si->editor.el_custom = TRUE;
 
   si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
@@ -1702,16 +1702,11 @@ void LoadSpecialMenuDesignSettings()
   char *value;
 
   /* !!! CHANGE THIS !!! (redundant initialization) !!! */
-  gfx.menu_main_hide_static_text = FALSE;
   global.num_toons = 20;
 
   if ((setup_file_list = loadSetupFileList(filename)) == NULL)
     return;
 
-  value = getTokenValue(setup_file_list, "menu.main.hide_static_text");
-  if (value != NULL)
-    gfx.menu_main_hide_static_text = get_boolean_from_string(value);
-
   value = getTokenValue(setup_file_list, "global.num_toons");
   if (value != NULL)
     global.num_toons = get_integer_from_string(value);