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.153 by root, Tue Sep 19 22:02:38 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
… …
315 310
316 cell = row->col + x - row->c0; 311 cell = row->col + x - row->c0;
317 312
318 cell->darkness = 0; 313 cell->darkness = 0;
319 cell->stat_hp = 0; 314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
320 } 317 }
321 } 318 }
322} 319}
323 320
324static void 321static void
… …
649#ifndef _WIN32 646#ifndef _WIN32
650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
651#endif 648#endif
652 649
653void 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
654add_font (char *file) 680add_font (char *file)
655 CODE: 681 CODE:
656 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
657 683
658void 684void
… …
760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
761#endif 787#endif
762 _exit (1); 788 _exit (1);
763 789
764void 790void
765_exit (int retval) 791_exit (int retval = 0)
766 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
767 _exit (retval); 796 _exit (retval);
797#endif
768 798
769MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
770 800
771CFPlus::Font 801CFPlus::Font
772new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1138} 1168}
1139 1169
1140MODULE = CFPlus PACKAGE = CFPlus::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1141 1171
1142CFPlus::Map 1172CFPlus::Map
1143new (SV *class, int map_width, int map_height) 1173new (SV *class)
1144 CODE: 1174 CODE:
1145 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1146 RETVAL->x = 0; 1176 RETVAL->x = 0;
1147 RETVAL->y = 0; 1177 RETVAL->y = 0;
1148 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1149 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1150 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1151 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1152 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1153 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1154 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
… …
1165 map_clear (self); 1195 map_clear (self);
1166 Safefree (self->face); 1196 Safefree (self->face);
1167 Safefree (self->tex); 1197 Safefree (self->tex);
1168 Safefree (self); 1198 Safefree (self);
1169} 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;
1170 1206
1171void 1207void
1172clear (CFPlus::Map self) 1208clear (CFPlus::Map self)
1173 CODE: 1209 CODE:
1174 map_clear (self); 1210 map_clear (self);
… …
1244void 1280void
1245scroll (CFPlus::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1246 CODE: 1282 CODE:
1247{ 1283{
1248 if (dx > 0) 1284 if (dx > 0)
1249 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1250 else if (dx < 0) 1286 else if (dx < 0)
1251 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);
1252 1288
1253 if (dy > 0) 1289 if (dy > 0)
1254 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1255 else if (dy < 0) 1291 else if (dy < 0)
1256 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);
1257 1293
1258 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1259 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1260 1296
1261 while (self->y < 0) 1297 while (self->y < 0)
… …
1287 1323
1288 if (flags & 15) 1324 if (flags & 15)
1289 { 1325 {
1290 if (!cell->darkness) 1326 if (!cell->darkness)
1291 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1292 cell->darkness = 256; 1329 cell->darkness = 256;
1293 cell->face [0] = 0;
1294 cell->face [1] = 0;
1295 cell->face [2] = 0;
1296 } 1330 }
1297 1331
1298 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1299 1333
1300 if (flags & 8) 1334 if (flags & 8)
… …
1351 { 1385 {
1352 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;
1353 } 1387 }
1354 } 1388 }
1355 else 1389 else
1356 {
1357 cell->darkness = 0; 1390 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1360 } 1391 }
1361} 1392}
1362 1393
1363SV * 1394SV *
1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1419} 1450}
1420 OUTPUT: 1451 OUTPUT:
1421 RETVAL 1452 RETVAL
1422 1453
1423void 1454void
1424draw (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)
1425 CODE: 1456 CODE:
1426{ 1457{
1427 int vx, vy;
1428 int x, y, z; 1458 int x, y, z;
1429 int last_name; 1459 int last_name;
1430 mapface face; 1460 mapface face;
1431
1432 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1433 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1434
1435 /*
1436 int vx = self->vx = self->w >= sw
1437 ? self->x + (self->w - sw) / 2
1438 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1439
1440 int vy = self->vy = self->h >= sh
1441 ? self->y + (self->h - sh) / 2
1442 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1443 */
1444 1461
1445 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1446 1463
1447 glEnable (GL_BLEND); 1464 glEnable (GL_BLEND);
1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1451 1468
1452 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1453 1470
1454 last_name = 0; 1471 last_name = 0;
1455 1472
1473 mx += self->x;
1474 my += self->y;
1475
1456 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1457 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1458 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1459 { 1479 {
1460 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1461 1481
1462 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1463 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1464 { 1484 {
1465 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1466 1486
1467 face = cell->face [z]; 1487 face = cell->face [z];
1468 1488
1469 if (face && face < self->texs) 1489 if (face && face < self->texs)
1470 { 1490 {
… …
1511 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1512 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1513 1533
1514 // top layer: overlays such as the health bar 1534 // top layer: overlays such as the health bar
1515 for (y = 0; y < sh; y++) 1535 for (y = 0; y < sh; y++)
1516 if (0 <= y + vy && y + vy < self->rows) 1536 if (0 <= y + my && y + my < self->rows)
1517 { 1537 {
1518 maprow *row = self->row + (y + vy); 1538 maprow *row = self->row + (y + my);
1519 1539
1520 for (x = 0; x < sw; x++) 1540 for (x = 0; x < sw; x++)
1521 if (row->c0 <= x + vx && x + vx < row->c1) 1541 if (row->c0 <= x + mx && x + mx < row->c1)
1522 { 1542 {
1523 mapcell *cell = row->col + (x + vx - row->c0); 1543 mapcell *cell = row->col + (x + mx - row->c0);
1524 1544
1525 int px = x * 32; 1545 int px = x * 32;
1526 int py = y * 32; 1546 int py = y * 32;
1527 1547
1528 if (cell->stat_hp) 1548 if (cell->stat_hp)
… …
1602 glDisable (GL_BLEND); 1622 glDisable (GL_BLEND);
1603 glDisable (GL_TEXTURE_2D); 1623 glDisable (GL_TEXTURE_2D);
1604} 1624}
1605 1625
1606void 1626void
1607fow_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)
1608 PPCODE: 1628 PPCODE:
1609{ 1629{
1610 int vx, vy;
1611 int x, y; 1630 int x, y;
1612 int sw4 = (sw + 3) & ~3; 1631 int sw4 = (sw + 3) & ~3;
1613 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1614 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1615 1634
1616 memset (darkness, 255, sw4 * sh); 1635 memset (darkness, 255, sw4 * sh);
1617 SvPOK_only (darkness_sv); 1636 SvPOK_only (darkness_sv);
1618 SvCUR_set (darkness_sv, sw4 * sh); 1637 SvCUR_set (darkness_sv, sw4 * sh);
1619 1638
1620 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1639 mx += self->x;
1621 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1640 my += self->y;
1622 1641
1623 for (y = 0; y < sh; y++) 1642 for (y = 0; y < sh; y++)
1624 if (0 <= y + vy && y + vy < self->rows) 1643 if (0 <= y + my && y + my < self->rows)
1625 { 1644 {
1626 maprow *row = self->row + (y + vy); 1645 maprow *row = self->row + (y + my);
1627 1646
1628 for (x = 0; x < sw; x++) 1647 for (x = 0; x < sw; x++)
1629 if (row->c0 <= x + vx && x + vx < row->c1) 1648 if (row->c0 <= x + mx && x + mx < row->c1)
1630 { 1649 {
1631 mapcell *cell = row->col + (x + vx - row->c0); 1650 mapcell *cell = row->col + (x + mx - row->c0);
1632 1651
1633 darkness[y * sw4 + x] = cell->darkness 1652 darkness[y * sw4 + x] = cell->darkness
1634 ? 255 - (cell->darkness - 1) 1653 ? 255 - (cell->darkness - 1)
1635 : 255 - FOW_DARKNESS; 1654 : 255 - FOW_DARKNESS;
1636 } 1655 }

Diff Legend

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