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.146 by root, Sat Aug 19 02:49:53 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
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# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
7#endif 9#endif
8 10
9#include "EXTERN.h" 11#include "EXTERN.h"
10#include "perl.h" 12#include "perl.h"
11#include "XSUB.h" 13#include "XSUB.h"
… …
36# include <sys/types.h> 38# include <sys/types.h>
37# include <sys/socket.h> 39# include <sys/socket.h>
38# include <netinet/in.h> 40# include <netinet/in.h>
39# include <netinet/tcp.h> 41# include <netinet/tcp.h>
40# include <inttypes.h> 42# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 43#endif
49 44
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 46
52#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
53 48
54#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
169 float s, t; 164 float s, t;
170 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
171} maptex; 166} maptex;
172 167
173typedef struct { 168typedef struct {
169 uint32_t player;
170 mapface face[3];
174 uint16_t darkness; 171 uint16_t darkness;
175 mapface face[3]; 172 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
177} mapcell; 173} mapcell;
178 174
179typedef struct { 175typedef struct {
180 int32_t c0, c1; 176 int32_t c0, c1;
181 mapcell *col; 177 mapcell *col;
… …
314 310
315 cell = row->col + x - row->c0; 311 cell = row->col + x - row->c0;
316 312
317 cell->darkness = 0; 313 cell->darkness = 0;
318 cell->stat_hp = 0; 314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
319 } 317 }
320 } 318 }
321} 319}
322 320
323static void 321static void
… …
648#ifndef _WIN32 646#ifndef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
650#endif 648#endif
651 649
652void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
653add_font (char *file) 680add_font (char *file)
654 CODE: 681 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
656 683
657void 684void
… …
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 787#endif
761 _exit (1); 788 _exit (1);
762 789
763void 790void
764_exit (int retval) 791_exit (int retval = 0)
765 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
766 _exit (retval); 796 _exit (retval);
797#endif
767 798
768MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
769 800
770CFPlus::Font 801CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1243void 1274void
1244scroll (CFPlus::Map self, int dx, int dy) 1275scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1276 CODE:
1246{ 1277{
1247 if (dx > 0) 1278 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1279 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1280 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1281 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1251 1282
1252 if (dy > 0) 1283 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1284 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1285 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1286 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1256 1287
1257 self->ox += dx; self->x += dx; 1288 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1289 self->oy += dy; self->y += dy;
1259 1290
1260 while (self->y < 0) 1291 while (self->y < 0)
… …
1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1304 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1274 uint8_t *data_end = (uint8_t *)SvEND (data_); 1305 uint8_t *data_end = (uint8_t *)SvEND (data_);
1275 mapcell *cell; 1306 mapcell *cell;
1276 int x, y, flags; 1307 int x, y, flags;
1277 1308
1278 while (data < data_end) 1309 while (data < data_end - 1)
1279 { 1310 {
1280 flags = (data [0] << 8) + data [1]; data += 2; 1311 flags = (data [0] << 8) + data [1]; data += 2;
1281 1312
1282 x = self->x + ((flags >> 10) & 63); 1313 x = self->x + ((flags >> 10) & 63);
1283 y = self->y + ((flags >> 4) & 63); 1314 y = self->y + ((flags >> 4) & 63);
… …
1286 1317
1287 if (flags & 15) 1318 if (flags & 15)
1288 { 1319 {
1289 if (!cell->darkness) 1320 if (!cell->darkness)
1290 { 1321 {
1322 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1323 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1324 }
1296 1325
1297 //TODO: don't trust server data to be in-range(!) 1326 //TODO: don't trust server data to be in-range(!)
1298 1327
1299 if (flags & 8) 1328 if (flags & 8)
… …
1305 do 1334 do
1306 { 1335 {
1307 ext = *data++; 1336 ext = *data++;
1308 cmd = ext & 0x3f; 1337 cmd = ext & 0x3f;
1309 1338
1310 if (ext < 4) 1339 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1; 1340 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health 1341 else if (cmd == 5) // health
1342 {
1343 cell->stat_width = 1;
1313 cell->stat_hp = *data++; 1344 cell->stat_hp = *data++;
1345 }
1346 else if (cmd == 6) // monster width
1347 cell->stat_width = *data++ + 1;
1348 else if (cmd == 0x47) // monster width
1349 {
1350 if (*data == 4)
1351 ; // decode player tag
1352
1353 data += *data + 1;
1354 }
1355 else if (cmd == 8) // cell flags
1356 cell->flags = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip 1357 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1; 1358 data += *data + 1;
1359 else
1360 data++;
1316 } 1361 }
1317 while (cmd & 0x80); 1362 while (ext & 0x80);
1318 } 1363 }
1319 else 1364 else
1320 cell->darkness = *data++ + 1; 1365 cell->darkness = *data++ + 1;
1321 } 1366 }
1322 1367
… …
1334 { 1379 {
1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1380 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1336 } 1381 }
1337 } 1382 }
1338 else 1383 else
1339 {
1340 cell->darkness = 0; 1384 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1343 } 1385 }
1344} 1386}
1345 1387
1346SV * 1388SV *
1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1389mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1410 int vx, vy; 1452 int vx, vy;
1411 int x, y, z; 1453 int x, y, z;
1412 int last_name; 1454 int last_name;
1413 mapface face; 1455 mapface face;
1414 1456
1415 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1416 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1417 1459
1418 /* 1460 /*
1419 int vx = self->vx = self->w >= sw 1461 int vx = self->vx = self->w >= sw
1420 ? self->x + (self->w - sw) / 2 1462 ? self->x + (self->w - sw) / 2
1421 : 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));
… …
1450 face = cell->face [z]; 1492 face = cell->face [z];
1451 1493
1452 if (face && face < self->texs) 1494 if (face && face < self->texs)
1453 { 1495 {
1454 maptex tex = self->tex [face]; 1496 maptex tex = self->tex [face];
1455
1456 int px = (x + 1) * 32 - tex.w; 1497 int px = (x + 1) * 32 - tex.w;
1457 int py = (y + 1) * 32 - tex.h; 1498 int py = (y + 1) * 32 - tex.h;
1458 1499
1459 if (last_name != tex.name) 1500 if (last_name != tex.name)
1460 { 1501 {
1461 glEnd (); 1502 glEnd ();
1462 last_name = tex.name;
1463 glBindTexture (GL_TEXTURE_2D, last_name); 1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1464 glBegin (GL_QUADS); 1504 glBegin (GL_QUADS);
1465 } 1505 }
1466 1506
1467 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1468 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1469 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1509 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1470 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1471 } 1511 }
1512
1513 if (cell->flags && z == 2)
1514 {
1515 if (cell->flags & 1)
1516 {
1517 maptex tex = self->tex [1];
1518 int px = (x + 1) * 32 - tex.w + 2;
1519 int py = (y + 1) * 32 - tex.h - 6;
1520
1521 glEnd ();
1522 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523 glBegin (GL_QUADS);
1524
1525 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529 }
1530 }
1472 } 1531 }
1473 } 1532 }
1474 1533
1475 glEnd (); 1534 glEnd ();
1476 1535
… …
1491 int px = x * 32; 1550 int px = x * 32;
1492 int py = y * 32; 1551 int py = y * 32;
1493 1552
1494 if (cell->stat_hp) 1553 if (cell->stat_hp)
1495 { 1554 {
1496 int width = sh / 28 + 1; 1555 int width = cell->stat_width * 32;
1556 int thick = sh / 28 + 1 + cell->stat_width;
1497 1557
1498 glColor3ub (0, 0, 0); 1558 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2); 1559 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py);
1500 1561
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1562 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1502 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1563 glRectf (px + 2,
1564 py - thick - 1,
1565 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1503 } 1566 }
1504 } 1567 }
1505 } 1568 }
1506} 1569}
1507 1570

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines