--- deliantra/Deliantra-Client/Client.xs	2008/07/18 22:56:11	1.265
+++ deliantra/Deliantra-Client/Client.xs	2008/08/28 00:53:53	1.275
@@ -41,6 +41,11 @@
 #include <SDL_mixer.h>
 #include <SDL_opengl.h>
 
+/* work around os x broken headers */
+#ifdef __MACOSX__
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
 #define PANGO_ENABLE_BACKEND
 #define G_DISABLE_CAST_CHECKS
 
@@ -369,6 +374,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)
 {
@@ -392,10 +407,7 @@
 
               cell = row->col + x - row->c0;
               
-              cell->darkness = 0;
-              cell->stat_hp  = 0;
-              cell->flags    = 0;
-              cell->player   = 0;
+              CELL_CLEAR (cell);
             }
       }
 }
@@ -517,6 +529,44 @@
   return 1;
 }
 
+static void
+deliantra_main ()
+{
+  char *argv[] = { 0 };
+  call_argv ("::main", G_DISCARD | G_VOID, argv);
+}
+
+#ifdef __MACOSX__
+  /* to due surprising braindamage on the side of SDL design, we
+   * do some mind-boggling hack here: SDL requires a custom main()
+   * on OS X, so... we provide one and call the original main(), which,
+   * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
+   * and which calls our main (== SDL_main) back.
+   */
+  extern C_LINKAGE int
+  main (int argc, char *argv[])
+  {
+    deliantra_main ();
+  }
+
+  #undef main
+
+  extern C_LINKAGE int main (int argc, char *argv[]);
+
+  static void
+  SDL_braino (void)
+  {
+    char *argv[] = { "deliantra client", 0 };
+    (main) (1, argv);
+  }
+#else
+  static void
+  SDL_braino (void)
+  {
+    deliantra_main ();
+  }
+#endif
+
 MODULE = Deliantra::Client	PACKAGE = DC
 
 PROTOTYPES: ENABLE
@@ -555,6 +605,56 @@
         const_iv (SDL_APPMOUSEFOCUS),
         const_iv (SDL_APPACTIVE),
 
+
+        const_iv (SDLK_UNKNOWN),
+        const_iv (SDLK_FIRST),
+        const_iv (SDLK_BACKSPACE),
+        const_iv (SDLK_TAB),
+        const_iv (SDLK_CLEAR),
+        const_iv (SDLK_RETURN),
+        const_iv (SDLK_PAUSE),
+        const_iv (SDLK_ESCAPE),
+        const_iv (SDLK_SPACE),
+        const_iv (SDLK_EXCLAIM),
+        const_iv (SDLK_QUOTEDBL),
+        const_iv (SDLK_HASH),
+        const_iv (SDLK_DOLLAR),
+        const_iv (SDLK_AMPERSAND),
+        const_iv (SDLK_QUOTE),
+        const_iv (SDLK_LEFTPAREN),
+        const_iv (SDLK_RIGHTPAREN),
+        const_iv (SDLK_ASTERISK),
+        const_iv (SDLK_PLUS),
+        const_iv (SDLK_COMMA),
+        const_iv (SDLK_MINUS),
+        const_iv (SDLK_PERIOD),
+        const_iv (SDLK_SLASH),
+        const_iv (SDLK_0),
+        const_iv (SDLK_1),
+        const_iv (SDLK_2),
+        const_iv (SDLK_3),
+        const_iv (SDLK_4),
+        const_iv (SDLK_5),
+        const_iv (SDLK_6),
+        const_iv (SDLK_7),
+        const_iv (SDLK_8),
+        const_iv (SDLK_9),
+        const_iv (SDLK_COLON),
+        const_iv (SDLK_SEMICOLON),
+        const_iv (SDLK_LESS),
+        const_iv (SDLK_EQUALS),
+        const_iv (SDLK_GREATER),
+        const_iv (SDLK_QUESTION),
+        const_iv (SDLK_AT),
+
+        const_iv (SDLK_LEFTBRACKET),
+        const_iv (SDLK_BACKSLASH),
+        const_iv (SDLK_RIGHTBRACKET),
+        const_iv (SDLK_CARET),
+        const_iv (SDLK_UNDERSCORE),
+        const_iv (SDLK_BACKQUOTE),
+        const_iv (SDLK_DELETE),
+
 	const_iv (SDLK_FIRST),
 	const_iv (SDLK_LAST),
 	const_iv (SDLK_KP0),
@@ -666,7 +766,9 @@
         const_iv (SDL_GL_MULTISAMPLEBUFFERS),
         const_iv (SDL_GL_MULTISAMPLESAMPLES),
         const_iv (SDL_GL_ACCELERATED_VISUAL),
-        const_iv (SDL_GL_SWAP_CONTROL)
+        const_iv (SDL_GL_SWAP_CONTROL),
+
+        const_iv (FOW_DARKNESS)
 #	undef const_iv
   };
     
@@ -714,6 +816,8 @@
 
 char *SDL_GetError ()
 
+void SDL_braino ()
+
 int SDL_Init (U32 flags)
 
 int SDL_InitSubSystem (U32 flags)
@@ -1782,7 +1886,7 @@
                     }
               }
             else
-              cell->darkness = 0;
+              CELL_CLEAR (cell);
           }
 }
 	OUTPUT:
@@ -1844,7 +1948,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;
@@ -2101,8 +2205,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);
@@ -2229,7 +2333,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)