X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=b89c42f3adeba2c430f76c47166e80569b5ded94;hb=20e9d89a234989e55d9d232b6e5ba5a81342ced6;hp=0e7caea5013f510cf8d0e9f314b20c0a6d910bea;hpb=da8f8eaa9d466f33d94ff884230a613b3f239700;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index 0e7caea5..b89c42f3 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,115 +3,87 @@
  * cave data structures
  */
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include "main_em.h"
 
-#include "global.h"
-#include "tile.h"
-#include "level.h"
-#include "file.h"
 
+struct LevelInfo_EM native_em_level;
 
-#if defined(TARGET_X11)
+void setLevelInfoToDefaults_EM(void)
+{
+  int i;
 
-struct cave_node *cave_list;
+  native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
+
+  native_em_level.lev = &lev;
+  for (i = 0; i < MAX_PLAYERS; i++)
+    native_em_level.ply[i] = &ply[i];
 
-static void setLevelInfoToDefaults_EM(void)
-{
   lev.width = 64;
   lev.height = 32;
 
-  ply1.x_initial = 0;
-  ply1.y_initial = 0;
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    ply[i].x_initial = 0;
+    ply[i].y_initial = 0;
+  }
 
-  ply2.x_initial = 0;
-  ply2.y_initial = 0;
-}
+  lev.lenses_cnt_initial = 0;
+  lev.magnify_cnt_initial = 0;
 
+  lev.wheel_cnt_initial = 0;
+  lev.wheel_x_initial = 1;
+  lev.wheel_y_initial = 1;
 
-/* attempt load a cave
- * 
- * completely initializes the level structure, ready for a game
- */
-int OLD_cave_convert(char *filename)
-{
-  int result;
-  FILE *file;
-  int actual;
-  int length;
-  unsigned char buffer[16384];
+  lev.wind_time = 9999;
+  lev.wind_cnt_initial = 0;
 
-  /* always start with reliable default values */
-  setLevelInfoToDefaults_EM();
+  lev.wonderwall_state_initial = 0;
+  lev.wonderwall_time_initial = 0;
 
-  file = fopen(filename, "rb");
-  if (file == 0)
-  {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, filename, "open error",
-	    strerror(errno));
-    result = 1;
-    goto fail;
-  }
+  lev.num_ball_arrays = 8;
 
-  actual = fread(buffer, 1, 16384, file);
-  if (actual == -1)
-  {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, filename, "read error",
-	    strerror(errno));
-    result = 1;
-    goto fail;
-  }
+  for (i = 0; i < TILE_MAX; i++)
+    lev.android_array[i] = Xblank;
 
-  length = actual;
-  fclose(file);
-  file = 0;
+  /* initial number of players in this level */
+  lev.home_initial = 0;
 
-  if (!cleanup_em_level(buffer, &length))
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    fprintf(stderr, "%s: \"%s\": %s\n", progname, filename,
-	    "unrecognized format");
-    result = 1;
-    goto fail;
+    ply[i].exists = 0;
+    ply[i].alive_initial = FALSE;
   }
+}
 
-  convert_em_level(buffer);
-  prepare_em_level();
-
-  result = 0;
-
- fail:
-
-  if (file)
-    fclose(file);
 
-  return(result);
-}
+/* load cave
+ * 
+ * completely initializes the level structure, ready for a game
+ */
 
 #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)
   {
@@ -120,92 +92,17 @@ 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;
 }
-
-void read_cave_list(void)
-{
-  char name[MAXNAME+2];
-  struct cave_node *node, **prev;
-  DIR *dir;
-  struct dirent *entry;
-  char *cut;
-  int len;
-
-  free_cave_list(); /* delete old list if i forgot to before */
-
-  name[MAXNAME] = 0;
-  if (arg_basedir)
-  {
-    snprintf(name, MAXNAME+2, "%s/%s", arg_basedir, EM_LVL_DIR);
-  }
-  else
-  {
-    snprintf(name, MAXNAME+2, "%s", EM_LVL_DIR);
-  }
-
-  if (name[MAXNAME])
-    snprintf_overflow("read cave/ directory");
-
-  dir = opendir(name);
-  if (dir)
-  {
-    prev = &cave_list;
-    while ((entry = readdir(dir)))
-    {
-      if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
-	continue;
-
-      node = malloc(sizeof(*node)); if (node == 0) break;
-      *prev = node; prev = &node->next;
-
-      node->path[MAXNAME] = 0;
-      snprintf(node->path, MAXNAME+2, "%s/%s", name, entry->d_name);
-      if (node->path[MAXNAME])
-	snprintf_overflow("read cave/ directory");
-
-      cut = strrchr(node->path, '/'); cut = cut ? cut + 1 : node->path;
-      len = strlen(cut);
-      if (len <= 32)
-      {
-	strncpy(node->name, cut, 32);
-      }
-      else
-      {
-	snprintf(node->name, 32, "%.8s..%s", cut, cut + len - 16);
-      }
-    }
-
-    *prev = 0;
-    closedir(dir);
-  }
-  else
-  {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, name,
-	    "failed to open directory", strerror(errno));
-  }
-}
-
-void free_cave_list(void)
-{
-  struct cave_node *node, *next;
-
-  for (node = cave_list; node; node = next)
-  {
-    next = node->next;
-    free(node);
-  }
-  cave_list = 0;
-}
-
-#endif