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.160 by root, Mon Oct 9 01:06:36 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2long _ftol (double); /* defined by VC6 C libs */
3long _ftol2 (double dblSource) { return _ftol (dblSource); }
2# define WIN32_LEAN_AND_MEAN 4# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 5# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
4# include <malloc.h> 6# include <malloc.h>
5# include <windows.h> 7# include <windows.h>
8# include <wininet.h>
6# pragma warning(disable:4244) 9# pragma warning(disable:4244)
7#endif 10#endif
8 11
9#include "EXTERN.h" 12#include "EXTERN.h"
10#include "perl.h" 13#include "perl.h"
… …
169 float s, t; 172 float s, t;
170 uint8_t r, g, b, a; 173 uint8_t r, g, b, a;
171} maptex; 174} maptex;
172 175
173typedef struct { 176typedef struct {
177 uint32_t player;
178 mapface face[3];
174 uint16_t darkness; 179 uint16_t darkness;
175 mapface face[3]; 180 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
177} mapcell; 181} mapcell;
178 182
179typedef struct { 183typedef struct {
180 int32_t c0, c1; 184 int32_t c0, c1;
181 mapcell *col; 185 mapcell *col;
… …
314 318
315 cell = row->col + x - row->c0; 319 cell = row->col + x - row->c0;
316 320
317 cell->darkness = 0; 321 cell->darkness = 0;
318 cell->stat_hp = 0; 322 cell->stat_hp = 0;
323 cell->flags = 0;
324 cell->player = 0;
319 } 325 }
320 } 326 }
321} 327}
322 328
323static void 329static void
… …
648#ifndef _WIN32 654#ifndef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 655 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
650#endif 656#endif
651 657
652void 658void
659win32_proxy_info ()
660 PPCODE:
661{
662#ifdef _WIN32
663 char buffer[2048];
664 DWORD buflen;
665
666 EXTEND (SP, 3);
667
668 buflen = sizeof (buffer);
669 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
670 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
671 {
672 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
673
674 buflen = sizeof (buffer);
675 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
676 {
677 PUSHs (newSVpv (buffer, 0));
678
679 buflen = sizeof (buffer);
680 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
681 PUSHs (newSVpv (buffer, 0));
682 }
683 }
684#endif
685}
686
687void
653add_font (char *file) 688add_font (char *file)
654 CODE: 689 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 690 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
656 691
657void 692void
… …
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 794 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 795#endif
761 _exit (1); 796 _exit (1);
762 797
763void 798void
764_exit (int retval) 799_exit (int retval = 0)
765 CODE: 800 CODE:
766 _exit (retval); 801 _exit (retval);
767 802
768MODULE = CFPlus PACKAGE = CFPlus::Font 803MODULE = CFPlus PACKAGE = CFPlus::Font
769 804
… …
1243void 1278void
1244scroll (CFPlus::Map self, int dx, int dy) 1279scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1280 CODE:
1246{ 1281{
1247 if (dx > 0) 1282 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1283 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1284 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1285 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1251 1286
1252 if (dy > 0) 1287 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1288 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1289 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1290 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1256 1291
1257 self->ox += dx; self->x += dx; 1292 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1293 self->oy += dy; self->y += dy;
1259 1294
1260 while (self->y < 0) 1295 while (self->y < 0)
… …
1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1308 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1274 uint8_t *data_end = (uint8_t *)SvEND (data_); 1309 uint8_t *data_end = (uint8_t *)SvEND (data_);
1275 mapcell *cell; 1310 mapcell *cell;
1276 int x, y, flags; 1311 int x, y, flags;
1277 1312
1278 while (data < data_end) 1313 while (data < data_end - 1)
1279 { 1314 {
1280 flags = (data [0] << 8) + data [1]; data += 2; 1315 flags = (data [0] << 8) + data [1]; data += 2;
1281 1316
1282 x = self->x + ((flags >> 10) & 63); 1317 x = self->x + ((flags >> 10) & 63);
1283 y = self->y + ((flags >> 4) & 63); 1318 y = self->y + ((flags >> 4) & 63);
… …
1286 1321
1287 if (flags & 15) 1322 if (flags & 15)
1288 { 1323 {
1289 if (!cell->darkness) 1324 if (!cell->darkness)
1290 { 1325 {
1326 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1327 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1328 }
1296 1329
1297 //TODO: don't trust server data to be in-range(!) 1330 //TODO: don't trust server data to be in-range(!)
1298 1331
1299 if (flags & 8) 1332 if (flags & 8)
… …
1305 do 1338 do
1306 { 1339 {
1307 ext = *data++; 1340 ext = *data++;
1308 cmd = ext & 0x3f; 1341 cmd = ext & 0x3f;
1309 1342
1310 if (ext < 4) 1343 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1; 1344 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health 1345 else if (cmd == 5) // health
1346 {
1347 cell->stat_width = 1;
1313 cell->stat_hp = *data++; 1348 cell->stat_hp = *data++;
1349 }
1350 else if (cmd == 6) // monster width
1351 cell->stat_width = *data++ + 1;
1352 else if (cmd == 0x47) // monster width
1353 {
1354 if (*data == 4)
1355 ; // decode player tag
1356
1357 data += *data + 1;
1358 }
1359 else if (cmd == 8) // cell flags
1360 cell->flags = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip 1361 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1; 1362 data += *data + 1;
1363 else
1364 data++;
1316 } 1365 }
1317 while (cmd & 0x80); 1366 while (ext & 0x80);
1318 } 1367 }
1319 else 1368 else
1320 cell->darkness = *data++ + 1; 1369 cell->darkness = *data++ + 1;
1321 } 1370 }
1322 1371
… …
1334 { 1383 {
1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1384 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1336 } 1385 }
1337 } 1386 }
1338 else 1387 else
1339 {
1340 cell->darkness = 0; 1388 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1343 } 1389 }
1344} 1390}
1345 1391
1346SV * 1392SV *
1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1393mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1450 face = cell->face [z]; 1496 face = cell->face [z];
1451 1497
1452 if (face && face < self->texs) 1498 if (face && face < self->texs)
1453 { 1499 {
1454 maptex tex = self->tex [face]; 1500 maptex tex = self->tex [face];
1455
1456 int px = (x + 1) * 32 - tex.w; 1501 int px = (x + 1) * 32 - tex.w;
1457 int py = (y + 1) * 32 - tex.h; 1502 int py = (y + 1) * 32 - tex.h;
1458 1503
1459 if (last_name != tex.name) 1504 if (last_name != tex.name)
1460 { 1505 {
1461 glEnd (); 1506 glEnd ();
1462 last_name = tex.name;
1463 glBindTexture (GL_TEXTURE_2D, last_name); 1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1464 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1465 } 1509 }
1466 1510
1467 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1468 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1469 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1513 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1470 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1471 } 1515 }
1516
1517 if (cell->flags && z == 2)
1518 {
1519 if (cell->flags & 1)
1520 {
1521 maptex tex = self->tex [1];
1522 int px = (x + 1) * 32 - tex.w + 2;
1523 int py = (y + 1) * 32 - tex.h - 6;
1524
1525 glEnd ();
1526 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1527 glBegin (GL_QUADS);
1528
1529 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1530 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1531 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1532 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1533 }
1534 }
1472 } 1535 }
1473 } 1536 }
1474 1537
1475 glEnd (); 1538 glEnd ();
1476 1539
… …
1491 int px = x * 32; 1554 int px = x * 32;
1492 int py = y * 32; 1555 int py = y * 32;
1493 1556
1494 if (cell->stat_hp) 1557 if (cell->stat_hp)
1495 { 1558 {
1496 int width = sh / 28 + 1; 1559 int width = cell->stat_width * 32;
1560 int thick = sh / 28 + 1 + cell->stat_width;
1497 1561
1498 glColor3ub (0, 0, 0); 1562 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2); 1563 glRectf (px + 1, py - thick - 2,
1564 px + width - 1, py);
1500 1565
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1566 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); 1567 glRectf (px + 2,
1568 py - thick - 1,
1569 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1503 } 1570 }
1504 } 1571 }
1505 } 1572 }
1506} 1573}
1507 1574

Diff Legend

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