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.144 by root, Fri Aug 18 02:25:12 2006 UTC vs.
Revision 1.162 by root, Fri Oct 13 19:23:08 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;
… …
294static void 290static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 292{
297 int x, y; 293 int x, y;
298 maprow *row; 294 maprow *row;
295 mapcell *cell;
299 296
300 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 298 if (y >= 0)
302 { 299 {
303 if (y >= self->rows) 300 if (y >= self->rows)
… …
309 if (x >= row->c0) 306 if (x >= row->c0)
310 { 307 {
311 if (x >= row->c1) 308 if (x >= row->c1)
312 break; 309 break;
313 310
314 row->col[x - row->c0].darkness = 0; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
315 } 317 }
316 } 318 }
317} 319}
318 320
319static void 321static void
… …
644#ifndef _WIN32 646#ifndef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
646#endif 648#endif
647 649
648void 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
649add_font (char *file) 680add_font (char *file)
650 CODE: 681 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
652 683
653void 684void
… …
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 787#endif
757 _exit (1); 788 _exit (1);
758 789
759void 790void
760_exit (int retval) 791_exit (int retval = 0)
761 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
762 _exit (retval); 796 _exit (retval);
797#endif
763 798
764MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
765 800
766CFPlus::Font 801CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1239void 1274void
1240scroll (CFPlus::Map self, int dx, int dy) 1275scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1276 CODE:
1242{ 1277{
1243 if (dx > 0) 1278 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1279 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1280 else if (dx < 0)
1246 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);
1247 1282
1248 if (dy > 0) 1283 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1284 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1285 else if (dy < 0)
1251 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);
1252 1287
1253 self->ox += dx; self->x += dx; 1288 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1289 self->oy += dy; self->y += dy;
1255 1290
1256 while (self->y < 0) 1291 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1304 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1305 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1306 mapcell *cell;
1272 int x, y, flags; 1307 int x, y, flags;
1273 1308
1274 while (data < data_end) 1309 while (data < data_end - 1)
1275 { 1310 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1311 flags = (data [0] << 8) + data [1]; data += 2;
1277 1312
1278 x = self->x + ((flags >> 10) & 63); 1313 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1314 y = self->y + ((flags >> 4) & 63);
… …
1282 1317
1283 if (flags & 15) 1318 if (flags & 15)
1284 { 1319 {
1285 if (!cell->darkness) 1320 if (!cell->darkness)
1286 { 1321 {
1322 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1323 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1324 }
1293 1325
1294 //TODO: don't trust server data to be in-range(!) 1326 //TODO: don't trust server data to be in-range(!)
1295 1327
1296 if (flags & 8) 1328 if (flags & 8)
… …
1302 do 1334 do
1303 { 1335 {
1304 ext = *data++; 1336 ext = *data++;
1305 cmd = ext & 0x3f; 1337 cmd = ext & 0x3f;
1306 1338
1307 if (ext < 4) 1339 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1340 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1341 else if (cmd == 5) // health
1342 {
1343 cell->stat_width = 1;
1310 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++;
1311 else if (ext & 0x40) // unknown, multibyte => skip 1357 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1; 1358 data += *data + 1;
1359 else
1360 data++;
1313 } 1361 }
1314 while (cmd & 0x80); 1362 while (ext & 0x80);
1315 } 1363 }
1316 else 1364 else
1317 cell->darkness = *data++ + 1; 1365 cell->darkness = *data++ + 1;
1318 } 1366 }
1319 1367
… …
1441 { 1489 {
1442 mapcell *cell = row->col + (x + vx - row->c0); 1490 mapcell *cell = row->col + (x + vx - row->c0);
1443 1491
1444 face = cell->face [z]; 1492 face = cell->face [z];
1445 1493
1446 if (face) 1494 if (face && face < self->texs)
1447 { 1495 {
1448 maptex tex = self->tex [face]; 1496 maptex tex = self->tex [face];
1449
1450 int px = (x + 1) * 32 - tex.w; 1497 int px = (x + 1) * 32 - tex.w;
1451 int py = (y + 1) * 32 - tex.h; 1498 int py = (y + 1) * 32 - tex.h;
1452 1499
1453 if (last_name != tex.name) 1500 if (last_name != tex.name)
1454 { 1501 {
1455 glEnd (); 1502 glEnd ();
1456 last_name = tex.name;
1457 glBindTexture (GL_TEXTURE_2D, last_name); 1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1458 glBegin (GL_QUADS); 1504 glBegin (GL_QUADS);
1459 } 1505 }
1460 1506
1461 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1462 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1463 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);
1464 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1465 } 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 }
1466 } 1531 }
1467 } 1532 }
1468 1533
1469 glEnd (); 1534 glEnd ();
1470 1535
1471 glDisable (GL_TEXTURE_2D); 1536 glDisable (GL_TEXTURE_2D);
1472 glDisable (GL_BLEND); 1537 glDisable (GL_BLEND);
1473 1538
1539 // top layer: overlays such as the health bar
1474 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1475 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + vy && y + vy < self->rows)
1476 { 1542 {
1477 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + vy);
1478 1544
… …
1484 int px = x * 32; 1550 int px = x * 32;
1485 int py = y * 32; 1551 int py = y * 32;
1486 1552
1487 if (cell->stat_hp) 1553 if (cell->stat_hp)
1488 { 1554 {
1555 int width = cell->stat_width * 32;
1556 int thick = sh / 28 + 1 + cell->stat_width;
1557
1489 glColor3ub (0, 0, 0); 1558 glColor3ub (0, 0, 0);
1490 glRectf (px + 1, py + 1, px + 31, py + 4); 1559 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py);
1491 1561
1492 glColor3ub (0, 255, 0); 1562 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1493 glBegin (GL_LINES);
1494 glVertex2f (px + 2, py + 2.5f); 1563 glRectf (px + 2,
1495 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f); 1564 py - thick - 1,
1496 glEnd (); 1565 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1497 } 1566 }
1498 } 1567 }
1499 } 1568 }
1500} 1569}
1501 1570

Diff Legend

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