renamed some fields in level structure for EM engine

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

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index b816aff273bfd61e2481284047ffb653f3181853..43732aa1ccd6b6cf2981a3680990c234919609e7 100644 (file)
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -13,57 +13,38 @@ void setLevelInfoToDefaults_EM(void)
   int i;
 
   native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
+  native_em_level.cav = &cav;
 
-  native_em_level.lev = &lev;
+  game_em.lev = &lev;
   for (i = 0; i < MAX_PLAYERS; i++)
-    native_em_level.ply[i] = &ply[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++)
   {
-    ply[i].x_initial = 0;
-    ply[i].y_initial = 0;
+    cav.player_x[i] = -1;
+    cav.player_y[i] = -1;
   }
 
-  lev.lenses_cnt_initial = 0;
-  lev.magnify_cnt_initial = 0;
+  cav.lenses_cnt = 0;
+  cav.magnify_cnt = 0;
 
-  lev.wheel_cnt_initial = 0;
-  lev.wheel_x_initial = 1;
-  lev.wheel_y_initial = 1;
+  cav.wheel_cnt = 0;
+  cav.wheel_x = 1;
+  cav.wheel_y = 1;
 
-  lev.wind_time = 9999;
-  lev.wind_cnt_initial = 0;
+  cav.wind_time = 9999;
+  cav.wind_cnt = 0;
 
-  lev.wonderwall_state_initial = 0;
-  lev.wonderwall_time_initial = 0;
+  cav.wonderwall_state = 0;
+  cav.wonderwall_time = 0;
 
-  lev.num_ball_arrays = 8;
+  cav.num_ball_arrays = 8;
 
   for (i = 0; i < TILE_MAX; i++)
-    lev.android_array[i] = Xblank;
-
-#if 1
-  /* 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;
-  }
-#else
-  /* initial number of players in this level */
-  lev.home_initial = (setup.team_mode ? 2 : 1);
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    ply[i].exists = 0;
-    ply[i].alive_initial = (lev.home_initial > i ? TRUE : FALSE);
-  }
-#endif
+    cav.android_array[i] = Xblank;
 }
 
 
@@ -79,12 +60,12 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
   unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
   int raw_leveldata_length;
   int file_version;
-  FILE *file;
+  File *file;
 
   /* always start with reliable default values */
   setLevelInfoToDefaults_EM();
 
-  if (!(file = fopen(filename, MODE_READ)))
+  if (!(file = openFile(filename, MODE_READ)))
   {
     if (!level_info_only)
       Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
@@ -92,9 +73,9 @@ boolean LoadNativeLevel_EM(char *filename, boolean level_info_only)
     return FALSE;
   }
 
-  raw_leveldata_length = fread(raw_leveldata, 1, MAX_EM_LEVEL_SIZE, file);
+  raw_leveldata_length = readFile(file, raw_leveldata, 1, MAX_EM_LEVEL_SIZE);
 
-  fclose(file);
+  closeFile(file);
 
   if (raw_leveldata_length <= 0)
   {