X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=40b2dc6f90e6e6f9af864ed3a1c4c525aa180137;hb=HEAD;hp=fc872e9c8b994838bf7f7b6a9a7882b9f6b61e21;hpb=3f3cf82da520ddc14fbfd50d284e1eacc620b6b3;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index fc872e9c..25d7785a 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -51,22 +51,27 @@ void setLevelInfoToDefaults_EM(void)
   cav.amoeba_time	= 0;
   cav.wonderwall_time	= 0;
   cav.wheel_time	= 0;
-  cav.wheel_x		= 1;
-  cav.wheel_y		= 1;
+  cav.wheel_x		= 0;
+  cav.wheel_y		= 0;
   cav.lenses_time	= 0;
   cav.magnify_time	= 0;
-  cav.wind_time		= 9999;
+  cav.wind_time		= 0;
   cav.wind_direction	= 0;
 
-  cav.ball_random	= 0;
-  cav.ball_state	= 0;
-  cav.wonderwall_state	= 0;
-  cav.wheel_cnt		= 0;
-  cav.lenses_cnt	= 0;
-  cav.magnify_cnt	= 0;
-  cav.wind_cnt		= 0;
+  cav.num_eater_arrays	= 8;
+  cav.num_ball_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;
+  cav.wonderwall_active	= FALSE;
+  cav.wheel_active	= FALSE;
+  cav.lenses_active	= FALSE;
+  cav.magnify_active	= FALSE;
 
   for (i = 0; i < 8; i++)
     for (j = 0; j < 9; j++)
@@ -105,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;
   }
@@ -116,16 +121,16 @@ 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;
   }
 
-  file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length,filename);
+  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);
+    Warn("unknown EM level '%s' -- using empty level", filename);
 
     return FALSE;
   }