X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=473a73926cbcaa9f24502582db6844c9746b786a;hb=983b7bc7f3493b1522d08d8e7bdecb3bd8e462eb;hp=02f79efba0d11e70715115968b1366d06323acf8;hpb=341dd8cb9d8d33191f3eeda7eba45f02418d2819;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 02f79efb..473a7392 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2508,7 +2508,10 @@ void LoadLevelFromFileInfo(struct LevelInfo *level,
   if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN)
     level->game_engine_type = GAME_ENGINE_TYPE_RND;
 
-  CopyNativeLevel_Native_to_RND(level);
+  if (level_file_info->type == LEVEL_FILE_TYPE_RND)
+    CopyNativeLevel_RND_to_Native(level);
+  else
+    CopyNativeLevel_Native_to_RND(level);
 }
 
 void LoadLevelFromFilename(struct LevelInfo *level, char *filename)
@@ -4002,7 +4005,7 @@ void SaveTape(int nr)
   tape.changed = FALSE;
 
   if (new_tape)
-    Request("tape saved !", REQ_CONFIRM);
+    Request("Tape saved !", REQ_CONFIRM);
 }
 
 void DumpTape(struct TapeInfo *tape)
@@ -4166,17 +4169,18 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_QUICK_DOORS			10
 #define SETUP_TOKEN_TEAM_MODE			11
 #define SETUP_TOKEN_HANDICAP			12
-#define SETUP_TOKEN_TIME_LIMIT			13
-#define SETUP_TOKEN_FULLSCREEN			14
-#define SETUP_TOKEN_ASK_ON_ESCAPE		15
-#define SETUP_TOKEN_GRAPHICS_SET		16
-#define SETUP_TOKEN_SOUNDS_SET			17
-#define SETUP_TOKEN_MUSIC_SET			18
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	19
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	20
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	21
-
-#define NUM_GLOBAL_SETUP_TOKENS			22
+#define SETUP_TOKEN_SKIP_LEVELS			13
+#define SETUP_TOKEN_TIME_LIMIT			14
+#define SETUP_TOKEN_FULLSCREEN			15
+#define SETUP_TOKEN_ASK_ON_ESCAPE		16
+#define SETUP_TOKEN_GRAPHICS_SET		17
+#define SETUP_TOKEN_SOUNDS_SET			18
+#define SETUP_TOKEN_MUSIC_SET			19
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	20
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	21
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	22
+
+#define NUM_GLOBAL_SETUP_TOKENS			23
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -4256,6 +4260,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.quick_doors,	"quick_doors"			},
   { TYPE_SWITCH, &si.team_mode,		"team_mode"			},
   { TYPE_SWITCH, &si.handicap,		"handicap"			},
+  { TYPE_SWITCH, &si.skip_levels,	"skip_levels"			},
   { TYPE_SWITCH, &si.time_limit,	"time_limit"			},
   { TYPE_SWITCH, &si.fullscreen,	"fullscreen"			},
   { TYPE_SWITCH, &si.ask_on_escape,	"ask_on_escape"			},
@@ -4357,6 +4362,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->quick_doors = FALSE;
   si->team_mode = FALSE;
   si->handicap = TRUE;
+  si->skip_levels = TRUE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
   si->ask_on_escape = TRUE;
@@ -4685,7 +4691,19 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements)
   {
     char *value = getHashEntry(element_hash, list->token);
 
-    if (value)
+    if (value == NULL)		/* try to find obsolete token mapping */
+    {
+      char *mapped_token = get_mapped_token(list->token);
+
+      if (mapped_token != NULL)
+      {
+	value = getHashEntry(element_hash, mapped_token);
+
+	free(mapped_token);
+      }
+    }
+
+    if (value != NULL)
     {
       (*elements)[(*num_elements)++] = atoi(value);
     }