X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fconvert.c;h=00768b5b96a54aa3b87797426136a8a1dcc8350f;hb=6b9e2be7;hp=581c93eec2baf21fa797f2269a1afff8e74a29d7;hpb=b458e5d5c416af09939734766095965aedabfe0d;p=rocksndiamonds.git

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 581c93ee..00768b5b 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -9,7 +9,7 @@
 
 void prepare_em_level(void)
 {
-  int i, x, y;
+  int i, j, x, y;
   int players_left;
   boolean team_mode;
 
@@ -17,6 +17,9 @@ void prepare_em_level(void)
 
   game_init_cave_buffers();
 
+  lev.width  = cav.width;
+  lev.height = cav.height;
+
   lev.left = CAVE_BUFFER_XOFFSET;
   lev.top  = CAVE_BUFFER_YOFFSET;
   lev.right = lev.left + lev.width;
@@ -38,43 +41,80 @@ void prepare_em_level(void)
 
   for (x = 0; x < lev.width; x++)
     for (y = 0; y < lev.height; y++)
-      lev.cave[lev.left + x][lev.top + y] = native_em_level.cave[x][y];
+      lev.cave[lev.left + x][lev.top + y] = cav.cave[x][y];
 
   for (x = lev.left; x < lev.right; x++)
     for (y = lev.top; y < lev.bottom; y++)
       lev.next[x][y] = lev.draw[x][y] = lev.cave[x][y];
 
-  lev.time_initial = lev.time_seconds;
-  lev.time = lev.time_initial;
-
-  lev.required = lev.required_initial;
+  lev.time = cav.time_seconds;
+  lev.gems_needed = cav.gems_needed;
   lev.score = 0;
 
-  lev.android_move_cnt  = lev.android_move_time;
-  lev.android_clone_cnt = lev.android_clone_time;
-
-  lev.ball_pos = 0;
-  lev.ball_state = lev.ball_state_initial;
-  lev.ball_cnt = lev.ball_time;
+  lev.eater_score	= cav.eater_score;
+  lev.alien_score	= cav.alien_score;
+  lev.bug_score		= cav.bug_score;
+  lev.tank_score	= cav.tank_score;
+  lev.emerald_score	= cav.emerald_score;
+  lev.diamond_score	= cav.diamond_score;
+  lev.nut_score		= cav.nut_score;
+  lev.slurp_score	= cav.slurp_score;
+  lev.dynamite_score	= cav.dynamite_score;
+  lev.key_score		= cav.key_score;
+  lev.lenses_score	= cav.lenses_score;
+  lev.magnify_score	= cav.magnify_score;
+  lev.exit_score	= cav.exit_score;
+
+  lev.amoeba_time = cav.amoeba_time;
+
+  lev.android_move_time = cav.android_move_time;
+  lev.android_move_cnt  = cav.android_move_time;
+
+  lev.android_clone_time = cav.android_clone_time;
+  lev.android_clone_cnt  = cav.android_clone_time;
+
+  lev.ball_time   = cav.ball_time;
+  lev.ball_cnt    = cav.ball_time;
+  lev.ball_state  = cav.ball_state;
+  lev.ball_random = cav.ball_random;
+  lev.ball_pos    = 0;
 
   lev.eater_pos = 0;
   lev.shine_cnt = 0;
 
-  lev.lenses_cnt = lev.lenses_cnt_initial;
-  lev.magnify_cnt = lev.magnify_cnt_initial;
+  lev.lenses_time = cav.lenses_time;
+  lev.lenses_cnt  = cav.lenses_cnt;
 
-  lev.wheel_cnt = lev.wheel_cnt_initial;
-  lev.wheel_x   = lev.wheel_x_initial;
-  lev.wheel_y   = lev.wheel_y_initial;
+  lev.magnify_time = cav.magnify_time;
+  lev.magnify_cnt  = cav.magnify_cnt;
 
-  lev.wind_direction = lev.wind_direction_initial;
-  lev.wind_cnt       = lev.wind_cnt_initial;
+  lev.wheel_time = cav.wheel_time;
+  lev.wheel_cnt  = cav.wheel_cnt;
+  lev.wheel_x    = cav.wheel_x;
+  lev.wheel_y    = cav.wheel_y;
 
-  lev.wonderwall_state = lev.wonderwall_state_initial;
-  lev.wonderwall_time  = lev.wonderwall_time_initial;
+  lev.wind_time      = cav.wind_time;
+  lev.wind_cnt       = cav.wind_cnt;
+  lev.wind_direction = cav.wind_direction;
+
+  lev.wonderwall_time  = cav.wonderwall_time;
+  lev.wonderwall_state = cav.wonderwall_state;
 
   lev.killed_out_of_time = FALSE;
 
+  lev.num_ball_arrays = cav.num_ball_arrays;
+
+  for (i = 0; i < 8; i++)
+    for (j = 0; j < 9; j++)
+      lev.eater_array[i][j] = cav.eater_array[i][j];
+
+  for (i = 0; i < 8; i++)
+    for (j = 0; j < 8; j++)
+      lev.ball_array[i][j] = cav.ball_array[i][j];
+
+  for (i = 0; i < TILE_MAX; i++)
+    lev.android_array[i] = cav.android_array[i];
+
   /* determine number of players in this level */
   lev.home_initial = 0;
 
@@ -83,8 +123,8 @@ void prepare_em_level(void)
     ply[i].exists = 0;
     ply[i].alive_initial = FALSE;
 
-    if (lev.player_x[i] != -1 &&
-	lev.player_y[i] != -1)
+    if (cav.player_x[i] != -1 &&
+	cav.player_y[i] != -1)
     {
       ply[i].exists = 1;
 
@@ -111,10 +151,8 @@ void prepare_em_level(void)
       }
       else
       {
-	int x = lev.player_x[i];
-	int y = lev.player_y[i];
-
-	native_em_level.cave[x][y] = Xblank;
+	int x = cav.player_x[i];
+	int y = cav.player_y[i];
 
 	lev.cave[lev.left + x][lev.top + y] = Xblank;
 	lev.next[lev.left + x][lev.top + y] = Xblank;
@@ -131,8 +169,8 @@ void prepare_em_level(void)
     ply[i].dynamite_cnt = 0;
     ply[i].keys = 0;
     ply[i].anim = 0;
-    ply[i].oldx = ply[i].x = lev.player_x[i] + lev.left;
-    ply[i].oldy = ply[i].y = lev.player_y[i] + lev.top;
+    ply[i].oldx = ply[i].x = cav.player_x[i] + lev.left;
+    ply[i].oldy = ply[i].y = cav.player_y[i] + lev.top;
     ply[i].last_move_dir = MV_NONE;
     ply[i].joy_n = ply[i].joy_e = ply[i].joy_s = ply[i].joy_w = 0;
     ply[i].joy_snap  = ply[i].joy_drop = 0;
@@ -144,6 +182,7 @@ void prepare_em_level(void)
   //
   // - game_em.use_single_button (default: TRUE)
   // - game_em.use_snap_key_bug (default: FALSE)
+  // - game_em.use_old_explosions (default: FALSE)
 
   game_em.level_solved = FALSE;
   game_em.game_over = FALSE;