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.137 by root, Sun Aug 13 19:47:05 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
… …
144} 139}
145 140
146static void 141static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
150 148
151 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 151
154 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
155} 157}
156 158
157typedef uint16_t mapface; 159typedef uint16_t mapface;
158 160
159typedef struct { 161typedef struct {
… …
162 float s, t; 164 float s, t;
163 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
164} maptex; 166} maptex;
165 167
166typedef struct { 168typedef struct {
167 int16_t darkness; 169 uint32_t player;
168 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
169} mapcell; 173} mapcell;
170 174
171typedef struct { 175typedef struct {
172 int32_t c0, c1; 176 int32_t c0, c1;
173 mapcell *col; 177 mapcell *col;
… …
286static void 290static void
287map_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)
288{ 292{
289 int x, y; 293 int x, y;
290 maprow *row; 294 maprow *row;
295 mapcell *cell;
291 296
292 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 298 if (y >= 0)
294 { 299 {
295 if (y >= self->rows) 300 if (y >= self->rows)
… …
301 if (x >= row->c0) 306 if (x >= row->c0)
302 { 307 {
303 if (x >= row->c1) 308 if (x >= row->c1)
304 break; 309 break;
305 310
306 row->col[x - row->c0].darkness = -1; 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;
307 } 317 }
308 } 318 }
309} 319}
310 320
311static void 321static void
… …
348 n |= n >> 8; 358 n |= n >> 8;
349 n |= n >> 16; 359 n |= n >> 16;
350 360
351 return n + 1; 361 return n + 1;
352} 362}
363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
353 367
354MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
355 369
356PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
357 371
… …
361 static const struct { 375 static const struct {
362 const char *name; 376 const char *name;
363 IV iv; 377 IV iv;
364 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
365# 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
366 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
379 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
383 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
384 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
443 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
448 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 487# undef const_iv
465 }; 488 };
466 489
467 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; )
468 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);
469} 495}
470 496
471int 497int
472in_destruct () 498in_destruct ()
473 CODE: 499 CODE:
… …
577 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
578 case SDL_KEYUP: 604 case SDL_KEYUP:
579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
580 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
581 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 */
582 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
583 break; 610 break;
584 611
585 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
634lowdelay (int fd, int val = 1) 661lowdelay (int fd, int val = 1)
635 CODE: 662 CODE:
636#ifndef _WIN32 663#ifndef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
638#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}
639 695
640void 696void
641add_font (char *file) 697add_font (char *file)
642 CODE: 698 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 804#endif
749 _exit (1); 805 _exit (1);
750 806
751void 807void
752_exit (int retval) 808_exit (int retval = 0)
753 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
754 _exit (retval); 813 _exit (retval);
814#endif
755 815
756MODULE = CFPlus PACKAGE = CFPlus::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
757 817
758CFPlus::Font 818CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
… …
1006xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1067 CODE:
1008{ 1068{
1009 int index, trailing; 1069 int index, trailing;
1010 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);
1011 RETVAL = index; 1071 RETVAL = index + trailing;
1012} 1072}
1013 OUTPUT: 1073 OUTPUT:
1014 RETVAL 1074 RETVAL
1015 1075
1016void 1076void
… …
1022 1082
1023 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1024 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 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 }
1027} 1126}
1028 1127
1029void 1128void
1030render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1130 PPCODE:
… …
1125} 1224}
1126 1225
1127MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1128 1227
1129CFPlus::Map 1228CFPlus::Map
1130new (SV *class, int map_width, int map_height) 1229new (SV *class)
1131 CODE: 1230 CODE:
1132 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1133 RETVAL->x = 0; 1232 RETVAL->x = 0;
1134 RETVAL->y = 0; 1233 RETVAL->y = 0;
1135 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1136 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1137 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1138 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1139 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1140 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1141 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1152 map_clear (self); 1251 map_clear (self);
1153 Safefree (self->face); 1252 Safefree (self->face);
1154 Safefree (self->tex); 1253 Safefree (self->tex);
1155 Safefree (self); 1254 Safefree (self);
1156} 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;
1157 1262
1158void 1263void
1159clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1160 CODE: 1265 CODE:
1161 map_clear (self); 1266 map_clear (self);
… …
1231void 1336void
1232scroll (CFPlus::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1338 CODE:
1234{ 1339{
1235 if (dx > 0) 1340 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1342 else if (dx < 0)
1238 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);
1239 1344
1240 if (dy > 0) 1345 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1347 else if (dy < 0)
1243 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);
1244 1349
1245 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1247 1352
1248 while (self->y < 0) 1353 while (self->y < 0)
… …
1253 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
1254 } 1359 }
1255} 1360}
1256 1361
1257void 1362void
1258map1a_update (CFPlus::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1364 CODE:
1260{ 1365{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1368 mapcell *cell;
1264 int x, y, flags; 1369 int x, y, flags;
1265 1370
1266 while (data < data_end) 1371 while (data < data_end - 1)
1267 { 1372 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1269 1374
1270 x = self->x + ((flags >> 10) & 63); 1375 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1376 y = self->y + ((flags >> 4) & 63);
1272 1377
1273 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
1274 1379
1275 if (flags & 15) 1380 if (flags & 15)
1276 { 1381 {
1277 if (cell->darkness < 0) 1382 if (!cell->darkness)
1278 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1385 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1386 }
1284 1387
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1389
1390 if (flags & 8)
1391 {
1392 if (extmap)
1393 {
1394 uint8_t ext, cmd;
1395
1396 do
1397 {
1398 ext = *data++;
1399 cmd = ext & 0x3f;
1400
1401 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health
1404 {
1405 cell->stat_width = 1;
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++;
1419 else if (ext & 0x40) // unknown, multibyte => skip
1420 data += *data + 1;
1421 else
1422 data++;
1423 }
1424 while (ext & 0x80);
1425 }
1426 else
1427 cell->darkness = *data++ + 1;
1428 }
1288 1429
1289 if (flags & 4) 1430 if (flags & 4)
1290 { 1431 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1292 } 1433 }
… …
1300 { 1441 {
1301 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;
1302 } 1443 }
1303 } 1444 }
1304 else 1445 else
1305 cell->darkness = -1; 1446 cell->darkness = 0;
1306 } 1447 }
1307} 1448}
1308 1449
1309SV * 1450SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1365} 1506}
1366 OUTPUT: 1507 OUTPUT:
1367 RETVAL 1508 RETVAL
1368 1509
1369void 1510void
1370draw (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)
1371 CODE: 1512 CODE:
1372{ 1513{
1373 int vx, vy;
1374 int x, y, z; 1514 int x, y, z;
1375 int last_name; 1515 int last_name;
1376 mapface face; 1516 mapface face;
1377
1378 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1379 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1380
1381 /*
1382 int vx = self->vx = self->w >= sw
1383 ? self->x + (self->w - sw) / 2
1384 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1385
1386 int vy = self->vy = self->h >= sh
1387 ? self->y + (self->h - sh) / 2
1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1389 */
1390 1517
1391 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1392 1519
1393 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1397 1524
1398 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1399 1526
1400 last_name = 0; 1527 last_name = 0;
1401 1528
1529 mx += self->x;
1530 my += self->y;
1531
1402 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1403 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1404 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1405 { 1535 {
1406 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1407 1537
1408 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1409 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1410 { 1540 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1412 1542
1413 face = cell->face [z]; 1543 face = cell->face [z];
1414 1544
1415 if (face) 1545 if (face && face < self->texs)
1416 { 1546 {
1417 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1418
1419 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1420 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1421 1550
1422 if (last_name != tex.name) 1551 if (last_name != tex.name)
1423 { 1552 {
1424 glEnd (); 1553 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1428 } 1556 }
1429 1557
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 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);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 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 }
1435 } 1582 }
1436 } 1583 }
1437 1584
1438 glEnd (); 1585 glEnd ();
1439 1586
1440 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1589
1590 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows)
1593 {
1594 maprow *row = self->row + (y + my);
1595
1596 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1)
1598 {
1599 mapcell *cell = row->col + (x + mx - row->c0);
1600
1601 int px = x * 32;
1602 int py = y * 32;
1603
1604 if (cell->stat_hp)
1605 {
1606 int width = cell->stat_width * 32;
1607 int thick = sh / 28 + 1 + cell->stat_width;
1608
1609 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py);
1612
1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1614 glRectf (px + 2,
1615 py - thick - 1,
1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1617 }
1618 }
1619 }
1442} 1620}
1443 1621
1444void 1622void
1445draw_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)
1446 CODE: 1624 CODE:
… …
1500 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1502} 1680}
1503 1681
1504void 1682void
1505fow_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)
1506 PPCODE: 1684 PPCODE:
1507{ 1685{
1508 int vx, vy;
1509 int x, y; 1686 int x, y;
1510 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513 1690
1514 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1517 1694
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1520 1697
1521 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1523 { 1700 {
1524 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1525 1702
1526 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1528 { 1705 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1530 1707
1531 darkness[y * sw4 + x] = cell->darkness < 0 1708 darkness[y * sw4 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1710 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1711 }
1535 } 1712 }
1536 1713
1537 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1830
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1834
1658 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1659 { 1836 {
1660 cell->darkness = -1; 1837 cell->darkness = 0;
1661 1838
1662 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1663 { 1840 {
1664 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1665 1842
… …
1803 const_iv (GL_SEPARABLE_2D), 1980 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 1986 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 1988 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 1989 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 1990 const_iv (GL_TRIANGLE_STRIP),

Diff Legend

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