rnd-20130916-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index ff33da821a2a941ee786dd5217f6949796d363a9..21aea23846ba9d6a060261331174d87e07e84472 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2584,13 +2584,21 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i, x, y;
   int element;
-  int num_contents, content_xsize, content_ysize;
+  int num_contents;
+#if 0
+  int content_xsize, content_ysize;
+#endif
   int content_array[MAX_ELEMENT_CONTENTS][3][3];
 
   element = getMappedElement(getFile16BitBE(file));
   num_contents = getFile8Bit(file);
+#if 1
+  getFile8Bit(file);   /* content x size (unused) */
+  getFile8Bit(file);   /* content y size (unused) */
+#else
   content_xsize = getFile8Bit(file);
   content_ysize = getFile8Bit(file);
+#endif
 
   ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
 
@@ -7139,8 +7147,12 @@ static void LoadLevelFromFileInfo(struct LevelInfo *level,
 
   /* if level file is invalid, restore level structure to default values */
   if (level->no_valid_file)
+  {
     setLevelInfoToDefaults(level, level_info_only);
 
+    level->no_valid_file = TRUE;       /* but keep "no valid file" flag */
+  }
+
   if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN)
     level->game_engine_type = GAME_ENGINE_TYPE_RND;
 
@@ -7576,10 +7588,14 @@ void LoadLevel(int nr)
 
 void LoadLevelInfoOnly(int nr)
 {
+#if 0
   char *filename;
+#endif
 
   setLevelFileInfo(&level.file_info, nr);
+#if 0
   filename = level.file_info.filename;
+#endif
 
   LoadLevelFromFileInfo(&level, &level.file_info, TRUE);
 }