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.164 by root, Tue Nov 7 22:41:27 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)
… …
1137} 1168}
1138 1169
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1171
1141CFPlus::Map 1172CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1173new (SV *class)
1143 CODE: 1174 CODE:
1144 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1176 RETVAL->x = 0;
1146 RETVAL->y = 0; 1177 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1153 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
… …
1164 map_clear (self); 1195 map_clear (self);
1165 Safefree (self->face); 1196 Safefree (self->face);
1166 Safefree (self->tex); 1197 Safefree (self->tex);
1167 Safefree (self); 1198 Safefree (self);
1168} 1199}
1200
1201void
1202resize (CFPlus::Map self, int map_width, int map_height)
1203 CODE:
1204 self->w = map_width;
1205 self->h = map_height;
1169 1206
1170void 1207void
1171clear (CFPlus::Map self) 1208clear (CFPlus::Map self)
1172 CODE: 1209 CODE:
1173 map_clear (self); 1210 map_clear (self);
… …
1243void 1280void
1244scroll (CFPlus::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1282 CODE:
1246{ 1283{
1247 if (dx > 0) 1284 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1286 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1251 1288
1252 if (dy > 0) 1289 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1291 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1256 1293
1257 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1259 1296
1260 while (self->y < 0) 1297 while (self->y < 0)
… …
1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1274 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1275 mapcell *cell; 1312 mapcell *cell;
1276 int x, y, flags; 1313 int x, y, flags;
1277 1314
1278 while (data < data_end) 1315 while (data < data_end - 1)
1279 { 1316 {
1280 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1281 1318
1282 x = self->x + ((flags >> 10) & 63); 1319 x = self->x + ((flags >> 10) & 63);
1283 y = self->y + ((flags >> 4) & 63); 1320 y = self->y + ((flags >> 4) & 63);
… …
1286 1323
1287 if (flags & 15) 1324 if (flags & 15)
1288 { 1325 {
1289 if (!cell->darkness) 1326 if (!cell->darkness)
1290 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1329 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1330 }
1296 1331
1297 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1298 1333
1299 if (flags & 8) 1334 if (flags & 8)
… …
1305 do 1340 do
1306 { 1341 {
1307 ext = *data++; 1342 ext = *data++;
1308 cmd = ext & 0x3f; 1343 cmd = ext & 0x3f;
1309 1344
1310 if (ext < 4) 1345 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1; 1346 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health 1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1313 cell->stat_hp = *data++; 1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip 1363 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1; 1364 data += *data + 1;
1365 else
1366 data++;
1316 } 1367 }
1317 while (cmd & 0x80); 1368 while (ext & 0x80);
1318 } 1369 }
1319 else 1370 else
1320 cell->darkness = *data++ + 1; 1371 cell->darkness = *data++ + 1;
1321 } 1372 }
1322 1373
… …
1334 { 1385 {
1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1336 } 1387 }
1337 } 1388 }
1338 else 1389 else
1339 {
1340 cell->darkness = 0; 1390 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1343 } 1391 }
1344} 1392}
1345 1393
1346SV * 1394SV *
1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1402} 1450}
1403 OUTPUT: 1451 OUTPUT:
1404 RETVAL 1452 RETVAL
1405 1453
1406void 1454void
1407draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1408 CODE: 1456 CODE:
1409{ 1457{
1410 int vx, vy;
1411 int x, y, z; 1458 int x, y, z;
1412 int last_name; 1459 int last_name;
1413 mapface face; 1460 mapface face;
1414
1415 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1416 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1417
1418 /*
1419 int vx = self->vx = self->w >= sw
1420 ? self->x + (self->w - sw) / 2
1421 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1422
1423 int vy = self->vy = self->h >= sh
1424 ? self->y + (self->h - sh) / 2
1425 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1426 */
1427 1461
1428 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1429 1463
1430 glEnable (GL_BLEND); 1464 glEnable (GL_BLEND);
1431 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1434 1468
1435 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1436 1470
1437 last_name = 0; 1471 last_name = 0;
1438 1472
1473 mx += self->x;
1474 my += self->y;
1475
1439 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1440 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1441 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1442 { 1479 {
1443 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1444 1481
1445 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1446 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1447 { 1484 {
1448 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1449 1486
1450 face = cell->face [z]; 1487 face = cell->face [z];
1451 1488
1452 if (face && face < self->texs) 1489 if (face && face < self->texs)
1453 { 1490 {
1454 maptex tex = self->tex [face]; 1491 maptex tex = self->tex [face];
1455
1456 int px = (x + 1) * 32 - tex.w; 1492 int px = (x + 1) * 32 - tex.w;
1457 int py = (y + 1) * 32 - tex.h; 1493 int py = (y + 1) * 32 - tex.h;
1458 1494
1459 if (last_name != tex.name) 1495 if (last_name != tex.name)
1460 { 1496 {
1461 glEnd (); 1497 glEnd ();
1462 last_name = tex.name;
1463 glBindTexture (GL_TEXTURE_2D, last_name); 1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1464 glBegin (GL_QUADS); 1499 glBegin (GL_QUADS);
1465 } 1500 }
1466 1501
1467 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1468 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1469 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1504 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1470 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1471 } 1506 }
1507
1508 if (cell->flags && z == 2)
1509 {
1510 if (cell->flags & 1)
1511 {
1512 maptex tex = self->tex [1];
1513 int px = (x + 1) * 32 - tex.w + 2;
1514 int py = (y + 1) * 32 - tex.h - 6;
1515
1516 glEnd ();
1517 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518 glBegin (GL_QUADS);
1519
1520 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524 }
1525 }
1472 } 1526 }
1473 } 1527 }
1474 1528
1475 glEnd (); 1529 glEnd ();
1476 1530
1477 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1478 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1479 1533
1480 // top layer: overlays such as the health bar 1534 // top layer: overlays such as the health bar
1481 for (y = 0; y < sh; y++) 1535 for (y = 0; y < sh; y++)
1482 if (0 <= y + vy && y + vy < self->rows) 1536 if (0 <= y + my && y + my < self->rows)
1483 { 1537 {
1484 maprow *row = self->row + (y + vy); 1538 maprow *row = self->row + (y + my);
1485 1539
1486 for (x = 0; x < sw; x++) 1540 for (x = 0; x < sw; x++)
1487 if (row->c0 <= x + vx && x + vx < row->c1) 1541 if (row->c0 <= x + mx && x + mx < row->c1)
1488 { 1542 {
1489 mapcell *cell = row->col + (x + vx - row->c0); 1543 mapcell *cell = row->col + (x + mx - row->c0);
1490 1544
1491 int px = x * 32; 1545 int px = x * 32;
1492 int py = y * 32; 1546 int py = y * 32;
1493 1547
1494 if (cell->stat_hp) 1548 if (cell->stat_hp)
1495 { 1549 {
1496 int width = sh / 28 + 1; 1550 int width = cell->stat_width * 32;
1551 int thick = sh / 28 + 1 + cell->stat_width;
1497 1552
1498 glColor3ub (0, 0, 0); 1553 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2); 1554 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py);
1500 1556
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1557 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); 1558 glRectf (px + 2,
1559 py - thick - 1,
1560 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1503 } 1561 }
1504 } 1562 }
1505 } 1563 }
1506} 1564}
1507 1565
… …
1564 glDisable (GL_BLEND); 1622 glDisable (GL_BLEND);
1565 glDisable (GL_TEXTURE_2D); 1623 glDisable (GL_TEXTURE_2D);
1566} 1624}
1567 1625
1568void 1626void
1569fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1627fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1570 PPCODE: 1628 PPCODE:
1571{ 1629{
1572 int vx, vy;
1573 int x, y; 1630 int x, y;
1574 int sw4 = (sw + 3) & ~3; 1631 int sw4 = (sw + 3) & ~3;
1575 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1576 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1577 1634
1578 memset (darkness, 255, sw4 * sh); 1635 memset (darkness, 255, sw4 * sh);
1579 SvPOK_only (darkness_sv); 1636 SvPOK_only (darkness_sv);
1580 SvCUR_set (darkness_sv, sw4 * sh); 1637 SvCUR_set (darkness_sv, sw4 * sh);
1581 1638
1582 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1639 mx += self->x;
1583 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1640 my += self->y;
1584 1641
1585 for (y = 0; y < sh; y++) 1642 for (y = 0; y < sh; y++)
1586 if (0 <= y + vy && y + vy < self->rows) 1643 if (0 <= y + my && y + my < self->rows)
1587 { 1644 {
1588 maprow *row = self->row + (y + vy); 1645 maprow *row = self->row + (y + my);
1589 1646
1590 for (x = 0; x < sw; x++) 1647 for (x = 0; x < sw; x++)
1591 if (row->c0 <= x + vx && x + vx < row->c1) 1648 if (row->c0 <= x + mx && x + mx < row->c1)
1592 { 1649 {
1593 mapcell *cell = row->col + (x + vx - row->c0); 1650 mapcell *cell = row->col + (x + mx - row->c0);
1594 1651
1595 darkness[y * sw4 + x] = cell->darkness 1652 darkness[y * sw4 + x] = cell->darkness
1596 ? 255 - (cell->darkness - 1) 1653 ? 255 - (cell->darkness - 1)
1597 : 255 - FOW_DARKNESS; 1654 : 255 - FOW_DARKNESS;
1598 } 1655 }

Diff Legend

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