added full compatibility for wrap-around levels in EM engine

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

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index e501a8917438f117cfab4a55796e1c918937a258..40b2dc6f90e6e6f9af864ed3a1c4c525aa180137 100644 (file)
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -58,11 +58,13 @@ void setLevelInfoToDefaults_EM(void)
   cav.wind_time                = 0;
   cav.wind_direction   = 0;
 
+  cav.num_eater_arrays = 8;
   cav.num_ball_arrays  = 8;
 
   cav.testmode         = FALSE;
   cav.teamwork         = FALSE;
   cav.infinite         = TRUE;
+  cav.infinite_true    = FALSE;        // default: use original EMC behaviour
 
   cav.ball_random      = FALSE;
   cav.ball_active      = FALSE;
@@ -108,7 +110,7 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
   if (!(file = openFile(filename, MODE_READ)))
   {
     if (!level_info_only)
-      Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+      Warn("cannot open level '%s' -- using empty level", filename);
 
     return FALSE;
   }
@@ -119,7 +121,7 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
 
   if (raw_leveldata_length <= 0)
   {
-    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+    Warn("cannot read level '%s' -- using empty level", filename);
 
     return FALSE;
   }
@@ -128,7 +130,7 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
 
   if (file_version == FILE_VERSION_EM_UNKNOWN)
   {
-    Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);
+    Warn("unknown EM level '%s' -- using empty level", filename);
 
     return FALSE;
   }