X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=a811d03ee3d8baf23f3ce4a5867f9f5afd47c1bb;hb=37a06df577bbfd00f4b361f92cacb0d97036ba93;hp=ad5f4b410dd309c5c52da0d00e6ad739ec66feb8;hpb=12a92e1aa977ccfcc6223eaabc92d6c3ca84e2ff;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index ad5f4b41..a811d03e 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,185 +3,101 @@
  * cave data structures
  */
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
 #include "global.h"
 #include "tile.h"
 #include "level.h"
-#include "file.h"
 
 
-#if defined(TARGET_X11)
+struct LevelInfo_EM native_em_level;
 
-struct cave_node *cave_list;
+void setLevelInfoToDefaults_EM(void)
+{
+  int i;
 
-static void clear(void);
+  native_em_level.file_version = FILE_VERSION_EM_ACTUAL;
 
-/* attempt load a cave
- * 
- * completely initializes the level structure, ready for a game
- */
-int cave_convert(char *filename)
-{
-  int result;
-  FILE *file;
-  int actual;
-  unsigned long length;
-  unsigned char buffer[16384];
+  native_em_level.lev = &lev;
+  native_em_level.ply1 = &ply1;
+  native_em_level.ply2 = &ply2;
 
-  clear();
+  lev.width = 64;
+  lev.height = 32;
 
-  file = fopen(filename, "rb");
-  if (file == 0)
-  {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, filename, "open error",
-	    strerror(errno));
-    result = 1;
-    goto fail;
-  }
+  ply1.x_initial = 0;
+  ply1.y_initial = 0;
 
-  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;
-  }
+  ply2.x_initial = 0;
+  ply2.y_initial = 0;
 
-  length = actual;
-  fclose(file);
-  file = 0;
+  lev.lenses_cnt_initial = 0;
+  lev.magnify_cnt_initial = 0;
 
-  if (clean_emerald(buffer, &length))
-  {
-    fprintf(stderr, "%s: \"%s\": %s\n", progname, filename,
-	    "unrecognized format");
-    result = 1;
-    goto fail;
-  }
+  lev.wheel_cnt_initial = 0;
+  lev.wheel_x_initial = 1;
+  lev.wheel_y_initial = 1;
 
-  convert_emerald(buffer);
+  lev.wind_time = 9999;
+  lev.wind_cnt_initial = 0;
 
-  result = 0;
+  lev.wonderwall_state_initial = 0;
+  lev.wonderwall_time_initial = 0;
 
- fail:
+  lev.num_ball_arrays = 8;
 
-  if (file)
-    fclose(file);
+  for (i = 0; i < TILE_MAX; i++)
+    lev.android_array[i] = Xblank;
 
-  return(result);
-}
+  lev.home_initial = 1;		/* initial number of players in this level */
 
-static void clear(void)
-{
-  lev.home = 1; /* number of players */
-  lev.width = 0;
-  lev.height = 0;
-  lev.time = 0;
-  lev.required = 0;
-  lev.score = 0;
-
-  ply1.num = 0;
-  ply1.alive = (lev.home >= 1);
-  ply1.dynamite = 0;
-  ply1.dynamite_cnt = 0;
-  ply1.keys = 0;
-  ply1.anim = 0;
-  ply1.oldx = ply1.x = 0;
-  ply1.oldy = ply1.y = 0;
-  ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = ply1.joy_fire = 0;
-  ply1.joy_stick = ply1.joy_spin = 0;
-  ply2.num = 1;
-  ply2.alive = (lev.home >= 2);
-  ply2.dynamite = 0;
-  ply2.dynamite_cnt = 0;
-  ply2.keys = 0;
-  ply2.anim = 0;
-  ply2.oldx = ply2.x = 0;
-  ply2.oldy = ply2.y = 0;
-  ply2.joy_n = ply2.joy_e = ply2.joy_s = ply2.joy_w = ply2.joy_fire = 0;
-  ply2.joy_stick = ply2.joy_spin = 0;
+  ply1.alive_initial = (lev.home_initial >= 1);
+  ply2.alive_initial = (lev.home_initial >= 2);
 }
 
-void read_cave_list(void)
+
+/* load cave
+ * 
+ * completely initializes the level structure, ready for a game
+ */
+
+#define MAX_EM_LEVEL_SIZE		16384
+
+boolean LoadNativeLevel_EM(char *filename)
 {
-  char name[MAXNAME+2];
-  struct cave_node *node, **prev;
-  DIR *dir;
-  struct dirent *entry;
-  char *cut;
-  int len;
+  unsigned char raw_leveldata[MAX_EM_LEVEL_SIZE];
+  int raw_leveldata_length;
+  int file_version;
+  FILE *file;
 
-  free_cave_list(); /* delete old list if i forgot to before */
+  /* always start with reliable default values */
+  setLevelInfoToDefaults_EM();
 
-  name[MAXNAME] = 0;
-  if (arg_basedir)
+  if (!(file = fopen(filename, MODE_READ)))
   {
-    snprintf(name, MAXNAME+2, "%s/%s", arg_basedir, EM_LVL_DIR);
-  }
-  else
-  {
-    snprintf(name, MAXNAME+2, "%s", EM_LVL_DIR);
+    Error(ERR_WARN, "cannot open level '%s' -- using empty level", filename);
+
+    return FALSE;
   }
 
-  if (name[MAXNAME])
-    snprintf_overflow("read cave/ directory");
+  raw_leveldata_length = fread(raw_leveldata, 1, MAX_EM_LEVEL_SIZE, file);
+
+  fclose(file);
 
-  dir = opendir(name);
-  if (dir)
+  if (raw_leveldata_length <= 0)
   {
-    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);
+    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+
+    return FALSE;
   }
-  else
+
+  if (!(file_version = cleanup_em_level(raw_leveldata, raw_leveldata_length)))
   {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, name,
-	    "failed to open directory", strerror(errno));
+    Error(ERR_WARN, "unknown EM level '%s' -- using empty level", filename);
+
+    return FALSE;
   }
-}
 
-void free_cave_list(void)
-{
-  struct cave_node *node, *next;
+  convert_em_level(raw_leveldata, file_version);
+  prepare_em_level();
 
-  for (node = cave_list; node; node = next)
-  {
-    next = node->next;
-    free(node);
-  }
-  cave_list = 0;
+  return TRUE;
 }
-
-#endif