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.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

… …
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# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
8#endif 9#endif
9 10
10#include "EXTERN.h" 11#include "EXTERN.h"
11#include "perl.h" 12#include "perl.h"
12#include "XSUB.h" 13#include "XSUB.h"
… …
37# include <sys/types.h> 38# include <sys/types.h>
38# include <sys/socket.h> 39# include <sys/socket.h>
39# include <netinet/in.h> 40# include <netinet/in.h>
40# include <netinet/tcp.h> 41# include <netinet/tcp.h>
41# include <inttypes.h> 42# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 43#endif
50 44
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 46
53#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
54 48
55#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
794 _exit (1); 788 _exit (1);
795 789
796void 790void
797_exit (int retval = 0) 791_exit (int retval = 0)
798 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
799 _exit (retval); 796 _exit (retval);
797#endif
800 798
801MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
802 800
803CFPlus::Font 801CFPlus::Font
804new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1170} 1168}
1171 1169
1172MODULE = CFPlus PACKAGE = CFPlus::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1173 1171
1174CFPlus::Map 1172CFPlus::Map
1175new (SV *class, int map_width, int map_height) 1173new (SV *class)
1176 CODE: 1174 CODE:
1177 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1178 RETVAL->x = 0; 1176 RETVAL->x = 0;
1179 RETVAL->y = 0; 1177 RETVAL->y = 0;
1180 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1181 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1182 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1183 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1184 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1185 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1186 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
… …
1197 map_clear (self); 1195 map_clear (self);
1198 Safefree (self->face); 1196 Safefree (self->face);
1199 Safefree (self->tex); 1197 Safefree (self->tex);
1200 Safefree (self); 1198 Safefree (self);
1201} 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;
1202 1206
1203void 1207void
1204clear (CFPlus::Map self) 1208clear (CFPlus::Map self)
1205 CODE: 1209 CODE:
1206 map_clear (self); 1210 map_clear (self);
… …
1446} 1450}
1447 OUTPUT: 1451 OUTPUT:
1448 RETVAL 1452 RETVAL
1449 1453
1450void 1454void
1451draw (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)
1452 CODE: 1456 CODE:
1453{ 1457{
1454 int vx, vy;
1455 int x, y, z; 1458 int x, y, z;
1456 int last_name; 1459 int last_name;
1457 mapface face; 1460 mapface face;
1458
1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1461
1462 /*
1463 int vx = self->vx = self->w >= sw
1464 ? self->x + (self->w - sw) / 2
1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1466
1467 int vy = self->vy = self->h >= sh
1468 ? self->y + (self->h - sh) / 2
1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1470 */
1471 1461
1472 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1473 1463
1474 glEnable (GL_BLEND); 1464 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1478 1468
1479 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1480 1470
1481 last_name = 0; 1471 last_name = 0;
1482 1472
1473 mx += self->x;
1474 my += self->y;
1475
1483 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1484 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1485 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1486 { 1479 {
1487 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1488 1481
1489 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1490 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1491 { 1484 {
1492 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1493 1486
1494 face = cell->face [z]; 1487 face = cell->face [z];
1495 1488
1496 if (face && face < self->texs) 1489 if (face && face < self->texs)
1497 { 1490 {
… …
1538 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1539 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1540 1533
1541 // top layer: overlays such as the health bar 1534 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++) 1535 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows) 1536 if (0 <= y + my && y + my < self->rows)
1544 { 1537 {
1545 maprow *row = self->row + (y + vy); 1538 maprow *row = self->row + (y + my);
1546 1539
1547 for (x = 0; x < sw; x++) 1540 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1) 1541 if (row->c0 <= x + mx && x + mx < row->c1)
1549 { 1542 {
1550 mapcell *cell = row->col + (x + vx - row->c0); 1543 mapcell *cell = row->col + (x + mx - row->c0);
1551 1544
1552 int px = x * 32; 1545 int px = x * 32;
1553 int py = y * 32; 1546 int py = y * 32;
1554 1547
1555 if (cell->stat_hp) 1548 if (cell->stat_hp)
… …
1629 glDisable (GL_BLEND); 1622 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D); 1623 glDisable (GL_TEXTURE_2D);
1631} 1624}
1632 1625
1633void 1626void
1634fow_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)
1635 PPCODE: 1628 PPCODE:
1636{ 1629{
1637 int vx, vy;
1638 int x, y; 1630 int x, y;
1639 int sw4 = (sw + 3) & ~3; 1631 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642 1634
1643 memset (darkness, 255, sw4 * sh); 1635 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv); 1636 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh); 1637 SvCUR_set (darkness_sv, sw4 * sh);
1646 1638
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1639 mx += self->x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1640 my += self->y;
1649 1641
1650 for (y = 0; y < sh; y++) 1642 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows) 1643 if (0 <= y + my && y + my < self->rows)
1652 { 1644 {
1653 maprow *row = self->row + (y + vy); 1645 maprow *row = self->row + (y + my);
1654 1646
1655 for (x = 0; x < sw; x++) 1647 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1) 1648 if (row->c0 <= x + mx && x + mx < row->c1)
1657 { 1649 {
1658 mapcell *cell = row->col + (x + vx - row->c0); 1650 mapcell *cell = row->col + (x + mx - row->c0);
1659 1651
1660 darkness[y * sw4 + x] = cell->darkness 1652 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1) 1653 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS; 1654 : 255 - FOW_DARKNESS;
1663 } 1655 }

Diff Legend

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