fix segfault on 64bit systems

[flatwaifu.git] / src / vga.c

diff --git a/src/vga.c b/src/vga.c
index e06baf482dd3ed2a891a5e154a5ce38f434b54ac..3b4e06516a2794a295fba2e6f9fe641782123d29 100644 (file)
--- a/src/vga.c
+++ b/src/vga.c
@@ -25,6 +25,10 @@
 #include <SDL.h>
 #include "error.h"
 #include "view.h"
+#include "memory.h"
+#include "misc.h"
+
+#include <assert.h>
 
 
 // адрес экранного буфера
@@ -45,6 +49,22 @@ char fullscreen = OFF;
 
 #define HQ 2
 
+vgaimg *V_getvgaimg (int id) {
+  int loaded = M_was_locked(id);
+  vgaimg *v = M_lock(id);
+  if (v != NULL && !loaded) {
+    v->w = short2host(v->w);
+    v->h = short2host(v->h);
+    v->sx = short2host(v->sx);
+    v->sy = short2host(v->sy);
+  }
+  return v;
+}
+
+vgaimg *V_loadvgaimg (char *name) {
+  return V_getvgaimg(F_getresid(name));
+}
+
 short V_init(void)
 {
     Uint32 flags = SDL_SWSURFACE|SDL_DOUBLEBUF|SDL_HWPALETTE;
@@ -301,31 +321,26 @@ void V_remap_rect(int x,int y,int w,int h,byte *cmap)
 extern void *walp[256];
 extern byte clrmap[256*12];
 
-void Z_drawfld(byte *fld, int bg)
+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;
-
-
+    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];
-                if ((int)pic <= 3) {
-                    if (!bg) {
-                        byte *cmap = clrmap + ((int)pic+7)*256;
-                        V_remap_rect(sx, sy, CELW, CELH, cmap);
-                    }
-                }
-                else {
-                    V_pic(sx, sy, pic);
+              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++;
         }
     }