--- deliantra/Deliantra-Client/Client.xs	2006/10/09 01:06:36	1.160
+++ deliantra/Deliantra-Client/Client.xs	2006/11/07 22:41:27	1.164
@@ -1,12 +1,11 @@
 #ifdef _WIN32
-long _ftol (double); /* defined by VC6 C libs */
-long _ftol2 (double dblSource) { return _ftol (dblSource); }
 # define WIN32_LEAN_AND_MEAN
 # define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
 # include <malloc.h>
 # include <windows.h>
 # include <wininet.h>
 # pragma warning(disable:4244)
+# pragma warning(disable:4761)
 #endif
 
 #include "EXTERN.h"
@@ -41,16 +40,9 @@
 # include <netinet/in.h>
 # include <netinet/tcp.h>
 # include <inttypes.h>
-#else
- typedef unsigned char  uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int   uint32_t;
- typedef   signed char  int8_t;
- typedef   signed short int16_t;
- typedef   signed int   int32_t;
 #endif
 
-#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
+#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
 
 #define FOW_DARKNESS 32
 
@@ -798,7 +790,11 @@
 void
 _exit (int retval = 0)
 	CODE:
+#ifdef WIN32
+        ExitThread (retval); // unclean, please beam me up
+#else
         _exit (retval);
+#endif
 
 MODULE = CFPlus	PACKAGE = CFPlus::Font
 
@@ -1174,13 +1170,13 @@
 MODULE = CFPlus	PACKAGE = CFPlus::Map
 
 CFPlus::Map
-new (SV *class, int map_width, int map_height)
+new (SV *class)
 	CODE:
         New (0, RETVAL, 1, struct map);
         RETVAL->x  = 0;
         RETVAL->y  = 0;
-        RETVAL->w  = map_width;
-        RETVAL->h  = map_height;
+        RETVAL->w  = 0;
+        RETVAL->h  = 0;
         RETVAL->ox = 0;
         RETVAL->oy = 0;
         RETVAL->faces = 8192;
@@ -1203,6 +1199,12 @@
 }
 
 void
+resize (CFPlus::Map self, int map_width, int map_height)
+	CODE:
+        self->w = map_width;
+        self->h = map_height;
+
+void
 clear (CFPlus::Map self)
 	CODE:
         map_clear (self);
@@ -1450,27 +1452,13 @@
         RETVAL
 
 void
-draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
+draw (CFPlus::Map self, int mx, int my, int sw, int sh)
 	CODE:
 {
-	int vx, vy;
         int x, y, z;
         int last_name;
         mapface face;
 
-        vx = self->x + self->w / 2 - sw / 2 - shift_x;
-        vy = self->y + self->h / 2 - sh / 2 - shift_y;
-
-        /*
-        int vx = self->vx = self->w >= sw
-          ? self->x + (self->w - sw) / 2
-          : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
-
-        int vy = self->vy = self->h >= sh
-          ? self->y + (self->h - sh) / 2
-          : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
-        */
-
         glColor4ub (255, 255, 255, 255);
 
         glEnable (GL_BLEND);
@@ -1482,16 +1470,19 @@
 
         last_name = 0;
 
+        mx += self->x;
+        my += self->y;
+
         for (z = 0; z < 3; z++)
           for (y = 0; y < sh; y++)
-            if (0 <= y + vy && y + vy < self->rows)
+            if (0 <= y + my && y + my < self->rows)
               {
-                maprow *row = self->row + (y + vy);
+                maprow *row = self->row + (y + my);
 
                 for (x = 0; x < sw; x++)
-                  if (row->c0 <= x + vx && x + vx < row->c1)
+                  if (row->c0 <= x + mx && x + mx < row->c1)
                     {
-                      mapcell *cell = row->col + (x + vx - row->c0);
+                      mapcell *cell = row->col + (x + mx - row->c0);
 
                       face = cell->face [z];
 
@@ -1542,14 +1533,14 @@
 
         // top layer: overlays such as the health bar
         for (y = 0; y < sh; y++)
-          if (0 <= y + vy && y + vy < self->rows)
+          if (0 <= y + my && y + my < self->rows)
             {
-              maprow *row = self->row + (y + vy);
+              maprow *row = self->row + (y + my);
 
               for (x = 0; x < sw; x++)
-                if (row->c0 <= x + vx && x + vx < row->c1)
+                if (row->c0 <= x + mx && x + mx < row->c1)
                   {
-                    mapcell *cell = row->col + (x + vx - row->c0);
+                    mapcell *cell = row->col + (x + mx - row->c0);
 
                     int px = x * 32;
                     int py = y * 32;
@@ -1633,10 +1624,9 @@
 }
 
 void
-fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
+fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
 	PPCODE:
 {
-	int vx, vy;
         int x, y;
         int sw4 = (sw + 3) & ~3;
 	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
@@ -1646,18 +1636,18 @@
         SvPOK_only (darkness_sv);
         SvCUR_set (darkness_sv, sw4 * sh);
 
-        vx = self->x + (self->w - sw + 1) / 2 - shift_x;
-        vy = self->y + (self->h - sh + 1) / 2 - shift_y;
+        mx += self->x;
+        my += self->y;
 
         for (y = 0; y < sh; y++)
-          if (0 <= y + vy && y + vy < self->rows)
+          if (0 <= y + my && y + my < self->rows)
             {
-              maprow *row = self->row + (y + vy);
+              maprow *row = self->row + (y + my);
 
               for (x = 0; x < sw; x++)
-                if (row->c0 <= x + vx && x + vx < row->c1)
+                if (row->c0 <= x + mx && x + mx < row->c1)
                   {
-                    mapcell *cell = row->col + (x + vx - row->c0);
+                    mapcell *cell = row->col + (x + mx - row->c0);
 
                     darkness[y * sw4 + x] = cell->darkness
                       ? 255 - (cell->darkness - 1)