manager: remove flag 0x8000 from resource handle id

[flatwaifu.git] / src / view.c

diff --git a/src/view.c b/src/view.c
index 043ac7839b459fd6aa0c3c96d5398bf5111f45ba..f902e23648dbe7727678f94a702feda84f22d4d9 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -68,26 +68,26 @@ void W_savegame (FILE* h) {
 
 void W_loadgame (FILE* h) {
   int i;
 
 void W_loadgame (FILE* h) {
   int i;

-  char s[256][8];
+  char s[8];

   sky_type = myfread32(h);
   R_loadsky(sky_type);
   sky_type = myfread32(h);
   R_loadsky(sky_type);

+  R_begin_load();

   for (i = 1; i < 256; ++i) {
   for (i = 1; i < 256; ++i) {

-    myfread(s[i], 8, 1, h);
+    myfread(s, 8, 1, h);
+    if (s[0]) {
+      R_load(s);
+    }

   }
   }

-  R_begin_load();
-  i = myfread32(h); // ignore
-  for (i = 1; i < 256; i++) {
-    walf[i] = myfread32(h);
-    R_load(s[i], walf[i] & 1);
+  R_end_load();
+  for (i = 0; i < 256; i++) {
+    myfread32(h); // useless

   }
   for (i = 0; i < 256; i++) {
   }
   for (i = 0; i < 256; i++) {

-    //walswp[i] = myfread8(h);
-    (void)myfread8(h); // useless in new code
+    walf[i] = myfread8(h);

   }
   myfread(fldb, FLDW*FLDH, 1, h);
   myfread(fld, FLDW*FLDH, 1, h);
   myfread(fldf, FLDW*FLDH, 1, h);
   }
   myfread(fldb, FLDW*FLDH, 1, h);
   myfread(fld, FLDW*FLDH, 1, h);
   myfread(fldf, FLDW*FLDH, 1, h);

-  R_end_load();

 }
 
 void W_init (void) {
 }
 
 void W_init (void) {


@@ -122,16 +122,17 @@ static void unpack (void *buf, int len, void *obuf) {
 }
 
 int W_load (FILE *h) {
 }
 
 int W_load (FILE *h) {

+  int i;

   char s[8];
   char s[8];

-  int i, j, t;

   void *p, *buf;
   switch (blk.t) {
   case MB_WALLNAMES:
     R_begin_load();
   void *p, *buf;
   switch (blk.t) {
   case MB_WALLNAMES:
     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);
     for (i = 1; i < 256 && blk.sz > 0; i++, blk.sz -= 9) {
       myfread(s, 8, 1, h);

-      t = myfread8(h);
-      R_load(s, t);
+      walf[i] = myfread8(h) ? 1 : 0; // ???
+      R_load(s);

       if (strncasecmp(s, "VTRAP01", 8) == 0) {
         walf[i] |= 2;
       }
       if (strncasecmp(s, "VTRAP01", 8) == 0) {
         walf[i] |= 2;
       }