added using separate constants for tiles in EM engine caves and game logic

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

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index 7788ae70748bfb49eaa4a7112627be1686d6a829..ed5dc9426101925efaffd6877b8bdf66d5fd8960 100644 (file)
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -10,50 +10,78 @@ struct LevelInfo_EM native_em_level;
 
 void setLevelInfoToDefaults_EM(void)
 {
-  int i;
+  int i, j, x, y;
 
   native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
-  native_em_level.lev = &lev;
+  native_em_level.cav = &cav;
 
   game_em.lev = &lev;
   for (i = 0; i < MAX_PLAYERS; i++)
     game_em.ply[i] = &ply[i];
 
-  lev.width = 64;
-  lev.height = 32;
+  cav.width  = 64;
+  cav.height = 32;
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
-    lev.player_x[i] = -1;
-    lev.player_y[i] = -1;
+    cav.player_x[i] = -1;
+    cav.player_y[i] = -1;
   }
 
-  lev.lenses_cnt_initial = 0;
-  lev.magnify_cnt_initial = 0;
-
-  lev.wheel_cnt_initial = 0;
-  lev.wheel_x_initial = 1;
-  lev.wheel_y_initial = 1;
-
-  lev.wind_time = 9999;
-  lev.wind_cnt_initial = 0;
-
-  lev.wonderwall_state_initial = 0;
-  lev.wonderwall_time_initial = 0;
-
-  lev.num_ball_arrays = 8;
+  cav.time_seconds     = 0;
+  cav.gems_needed      = 0;
+
+  cav.eater_score      = 0;
+  cav.alien_score      = 0;
+  cav.bug_score                = 0;
+  cav.tank_score       = 0;
+  cav.slurp_score      = 0;
+  cav.nut_score                = 0;
+  cav.emerald_score    = 0;
+  cav.diamond_score    = 0;
+  cav.dynamite_score   = 0;
+  cav.key_score                = 0;
+  cav.lenses_score     = 0;
+  cav.magnify_score    = 0;
+  cav.exit_score       = 0;
+
+  cav.android_move_time        = 0;
+  cav.android_clone_time= 0;
+  cav.ball_time                = 0;
+  cav.amoeba_time      = 0;
+  cav.wonderwall_time  = 0;
+  cav.wheel_time       = 0;
+  cav.wheel_x          = 1;
+  cav.wheel_y          = 1;
+  cav.lenses_time      = 0;
+  cav.magnify_time     = 0;
+  cav.wind_time                = 9999;
+  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_ball_arrays = 8;
+
+  for (i = 0; i < 8; i++)
+    for (j = 0; j < 9; j++)
+      cav.eater_array[i][j] = Cblank;
+
+  for (i = 0; i < 8; i++)
+    for (j = 0; j < 8; j++)
+      cav.ball_array[i][j] = Cblank;
 
   for (i = 0; i < TILE_MAX; i++)
-    lev.android_array[i] = Xblank;
+    cav.android_array[i] = Cblank;
 
-  /* initial number of players in this level */
-  lev.home_initial = 0;
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    ply[i].exists = 0;
-    ply[i].alive_initial = FALSE;
-  }
+  for (x = 0; x < CAVE_WIDTH; x++)
+    for (y = 0; y < CAVE_HEIGHT; y++)
+      cav.cave[x][y] = Cblank;
 }