ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC

3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
8#endif 9#endif
9 10
10#include "EXTERN.h" 11#include "EXTERN.h"
11#include "perl.h" 12#include "perl.h"
12#include "XSUB.h" 13#include "XSUB.h"
37# include <sys/types.h> 38# include <sys/types.h>
38# include <sys/socket.h> 39# include <sys/socket.h>
39# include <netinet/in.h> 40# include <netinet/in.h>
40# include <netinet/tcp.h> 41# include <netinet/tcp.h>
41# include <inttypes.h> 42# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 43#endif
50 44
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 46
53#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
54 48
55#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
1458 int vx, vy; 1452 int vx, vy;
1459 int x, y, z; 1453 int x, y, z;
1460 int last_name; 1454 int last_name;
1461 mapface face; 1455 mapface face;
1462 1456
1463 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1464 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1465 1459
1466 /* 1460 /*
1467 int vx = self->vx = self->w >= sw 1461 int vx = self->vx = self->w >= sw
1468 ? self->x + (self->w - sw) / 2 1462 ? self->x + (self->w - sw) / 2
1469 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines