Merge branch 'master' into releases

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 791181393dc89c48c1e0ec28f5381c994bc0004f..bd2539b8ef19ac6cb8a5ac35eeca23952bd27d7b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -685,6 +685,10 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename)
   if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) ||
       IS_LEVELCLASS_USER(leveldir_current))
   {
+#if 0
+    printf("::: This level is private or contributed: '%s'\n", filename);
+#endif
+
     /* For user contributed and private levels, use the version of
        the game engine the levels were created for.
        Since 2.0.1, the game engine version is now directly stored
@@ -709,6 +713,11 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename)
   }
   else
   {
+#if 0
+    printf("::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n",
+          leveldir_current->sort_priority, filename);
+#endif
+
     /* Always use the latest version of the game engine for all but
        user contributed and private levels; this allows for actual
        corrections in the game engine to take effect for existing,
@@ -744,7 +753,8 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename)
                   element == EL_CHAR(']')  ? EL_CHAR_UUMLAUT :
                   element == EL_CHAR('^')  ? EL_CHAR_COPYRIGHT : element);
       }
-      else if (level->game_version < VERSION_IDENT(3,0,0))
+
+      if (level->game_version < VERSION_IDENT(3,0,0))
       {
        /* map Supaplex gravity tube elements */
        element = (element == EL_SP_GRAVITY_PORT_LEFT  ? EL_SP_PORT_LEFT  :