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.141 by root, Fri Aug 18 01:01:00 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 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)
7#endif 8#endif
8 9
9#include "EXTERN.h" 10#include "EXTERN.h"
10#include "perl.h" 11#include "perl.h"
… …
169 float s, t; 170 float s, t;
170 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
171} maptex; 172} maptex;
172 173
173typedef struct { 174typedef struct {
174 int16_t darkness; 175 uint32_t player;
175 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
176} mapcell; 179} mapcell;
177 180
178typedef struct { 181typedef struct {
179 int32_t c0, c1; 182 int32_t c0, c1;
180 mapcell *col; 183 mapcell *col;
… …
293static void 296static void
294map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
295{ 298{
296 int x, y; 299 int x, y;
297 maprow *row; 300 maprow *row;
301 mapcell *cell;
298 302
299 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
300 if (y >= 0) 304 if (y >= 0)
301 { 305 {
302 if (y >= self->rows) 306 if (y >= self->rows)
… …
308 if (x >= row->c0) 312 if (x >= row->c0)
309 { 313 {
310 if (x >= row->c1) 314 if (x >= row->c1)
311 break; 315 break;
312 316
313 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
314 } 323 }
315 } 324 }
316} 325}
317 326
318static void 327static void
… …
643#ifndef _WIN32 652#ifndef _WIN32
644 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
645#endif 654#endif
646 655
647void 656void
657win32_proxy_info ()
658 PPCODE:
659{
660#ifdef _WIN32
661 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048];
663 DWORD buflen;
664
665 EXTEND (SP, 3);
666
667 buflen = sizeof (buffer);
668 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
669 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
670 {
671 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
672
673 buflen = sizeof (buffer);
674 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
675 {
676 PUSHs (newSVpv (buffer, 0));
677
678 buflen = sizeof (buffer);
679 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
680 PUSHs (newSVpv (buffer, 0));
681 }
682 }
683#endif
684}
685
686void
648add_font (char *file) 687add_font (char *file)
649 CODE: 688 CODE:
650 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 689 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
651 690
652void 691void
… …
754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 793 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
755#endif 794#endif
756 _exit (1); 795 _exit (1);
757 796
758void 797void
759_exit (int retval) 798_exit (int retval = 0)
760 CODE: 799 CODE:
761 _exit (retval); 800 _exit (retval);
762 801
763MODULE = CFPlus PACKAGE = CFPlus::Font 802MODULE = CFPlus PACKAGE = CFPlus::Font
764 803
… …
1238void 1277void
1239scroll (CFPlus::Map self, int dx, int dy) 1278scroll (CFPlus::Map self, int dx, int dy)
1240 CODE: 1279 CODE:
1241{ 1280{
1242 if (dx > 0) 1281 if (dx > 0)
1243 map_blank (self, self->x, self->y, dx - 1, self->h); 1282 map_blank (self, self->x, self->y, dx, self->h);
1244 else if (dx < 0) 1283 else if (dx < 0)
1245 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1246 1285
1247 if (dy > 0) 1286 if (dy > 0)
1248 map_blank (self, self->x, self->y, self->w, dy - 1); 1287 map_blank (self, self->x, self->y, self->w, dy);
1249 else if (dy < 0) 1288 else if (dy < 0)
1250 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1251 1290
1252 self->ox += dx; self->x += dx; 1291 self->ox += dx; self->x += dx;
1253 self->oy += dy; self->y += dy; 1292 self->oy += dy; self->y += dy;
1254 1293
1255 while (self->y < 0) 1294 while (self->y < 0)
… …
1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1307 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1269 uint8_t *data_end = (uint8_t *)SvEND (data_); 1308 uint8_t *data_end = (uint8_t *)SvEND (data_);
1270 mapcell *cell; 1309 mapcell *cell;
1271 int x, y, flags; 1310 int x, y, flags;
1272 1311
1273 while (data < data_end) 1312 while (data < data_end - 1)
1274 { 1313 {
1275 flags = (data [0] << 8) + data [1]; data += 2; 1314 flags = (data [0] << 8) + data [1]; data += 2;
1276 1315
1277 x = self->x + ((flags >> 10) & 63); 1316 x = self->x + ((flags >> 10) & 63);
1278 y = self->y + ((flags >> 4) & 63); 1317 y = self->y + ((flags >> 4) & 63);
1279 1318
1280 cell = map_get_cell (self, x, y); 1319 cell = map_get_cell (self, x, y);
1281 1320
1282 if (flags & 15) 1321 if (flags & 15)
1283 { 1322 {
1284 if (cell->darkness < 0) 1323 if (!cell->darkness)
1285 { 1324 {
1325 memset (cell, 0, sizeof (*cell));
1286 cell->darkness = 0; 1326 cell->darkness = 256;
1287 cell->face [0] = 0;
1288 cell->face [1] = 0;
1289 cell->face [2] = 0;
1290 } 1327 }
1328
1329 //TODO: don't trust server data to be in-range(!)
1291 1330
1292 if (flags & 8) 1331 if (flags & 8)
1293 { 1332 {
1294 fprintf (stderr, "oi\n");//D
1295 if (extmap) 1333 if (extmap)
1296 { 1334 {
1297 uint8_t ext, cmd; 1335 uint8_t ext, cmd;
1298 1336
1299 do 1337 do
1300 { 1338 {
1301
1302 ext = *data++; 1339 ext = *data++;
1303 cmd = ext & 0x7f; 1340 cmd = ext & 0x3f;
1304 1341
1305 fprintf (stderr, "extcmd = %x\n", ext);//D
1306
1307 if (ext < 4) 1342 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64; 1343 cell->darkness = 255 - ext * 64 + 1;
1344 else if (cmd == 5) // health
1345 {
1346 cell->stat_width = 1;
1347 cell->stat_hp = *data++;
1348 }
1349 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width
1352 {
1353 if (*data == 4)
1354 ; // decode player tag
1355
1356 data += *data + 1;
1357 }
1358 else if (cmd == 8) // cell flags
1359 cell->flags = *data++;
1360 else if (ext & 0x40) // unknown, multibyte => skip
1361 data += *data + 1;
1362 else
1363 data++;
1309 } 1364 }
1310 while (cmd & 0x80); 1365 while (ext & 0x80);
1311 } 1366 }
1312 else 1367 else
1313 cell->darkness = flags & 8 ? *data++ : 255; 1368 cell->darkness = *data++ + 1;
1314 } 1369 }
1315
1316 //TODO: don't trust server data to be in-range(!)
1317 1370
1318 if (flags & 4) 1371 if (flags & 4)
1319 { 1372 {
1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1321 } 1374 }
… …
1329 { 1382 {
1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1331 } 1384 }
1332 } 1385 }
1333 else 1386 else
1334 cell->darkness = -1; 1387 cell->darkness = 0;
1335 } 1388 }
1336} 1389}
1337 1390
1338SV * 1391SV *
1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1392mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1439 { 1492 {
1440 mapcell *cell = row->col + (x + vx - row->c0); 1493 mapcell *cell = row->col + (x + vx - row->c0);
1441 1494
1442 face = cell->face [z]; 1495 face = cell->face [z];
1443 1496
1444 if (face) 1497 if (face && face < self->texs)
1445 { 1498 {
1446 maptex tex = self->tex [face]; 1499 maptex tex = self->tex [face];
1447
1448 int px = (x + 1) * 32 - tex.w; 1500 int px = (x + 1) * 32 - tex.w;
1449 int py = (y + 1) * 32 - tex.h; 1501 int py = (y + 1) * 32 - tex.h;
1450 1502
1451 if (last_name != tex.name) 1503 if (last_name != tex.name)
1452 { 1504 {
1453 glEnd (); 1505 glEnd ();
1454 last_name = tex.name;
1455 glBindTexture (GL_TEXTURE_2D, last_name); 1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1456 glBegin (GL_QUADS); 1507 glBegin (GL_QUADS);
1457 } 1508 }
1458 1509
1459 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1460 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1461 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1462 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1463 } 1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 }
1533 }
1464 } 1534 }
1465 } 1535 }
1466 1536
1467 glEnd (); 1537 glEnd ();
1468 1538
1469 glDisable (GL_TEXTURE_2D); 1539 glDisable (GL_TEXTURE_2D);
1470 glDisable (GL_BLEND); 1540 glDisable (GL_BLEND);
1541
1542 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows)
1545 {
1546 maprow *row = self->row + (y + vy);
1547
1548 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1)
1550 {
1551 mapcell *cell = row->col + (x + vx - row->c0);
1552
1553 int px = x * 32;
1554 int py = y * 32;
1555
1556 if (cell->stat_hp)
1557 {
1558 int width = cell->stat_width * 32;
1559 int thick = sh / 28 + 1 + cell->stat_width;
1560
1561 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py);
1564
1565 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1566 glRectf (px + 2,
1567 py - thick - 1,
1568 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1569 }
1570 }
1571 }
1471} 1572}
1472 1573
1473void 1574void
1474draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1575draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1475 CODE: 1576 CODE:
… …
1555 for (x = 0; x < sw; x++) 1656 for (x = 0; x < sw; x++)
1556 if (row->c0 <= x + vx && x + vx < row->c1) 1657 if (row->c0 <= x + vx && x + vx < row->c1)
1557 { 1658 {
1558 mapcell *cell = row->col + (x + vx - row->c0); 1659 mapcell *cell = row->col + (x + vx - row->c0);
1559 1660
1560 darkness[y * sw4 + x] = cell->darkness < 0 1661 darkness[y * sw4 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1)
1561 ? 255 - FOW_DARKNESS 1663 : 255 - FOW_DARKNESS;
1562 : 255 - cell->darkness;
1563 } 1664 }
1564 } 1665 }
1565 1666
1566 EXTEND (SP, 3); 1667 EXTEND (SP, 3);
1567 PUSHs (sv_2mortal (newSViv (sw4))); 1668 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1682 1783
1683 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1684 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1685 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1686 1787
1687 if (cell->darkness <= 0) 1788 if (cell->darkness == 0)
1688 { 1789 {
1689 cell->darkness = -1; 1790 cell->darkness = 0;
1690 1791
1691 for (z = 0; z <= 2; z++) 1792 for (z = 0; z <= 2; z++)
1692 { 1793 {
1693 cell->face[z] = face[z]; 1794 cell->face[z] = face[z];
1694 1795

Diff Legend

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