X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fcave.c;h=6bd4622096d3ac9d8b2f540788a3026305127932;hb=c5321d9d36d0a74062651d0352fbbaccbe125eca;hp=a6c2a33b2166d8d2d338635da41663b311350e97;hpb=afc13e1c0cca61ea29a91198f1e36d22c0c9e7e4;p=rocksndiamonds.git

diff --git a/src/game_em/cave.c b/src/game_em/cave.c
index a6c2a33b..6bd46220 100644
--- a/src/game_em/cave.c
+++ b/src/game_em/cave.c
@@ -3,21 +3,12 @@
  * 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 cave_node *cave_list;
 
 static void setLevelInfoToDefaults_EM(void)
@@ -41,59 +32,6 @@ static void setLevelInfoToDefaults_EM(void)
  * 
  * 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];
-
-  /* always start with reliable default values */
-  setLevelInfoToDefaults_EM();
-
-  file = fopen(filename, "rb");
-  if (file == 0)
-  {
-    fprintf(stderr, "%s: \"%s\": %s: %s\n", progname, filename, "open error",
-	    strerror(errno));
-    result = 1;
-    goto fail;
-  }
-
-  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;
-  }
-
-  length = actual;
-  fclose(file);
-  file = 0;
-
-  if (!cleanup_em_level(buffer, &length))
-  {
-    fprintf(stderr, "%s: \"%s\": %s\n", progname, filename,
-	    "unrecognized format");
-    result = 1;
-    goto fail;
-  }
-
-  convert_em_level(buffer);
-  prepare_em_level();
-
-  result = 0;
-
- fail:
-
-  if (file)
-    fclose(file);
-
-  return(result);
-}
 
 #define MAX_EM_LEVEL_SIZE		16384
 
@@ -136,80 +74,3 @@ boolean LoadNativeLevel_EM(char *filename)
 
   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