map: use streams for map loader

diff --git a/src/common/files.c b/src/common/files.c
index 7443ca7c18c4f3a58a3a29e8f326de2b148aa84a..91789f638b829061d41efe480276582e8dea2286 100644 (file)
--- a/src/common/files.c
+++ b/src/common/files.c
@@ -4,7 +4,16 @@
 #include <stdint.h>
 #include <assert.h>
 
-static void FILE_Reader_SetPos (Reader *r, int pos) {
+static long FILE_Reader_GetPos (Reader *r) {
+  FILE_Reader *rd = (FILE_Reader*)r;
+  assert(rd != NULL);
+  assert(rd->fp != NULL);
+  long pos = ftell(rd->fp);
+  assert(pos != -1); // fail
+  return pos;
+}
+
+static void FILE_Reader_SetPos (Reader *r, long pos) {
   FILE_Reader *rd = (FILE_Reader*)r;
   assert(rd != NULL);
   assert(rd->fp != NULL);
@@ -24,6 +33,7 @@ static void FILE_Reader_Read (Reader *r, void *data, size_t size, size_t n) {
 void FILE_AssignReader (FILE_Reader *r, FILE *fp) {
   assert(r != NULL);
   assert(fp != NULL);
+  r->base.getpos = FILE_Reader_GetPos;
   r->base.setpos = FILE_Reader_SetPos;
   r->base.read = FILE_Reader_Read;
   r->fp = fp;
@@ -44,12 +54,22 @@ void FILE_CloseReader (FILE_Reader *r) {
   if (r->fp != NULL) {
     fclose(r->fp);
   }
+  r->base.getpos = NULL;
   r->base.setpos = NULL;
   r->base.read = NULL;
   r->fp = NULL;
 }
 
-static void FILE_Writer_SetPos (Writer *w, int pos) {
+static long FILE_Writer_GetPos (Writer *w) {
+  FILE_Writer *wr = (FILE_Writer*)w;
+  assert(wr != NULL);
+  assert(wr->fp != NULL);
+  long pos = ftell(wr->fp);
+  assert(pos != -1); // fail
+  return pos;
+}
+
+static void FILE_Writer_SetPos (Writer *w, long pos) {
   FILE_Writer *wr = (FILE_Writer*)w;
   assert(wr != NULL);
   assert(wr->fp != NULL);
@@ -69,6 +89,7 @@ static void FILE_Writer_Write (Writer *w, const void *data, size_t size, size_t
 void FILE_AssignWriter (FILE_Writer *w, FILE *fp) {
   assert(w != NULL);
   assert(fp != NULL);
+  w->base.getpos = FILE_Writer_GetPos;
   w->base.setpos = FILE_Writer_SetPos;
   w->base.write = FILE_Writer_Write;
   w->fp = fp;
@@ -89,6 +110,7 @@ void FILE_CloseWriter (FILE_Writer *w) {
   if (w->fp != NULL) {
     fclose(w->fp);
   }
+  w->base.getpos = NULL;
   w->base.setpos = NULL;
   w->base.write = NULL;
   w->fp = NULL;

diff --git a/src/common/streams.h b/src/common/streams.h
index 50136410f409e9e67c4d351efdd4684a2c052b3c..8952e24dac7ce5717329534e0860998f6419f07a 100644 (file)
--- a/src/common/streams.h
+++ b/src/common/streams.h
@@ -8,12 +8,14 @@ typedef struct Reader Reader;
 typedef struct Writer Writer;
 
 struct Reader {
-  void (*setpos)(Reader *r, int pos);
+  long (*getpos)(Reader *r);
+  void (*setpos)(Reader *r, long pos);
   void (*read)(Reader *r, void *data, size_t size, size_t n);
 };
 
 struct Writer {
-  void (*setpos)(Writer *w, int pos);
+  long (*getpos)(Writer *w);
+  void (*setpos)(Writer *w, long pos);
   void (*write)(Writer *w, const void *data, size_t size, size_t n);
 };
 

diff --git a/src/map.c b/src/map.c
index 880abb479da44101744d7aa0b1cc23f3cc7ef427..1bdb4d3c145c643f19ac9ca207b9012c6fe95230 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -30,10 +30,14 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include "my.h"
 #include "error.h"
 #include "cp866.h"
 
+#include "common/streams.h"
+#include "common/files.h"
+
 enum {
   MB_COMMENT = -1, MB_END = 0,
   MB_WALLNAMES, MB_BACK, MB_WTYPE, MB_FRONT, MB_THING, MB_SWITCH,
@@ -61,10 +65,10 @@ typedef struct old_thing_t {
 
 static map_block_t blk;
 
-static int G_load (FILE *h) {
+static int G_load (Reader *h) {
   switch (blk.t) {
     case MB_MUSIC:
-      myfread(g_music, 8, 1, h);
+      stream_read(g_music, 8, 1, h);
       //if (music_random) {
       //  F_randmus(g_music);
       //}
@@ -74,16 +78,16 @@ static int G_load (FILE *h) {
   return 0;
 }
 
-static int IT_load (FILE *h) {
+static int IT_load (Reader *h) {
   int m, i, j;
   old_thing_t t;
   switch (blk.t) {
        case MB_THING:
          for (i = 0; blk.sz > 0; ++i, blk.sz -= 8) {
-      t.x = myfread16(h);
-      t.y = myfread16(h);
-      t.t = myfread16(h);
-      t.f = myfread16(h);
+      t.x = stream_read16(h);
+      t.y = stream_read16(h);
+      t.t = stream_read16(h);
+      t.f = stream_read16(h);
       it[i].o.x = t.x;
       it[i].o.y = t.y;
       it[i].t = t.t;
@@ -101,7 +105,8 @@ static int IT_load (FILE *h) {
     }
          if (!g_dm) {
       if (j == -1) {
-        ERR_fatal("Player 1 point not exists on the map");
+        logo("Player 1 point not exists on the map\n");
+        return 0; // error
       }
       dm_pos[0].x = it[j].o.x;
       dm_pos[0].y = it[j].o.y;
@@ -115,7 +120,8 @@ static int IT_load (FILE *h) {
     }
          if (!g_dm && _2pl) {
       if (j == -1) {
-        ERR_fatal("Player 2 point not exists on the map");
+        logo("Player 2 point not exists on the map\n");
+        return 0; // error
       }
       dm_pos[1].x = it[j].o.x;
       dm_pos[1].y = it[j].o.y;
@@ -133,7 +139,8 @@ static int IT_load (FILE *h) {
       }
     }
          if (g_dm && j < 2) {
-      ERR_fatal("Required at least two DM points on the map");
+      logo("Required at least two DM points on the map\n");
+      return 0; // error
     }
          if (g_dm) {
            dm_pnum = j;
@@ -167,21 +174,21 @@ static int IT_load (FILE *h) {
   return 0;
 }
 
-static int SW_load (FILE *h) {
+static int SW_load (Reader *h) {
   int i;
   switch(blk.t) {
     case MB_SWITCH2:
       sw_secrets = 0;
       for (i = 0; i < MAXSW && blk.sz > 0; ++i, blk.sz -= 9) {
-        sw[i].x = myfread8(h);
-        sw[i].y = myfread8(h);
-        sw[i].t = myfread8(h);
-        sw[i].tm = myfread8(h); // unused
-        sw[i].a = myfread8(h);
-        sw[i].b = myfread8(h);
-        sw[i].c = myfread8(h);
-        sw[i].d = myfread8(h); // unused
-        sw[i].f = myfread8(h);
+        sw[i].x = stream_read8(h);
+        sw[i].y = stream_read8(h);
+        sw[i].t = stream_read8(h);
+        sw[i].tm = stream_read8(h); // unused
+        sw[i].a = stream_read8(h);
+        sw[i].b = stream_read8(h);
+        sw[i].c = stream_read8(h);
+        sw[i].d = stream_read8(h); // unused
+        sw[i].f = stream_read8(h);
         sw[i].tm = 0;
         sw[i].d = 0;
         sw[i].f |= 0x80;
@@ -213,18 +220,19 @@ static void unpack (void *buf, int len, void *obuf) {
   }
 }
 
-static int read_array (void *p, FILE *h) {
+static int read_array (void *p, Reader *h) {
   void *buf;
   switch (blk.st) {
     case 0:
-      myfread(p, FLDW * FLDH, 1, h);
+      stream_read(p, FLDW * FLDH, 1, h);
       break;
     case 1:
       buf = malloc(blk.sz);
       if (buf == NULL) {
-        ERR_fatal("Out of memory");
+        logo("Out of memory\n");
+        return 0; // error
       }
-      myfread(buf, blk.sz, 1, h);
+      stream_read(buf, blk.sz, 1, h);
       unpack(buf, blk.sz, p);
       free(buf);
       break;
@@ -234,7 +242,7 @@ static int read_array (void *p, FILE *h) {
   return 1;
 }
 
-static int W_load (FILE *h) {
+static int W_load (Reader *h) {
   int i;
   char s[8];
   switch (blk.t) {
@@ -242,8 +250,8 @@ static int W_load (FILE *h) {
     R_begin_load();
     memset(walf, 0, sizeof(walf));
     for (i = 1; i < 256 && blk.sz > 0; i++, blk.sz -= 9) {
-      myfread(s, 8, 1, h);
-      walf[i] = myfread8(h) ? 1 : 0; // ???
+      stream_read(s, 8, 1, h);
+      walf[i] = stream_read8(h) ? 1 : 0; // ???
       R_load(s);
       if (cp866_strncasecmp(s, "VTRAP01", 8) == 0) {
         walf[i] |= 2;
@@ -258,47 +266,69 @@ static int W_load (FILE *h) {
   case MB_FRONT:
     return read_array(fldf, h);
   case MB_SKY:
-    sky_type = myfread16(h);
+    sky_type = stream_read16(h);
     R_loadsky(sky_type);
     return 1;
   }
   return 0;
 }
 
-void F_loadmap (char n[8]) {
-  int r, o;
-  FILE *h;
+int MAP_load (Reader *r) {
+  assert(r != NULL);
+  int ok = 0;
   map_header_t hdr;
-  W_init();
-  r = F_getresid(n);
-  h = wadh[wad[r].f];
-  fseek(h, wad[r].o, SEEK_SET);
-  myfread(hdr.id, 8, 1, h);
-  hdr.ver = myfread16(h);
-  if (memcmp(hdr.id, "Doom2D\x1A", 8) != 0) {
-    ERR_fatal("%.8s not map", n);
-  }
-  for (;;) {
-    blk.t = myfread16(h);
-    blk.st = myfread16(h);
-    blk.sz = myfread32(h);
-    if(blk.t == MB_END) {
-      break;
-    }
-    if(blk.t == MB_COMMENT) {
-      fseek(h, blk.sz, SEEK_CUR);
-      continue;
-    }
-    o = ftell(h) + blk.sz;
-    if(!G_load(h)) {
-      if(!W_load(h)) {
-        if(!IT_load(h)) {
-          if(!SW_load(h)) {
-            ERR_fatal("Unknown block %d(%d) on map %.8s", blk.t, blk.st, n);
-          }
-        }
+  W_init(); // reset all game data
+  stream_read(hdr.id, 8, 1, r);
+  hdr.ver = stream_read16(r);
+  if (memcmp(hdr.id, "Doom2D\x1A", 8) == 0) {
+    ok = 1;
+    while (ok) {
+      blk.t = stream_read16(r);
+      blk.st = stream_read16(r);
+      blk.sz = stream_read32(r);
+      long off = r->getpos(r) + blk.sz;
+      switch (blk.t) {
+        case MB_MUSIC:
+          ok = G_load(r);
+          break;
+        case MB_WALLNAMES:
+        case MB_BACK:
+        case MB_WTYPE:
+        case MB_FRONT:
+        case MB_SKY:
+          ok = W_load(r);
+          break;
+        case MB_THING:
+          ok = IT_load(r);
+          break;
+        case MB_SWITCH2:
+          ok = SW_load(r);
+          break;
+        case MB_COMMENT:
+          /* skip */
+          break;
+        case MB_END:
+          return ok;
+        default:
+          logo("Unknown block %d(%d)\n", blk.t, blk.st);
+          return 0; // error
       }
+      r->setpos(r, off);
     }
-    fseek(h, o, SEEK_SET);
+  } else {
+    logo("Invalid map header\n");
+    ok = 0;
+  }
+  return ok;
+}
+
+void F_loadmap (char n[8]) {
+  FILE_Reader rd;
+  int r = F_getresid(n);
+  FILE *h = wadh[wad[r].f];
+  fseek(h, wad[r].o, SEEK_SET);
+  FILE_AssignReader(&rd, h);
+  if (!MAP_load(&rd.base)) {
+    ERR_fatal("Failed to load map");
   }
 }

diff --git a/src/map.h b/src/map.h
index 15cfdd38541764e6ba293f25f5120449f19bd64b..d661b366ae639002e8b7cd97f51508f89deffe49 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -18,6 +18,9 @@
 #ifndef MAP_H_INCLUDED
 #define MAP_H_INCLUDED
 
+#include "common/streams.h"
+
+int MAP_load (Reader *r);
 void F_loadmap (char n[8]);
 
 #endif /* MAP_H_INCLUDED */