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.140 by root, Mon Aug 14 03:41:25 2006 UTC vs.
Revision 1.179 by root, Wed Apr 11 04:32:51 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
… …
159 155
160 *w = rect.width; 156 *w = rect.width;
161 *h = rect.height; 157 *h = rect.height;
162} 158}
163 159
160typedef uint16_t tileid;
164typedef uint16_t mapface; 161typedef uint16_t faceid;
165 162
166typedef struct { 163typedef struct {
167 GLint name; 164 int name;
168 int w, h; 165 int w, h;
169 float s, t; 166 float s, t;
170 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
171} maptex; 170} maptex;
172 171
173typedef struct { 172typedef struct {
173 uint32_t player;
174 tileid tile[3];
174 int16_t darkness; 175 uint16_t darkness;
175 mapface face[3]; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
176} mapcell; 177} mapcell;
177 178
178typedef struct { 179typedef struct {
179 int32_t c0, c1; 180 int32_t c0, c1;
180 mapcell *col; 181 mapcell *col;
181} maprow; 182} maprow;
182 183
183typedef struct map { 184typedef struct map {
184 int x, y, w, h; 185 int x, y, w, h;
185 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
186 int faces; 187 int faces; tileid *face2tile; // [faceid]
187 mapface *face; 188 int texs; maptex *tex; // [tileid]
188
189 int texs;
190 maptex *tex;
191 189
192 int32_t rows; 190 int32_t rows;
193 maprow *row; 191 maprow *row;
194} *CFPlus__Map; 192} *CFPlus__Map;
195 193
… …
215 return ptr; 213 return ptr;
216} 214}
217 215
218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
218
219static void
220need_facenum (struct map *self, faceid face)
221{
222 while (self->faces <= face)
223 {
224 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2;
226 }
227}
228
229static void
230need_texid (struct map *self, int texid)
231{
232 while (self->texs <= texid)
233 {
234 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2;
236 }
237}
220 238
221static maprow * 239static maprow *
222map_get_row (CFPlus__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
223{ 241{
224 if (0 > y) 242 if (0 > y)
… …
293static void 311static void
294map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 312map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
295{ 313{
296 int x, y; 314 int x, y;
297 maprow *row; 315 maprow *row;
316 mapcell *cell;
298 317
299 for (y = y0; y < y0 + h; y++) 318 for (y = y0; y < y0 + h; y++)
300 if (y >= 0) 319 if (y >= 0)
301 { 320 {
302 if (y >= self->rows) 321 if (y >= self->rows)
… …
308 if (x >= row->c0) 327 if (x >= row->c0)
309 { 328 {
310 if (x >= row->c1) 329 if (x >= row->c1)
311 break; 330 break;
312 331
313 row->col[x - row->c0].darkness = -1; 332 cell = row->col + x - row->c0;
333
334 cell->darkness = 0;
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
314 } 338 }
315 } 339 }
340}
341
342typedef struct {
343 tileid tile;
344 uint8_t x, y, level;
345} smooth_key;
346
347static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
351
352 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else
355 sv_setiv (*sv, bits);
316} 356}
317 357
318static void 358static void
319music_finished (void) 359music_finished (void)
320{ 360{
… …
355 n |= n >> 8; 395 n |= n >> 8;
356 n |= n >> 16; 396 n |= n >> 16;
357 397
358 return n + 1; 398 return n + 1;
359} 399}
400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
360 404
361MODULE = CFPlus PACKAGE = CFPlus 405MODULE = CFPlus PACKAGE = CFPlus
362 406
363PROTOTYPES: ENABLE 407PROTOTYPES: ENABLE
364 408
… …
368 static const struct { 412 static const struct {
369 const char *name; 413 const char *name;
370 IV iv; 414 IV iv;
371 } *civ, const_iv[] = { 415 } *civ, const_iv[] = {
372# define const_iv(name) { # name, (IV)name } 416# define const_iv(name) { # name, (IV)name }
417 const_iv (SDLK_MODIFIER_MIN),
418 const_iv (SDLK_MODIFIER_MAX),
419
373 const_iv (SDL_ACTIVEEVENT), 420 const_iv (SDL_ACTIVEEVENT),
374 const_iv (SDL_KEYDOWN), 421 const_iv (SDL_KEYDOWN),
375 const_iv (SDL_KEYUP), 422 const_iv (SDL_KEYUP),
376 const_iv (SDL_MOUSEMOTION), 423 const_iv (SDL_MOUSEMOTION),
377 const_iv (SDL_MOUSEBUTTONDOWN), 424 const_iv (SDL_MOUSEBUTTONDOWN),
… …
386 const_iv (SDL_EVENT_RESERVEDA), 433 const_iv (SDL_EVENT_RESERVEDA),
387 const_iv (SDL_EVENT_RESERVEDB), 434 const_iv (SDL_EVENT_RESERVEDB),
388 const_iv (SDL_VIDEORESIZE), 435 const_iv (SDL_VIDEORESIZE),
389 const_iv (SDL_VIDEOEXPOSE), 436 const_iv (SDL_VIDEOEXPOSE),
390 const_iv (SDL_USEREVENT), 437 const_iv (SDL_USEREVENT),
438
439 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE),
442
391 const_iv (SDLK_KP0), 443 const_iv (SDLK_KP0),
392 const_iv (SDLK_KP1), 444 const_iv (SDLK_KP1),
393 const_iv (SDLK_KP2), 445 const_iv (SDLK_KP2),
394 const_iv (SDLK_KP3), 446 const_iv (SDLK_KP3),
395 const_iv (SDLK_KP4), 447 const_iv (SDLK_KP4),
… …
450 const_iv (SDLK_BREAK), 502 const_iv (SDLK_BREAK),
451 const_iv (SDLK_MENU), 503 const_iv (SDLK_MENU),
452 const_iv (SDLK_POWER), 504 const_iv (SDLK_POWER),
453 const_iv (SDLK_EURO), 505 const_iv (SDLK_EURO),
454 const_iv (SDLK_UNDO), 506 const_iv (SDLK_UNDO),
507
455 const_iv (KMOD_NONE), 508 const_iv (KMOD_NONE),
509 const_iv (KMOD_SHIFT),
456 const_iv (KMOD_LSHIFT), 510 const_iv (KMOD_LSHIFT),
457 const_iv (KMOD_RSHIFT), 511 const_iv (KMOD_RSHIFT),
512 const_iv (KMOD_CTRL),
458 const_iv (KMOD_LCTRL), 513 const_iv (KMOD_LCTRL),
459 const_iv (KMOD_RCTRL), 514 const_iv (KMOD_RCTRL),
515 const_iv (KMOD_ALT),
460 const_iv (KMOD_LALT), 516 const_iv (KMOD_LALT),
461 const_iv (KMOD_RALT), 517 const_iv (KMOD_RALT),
518 const_iv (KMOD_META),
462 const_iv (KMOD_LMETA), 519 const_iv (KMOD_LMETA),
463 const_iv (KMOD_RMETA), 520 const_iv (KMOD_RMETA),
464 const_iv (KMOD_NUM), 521 const_iv (KMOD_NUM),
465 const_iv (KMOD_CAPS), 522 const_iv (KMOD_CAPS),
466 const_iv (KMOD_MODE), 523 const_iv (KMOD_MODE),
467 const_iv (KMOD_CTRL),
468 const_iv (KMOD_SHIFT),
469 const_iv (KMOD_ALT),
470 const_iv (KMOD_META)
471# undef const_iv 524# undef const_iv
472 }; 525 };
473 526
474 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
475 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
529
530 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
531 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
476} 532}
533
534void
535weaken (SV *rv)
536 PROTOTYPE: $
537 CODE:
538 sv_rvweaken (rv);
477 539
478int 540int
479in_destruct () 541in_destruct ()
480 CODE: 542 CODE:
481 RETVAL = PL_main_cv == Nullcv; 543 RETVAL = PL_main_cv == Nullcv;
… …
584 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
585 case SDL_KEYUP: 647 case SDL_KEYUP:
586 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
587 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
588 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
589 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
590 break; 653 break;
591 654
592 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
593 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
638Mix_AllocateChannels (int numchans = -1) 701Mix_AllocateChannels (int numchans = -1)
639 702
640void 703void
641lowdelay (int fd, int val = 1) 704lowdelay (int fd, int val = 1)
642 CODE: 705 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
707
708void
709win32_proxy_info ()
710 PPCODE:
711{
643#ifndef _WIN32 712#ifdef _WIN32
644 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 713 char buffer[2048];
714 DWORD buflen;
715
716 EXTEND (SP, 3);
717
718 buflen = sizeof (buffer);
719 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
720 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
721 {
722 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
723
724 buflen = sizeof (buffer);
725 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
726 {
727 PUSHs (newSVpv (buffer, 0));
728
729 buflen = sizeof (buffer);
730 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
731 PUSHs (newSVpv (buffer, 0));
732 }
733 }
645#endif 734#endif
735}
646 736
647void 737void
648add_font (char *file) 738add_font (char *file)
649 CODE: 739 CODE:
650 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 740 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
755#endif 845#endif
756 _exit (1); 846 _exit (1);
757 847
758void 848void
759_exit (int retval) 849_exit (int retval = 0)
760 CODE: 850 CODE:
851#ifdef WIN32
852 ExitThread (retval); // unclean, please beam me up
853#else
761 _exit (retval); 854 _exit (retval);
855#endif
762 856
763MODULE = CFPlus PACKAGE = CFPlus::Font 857MODULE = CFPlus PACKAGE = CFPlus::Font
764 858
765CFPlus::Font 859CFPlus::Font
766new_from_file (SV *class, char *path, int id = 0) 860new_from_file (SV *class, char *path, int id = 0)
… …
1013xy_to_index (CFPlus::Layout self, int x, int y) 1107xy_to_index (CFPlus::Layout self, int x, int y)
1014 CODE: 1108 CODE:
1015{ 1109{
1016 int index, trailing; 1110 int index, trailing;
1017 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1111 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1018 RETVAL = index; 1112 RETVAL = index + trailing;
1019} 1113}
1020 OUTPUT: 1114 OUTPUT:
1021 RETVAL 1115 RETVAL
1022 1116
1023void 1117void
… …
1029 1123
1030 EXTEND (SP, 3); 1124 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1125 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1128}
1129
1130void
1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1132 PPCODE:
1133{
1134 int line, x;
1135
1136 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1137 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1138
1139 EXTEND (SP, 2);
1140 PUSHs (sv_2mortal (newSViv (line - 1)));
1141 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1142}
1143
1144void
1145line_x_to_index (CFPlus::Layout self, int line, int x)
1146 PPCODE:
1147{
1148 PangoLayoutLine *lp;
1149 int index, trailing;
1150
1151 if (line < 0)
1152 XSRETURN_EMPTY;
1153
1154 if (!(lp = pango_layout_get_line (self->pl, line)))
1155 XSRETURN_EMPTY; /* do better */
1156
1157 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1158
1159 EXTEND (SP, 2);
1160 if (GIMME_V == G_SCALAR)
1161 PUSHs (sv_2mortal (newSViv (index + trailing)));
1162 else
1163 {
1164 PUSHs (sv_2mortal (newSViv (index)));
1165 PUSHs (sv_2mortal (newSViv (trailing)));
1166 }
1034} 1167}
1035 1168
1036void 1169void
1037render (CFPlus::Layout self, float x, float y, int flags = 0) 1170render (CFPlus::Layout self, float x, float y, int flags = 0)
1038 PPCODE: 1171 PPCODE:
… …
1132} 1265}
1133 1266
1134MODULE = CFPlus PACKAGE = CFPlus::Map 1267MODULE = CFPlus PACKAGE = CFPlus::Map
1135 1268
1136CFPlus::Map 1269CFPlus::Map
1137new (SV *class, int map_width, int map_height) 1270new (SV *class)
1138 CODE: 1271 CODE:
1139 New (0, RETVAL, 1, struct map); 1272 New (0, RETVAL, 1, struct map);
1140 RETVAL->x = 0; 1273 RETVAL->x = 0;
1141 RETVAL->y = 0; 1274 RETVAL->y = 0;
1142 RETVAL->w = map_width; 1275 RETVAL->w = 0;
1143 RETVAL->h = map_height; 1276 RETVAL->h = 0;
1144 RETVAL->ox = 0; 1277 RETVAL->ox = 0;
1145 RETVAL->oy = 0; 1278 RETVAL->oy = 0;
1146 RETVAL->faces = 8192; 1279 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1147 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1280 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1148 RETVAL->texs = 8192;
1149 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1150 RETVAL->rows = 0; 1281 RETVAL->rows = 0;
1151 RETVAL->row = 0; 1282 RETVAL->row = 0;
1152 OUTPUT: 1283 OUTPUT:
1153 RETVAL 1284 RETVAL
1154 1285
1155void 1286void
1156DESTROY (CFPlus::Map self) 1287DESTROY (CFPlus::Map self)
1157 CODE: 1288 CODE:
1158{ 1289{
1159 map_clear (self); 1290 map_clear (self);
1160 Safefree (self->face); 1291 Safefree (self->face2tile);
1161 Safefree (self->tex); 1292 Safefree (self->tex);
1162 Safefree (self); 1293 Safefree (self);
1163} 1294}
1164 1295
1165void 1296void
1297resize (CFPlus::Map self, int map_width, int map_height)
1298 CODE:
1299 self->w = map_width;
1300 self->h = map_height;
1301
1302void
1166clear (CFPlus::Map self) 1303clear (CFPlus::Map self)
1167 CODE: 1304 CODE:
1168 map_clear (self); 1305 map_clear (self);
1169 1306
1170void 1307void
1171set_face (CFPlus::Map self, int face, int texid) 1308set_tileid (CFPlus::Map self, int face, int tile)
1172 CODE: 1309 CODE:
1173{ 1310{
1174 while (self->faces <= face) 1311 need_facenum (self, face); self->face2tile [face] = tile;
1175 { 1312 need_texid (self, tile);
1176 Append (mapface, self->face, self->faces, self->faces); 1313}
1177 self->faces *= 2;
1178 }
1179 1314
1180 self->face [face] = texid; 1315void
1316set_smooth (CFPlus::Map self, int face, int smooth, int level)
1317 CODE:
1318{
1319 tileid texid;
1320 maptex *tex;
1321
1322 if (face < 0 || face >= self->faces)
1323 return;
1324
1325 if (smooth < 0 || smooth >= self->faces)
1326 return;
1327
1328 texid = self->face2tile [face];
1329
1330 if (!texid)
1331 return;
1332
1333 tex = self->tex + texid;
1334 tex->smoothtile = self->face2tile [smooth];
1335 tex->smoothlevel = level;
1181} 1336}
1182 1337
1183void 1338void
1184set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1339set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1185 CODE: 1340 CODE:
1186{ 1341{
1187 while (self->texs <= texid) 1342 need_texid (self, texid);
1188 {
1189 Append (maptex, self->tex, self->texs, self->texs);
1190 self->texs *= 2;
1191 }
1192 1343
1193 { 1344 {
1194 maptex *tex = self->tex + texid; 1345 maptex *tex = self->tex + texid;
1195 1346
1196 tex->name = name; 1347 tex->name = name;
… …
1238void 1389void
1239scroll (CFPlus::Map self, int dx, int dy) 1390scroll (CFPlus::Map self, int dx, int dy)
1240 CODE: 1391 CODE:
1241{ 1392{
1242 if (dx > 0) 1393 if (dx > 0)
1243 map_blank (self, self->x, self->y, dx - 1, self->h); 1394 map_blank (self, self->x, self->y, dx, self->h);
1244 else if (dx < 0) 1395 else if (dx < 0)
1245 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1246 1397
1247 if (dy > 0) 1398 if (dy > 0)
1248 map_blank (self, self->x, self->y, self->w, dy - 1); 1399 map_blank (self, self->x, self->y, self->w, dy);
1249 else if (dy < 0) 1400 else if (dy < 0)
1250 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1251 1402
1252 self->ox += dx; self->x += dx; 1403 self->ox += dx; self->x += dx;
1253 self->oy += dy; self->y += dy; 1404 self->oy += dy; self->y += dy;
1254 1405
1255 while (self->y < 0) 1406 while (self->y < 0)
… …
1260 self->y += MAP_EXTEND_Y; 1411 self->y += MAP_EXTEND_Y;
1261 } 1412 }
1262} 1413}
1263 1414
1264void 1415void
1265map1a_update (CFPlus::Map self, SV *data_) 1416map1a_update (CFPlus::Map self, SV *data_, int extmap)
1266 CODE: 1417 CODE:
1267{ 1418{
1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1419 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1269 uint8_t *data_end = (uint8_t *)SvEND (data_); 1420 uint8_t *data_end = (uint8_t *)SvEND (data_);
1270 mapcell *cell; 1421 mapcell *cell;
1271 int x, y, flags; 1422 int x, y, flags;
1272 1423
1273 while (data < data_end) 1424 while (data < data_end - 1)
1274 { 1425 {
1275 flags = (data [0] << 8) + data [1]; data += 2; 1426 flags = (data [0] << 8) + data [1]; data += 2;
1276 1427
1277 x = self->x + ((flags >> 10) & 63); 1428 x = self->x + ((flags >> 10) & 63);
1278 y = self->y + ((flags >> 4) & 63); 1429 y = self->y + ((flags >> 4) & 63);
1279 1430
1280 cell = map_get_cell (self, x, y); 1431 cell = map_get_cell (self, x, y);
1281 1432
1282 if (flags & 15) 1433 if (flags & 15)
1283 { 1434 {
1284 if (cell->darkness < 0) 1435 if (!cell->darkness)
1285 { 1436 {
1437 memset (cell, 0, sizeof (*cell));
1286 cell->darkness = 0; 1438 cell->darkness = 256;
1287 cell->face [0] = 0;
1288 cell->face [1] = 0;
1289 cell->face [2] = 0;
1290 } 1439 }
1291 1440
1292 cell->darkness = flags & 8 ? *data++ : 255;
1293
1294 //TODO: don't trust server data to be in-range(!) 1441 //TODO: don't trust server data to be in-range(!)
1442
1443 if (flags & 8)
1444 {
1445 if (extmap)
1446 {
1447 uint8_t ext, cmd;
1448
1449 do
1450 {
1451 ext = *data++;
1452 cmd = ext & 0x3f;
1453
1454 if (cmd < 4)
1455 cell->darkness = 255 - ext * 64 + 1;
1456 else if (cmd == 5) // health
1457 {
1458 cell->stat_width = 1;
1459 cell->stat_hp = *data++;
1460 }
1461 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47)
1464 {
1465 if (*data == 8)
1466 ; // decode player uuid
1467
1468 data += *data + 1;
1469 }
1470 else if (cmd == 8) // cell flags
1471 cell->flags = *data++;
1472 else if (ext & 0x40) // unknown, multibyte => skip
1473 data += *data + 1;
1474 else
1475 data++;
1476 }
1477 while (ext & 0x80);
1478 }
1479 else
1480 cell->darkness = *data++ + 1;
1481 }
1295 1482
1296 if (flags & 4) 1483 if (flags & 4)
1297 { 1484 {
1298 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1485 faceid face = (data [0] << 8) + data [1]; data += 2;
1486 need_facenum (self, face);
1487 cell->tile [0] = self->face2tile [face];
1299 } 1488 }
1300 1489
1301 if (flags & 2) 1490 if (flags & 2)
1302 { 1491 {
1303 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1492 faceid face = (data [0] << 8) + data [1]; data += 2;
1493 need_facenum (self, face);
1494 cell->tile [1] = self->face2tile [face];
1304 } 1495 }
1305 1496
1306 if (flags & 1) 1497 if (flags & 1)
1307 { 1498 {
1308 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1499 faceid face = (data [0] << 8) + data [1]; data += 2;
1500 need_facenum (self, face);
1501 cell->tile [2] = self->face2tile [face];
1309 } 1502 }
1310 } 1503 }
1311 else 1504 else
1312 cell->darkness = -1; 1505 cell->darkness = 0;
1313 } 1506 }
1314} 1507}
1315 1508
1316SV * 1509SV *
1317mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1343 { 1536 {
1344 mapcell *cell = row->col + (x - row->c0); 1537 mapcell *cell = row->col + (x - row->c0);
1345 1538
1346 for (z = 0; z <= 0; z++) 1539 for (z = 0; z <= 0; z++)
1347 { 1540 {
1348 mapface face = cell->face [z];
1349
1350 if (face)
1351 {
1352 maptex tex = self->tex [face]; 1541 maptex tex = self->tex [cell->tile [z]];
1353 int a0 = 255 - tex.a; 1542 int a0 = 255 - tex.a;
1354 int a1 = tex.a; 1543 int a1 = tex.a;
1355 1544
1356 r = (r * a0 + tex.r * a1) / 255; 1545 r = (r * a0 + tex.r * a1) / 255;
1357 g = (g * a0 + tex.g * a1) / 255; 1546 g = (g * a0 + tex.g * a1) / 255;
1358 b = (b * a0 + tex.b * a1) / 255; 1547 b = (b * a0 + tex.b * a1) / 255;
1359 a = (a * a0 + tex.a * a1) / 255; 1548 a = (a * a0 + tex.a * a1) / 255;
1360 }
1361 } 1549 }
1362 } 1550 }
1363 1551
1364 *map++ = (r ) 1552 *map++ = (r )
1365 | (g << 8) 1553 | (g << 8)
… …
1372} 1560}
1373 OUTPUT: 1561 OUTPUT:
1374 RETVAL 1562 RETVAL
1375 1563
1376void 1564void
1377draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1565draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1378 CODE: 1566 CODE:
1379{ 1567{
1380 int vx, vy; 1568 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1569 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1570 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1571 smooth_key skey;
1381 int x, y, z; 1572 int x, y, z;
1382 int last_name; 1573 int last_name;
1383 mapface face;
1384 1574
1385 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1575 // thats current max. sorry.
1386 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1576 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255;
1387 1578
1388 /* 1579 // clear key, in case of extra padding
1389 int vx = self->vx = self->w >= sw 1580 memset (&skey, 0, sizeof (skey));
1390 ? self->x + (self->w - sw) / 2
1391 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1392
1393 int vy = self->vy = self->h >= sh
1394 ? self->y + (self->h - sh) / 2
1395 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1396 */
1397 1581
1398 glColor4ub (255, 255, 255, 255); 1582 glColor4ub (255, 255, 255, 255);
1399 1583
1400 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
1401 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1404 1588
1405 glBegin (GL_QUADS); 1589 glBegin (GL_QUADS);
1406 1590
1407 last_name = 0; 1591 last_name = 0;
1408 1592
1593 mx += self->x;
1594 my += self->y;
1595
1596 // first pass: determine smooth_max
1597 // rather ugly, if you ask me
1598 // could also be stored inside mapcell and updated on change
1599 memset (smooth_max, 0, sizeof (smooth_max));
1600
1601 for (y = 0; y < sh; y++)
1602 if (0 <= y + my && y + my < self->rows)
1603 {
1604 maprow *row = self->row + (y + my);
1605
1606 for (x = 0; x < sw; x++)
1607 if (row->c0 <= x + mx && x + mx < row->c1)
1608 {
1609 mapcell *cell = row->col + (x + mx - row->c0);
1610
1611 smooth_max[x + 1][y + 1] =
1612 MAX (self->tex [cell->tile [0]].smoothlevel,
1613 MAX (self->tex [cell->tile [1]].smoothlevel,
1614 self->tex [cell->tile [2]].smoothlevel));
1615 }
1616 }
1617
1409 for (z = 0; z < 3; z++) 1618 for (z = 0; z <= 2; z++)
1619 {
1620 memset (smooth_level, 0, sizeof (smooth_level));
1621
1410 for (y = 0; y < sh; y++) 1622 for (y = 0; y < sh; y++)
1411 if (0 <= y + vy && y + vy < self->rows) 1623 if (0 <= y + my && y + my < self->rows)
1412 { 1624 {
1413 maprow *row = self->row + (y + vy); 1625 maprow *row = self->row + (y + my);
1414 1626
1415 for (x = 0; x < sw; x++) 1627 for (x = 0; x < sw; x++)
1416 if (row->c0 <= x + vx && x + vx < row->c1) 1628 if (row->c0 <= x + mx && x + mx < row->c1)
1417 { 1629 {
1418 mapcell *cell = row->col + (x + vx - row->c0); 1630 mapcell *cell = row->col + (x + mx - row->c0);
1419
1420 face = cell->face [z]; 1631 tileid tile = cell->tile [z];
1421 1632
1422 if (face) 1633 if (tile)
1634 {
1635 maptex tex = self->tex [tile];
1636 int px = (x + 1) * T - tex.w;
1637 int py = (y + 1) * T - tex.h;
1638
1639 // suppressing texture state switches here
1640 // is only moderately effective, but worth the extra effort
1641 if (last_name != tex.name)
1642 {
1643 if (!tex.name)
1644 tex = self->tex [2]; /* missing, replace by noface */
1645
1646 glEnd ();
1647 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1648 glBegin (GL_QUADS);
1649 }
1650
1651 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1652 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1653 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1654 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1655
1656 if (cell->flags && z == 2)
1657 {
1658 if (cell->flags & 1)
1659 {
1660 maptex tex = self->tex [1];
1661 int px = x * T + T * 2 / 32;
1662 int py = y * T - T * 6 / 32;
1663
1664 glEnd ();
1665 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1666 glBegin (GL_QUADS);
1667
1668 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1669 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1670 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1671 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1672 }
1673 }
1674
1675 // update smooth hash
1676 if (tex.smoothtile)
1677 {
1678 skey.tile = tex.smoothtile;
1679 skey.level = tex.smoothlevel;
1680
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682
1683 // add bits to current tile and all neighbours. skey.x|y is
1684 // shifted +1|+1 so we always stay positive.
1685
1686 // full tile
1687 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1688
1689 // borders
1690 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
1691 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
1692 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1693 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1694
1695 // corners
1696 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1697 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1698 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1699 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1700 }
1701 }
1702 }
1703 }
1704
1705 // go through all smoothlevels, lowest to highest, then draw
1706 // this is basically counting sort
1707 {
1708 int w, b;
1709
1710 for (w = 0; w < 256 / 32; ++w)
1711 {
1712 uint32_t smask = smooth_level [w];
1713 if (smask)
1714 for (b = 0; b < 32; ++b)
1715 if (smask & (((uint32_t)1) << b))
1423 { 1716 {
1424 maptex tex = self->tex [face]; 1717 int level = (w << 5) | b;
1718 HE *he;
1425 1719
1426 int px = (x + 1) * 32 - tex.w; 1720 hv_iterinit (smooth);
1427 int py = (y + 1) * 32 - tex.h; 1721 while ((he = hv_iternext (smooth)))
1428
1429 if (last_name != tex.name)
1430 { 1722 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he));
1725
1726 // bits is ___n cccc CCCC bbbb
1727 // n do not draw borders&corners
1728 // c draw these corners, but...
1729 // C ... not these
1730 // b draw these borders
1731
1732 if (!(bits & 0x1000)
1733 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y])
1735 {
1736 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15;
1740 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1741 float dx = tex.s * .0625f; // 16 images/row
1742 float dy = tex.t * .5f ; // 2 images/column
1743
1744 // this time naively avoiding texture state changes
1745 // save gobs of state changes.
1746 if (last_name != tex.name)
1747 {
1748 if (!tex.name)
1749 continue; // smoothing not yet available
1750
1431 glEnd (); 1751 glEnd ();
1432 last_name = tex.name;
1433 glBindTexture (GL_TEXTURE_2D, last_name); 1752 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1434 glBegin (GL_QUADS); 1753 glBegin (GL_QUADS);
1754 }
1755
1756 if (border)
1757 {
1758 float ox = border * dx;
1759
1760 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1761 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1762 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1763 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1764 }
1765
1766 if (corner)
1767 {
1768 float ox = corner * dx;
1769
1770 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1771 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1772 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1774 }
1775 }
1435 } 1776 }
1436
1437 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1438 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1439 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1440 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1441 } 1777 }
1442 }
1443 } 1778 }
1779 }
1780
1781 hv_clear (smooth);
1782 }
1444 1783
1445 glEnd (); 1784 glEnd ();
1446 1785
1447 glDisable (GL_TEXTURE_2D); 1786 glDisable (GL_TEXTURE_2D);
1448 glDisable (GL_BLEND); 1787 glDisable (GL_BLEND);
1788
1789 // top layer: overlays such as the health bar
1790 for (y = 0; y < sh; y++)
1791 if (0 <= y + my && y + my < self->rows)
1792 {
1793 maprow *row = self->row + (y + my);
1794
1795 for (x = 0; x < sw; x++)
1796 if (row->c0 <= x + mx && x + mx < row->c1)
1797 {
1798 mapcell *cell = row->col + (x + mx - row->c0);
1799
1800 int px = x * T;
1801 int py = y * T;
1802
1803 if (cell->stat_hp)
1804 {
1805 int width = cell->stat_width * T;
1806 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1807
1808 glColor3ub (0, 0, 0);
1809 glRectf (px + 1, py - thick - 2,
1810 px + width - 1, py);
1811
1812 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1813 glRectf (px + 2,
1814 py - thick - 1,
1815 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1816 }
1817 }
1818 }
1449} 1819}
1450 1820
1451void 1821void
1452draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1822draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1453 CODE: 1823 CODE:
… …
1507 glDisable (GL_BLEND); 1877 glDisable (GL_BLEND);
1508 glDisable (GL_TEXTURE_2D); 1878 glDisable (GL_TEXTURE_2D);
1509} 1879}
1510 1880
1511void 1881void
1512fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1882fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1513 PPCODE: 1883 PPCODE:
1514{ 1884{
1515 int vx, vy;
1516 int x, y; 1885 int x, y;
1517 int sw4 = (sw + 3) & ~3; 1886 int sw4 = (sw + 3) & ~3;
1518 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1887 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1519 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1888 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1520 1889
1521 memset (darkness, 255, sw4 * sh); 1890 memset (darkness, 255, sw4 * sh);
1522 SvPOK_only (darkness_sv); 1891 SvPOK_only (darkness_sv);
1523 SvCUR_set (darkness_sv, sw4 * sh); 1892 SvCUR_set (darkness_sv, sw4 * sh);
1524 1893
1525 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1894 mx += self->x;
1526 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1895 my += self->y;
1527 1896
1528 for (y = 0; y < sh; y++) 1897 for (y = 0; y < sh; y++)
1529 if (0 <= y + vy && y + vy < self->rows) 1898 if (0 <= y + my && y + my < self->rows)
1530 { 1899 {
1531 maprow *row = self->row + (y + vy); 1900 maprow *row = self->row + (y + my);
1532 1901
1533 for (x = 0; x < sw; x++) 1902 for (x = 0; x < sw; x++)
1534 if (row->c0 <= x + vx && x + vx < row->c1) 1903 if (row->c0 <= x + mx && x + mx < row->c1)
1535 { 1904 {
1536 mapcell *cell = row->col + (x + vx - row->c0); 1905 mapcell *cell = row->col + (x + mx - row->c0);
1537 1906
1538 darkness[y * sw4 + x] = cell->darkness < 0 1907 darkness[y * sw4 + x] = cell->darkness
1908 ? 255 - (cell->darkness - 1)
1539 ? 255 - FOW_DARKNESS 1909 : 255 - FOW_DARKNESS;
1540 : 255 - cell->darkness;
1541 } 1910 }
1542 } 1911 }
1543 1912
1544 EXTEND (SP, 3); 1913 EXTEND (SP, 3);
1545 PUSHs (sv_2mortal (newSViv (sw4))); 1914 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1581 if (row && row->c0 <= x && x < row->c1) 1950 if (row && row->c0 <= x && x < row->c1)
1582 { 1951 {
1583 mapcell *cell = row->col + (x - row->c0); 1952 mapcell *cell = row->col + (x - row->c0);
1584 uint8_t flags = 0; 1953 uint8_t flags = 0;
1585 1954
1586 if (cell->face [0]) flags |= 1; 1955 if (cell->tile [0]) flags |= 1;
1587 if (cell->face [1]) flags |= 2; 1956 if (cell->tile [1]) flags |= 2;
1588 if (cell->face [2]) flags |= 4; 1957 if (cell->tile [2]) flags |= 4;
1589 1958
1590 *data++ = flags; 1959 *data++ = flags;
1591 1960
1592 if (flags & 1) 1961 if (flags & 1)
1593 { 1962 {
1963 tileid tile = cell->tile [0];
1594 *data++ = cell->face [0] >> 8; 1964 *data++ = tile >> 8;
1595 *data++ = cell->face [0]; 1965 *data++ = tile;
1596 } 1966 }
1597 1967
1598 if (flags & 2) 1968 if (flags & 2)
1599 { 1969 {
1970 tileid tile = cell->tile [1];
1600 *data++ = cell->face [1] >> 8; 1971 *data++ = tile >> 8;
1601 *data++ = cell->face [1]; 1972 *data++ = tile;
1602 } 1973 }
1603 1974
1604 if (flags & 4) 1975 if (flags & 4)
1605 { 1976 {
1977 tileid tile = cell->tile [2];
1606 *data++ = cell->face [2] >> 8; 1978 *data++ = tile >> 8;
1607 *data++ = cell->face [2]; 1979 *data++ = tile;
1608 } 1980 }
1609 } 1981 }
1610 else 1982 else
1611 *data++ = 0; 1983 *data++ = 0;
1612 } 1984 }
… …
1652 { 2024 {
1653 uint8_t flags = *data++; 2025 uint8_t flags = *data++;
1654 2026
1655 if (flags) 2027 if (flags)
1656 { 2028 {
1657 mapface face[3] = { 0, 0, 0 };
1658
1659 mapcell *cell = row_get_cell (row, x); 2029 mapcell *cell = row_get_cell (row, x);
2030 tileid tile[3] = { 0, 0, 0 };
1660 2031
1661 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2032 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1662 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2033 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1663 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2034 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1664 2035
1665 if (cell->darkness <= 0) 2036 if (cell->darkness == 0)
1666 { 2037 {
1667 cell->darkness = -1; 2038 cell->darkness = 0;
1668 2039
1669 for (z = 0; z <= 2; z++) 2040 for (z = 0; z <= 2; z++)
1670 { 2041 {
1671 cell->face[z] = face[z]; 2042 tileid t = tile [z];
1672 2043
1673 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2044 if (t >= self->texs || (t && !self->tex [t].name))
2045 {
1674 XPUSHs (sv_2mortal (newSViv (face[z]))); 2046 XPUSHs (sv_2mortal (newSViv (t)));
2047 need_texid (self, t);
2048 }
2049
2050 cell->tile [z] = t;
1675 } 2051 }
1676 } 2052 }
1677 } 2053 }
1678 } 2054 }
1679 } 2055 }

Diff Legend

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