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

Diff Legend

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