moved function to different source file

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 3541c88871d2f7182e7a5fc6bfe4c32c3ebc1112..4ce1611104a57311201cfde05918c1e517ec4ee0 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -1 +1,159 @@
-/* (moved to reademc.c / WIP) */
+/* 2007-04-04 08:33:37
+ *
+ * convert intermediate cave format to internal cave structure for
+ * use in logic(). initializes entire internal structure.
+ */
+
+#include "main_em.h"
+
+
+void prepare_em_level(void)
+{
+  int i, x, y;
+  int players_left;
+  boolean team_mode;
+
+  /* reset all runtime variables to their initial values */
+
+  game_init_cave_buffers();
+
+  lev.left = CAVE_BUFFER_XOFFSET;
+  lev.top  = CAVE_BUFFER_YOFFSET;
+  lev.right = lev.left + lev.width;
+  lev.bottom = lev.top + lev.height;
+
+  /* add linked cave buffer columns for wrap-around movement */
+  for (x = 0; x < lev.left; x++)
+  {
+    lev.cavecol[x] = lev.cavecol[lev.width + x];
+    lev.nextcol[x] = lev.nextcol[lev.width + x];
+    lev.drawcol[x] = lev.drawcol[lev.width + x];
+    lev.boomcol[x] = lev.boomcol[lev.width + x];
+
+    lev.cavecol[lev.right + x] = lev.cavecol[lev.left + x];
+    lev.nextcol[lev.right + x] = lev.nextcol[lev.left + x];
+    lev.drawcol[lev.right + x] = lev.drawcol[lev.left + x];
+    lev.boomcol[lev.right + x] = lev.boomcol[lev.left + x];
+  }
+
+  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];
+
+  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.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_pos = 0;
+  lev.shine_cnt = 0;
+
+  lev.lenses_cnt = lev.lenses_cnt_initial;
+  lev.magnify_cnt = lev.magnify_cnt_initial;
+
+  lev.wheel_cnt = lev.wheel_cnt_initial;
+  lev.wheel_x   = lev.wheel_x_initial;
+  lev.wheel_y   = lev.wheel_y_initial;
+
+  lev.wind_direction = lev.wind_direction_initial;
+  lev.wind_cnt       = lev.wind_cnt_initial;
+
+  lev.wonderwall_state = lev.wonderwall_state_initial;
+  lev.wonderwall_time  = lev.wonderwall_time_initial;
+
+  lev.killed_out_of_time = FALSE;
+
+  /* determine 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;
+
+    if (ply[i].x_initial != -1 && ply[i].y_initial != -1)
+    {
+      ply[i].exists = 1;
+
+      lev.home_initial++;
+    }
+  }
+
+  team_mode = getTeamMode_EM();
+
+  if (!team_mode)
+    lev.home_initial = 1;
+
+  lev.home = lev.home_initial;
+  players_left = lev.home_initial;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    if (ply[i].exists)
+    {
+      if (players_left)
+      {
+       ply[i].alive_initial = TRUE;
+       players_left--;
+      }
+      else
+      {
+       int x = ply[i].x_initial;
+       int y = ply[i].y_initial;
+
+       native_em_level.cave[x][y] = Xblank;
+
+       lev.cave[lev.left + x][lev.top + y] = Xblank;
+       lev.next[lev.left + x][lev.top + y] = Xblank;
+       lev.draw[lev.left + x][lev.top + y] = Xblank;
+      }
+    }
+  }
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    ply[i].num = i;
+    ply[i].alive = ply[i].alive_initial;
+    ply[i].dynamite = 0;
+    ply[i].dynamite_cnt = 0;
+    ply[i].keys = 0;
+    ply[i].anim = 0;
+    ply[i].oldx = ply[i].x = ply[i].x_initial + lev.left;
+    ply[i].oldy = ply[i].y = ply[i].y_initial + 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;
+    ply[i].joy_stick = ply[i].joy_spin = 0;
+  }
+
+  // the following engine variables are initialized to version-specific values
+  // in function InitGameEngine() (src/game.c):
+  //
+  // - game_em.use_single_button (default: TRUE)
+  // - game_em.use_snap_key_bug (default: FALSE)
+
+  game_em.level_solved = FALSE;
+  game_em.game_over = FALSE;
+
+  game_em.any_player_moving = FALSE;
+  game_em.any_player_snapping = FALSE;
+
+  game_em.last_moving_player = 0;      /* default: first player */
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    game_em.last_player_direction[i] = MV_NONE;
+
+  lev.exit_x = lev.exit_y = -1;        /* kludge for playing player exit sound */
+}

