rnd-20140218-2-src

[rocksndiamonds.git] / src / game_em / cave.c

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index 47f7315eaeab5358bce2c7c8651748e91e2627ec..09cc59554811e8821f33fb576c43b7105382e438 100644 (file)
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,9 +3,7 @@
  * cave data structures
  */
 
-#include "global.h"
-#include "tile.h"
-#include "level.h"
+#include "main_em.h"
 
 
 struct LevelInfo_EM native_em_level;
@@ -76,7 +74,55 @@ void setLevelInfoToDefaults_EM(void)
 
 #define MAX_EM_LEVEL_SIZE              16384
 
-boolean LoadNativeLevel_EM(char *filename)
+#if 1
+
+boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
+{
+  unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
+  int raw_leveldata_length;
+  int file_version;
+  File *file;
+
+  /* always start with reliable default values */
+  setLevelInfoToDefaults_EM();
+
+  if (!(file = openFile(filename, MODE_READ)))
+  {
+    if (!level_info_only)
+      Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+
+    return FALSE;
+  }
+
+  raw_leveldata_length = readFile(file, raw_leveldata, 1, MAX_EM_LEVEL_SIZE);
+
+  closeFile(file);
+
+  if (raw_leveldata_length <= 0)
+  {
+    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+
+    return FALSE;
+  }
+
+  file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,filename);
+
+  if (file_version == FILE_VERSION_EM_UNKNOWN)
+  {
+    Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);
+
+    return FALSE;
+  }
+
+  convert_em_level(raw_leveldata, file_version);
+  prepare_em_level();
+
+  return TRUE;
+}
+
+#else
+
+boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
 {
   unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
   int raw_leveldata_length;
@@ -88,7 +134,8 @@ boolean LoadNativeLevel_EM(char *filename)
 
   if (!(file = fopen(filename, MODE_READ)))
   {
-    Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+    if (!level_info_only)
+      Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
 
     return FALSE;
   }
@@ -104,7 +151,9 @@ boolean LoadNativeLevel_EM(char *filename)
     return FALSE;
   }
 
-  if (!(file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length)))
+  file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,filename);
+
+  if (file_version == FILE_VERSION_EM_UNKNOWN)
   {
     Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);
 
@@ -116,3 +165,5 @@ boolean LoadNativeLevel_EM(char *filename)
 
   return TRUE;
 }
+
+#endif