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.139 by root, Mon Aug 14 03:04:17 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
… …
155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156 151
157 if (!rect.width) rect.width = 1; 152 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1; 153 if (!rect.height) rect.height = 1;
159 154
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width; 155 *w = rect.width;
163 *h = rect.height; 156 *h = rect.height;
164} 157}
165 158
166typedef uint16_t mapface; 159typedef uint16_t mapface;
… …
171 float s, t; 164 float s, t;
172 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
173} maptex; 166} maptex;
174 167
175typedef struct { 168typedef struct {
176 int16_t darkness; 169 uint32_t player;
177 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
178} mapcell; 173} mapcell;
179 174
180typedef struct { 175typedef struct {
181 int32_t c0, c1; 176 int32_t c0, c1;
182 mapcell *col; 177 mapcell *col;
… …
295static void 290static void
296map_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)
297{ 292{
298 int x, y; 293 int x, y;
299 maprow *row; 294 maprow *row;
295 mapcell *cell;
300 296
301 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
302 if (y >= 0) 298 if (y >= 0)
303 { 299 {
304 if (y >= self->rows) 300 if (y >= self->rows)
… …
310 if (x >= row->c0) 306 if (x >= row->c0)
311 { 307 {
312 if (x >= row->c1) 308 if (x >= row->c1)
313 break; 309 break;
314 310
315 row->col[x - row->c0].darkness = -1; 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;
316 } 317 }
317 } 318 }
318} 319}
319 320
320static void 321static void
… …
645#ifndef _WIN32 646#ifndef _WIN32
646 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
647#endif 648#endif
648 649
649void 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
650add_font (char *file) 680add_font (char *file)
651 CODE: 681 CODE:
652 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
653 683
654void 684void
… …
756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
757#endif 787#endif
758 _exit (1); 788 _exit (1);
759 789
760void 790void
761_exit (int retval) 791_exit (int retval = 0)
762 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
763 _exit (retval); 796 _exit (retval);
797#endif
764 798
765MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
766 800
767CFPlus::Font 801CFPlus::Font
768new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1240void 1274void
1241scroll (CFPlus::Map self, int dx, int dy) 1275scroll (CFPlus::Map self, int dx, int dy)
1242 CODE: 1276 CODE:
1243{ 1277{
1244 if (dx > 0) 1278 if (dx > 0)
1245 map_blank (self, self->x, self->y, dx - 1, self->h); 1279 map_blank (self, self->x, self->y, dx, self->h);
1246 else if (dx < 0) 1280 else if (dx < 0)
1247 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);
1248 1282
1249 if (dy > 0) 1283 if (dy > 0)
1250 map_blank (self, self->x, self->y, self->w, dy - 1); 1284 map_blank (self, self->x, self->y, self->w, dy);
1251 else if (dy < 0) 1285 else if (dy < 0)
1252 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);
1253 1287
1254 self->ox += dx; self->x += dx; 1288 self->ox += dx; self->x += dx;
1255 self->oy += dy; self->y += dy; 1289 self->oy += dy; self->y += dy;
1256 1290
1257 while (self->y < 0) 1291 while (self->y < 0)
… …
1262 self->y += MAP_EXTEND_Y; 1296 self->y += MAP_EXTEND_Y;
1263 } 1297 }
1264} 1298}
1265 1299
1266void 1300void
1267map1a_update (CFPlus::Map self, SV *data_) 1301map1a_update (CFPlus::Map self, SV *data_, int extmap)
1268 CODE: 1302 CODE:
1269{ 1303{
1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1304 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1271 uint8_t *data_end = (uint8_t *)SvEND (data_); 1305 uint8_t *data_end = (uint8_t *)SvEND (data_);
1272 mapcell *cell; 1306 mapcell *cell;
1273 int x, y, flags; 1307 int x, y, flags;
1274 1308
1275 while (data < data_end) 1309 while (data < data_end - 1)
1276 { 1310 {
1277 flags = (data [0] << 8) + data [1]; data += 2; 1311 flags = (data [0] << 8) + data [1]; data += 2;
1278 1312
1279 x = self->x + ((flags >> 10) & 63); 1313 x = self->x + ((flags >> 10) & 63);
1280 y = self->y + ((flags >> 4) & 63); 1314 y = self->y + ((flags >> 4) & 63);
1281 1315
1282 cell = map_get_cell (self, x, y); 1316 cell = map_get_cell (self, x, y);
1283 1317
1284 if (flags & 15) 1318 if (flags & 15)
1285 { 1319 {
1286 if (cell->darkness < 0) 1320 if (!cell->darkness)
1287 { 1321 {
1322 memset (cell, 0, sizeof (*cell));
1288 cell->darkness = 0; 1323 cell->darkness = 256;
1289 cell->face [0] = 0;
1290 cell->face [1] = 0;
1291 cell->face [2] = 0;
1292 } 1324 }
1293 1325
1294 cell->darkness = flags & 8 ? *data++ : 255;
1295
1296 //TODO: don't trust server data to be in-range(!) 1326 //TODO: don't trust server data to be in-range(!)
1327
1328 if (flags & 8)
1329 {
1330 if (extmap)
1331 {
1332 uint8_t ext, cmd;
1333
1334 do
1335 {
1336 ext = *data++;
1337 cmd = ext & 0x3f;
1338
1339 if (cmd < 4)
1340 cell->darkness = 255 - ext * 64 + 1;
1341 else if (cmd == 5) // health
1342 {
1343 cell->stat_width = 1;
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++;
1357 else if (ext & 0x40) // unknown, multibyte => skip
1358 data += *data + 1;
1359 else
1360 data++;
1361 }
1362 while (ext & 0x80);
1363 }
1364 else
1365 cell->darkness = *data++ + 1;
1366 }
1297 1367
1298 if (flags & 4) 1368 if (flags & 4)
1299 { 1369 {
1300 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1370 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1301 } 1371 }
… …
1309 { 1379 {
1310 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;
1311 } 1381 }
1312 } 1382 }
1313 else 1383 else
1314 cell->darkness = -1; 1384 cell->darkness = 0;
1315 } 1385 }
1316} 1386}
1317 1387
1318SV * 1388SV *
1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1389mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1382 int vx, vy; 1452 int vx, vy;
1383 int x, y, z; 1453 int x, y, z;
1384 int last_name; 1454 int last_name;
1385 mapface face; 1455 mapface face;
1386 1456
1387 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1388 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1389 1459
1390 /* 1460 /*
1391 int vx = self->vx = self->w >= sw 1461 int vx = self->vx = self->w >= sw
1392 ? self->x + (self->w - sw) / 2 1462 ? self->x + (self->w - sw) / 2
1393 : 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));
… …
1419 { 1489 {
1420 mapcell *cell = row->col + (x + vx - row->c0); 1490 mapcell *cell = row->col + (x + vx - row->c0);
1421 1491
1422 face = cell->face [z]; 1492 face = cell->face [z];
1423 1493
1424 if (face) 1494 if (face && face < self->texs)
1425 { 1495 {
1426 maptex tex = self->tex [face]; 1496 maptex tex = self->tex [face];
1427
1428 int px = (x + 1) * 32 - tex.w; 1497 int px = (x + 1) * 32 - tex.w;
1429 int py = (y + 1) * 32 - tex.h; 1498 int py = (y + 1) * 32 - tex.h;
1430 1499
1431 if (last_name != tex.name) 1500 if (last_name != tex.name)
1432 { 1501 {
1433 glEnd (); 1502 glEnd ();
1434 last_name = tex.name;
1435 glBindTexture (GL_TEXTURE_2D, last_name); 1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1436 glBegin (GL_QUADS); 1504 glBegin (GL_QUADS);
1437 } 1505 }
1438 1506
1439 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441 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);
1442 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443 } 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 }
1444 } 1531 }
1445 } 1532 }
1446 1533
1447 glEnd (); 1534 glEnd ();
1448 1535
1449 glDisable (GL_TEXTURE_2D); 1536 glDisable (GL_TEXTURE_2D);
1450 glDisable (GL_BLEND); 1537 glDisable (GL_BLEND);
1538
1539 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows)
1542 {
1543 maprow *row = self->row + (y + vy);
1544
1545 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1)
1547 {
1548 mapcell *cell = row->col + (x + vx - row->c0);
1549
1550 int px = x * 32;
1551 int py = y * 32;
1552
1553 if (cell->stat_hp)
1554 {
1555 int width = cell->stat_width * 32;
1556 int thick = sh / 28 + 1 + cell->stat_width;
1557
1558 glColor3ub (0, 0, 0);
1559 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py);
1561
1562 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1563 glRectf (px + 2,
1564 py - thick - 1,
1565 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1566 }
1567 }
1568 }
1451} 1569}
1452 1570
1453void 1571void
1454draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1572draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455 CODE: 1573 CODE:
… …
1535 for (x = 0; x < sw; x++) 1653 for (x = 0; x < sw; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1) 1654 if (row->c0 <= x + vx && x + vx < row->c1)
1537 { 1655 {
1538 mapcell *cell = row->col + (x + vx - row->c0); 1656 mapcell *cell = row->col + (x + vx - row->c0);
1539 1657
1540 darkness[y * sw4 + x] = cell->darkness < 0 1658 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1)
1541 ? 255 - FOW_DARKNESS 1660 : 255 - FOW_DARKNESS;
1542 : 255 - cell->darkness;
1543 } 1661 }
1544 } 1662 }
1545 1663
1546 EXTEND (SP, 3); 1664 EXTEND (SP, 3);
1547 PUSHs (sv_2mortal (newSViv (sw4))); 1665 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1662 1780
1663 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1781 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1664 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1782 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1665 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1783 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1666 1784
1667 if (cell->darkness <= 0) 1785 if (cell->darkness == 0)
1668 { 1786 {
1669 cell->darkness = -1; 1787 cell->darkness = 0;
1670 1788
1671 for (z = 0; z <= 2; z++) 1789 for (z = 0; z <= 2; z++)
1672 { 1790 {
1673 cell->face[z] = face[z]; 1791 cell->face[z] = face[z];
1674 1792

Diff Legend

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