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

Diff Legend

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