diff --git a/src/game_em/reademc.c b/src/game_em/reademc.c
index 6bcae474283588a23d02a993919dbf67885b3c7e..3bb920ab2286dec72514f3f0356ad88d1fa2a1b3 100644 (file)
--- a/src/game_em/reademc.c
+++ b/src/game_em/reademc.c
@@ -441,157 +441,6 @@ void convert_em_level(unsigned char *src, int file_version)
   native_em_level.file_version = file_version;
 }
 
-void prepare_em_level(void)
-{
-  int i, x, y;
-  int players_left;
-  boolean team_mode;
-
-  /* reset all runtime variables to their initial values */
-
-  game_init_cave_buffers();
-
-  lev.left = CAVE_BUFFER_XOFFSET;
-  lev.top  = CAVE_BUFFER_YOFFSET;
-  lev.right = lev.left + lev.width;
-  lev.bottom = lev.top + lev.height;
-
-  /* add linked cave buffer columns for wrap-around movement */
-  for (x = 0; x < lev.left; x++)
-  {
-    lev.cavecol[x] = lev.cavecol[lev.width + x];
-    lev.nextcol[x] = lev.nextcol[lev.width + x];
-    lev.drawcol[x] = lev.drawcol[lev.width + x];
-    lev.boomcol[x] = lev.boomcol[lev.width + x];
-
-    lev.cavecol[lev.right + x] = lev.cavecol[lev.left + x];
-    lev.nextcol[lev.right + x] = lev.nextcol[lev.left + x];
-    lev.drawcol[lev.right + x] = lev.drawcol[lev.left + x];
-    lev.boomcol[lev.right + x] = lev.boomcol[lev.left + x];
-  }
-
-  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];
-
-  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.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_pos = 0;
-  lev.shine_cnt = 0;
-
-  lev.lenses_cnt = lev.lenses_cnt_initial;
-  lev.magnify_cnt = lev.magnify_cnt_initial;
-
-  lev.wheel_cnt = lev.wheel_cnt_initial;
-  lev.wheel_x   = lev.wheel_x_initial;
-  lev.wheel_y   = lev.wheel_y_initial;
-
-  lev.wind_direction = lev.wind_direction_initial;
-  lev.wind_cnt       = lev.wind_cnt_initial;
-
-  lev.wonderwall_state = lev.wonderwall_state_initial;
-  lev.wonderwall_time  = lev.wonderwall_time_initial;
-
-  lev.killed_out_of_time = FALSE;
-
-  /* determine 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;
-
-    if (ply[i].x_initial != -1 && ply[i].y_initial != -1)
-    {
-      ply[i].exists = 1;
-
-      lev.home_initial++;
-    }
-  }
-
-  team_mode = getTeamMode_EM();
-
-  if (!team_mode)
-    lev.home_initial = 1;
-
-  lev.home = lev.home_initial;
-  players_left = lev.home_initial;
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    if (ply[i].exists)
-    {
-      if (players_left)
-      {
-       ply[i].alive_initial = TRUE;
-       players_left--;
-      }
-      else
-      {
-       int x = ply[i].x_initial;
-       int y = ply[i].y_initial;
-
-       native_em_level.cave[x][y] = Xblank;
-
-       lev.cave[lev.left + x][lev.top + y] = Xblank;
-       lev.next[lev.left + x][lev.top + y] = Xblank;
-       lev.draw[lev.left + x][lev.top + y] = Xblank;
-      }
-    }
-  }
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    ply[i].num = i;
-    ply[i].alive = ply[i].alive_initial;
-    ply[i].dynamite = 0;
-    ply[i].dynamite_cnt = 0;
-    ply[i].keys = 0;
-    ply[i].anim = 0;
-    ply[i].oldx = ply[i].x = ply[i].x_initial + lev.left;
-    ply[i].oldy = ply[i].y = ply[i].y_initial + 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;
-    ply[i].joy_stick = ply[i].joy_spin = 0;
-  }
-
-  // the following engine variables are initialized to version-specific values
-  // in function InitGameEngine() (src/game.c):
-  //
-  // - game_em.use_single_button (default: TRUE)
-  // - game_em.use_snap_key_bug (default: FALSE)
-
-  game_em.level_solved = FALSE;
-  game_em.game_over = FALSE;
-
-  game_em.any_player_moving = FALSE;
-  game_em.any_player_snapping = FALSE;
-
-  game_em.last_moving_player = 0;      /* default: first player */
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-    game_em.last_player_direction[i] = MV_NONE;
-
-  lev.exit_x = lev.exit_y = -1;        /* kludge for playing player exit sound */
-}
-
 
 /* convert all emerald mine caves to emc version 6 cave format.
  *