X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=09cc59554811e8821f33fb576c43b7105382e438;hb=358fe8d37855c22ee5ee4e24d486757500043178;hp=b816aff273bfd61e2481284047ffb653f3181853;hpb=8848a001bf529a3e06710b80b928094e48f25aa8;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index b816aff2..09cc5955 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -74,6 +74,54 @@ void setLevelInfoToDefaults_EM(void)
 
 #define MAX_EM_LEVEL_SIZE		16384
 
+#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];
@@ -117,3 +165,5 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
 
   return TRUE;
 }
+
+#endif