X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=ed5dc9426101925efaffd6877b8bdf66d5fd8960;hb=58ea80c54f5a1e6605e2c33b554dff1fcc0c26b5;hp=4f8500cc2b05758f7baa5bc783c00191cfb96f80;hpb=e6c0b4c0114691d197018f878e0150a3f5d8490e;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index 4f8500cc..ed5dc942 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,26 +3,85 @@
  * cave data structures
  */
 
-#include "global.h"
-#include "tile.h"
-#include "level.h"
-#include "file.h"
+#include "main_em.h"
 
 
-static void setLevelInfoToDefaults_EM(void)
+struct LevelInfo_EM native_em_level;
+
+void setLevelInfoToDefaults_EM(void)
 {
-  native_em_level.lev = &lev;
-  native_em_level.ply1 = &ply1;
-  native_em_level.ply2 = &ply2;
+  int i, j, x, y;
+
+  native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
+  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;
 
-  ply1.x_initial = 0;
-  ply1.y_initial = 0;
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    cav.player_x[i] = -1;
+    cav.player_y[i] = -1;
+  }
 
-  ply2.x_initial = 0;
-  ply2.y_initial = 0;
+  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++)
+    cav.android_array[i] = Cblank;
+
+  for (x = 0; x < CAVE_WIDTH; x++)
+    for (y = 0; y < CAVE_HEIGHT; y++)
+      cav.cave[x][y] = Cblank;
 }
 
 
@@ -33,25 +92,27 @@ static 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;
-  FILE *file;
+  int file_version;
+  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)
   {
@@ -60,14 +121,16 @@ boolean LoadNativeLevel_EM(char *filename)
     return FALSE;
   }
 
-  if (!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);
 
     return FALSE;
   }
 
-  convert_em_level(raw_leveldata);
+  convert_em_level(raw_leveldata, file_version);
   prepare_em_level();
 
   return TRUE;