--- deliantra/Deliantra-Client/Client.xs	2008/07/16 20:12:27	1.262
+++ deliantra/Deliantra-Client/Client.xs	2008/07/20 15:05:13	1.270
@@ -88,12 +88,6 @@
 /* mask out modifiers we are not interested in */
 #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
 
-#if 1
-# define PARACHUTE SDL_INIT_NOPARACHUTE
-#else
-# define PARACHUTE 0
-#endif
-
 static AV *texture_av;
 
 static struct
@@ -375,6 +369,16 @@
   self->rows = 0;
 }
 
+#define CELL_CLEAR(cell)	\
+  do {				\
+    if ((cell)->player)		\
+      (cell)->tile [2] = 0;	\
+    (cell)->darkness = 0;	\
+    (cell)->stat_hp  = 0;	\
+    (cell)->flags    = 0;	\
+    (cell)->player   = 0;	\
+  } while (0)
+
 static void
 map_blank (DC__Map self, int x0, int y0, int w, int h)
 {
@@ -398,10 +402,7 @@
 
               cell = row->col + x - row->c0;
               
-              cell->darkness = 0;
-              cell->stat_hp  = 0;
-              cell->flags    = 0;
-              cell->player   = 0;
+              CELL_CLEAR (cell);
             }
       }
 }
@@ -646,6 +647,35 @@
 	const_iv (KMOD_MODE),
 
         const_iv (MIX_DEFAULT_FORMAT),
+
+	const_iv (SDL_INIT_TIMER),
+	const_iv (SDL_INIT_AUDIO),
+	const_iv (SDL_INIT_VIDEO),
+	const_iv (SDL_INIT_CDROM),
+	const_iv (SDL_INIT_JOYSTICK),
+	const_iv (SDL_INIT_EVERYTHING),
+	const_iv (SDL_INIT_NOPARACHUTE),
+	const_iv (SDL_INIT_EVENTTHREAD),
+
+	const_iv (SDL_GL_RED_SIZE),
+	const_iv (SDL_GL_GREEN_SIZE),
+	const_iv (SDL_GL_BLUE_SIZE),
+	const_iv (SDL_GL_ALPHA_SIZE),
+	const_iv (SDL_GL_DOUBLEBUFFER),
+	const_iv (SDL_GL_BUFFER_SIZE),
+	const_iv (SDL_GL_DEPTH_SIZE),
+	const_iv (SDL_GL_STENCIL_SIZE),
+	const_iv (SDL_GL_ACCUM_RED_SIZE),
+	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
+	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
+	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
+        const_iv (SDL_GL_STEREO),
+        const_iv (SDL_GL_MULTISAMPLEBUFFERS),
+        const_iv (SDL_GL_MULTISAMPLESAMPLES),
+        const_iv (SDL_GL_ACCELERATED_VISUAL),
+        const_iv (SDL_GL_SWAP_CONTROL),
+
+        const_iv (FOW_DARKNESS)
 #	undef const_iv
   };
     
@@ -673,6 +703,12 @@
 
 NV ceil (NV x)
 
+NV ceilabs (NV x)
+	CODE:
+        RETVAL = x < 0. ? - ceil (-x) : ceil (x);
+	OUTPUT:
+        RETVAL
+
 IV minpot (UV n)
 
 IV popcount (UV n)
@@ -691,14 +727,24 @@
 #endif
 }
 
-char *
-SDL_GetError ()
+char *SDL_GetError ()
 
-int
-SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
+int SDL_Init (U32 flags)
 
-void
-SDL_Quit ()
+int SDL_InitSubSystem (U32 flags)
+
+void SDL_QuitSubSystem (U32 flags)
+
+void SDL_Quit ()
+
+int SDL_GL_SetAttribute (int attr, int value)
+
+int SDL_GL_GetAttribute (int attr)
+	CODE:
+        if (SDL_GL_GetAttribute (attr, &RETVAL))
+          XSRETURN_UNDEF;
+        OUTPUT:
+        RETVAL
 
 void
 SDL_ListModes (int rgb, int alpha)
@@ -720,17 +766,14 @@
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
-#if SDL_VERSION_ATLEAST(1,2,10)
-        SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
         SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
-#endif
 
 	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
 
         if (m && m != (SDL_Rect **)-1)
           while (*m)
             {
-              if ((*m)->w >= 800 && (*m)->h >= 480)
+              if ((*m)->w >= 400 && (*m)->h >= 300)
                 {
                   AV *av = newAV ();
                   av_push (av, newSViv ((*m)->w));
@@ -1754,7 +1797,7 @@
                     }
               }
             else
-              cell->darkness = 0;
+              CELL_CLEAR (cell);
           }
 }
 	OUTPUT:
@@ -1816,7 +1859,7 @@
         RETVAL
 
 void
-draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
+draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
 	CODE:
 {
         int x, y, z;
@@ -2073,8 +2116,8 @@
         if (pl_tex.name)
           {
             maptex tex = pl_tex;
-            int px = pl_x + pdx;
-            int py = pl_y + pdy;
+            int px = pl_x + sdx;
+            int py = pl_y + sdy;
 
             key.texname = tex.name;
             arr = rc_array (rc, &key);
@@ -2201,7 +2244,7 @@
         mx += self->x - 1;
         my += self->y - 1;
 
-        memset (darkness1, 255, sw1 * sh1);
+        memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
 
         for (y = 0; y < sh1; y++)
           if (0 <= y + my && y + my < self->rows)