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.151 by root, Sat Aug 19 18:17:18 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 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
… …
169 float s, t; 164 float s, t;
170 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
171} maptex; 166} maptex;
172 167
173typedef struct { 168typedef struct {
169 uint32_t player;
170 mapface face[3];
174 uint16_t darkness; 171 uint16_t darkness;
175 mapface face[3];
176 uint8_t stat_width, stat_hp; 172 uint8_t stat_width, stat_hp, flags;
177} mapcell; 173} mapcell;
178 174
179typedef struct { 175typedef struct {
180 int32_t c0, c1; 176 int32_t c0, c1;
181 mapcell *col; 177 mapcell *col;
… …
314 310
315 cell = row->col + x - row->c0; 311 cell = row->col + x - row->c0;
316 312
317 cell->darkness = 0; 313 cell->darkness = 0;
318 cell->stat_hp = 0; 314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
319 } 317 }
320 } 318 }
321} 319}
322 320
323static void 321static void
… …
360 n |= n >> 8; 358 n |= n >> 8;
361 n |= n >> 16; 359 n |= n >> 16;
362 360
363 return n + 1; 361 return n + 1;
364} 362}
363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
365 367
366MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
367 369
368PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
369 371
… …
373 static const struct { 375 static const struct {
374 const char *name; 376 const char *name;
375 IV iv; 377 IV iv;
376 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
377# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
378 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
379 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
380 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
381 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
382 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
391 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
392 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
393 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
394 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
395 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
396 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
397 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
398 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
399 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
400 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
455 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
456 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
457 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
458 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
459 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
460 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
461 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
462 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
463 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
464 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
465 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
466 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
467 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
468 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
469 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
470 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
471 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
472 const_iv (KMOD_CTRL),
473 const_iv (KMOD_SHIFT),
474 const_iv (KMOD_ALT),
475 const_iv (KMOD_META)
476# undef const_iv 487# undef const_iv
477 }; 488 };
478 489
479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
481} 495}
482 496
483int 497int
484in_destruct () 498in_destruct ()
485 CODE: 499 CODE:
… …
589 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
590 case SDL_KEYUP: 604 case SDL_KEYUP:
591 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
594 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595 break; 610 break;
596 611
597 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
646lowdelay (int fd, int val = 1) 661lowdelay (int fd, int val = 1)
647 CODE: 662 CODE:
648#ifndef _WIN32 663#ifndef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
650#endif 665#endif
666
667void
668win32_proxy_info ()
669 PPCODE:
670{
671#ifdef _WIN32
672 char buffer[2048];
673 DWORD buflen;
674
675 EXTEND (SP, 3);
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
682
683 buflen = sizeof (buffer);
684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
685 {
686 PUSHs (newSVpv (buffer, 0));
687
688 buflen = sizeof (buffer);
689 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
690 PUSHs (newSVpv (buffer, 0));
691 }
692 }
693#endif
694}
651 695
652void 696void
653add_font (char *file) 697add_font (char *file)
654 CODE: 698 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 804#endif
761 _exit (1); 805 _exit (1);
762 806
763void 807void
764_exit (int retval) 808_exit (int retval = 0)
765 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
766 _exit (retval); 813 _exit (retval);
814#endif
767 815
768MODULE = CFPlus PACKAGE = CFPlus::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
769 817
770CFPlus::Font 818CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
… …
1018xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1019 CODE: 1067 CODE:
1020{ 1068{
1021 int index, trailing; 1069 int index, trailing;
1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023 RETVAL = index; 1071 RETVAL = index + trailing;
1024} 1072}
1025 OUTPUT: 1073 OUTPUT:
1026 RETVAL 1074 RETVAL
1027 1075
1028void 1076void
… …
1034 1082
1035 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1087}
1088
1089void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1091 PPCODE:
1092{
1093 int line, x;
1094
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097
1098 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1121 else
1122 {
1123 PUSHs (sv_2mortal (newSViv (index)));
1124 PUSHs (sv_2mortal (newSViv (trailing)));
1125 }
1039} 1126}
1040 1127
1041void 1128void
1042render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1043 PPCODE: 1130 PPCODE:
… …
1137} 1224}
1138 1225
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1227
1141CFPlus::Map 1228CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1229new (SV *class)
1143 CODE: 1230 CODE:
1144 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1232 RETVAL->x = 0;
1146 RETVAL->y = 0; 1233 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1153 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1164 map_clear (self); 1251 map_clear (self);
1165 Safefree (self->face); 1252 Safefree (self->face);
1166 Safefree (self->tex); 1253 Safefree (self->tex);
1167 Safefree (self); 1254 Safefree (self);
1168} 1255}
1256
1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1169 1262
1170void 1263void
1171clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1172 CODE: 1265 CODE:
1173 map_clear (self); 1266 map_clear (self);
… …
1243void 1336void
1244scroll (CFPlus::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1338 CODE:
1246{ 1339{
1247 if (dx > 0) 1340 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1342 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1251 1344
1252 if (dy > 0) 1345 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1347 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1256 1349
1257 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1259 1352
1260 while (self->y < 0) 1353 while (self->y < 0)
… …
1286 1379
1287 if (flags & 15) 1380 if (flags & 15)
1288 { 1381 {
1289 if (!cell->darkness) 1382 if (!cell->darkness)
1290 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1385 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1386 }
1296 1387
1297 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1298 1389
1299 if (flags & 8) 1390 if (flags & 8)
… …
1314 cell->stat_width = 1; 1405 cell->stat_width = 1;
1315 cell->stat_hp = *data++; 1406 cell->stat_hp = *data++;
1316 } 1407 }
1317 else if (cmd == 6) // monster width 1408 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1; 1409 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width
1411 {
1412 if (*data == 4)
1413 ; // decode player tag
1414
1415 data += *data + 1;
1416 }
1417 else if (cmd == 8) // cell flags
1418 cell->flags = *data++;
1319 else if (ext & 0x40) // unknown, multibyte => skip 1419 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1; 1420 data += *data + 1;
1321 else 1421 else
1322 data++; 1422 data++;
1323 } 1423 }
… …
1341 { 1441 {
1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1343 } 1443 }
1344 } 1444 }
1345 else 1445 else
1346 {
1347 cell->darkness = 0; 1446 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1350 } 1447 }
1351} 1448}
1352 1449
1353SV * 1450SV *
1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1409} 1506}
1410 OUTPUT: 1507 OUTPUT:
1411 RETVAL 1508 RETVAL
1412 1509
1413void 1510void
1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1415 CODE: 1512 CODE:
1416{ 1513{
1417 int vx, vy;
1418 int x, y, z; 1514 int x, y, z;
1419 int last_name; 1515 int last_name;
1420 mapface face; 1516 mapface face;
1421
1422 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1423 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1424
1425 /*
1426 int vx = self->vx = self->w >= sw
1427 ? self->x + (self->w - sw) / 2
1428 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1429
1430 int vy = self->vy = self->h >= sh
1431 ? self->y + (self->h - sh) / 2
1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1433 */
1434 1517
1435 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1436 1519
1437 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1441 1524
1442 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1443 1526
1444 last_name = 0; 1527 last_name = 0;
1445 1528
1529 mx += self->x;
1530 my += self->y;
1531
1446 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1447 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1448 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1449 { 1535 {
1450 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1451 1537
1452 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1453 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1454 { 1540 {
1455 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1456 1542
1457 face = cell->face [z]; 1543 face = cell->face [z];
1458 1544
1459 if (face && face < self->texs) 1545 if (face && face < self->texs)
1460 { 1546 {
1461 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1462
1463 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1464 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1465 1550
1466 if (last_name != tex.name) 1551 if (last_name != tex.name)
1467 { 1552 {
1468 glEnd (); 1553 glEnd ();
1469 last_name = tex.name;
1470 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1471 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1472 } 1556 }
1473 1557
1474 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1478 } 1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1)
1567 {
1568 maptex tex = self->tex [1];
1569 int px = (x + 1) * 32 - tex.w + 2;
1570 int py = (y + 1) * 32 - tex.h - 6;
1571
1572 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574 glBegin (GL_QUADS);
1575
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580 }
1581 }
1479 } 1582 }
1480 } 1583 }
1481 1584
1482 glEnd (); 1585 glEnd ();
1483 1586
1484 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1588 glDisable (GL_BLEND);
1485 1589
1486 // top layer: overlays such as the health bar 1590 // top layer: overlays such as the health bar
1487 for (y = 0; y < sh; y++) 1591 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows) 1592 if (0 <= y + my && y + my < self->rows)
1489 { 1593 {
1490 maprow *row = self->row + (y + vy); 1594 maprow *row = self->row + (y + my);
1491 1595
1492 for (x = 0; x < sw; x++) 1596 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1) 1597 if (row->c0 <= x + mx && x + mx < row->c1)
1494 { 1598 {
1495 mapcell *cell = row->col + (x + vx - row->c0); 1599 mapcell *cell = row->col + (x + mx - row->c0);
1496 1600
1497 int px = x * 32; 1601 int px = x * 32;
1498 int py = y * 32; 1602 int py = y * 32;
1499 1603
1500 if (cell->stat_hp) 1604 if (cell->stat_hp)
1501 { 1605 {
1502 int width = cell->stat_width * 32; 1606 int width = cell->stat_width * 32;
1503 int thick = sh / 28 + 1 + cell->stat_width; 1607 int thick = sh / 28 + 1 + cell->stat_width;
1504 1608
1505 glColor4ub (0, 0, 0, 223); 1609 glColor3ub (0, 0, 0);
1506 glRectf (px + 1, py - thick - 2, 1610 glRectf (px + 1, py - thick - 2,
1507 px + width - 1, py); 1611 px + width - 1, py);
1508 1612
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 223); 1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1510 glRectf (px + 2, 1614 glRectf (px + 2,
1511 py - thick - 1, 1615 py - thick - 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1513 } 1617 }
1514 } 1618 }
1515 } 1619 }
1516
1517 glDisable (GL_BLEND);
1518} 1620}
1519 1621
1520void 1622void
1521draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1522 CODE: 1624 CODE:
… …
1576 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1577 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1578} 1680}
1579 1681
1580void 1682void
1581fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1582 PPCODE: 1684 PPCODE:
1583{ 1685{
1584 int vx, vy;
1585 int x, y; 1686 int x, y;
1586 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1589 1690
1590 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1591 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1592 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1593 1694
1594 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1595 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1596 1697
1597 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1598 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1599 { 1700 {
1600 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1601 1702
1602 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1603 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1604 { 1705 {
1605 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1606 1707
1607 darkness[y * sw4 + x] = cell->darkness 1708 darkness[y * sw4 + x] = cell->darkness
1608 ? 255 - (cell->darkness - 1) 1709 ? 255 - (cell->darkness - 1)
1609 : 255 - FOW_DARKNESS; 1710 : 255 - FOW_DARKNESS;
1610 } 1711 }

Diff Legend

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