fully separate render

[flatwaifu.git] / src / vga.c

diff --git a/src/vga.c b/src/vga.c
index 3b4e06516a2794a295fba2e6f9fe641782123d29..0d16859efde217bd07cc56e0da4dfda6a726744a 100644 (file)
--- a/src/vga.c
+++ b/src/vga.c
@@ -27,6 +27,7 @@
 #include "view.h"
 #include "memory.h"
 #include "misc.h"
+#include "files.h"
 
 #include <assert.h>
 
@@ -47,6 +48,16 @@ int cx1,cx2,cy1,cy2;
 
 char fullscreen = OFF;
 
+byte bright[256];
+byte mixmap[256][256];
+byte clrmap[256*12];
+
+static byte flametab[16] = {
+  0xBC,0xBA,0xB8,0xB6,0xB4,0xB2,0xB0,0xD5,0xD6,0xD7,0xA1,0xA0,0xE3,0xE2,0xE1,0xE0
+};
+
+extern void *walp[256];
+
 #define HQ 2
 
 vgaimg *V_getvgaimg (int id) {
@@ -211,11 +222,6 @@ void V_dot(short x,short y, unsigned char c)
     putpixel(x,y,c);
 }
 
-
-extern byte bright[256];
-extern byte flametab[16];
-extern byte mixmap[256][256];
-
 void smoke_sprf(int x, int y, byte c)
 {
     byte t = getpixel(x,y);
@@ -318,34 +324,6 @@ void V_remap_rect(int x,int y,int w,int h,byte *cmap)
             mappixel(cx,cy,cmap);
 }
 
-extern void *walp[256];
-extern byte clrmap[256*12];
-
-void Z_drawfld (byte *fld, int bg)
-{
-    byte *p = fld;
-    int x, y;
-    for (y = 0; y < FLDH; y++) {
-        for (x = 0; x < FLDW; x++) {
-            int sx = x * CELW - w_x + WD / 2;
-            int sy = y * CELH - w_y + HT / 2 + 1 + w_o;
-            if (*p) {
-              vgaimg *pic = walp[*p];
-              // special pointer value setted for _WATER_* in view.c
-              if ((intptr_t)pic <= 3) {
-                if (!bg) {
-                  byte *cmap = clrmap + ((intptr_t)pic+7)*256;
-                  V_remap_rect(sx, sy, CELW, CELH, cmap);
-                }
-              } else {
-                V_pic(sx, sy, pic);
-              }
-            }
-            p++;
-        }
-    }
-}
-
 void V_toggle()
 {
     if (!SDL_WM_ToggleFullScreen(screen)) {