major cleanup of preprocessor hell

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

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index 22ea317e33d146044806760c8389bef81ab38586..b89c42f3adeba2c430f76c47166e80569b5ded94 100644 (file)
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,9 +3,7 @@
  * cave data structures
  */
 
-#include "global.h"
-#include "tile.h"
-#include "level.h"
+#include "main_em.h"
 
 
 struct LevelInfo_EM native_em_level;
@@ -17,17 +15,17 @@ void setLevelInfoToDefaults_EM(void)
   native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
 
   native_em_level.lev = &lev;
-  native_em_level.ply1 = &ply1;
-  native_em_level.ply2 = &ply2;
+  for (i = 0; i < MAX_PLAYERS; i++)
+    native_em_level.ply[i] = &ply[i];
 
   lev.width = 64;
   lev.height = 32;
 
-  ply1.x_initial = 0;
-  ply1.y_initial = 0;
-
-  ply2.x_initial = 0;
-  ply2.y_initial = 0;
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    ply[i].x_initial = 0;
+    ply[i].y_initial = 0;
+  }
 
   lev.lenses_cnt_initial = 0;
   lev.magnify_cnt_initial = 0;
@@ -42,13 +40,19 @@ void setLevelInfoToDefaults_EM(void)
   lev.wonderwall_state_initial = 0;
   lev.wonderwall_time_initial = 0;
 
+  lev.num_ball_arrays = 8;
+
   for (i = 0; i < TILE_MAX; i++)
     lev.android_array[i] = Xblank;
 
-  lev.home_initial = 1;                /* initial number of players in this level */
+  /* initial number of players in this level */
+  lev.home_initial = 0;
 
-  ply1.alive_initial = (lev.home_initial >= 1);
-  ply2.alive_initial = (lev.home_initial >= 2);
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    ply[i].exists = 0;
+    ply[i].alive_initial = FALSE;
+  }
 }
 
 
@@ -59,26 +63,27 @@ void setLevelInfoToDefaults_EM(void)
 
 #define MAX_EM_LEVEL_SIZE              16384
 
-boolean LoadNativeLevel_EM(char *filename)
+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)))
   {
-    Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+    if (!level_info_only)
+      Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
 
     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)
   {
@@ -87,7 +92,9 @@ boolean LoadNativeLevel_EM(char *filename)
     return FALSE;
   }
 
-  if (!(file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length)))
+  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);