X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fview.c;h=18196984a49fff3acc5aaf33351195f7630584b0;hb=b7c39e0d9229a7616c63cf545cdd9576b9bf3e2c;hp=73953d7dea30d469ec88408bf47f4cd230cc1ff1;hpb=d070670f189ec66ed2ac6b45834a192c004bc92f;p=flatwaifu.git

diff --git a/src/view.c b/src/view.c
index 73953d7..1819698 100644
--- a/src/view.c
+++ b/src/view.c
@@ -23,7 +23,6 @@
 #include "glob.h"
 #include <string.h>
 #include <stdlib.h>
-#include "vga.h"
 #include "memory.h"
 #include "files.h"
 #include "error.h"
@@ -42,22 +41,14 @@
 #include "my.h"
 #include "render.h"
 
-int WD;
-int HT;
-
-extern map_block_t blk;
-
 byte w_horiz=ON;
-int w_o,w_x,w_y,sky_type=1;
+int sky_type=1;
 dword walf[256];
 byte walswp[256];
 byte fldb[FLDH][FLDW];
 byte fldf[FLDH][FLDW];
 byte fld[FLDH][FLDW];
 
-extern int lt_time,lt_type,lt_side,lt_ypos;
-extern void *ltn[2][2];
-
 void W_savegame (FILE* h) {
   char s[8];
   int i;
@@ -86,14 +77,14 @@ void W_loadgame (FILE* h) {
     myfread(s[i], 8, 1, h);
   }
   R_begin_load();
-  R_load("", 0); // empty
   i = myfread32(h); // ignore
   for (i = 1; i < 256; i++) {
     walf[i] = myfread32(h);
     R_load(s[i], walf[i] & 1);
   }
   for (i = 0; i < 256; i++) {
-    walswp[i] = myfread8(h);
+    //walswp[i] = myfread8(h);
+    (void)myfread8(h); // useless in new code
   }
   myfread(fldb, FLDW*FLDH, 1, h);
   myfread(fld, FLDW*FLDH, 1, h);
@@ -101,7 +92,7 @@ void W_loadgame (FILE* h) {
   R_end_load();
 }
 
-void W_init(void) {
+void W_init (void) {
   DOT_init();
   SMK_init();
   FX_init();
@@ -114,7 +105,7 @@ void W_init(void) {
   free_chunks();
 }
 
-static void unpack(void *buf, int len, void *obuf) {
+static void unpack (void *buf, int len, void *obuf) {
   int i = 0;
   int j = 0;
   unsigned char *p = buf;
@@ -140,7 +131,6 @@ int W_load (FILE *h) {
   switch (blk.t) {
   case MB_WALLNAMES:
     R_begin_load();
-    R_load("", 0); // empty
     for (i = 1; i < 256 && blk.sz > 0; i++, blk.sz -= 9) {
       myfread(s, 8, 1, h);
       t = myfread8(h);