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.142 by root, Fri Aug 18 01:27:15 2006 UTC vs.
Revision 1.172 by root, Mon Apr 2 19:29:27 2007 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 NTDDI_VERSION NTDDI_WIN2K // 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]; 173 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
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;
… …
294static void 291static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 293{
297 int x, y; 294 int x, y;
298 maprow *row; 295 maprow *row;
296 mapcell *cell;
299 297
300 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 299 if (y >= 0)
302 { 300 {
303 if (y >= self->rows) 301 if (y >= self->rows)
… …
309 if (x >= row->c0) 307 if (x >= row->c0)
310 { 308 {
311 if (x >= row->c1) 309 if (x >= row->c1)
312 break; 310 break;
313 311
314 row->col[x - row->c0].darkness = 0; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
315 } 318 }
316 } 319 }
317} 320}
318 321
319static void 322static void
… …
356 n |= n >> 8; 359 n |= n >> 8;
357 n |= n >> 16; 360 n |= n >> 16;
358 361
359 return n + 1; 362 return n + 1;
360} 363}
364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
361 368
362MODULE = CFPlus PACKAGE = CFPlus 369MODULE = CFPlus PACKAGE = CFPlus
363 370
364PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
365 372
… …
369 static const struct { 376 static const struct {
370 const char *name; 377 const char *name;
371 IV iv; 378 IV iv;
372 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
373# 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
374 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
375 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
376 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
377 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
378 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
… …
387 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
388 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
389 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
390 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
391 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
392 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
393 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
394 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
395 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
396 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
… …
451 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
452 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
453 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
454 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
455 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
456 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
457 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
458 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
459 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
460 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
461 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
462 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
463 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
464 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
465 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
466 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
467 const_iv (KMOD_MODE), 487 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 488# undef const_iv
473 }; 489 };
474 490
475 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; )
476 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);
477} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
478 503
479int 504int
480in_destruct () 505in_destruct ()
481 CODE: 506 CODE:
482 RETVAL = PL_main_cv == Nullcv; 507 RETVAL = PL_main_cv == Nullcv;
… …
585 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
586 case SDL_KEYUP: 611 case SDL_KEYUP:
587 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
588 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
589 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 */
590 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
591 break; 617 break;
592 618
593 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
642lowdelay (int fd, int val = 1) 668lowdelay (int fd, int val = 1)
643 CODE: 669 CODE:
644#ifndef _WIN32 670#ifndef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
646#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}
647 702
648void 703void
649add_font (char *file) 704add_font (char *file)
650 CODE: 705 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 811#endif
757 _exit (1); 812 _exit (1);
758 813
759void 814void
760_exit (int retval) 815_exit (int retval = 0)
761 CODE: 816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
762 _exit (retval); 820 _exit (retval);
821#endif
763 822
764MODULE = CFPlus PACKAGE = CFPlus::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
765 824
766CFPlus::Font 825CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
… …
1014xy_to_index (CFPlus::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
1015 CODE: 1074 CODE:
1016{ 1075{
1017 int index, trailing; 1076 int index, trailing;
1018 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);
1019 RETVAL = index; 1078 RETVAL = index + trailing;
1020} 1079}
1021 OUTPUT: 1080 OUTPUT:
1022 RETVAL 1081 RETVAL
1023 1082
1024void 1083void
… …
1030 1089
1031 EXTEND (SP, 3); 1090 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1091 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1034 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 }
1035} 1133}
1036 1134
1037void 1135void
1038render (CFPlus::Layout self, float x, float y, int flags = 0) 1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1039 PPCODE: 1137 PPCODE:
… …
1133} 1231}
1134 1232
1135MODULE = CFPlus PACKAGE = CFPlus::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1136 1234
1137CFPlus::Map 1235CFPlus::Map
1138new (SV *class, int map_width, int map_height) 1236new (SV *class)
1139 CODE: 1237 CODE:
1140 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1141 RETVAL->x = 0; 1239 RETVAL->x = 0;
1142 RETVAL->y = 0; 1240 RETVAL->y = 0;
1143 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1144 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1145 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1146 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1147 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1148 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1149 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
… …
1160 map_clear (self); 1258 map_clear (self);
1161 Safefree (self->face); 1259 Safefree (self->face);
1162 Safefree (self->tex); 1260 Safefree (self->tex);
1163 Safefree (self); 1261 Safefree (self);
1164} 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;
1165 1269
1166void 1270void
1167clear (CFPlus::Map self) 1271clear (CFPlus::Map self)
1168 CODE: 1272 CODE:
1169 map_clear (self); 1273 map_clear (self);
… …
1239void 1343void
1240scroll (CFPlus::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1345 CODE:
1242{ 1346{
1243 if (dx > 0) 1347 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1349 else if (dx < 0)
1246 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);
1247 1351
1248 if (dy > 0) 1352 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1354 else if (dy < 0)
1251 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);
1252 1356
1253 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1255 1359
1256 while (self->y < 0) 1360 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1375 mapcell *cell;
1272 int x, y, flags; 1376 int x, y, flags;
1273 1377
1274 while (data < data_end) 1378 while (data < data_end - 1)
1275 { 1379 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1277 1381
1278 x = self->x + ((flags >> 10) & 63); 1382 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1383 y = self->y + ((flags >> 4) & 63);
… …
1282 1386
1283 if (flags & 15) 1387 if (flags & 15)
1284 { 1388 {
1285 if (!cell->darkness) 1389 if (!cell->darkness)
1286 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1392 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 } 1393 }
1292 1394
1293 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1294 1396
1295 if (flags & 8) 1397 if (flags & 8)
… …
1299 uint8_t ext, cmd; 1401 uint8_t ext, cmd;
1300 1402
1301 do 1403 do
1302 { 1404 {
1303 ext = *data++; 1405 ext = *data++;
1304 cmd = ext & 0x7f; 1406 cmd = ext & 0x3f;
1305 1407
1306 if (ext < 4) 1408 if (cmd < 4)
1307 cell->darkness = 255 - ext * 64 + 1; 1409 cell->darkness = 255 - ext * 64 + 1;
1308 else if (ext == 5) // health 1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1309 cell->stat_hp = *data++; 1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
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++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1310 } 1430 }
1311 while (cmd & 0x80); 1431 while (ext & 0x80);
1312 } 1432 }
1313 else 1433 else
1314 cell->darkness = *data++ + 1; 1434 cell->darkness = *data++ + 1;
1315 } 1435 }
1316 1436
… …
1366 1486
1367 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1368 { 1488 {
1369 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1370 1490
1371 if (face) 1491 if (face > 0 && face < self->texs)
1372 { 1492 {
1373 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1374 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1375 int a1 = tex.a; 1495 int a1 = tex.a;
1376 1496
… …
1393} 1513}
1394 OUTPUT: 1514 OUTPUT:
1395 RETVAL 1515 RETVAL
1396 1516
1397void 1517void
1398draw (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, int T)
1399 CODE: 1519 CODE:
1400{ 1520{
1401 int vx, vy;
1402 int x, y, z; 1521 int x, y, z;
1403 int last_name; 1522 int last_name;
1404 mapface face; 1523 mapface face;
1405
1406 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1407 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1408
1409 /*
1410 int vx = self->vx = self->w >= sw
1411 ? self->x + (self->w - sw) / 2
1412 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1413
1414 int vy = self->vy = self->h >= sh
1415 ? self->y + (self->h - sh) / 2
1416 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1417 */
1418 1524
1419 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1420 1526
1421 glEnable (GL_BLEND); 1527 glEnable (GL_BLEND);
1422 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1425 1531
1426 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1427 1533
1428 last_name = 0; 1534 last_name = 0;
1429 1535
1536 mx += self->x;
1537 my += self->y;
1538
1430 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1431 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1432 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1433 { 1542 {
1434 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1435 1544
1436 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1437 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1438 { 1547 {
1439 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1440 1549
1441 face = cell->face [z]; 1550 face = cell->face [z];
1442 1551
1443 if (face) 1552 if (face > 0 && face < self->texs)
1444 { 1553 {
1445 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1446
1447 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1448 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1449 1557
1450 if (last_name != tex.name) 1558 if (last_name != tex.name)
1451 { 1559 {
1452 glEnd (); 1560 glEnd ();
1453 last_name = tex.name;
1454 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1455 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1456 } 1563 }
1457 1564
1458 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1459 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1460 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);
1461 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1462 } 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) * T - tex.w + 2;
1577 int py = (y + 1) * T - 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 }
1463 } 1589 }
1464 } 1590 }
1465 1591
1466 glEnd (); 1592 glEnd ();
1467 1593
1468 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1469 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * T;
1609 int py = y * T;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * T;
1614 int thick = sh / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1470} 1627}
1471 1628
1472void 1629void
1473draw_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)
1474 CODE: 1631 CODE:
… …
1528 glDisable (GL_BLEND); 1685 glDisable (GL_BLEND);
1529 glDisable (GL_TEXTURE_2D); 1686 glDisable (GL_TEXTURE_2D);
1530} 1687}
1531 1688
1532void 1689void
1533fow_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)
1534 PPCODE: 1691 PPCODE:
1535{ 1692{
1536 int vx, vy;
1537 int x, y; 1693 int x, y;
1538 int sw4 = (sw + 3) & ~3; 1694 int sw4 = (sw + 3) & ~3;
1539 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1540 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1541 1697
1542 memset (darkness, 255, sw4 * sh); 1698 memset (darkness, 255, sw4 * sh);
1543 SvPOK_only (darkness_sv); 1699 SvPOK_only (darkness_sv);
1544 SvCUR_set (darkness_sv, sw4 * sh); 1700 SvCUR_set (darkness_sv, sw4 * sh);
1545 1701
1546 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1702 mx += self->x;
1547 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1703 my += self->y;
1548 1704
1549 for (y = 0; y < sh; y++) 1705 for (y = 0; y < sh; y++)
1550 if (0 <= y + vy && y + vy < self->rows) 1706 if (0 <= y + my && y + my < self->rows)
1551 { 1707 {
1552 maprow *row = self->row + (y + vy); 1708 maprow *row = self->row + (y + my);
1553 1709
1554 for (x = 0; x < sw; x++) 1710 for (x = 0; x < sw; x++)
1555 if (row->c0 <= x + vx && x + vx < row->c1) 1711 if (row->c0 <= x + mx && x + mx < row->c1)
1556 { 1712 {
1557 mapcell *cell = row->col + (x + vx - row->c0); 1713 mapcell *cell = row->col + (x + mx - row->c0);
1558 1714
1559 darkness[y * sw4 + x] = cell->darkness 1715 darkness[y * sw4 + x] = cell->darkness
1560 ? 255 - cell->darkness + 1 1716 ? 255 - (cell->darkness - 1)
1561 : 255 - FOW_DARKNESS; 1717 : 255 - FOW_DARKNESS;
1562 } 1718 }
1563 } 1719 }
1564 1720
1565 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
… …
1681 1837
1682 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1683 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1684 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1685 1841
1686 if (cell->darkness <= 1) 1842 if (cell->darkness == 0)
1687 { 1843 {
1688 cell->darkness = 0; 1844 cell->darkness = 0;
1689 1845
1690 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1691 { 1847 {

Diff Legend

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