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

Diff Legend

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