--- deliantra/Deliantra-Client/Client.xs	2006/10/09 01:06:36	1.160
+++ deliantra/Deliantra-Client/Client.xs	2006/10/18 12:53:45	1.163
@@ -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
 
@@ -1458,8 +1454,8 @@
         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;
+        vx = self->x + ((self->w - sw) >> 1) - shift_x;
+        vy = self->y + ((self->h - sh) >> 1) - shift_y;
 
         /*
         int vx = self->vx = self->w >= sw