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.145 by root, Fri Aug 18 03:19:58 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]; 172 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
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;
… …
294static void 290static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 292{
297 int x, y; 293 int x, y;
298 maprow *row; 294 maprow *row;
295 mapcell *cell;
299 296
300 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 298 if (y >= 0)
302 { 299 {
303 if (y >= self->rows) 300 if (y >= self->rows)
… …
309 if (x >= row->c0) 306 if (x >= row->c0)
310 { 307 {
311 if (x >= row->c1) 308 if (x >= row->c1)
312 break; 309 break;
313 310
314 row->col[x - row->c0].darkness = 0; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
315 } 317 }
316 } 318 }
317} 319}
318 320
319static void 321static void
… …
356 n |= n >> 8; 358 n |= n >> 8;
357 n |= n >> 16; 359 n |= n >> 16;
358 360
359 return n + 1; 361 return n + 1;
360} 362}
363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
361 367
362MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
363 369
364PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
365 371
… …
369 static const struct { 375 static const struct {
370 const char *name; 376 const char *name;
371 IV iv; 377 IV iv;
372 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
373# 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
374 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
375 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
376 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
377 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
378 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
387 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
388 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
389 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
390 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
391 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
392 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
393 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
394 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
395 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
396 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
451 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
452 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
453 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
454 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
455 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
456 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
457 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
458 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
459 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
460 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
461 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
462 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
463 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
464 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
465 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
466 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
467 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
468 const_iv (KMOD_CTRL),
469 const_iv (KMOD_SHIFT),
470 const_iv (KMOD_ALT),
471 const_iv (KMOD_META)
472# undef const_iv 487# undef const_iv
473 }; 488 };
474 489
475 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; )
476 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);
477} 495}
478 496
479int 497int
480in_destruct () 498in_destruct ()
481 CODE: 499 CODE:
… …
585 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
586 case SDL_KEYUP: 604 case SDL_KEYUP:
587 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
588 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
589 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 */
590 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
591 break; 610 break;
592 611
593 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
642lowdelay (int fd, int val = 1) 661lowdelay (int fd, int val = 1)
643 CODE: 662 CODE:
644#ifndef _WIN32 663#ifndef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
646#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}
647 695
648void 696void
649add_font (char *file) 697add_font (char *file)
650 CODE: 698 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 804#endif
757 _exit (1); 805 _exit (1);
758 806
759void 807void
760_exit (int retval) 808_exit (int retval = 0)
761 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
762 _exit (retval); 813 _exit (retval);
814#endif
763 815
764MODULE = CFPlus PACKAGE = CFPlus::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
765 817
766CFPlus::Font 818CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
… …
1014xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1015 CODE: 1067 CODE:
1016{ 1068{
1017 int index, trailing; 1069 int index, trailing;
1018 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);
1019 RETVAL = index; 1071 RETVAL = index + trailing;
1020} 1072}
1021 OUTPUT: 1073 OUTPUT:
1022 RETVAL 1074 RETVAL
1023 1075
1024void 1076void
… …
1030 1082
1031 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1034 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 }
1035} 1126}
1036 1127
1037void 1128void
1038render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1039 PPCODE: 1130 PPCODE:
… …
1133} 1224}
1134 1225
1135MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1136 1227
1137CFPlus::Map 1228CFPlus::Map
1138new (SV *class, int map_width, int map_height) 1229new (SV *class)
1139 CODE: 1230 CODE:
1140 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1141 RETVAL->x = 0; 1232 RETVAL->x = 0;
1142 RETVAL->y = 0; 1233 RETVAL->y = 0;
1143 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1144 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1145 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1146 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1147 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1148 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1149 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1160 map_clear (self); 1251 map_clear (self);
1161 Safefree (self->face); 1252 Safefree (self->face);
1162 Safefree (self->tex); 1253 Safefree (self->tex);
1163 Safefree (self); 1254 Safefree (self);
1164} 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;
1165 1262
1166void 1263void
1167clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1168 CODE: 1265 CODE:
1169 map_clear (self); 1266 map_clear (self);
… …
1239void 1336void
1240scroll (CFPlus::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1338 CODE:
1242{ 1339{
1243 if (dx > 0) 1340 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1342 else if (dx < 0)
1246 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);
1247 1344
1248 if (dy > 0) 1345 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1347 else if (dy < 0)
1251 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);
1252 1349
1253 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1255 1352
1256 while (self->y < 0) 1353 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1368 mapcell *cell;
1272 int x, y, flags; 1369 int x, y, flags;
1273 1370
1274 while (data < data_end) 1371 while (data < data_end - 1)
1275 { 1372 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1277 1374
1278 x = self->x + ((flags >> 10) & 63); 1375 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1376 y = self->y + ((flags >> 4) & 63);
… …
1282 1379
1283 if (flags & 15) 1380 if (flags & 15)
1284 { 1381 {
1285 if (!cell->darkness) 1382 if (!cell->darkness)
1286 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1385 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1386 }
1293 1387
1294 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1295 1389
1296 if (flags & 8) 1390 if (flags & 8)
… …
1302 do 1396 do
1303 { 1397 {
1304 ext = *data++; 1398 ext = *data++;
1305 cmd = ext & 0x3f; 1399 cmd = ext & 0x3f;
1306 1400
1307 if (ext < 4) 1401 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1402 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1403 else if (cmd == 5) // health
1404 {
1405 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 1406 cell->stat_hp = *data++;
1407 }
1408 else if (cmd == 6) // monster width
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++;
1311 else if (ext & 0x40) // unknown, multibyte => skip 1419 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1; 1420 data += *data + 1;
1421 else
1422 data++;
1313 } 1423 }
1314 while (cmd & 0x80); 1424 while (ext & 0x80);
1315 } 1425 }
1316 else 1426 else
1317 cell->darkness = *data++ + 1; 1427 cell->darkness = *data++ + 1;
1318 } 1428 }
1319 1429
… …
1396} 1506}
1397 OUTPUT: 1507 OUTPUT:
1398 RETVAL 1508 RETVAL
1399 1509
1400void 1510void
1401draw (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)
1402 CODE: 1512 CODE:
1403{ 1513{
1404 int vx, vy;
1405 int x, y, z; 1514 int x, y, z;
1406 int last_name; 1515 int last_name;
1407 mapface face; 1516 mapface face;
1408
1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1411
1412 /*
1413 int vx = self->vx = self->w >= sw
1414 ? self->x + (self->w - sw) / 2
1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1416
1417 int vy = self->vy = self->h >= sh
1418 ? self->y + (self->h - sh) / 2
1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1420 */
1421 1517
1422 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1423 1519
1424 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1428 1524
1429 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1430 1526
1431 last_name = 0; 1527 last_name = 0;
1432 1528
1529 mx += self->x;
1530 my += self->y;
1531
1433 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1434 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1435 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1436 { 1535 {
1437 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1438 1537
1439 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1440 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1441 { 1540 {
1442 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1443 1542
1444 face = cell->face [z]; 1543 face = cell->face [z];
1445 1544
1446 if (face && face < self->texs) 1545 if (face && face < self->texs)
1447 { 1546 {
1448 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1449
1450 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1451 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1452 1550
1453 if (last_name != tex.name) 1551 if (last_name != tex.name)
1454 { 1552 {
1455 glEnd (); 1553 glEnd ();
1456 last_name = tex.name;
1457 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1458 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1459 } 1556 }
1460 1557
1461 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1462 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1463 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);
1464 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1465 } 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 }
1466 } 1582 }
1467 } 1583 }
1468 1584
1469 glEnd (); 1585 glEnd ();
1470 1586
1471 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1472 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1473 1589
1474 // top layer: overlays such as the health bar 1590 // top layer: overlays such as the health bar
1475 for (y = 0; y < sh; y++) 1591 for (y = 0; y < sh; y++)
1476 if (0 <= y + vy && y + vy < self->rows) 1592 if (0 <= y + my && y + my < self->rows)
1477 { 1593 {
1478 maprow *row = self->row + (y + vy); 1594 maprow *row = self->row + (y + my);
1479 1595
1480 for (x = 0; x < sw; x++) 1596 for (x = 0; x < sw; x++)
1481 if (row->c0 <= x + vx && x + vx < row->c1) 1597 if (row->c0 <= x + mx && x + mx < row->c1)
1482 { 1598 {
1483 mapcell *cell = row->col + (x + vx - row->c0); 1599 mapcell *cell = row->col + (x + mx - row->c0);
1484 1600
1485 int px = x * 32; 1601 int px = x * 32;
1486 int py = y * 32; 1602 int py = y * 32;
1487 1603
1488 if (cell->stat_hp) 1604 if (cell->stat_hp)
1489 { 1605 {
1490 int width = sh / 28 + 1; 1606 int width = cell->stat_width * 32;
1607 int thick = sh / 28 + 1 + cell->stat_width;
1491 1608
1492 glColor3ub (0, 0, 0); 1609 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2); 1610 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py);
1494 1612
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1496 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1614 glRectf (px + 2,
1615 py - thick - 1,
1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1497 } 1617 }
1498 } 1618 }
1499 } 1619 }
1500} 1620}
1501 1621
… …
1558 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1560} 1680}
1561 1681
1562void 1682void
1563fow_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)
1564 PPCODE: 1684 PPCODE:
1565{ 1685{
1566 int vx, vy;
1567 int x, y; 1686 int x, y;
1568 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571 1690
1572 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1575 1694
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1578 1697
1579 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1581 { 1700 {
1582 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1583 1702
1584 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1586 { 1705 {
1587 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1588 1707
1589 darkness[y * sw4 + x] = cell->darkness 1708 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1) 1709 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS; 1710 : 255 - FOW_DARKNESS;
1592 } 1711 }

Diff Legend

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