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.133 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.181 by root, Mon Apr 16 21:06:36 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;
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 584
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif
519 590
520 SDL_EnableUNICODE (1); 591 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 593
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
575 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
576 case SDL_KEYUP: 647 case SDL_KEYUP:
577 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579 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 */
580 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581 break; 653 break;
582 654
583 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
584 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
629Mix_AllocateChannels (int numchans = -1) 701Mix_AllocateChannels (int numchans = -1)
630 702
631void 703void
632lowdelay (int fd, int val = 1) 704lowdelay (int fd, int val = 1)
633 CODE: 705 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
707
708void
709win32_proxy_info ()
710 PPCODE:
711{
634#ifndef _WIN32 712#ifdef _WIN32
635 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 }
636#endif 734#endif
735}
637 736
638void 737void
639add_font (char *file) 738add_font (char *file)
640 CODE: 739 CODE:
641 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 740 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746#endif 845#endif
747 _exit (1); 846 _exit (1);
748 847
749void 848void
750_exit (int retval) 849_exit (int retval = 0)
751 CODE: 850 CODE:
851#ifdef WIN32
852 ExitThread (retval); // unclean, please beam me up
853#else
752 _exit (retval); 854 _exit (retval);
855#endif
753 856
754MODULE = CFPlus PACKAGE = CFPlus::Font 857MODULE = CFPlus PACKAGE = CFPlus::Font
755 858
756CFPlus::Font 859CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 860new_from_file (SV *class, char *path, int id = 0)
… …
1004xy_to_index (CFPlus::Layout self, int x, int y) 1107xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1108 CODE:
1006{ 1109{
1007 int index, trailing; 1110 int index, trailing;
1008 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);
1009 RETVAL = index; 1112 RETVAL = index + trailing;
1010} 1113}
1011 OUTPUT: 1114 OUTPUT:
1012 RETVAL 1115 RETVAL
1013 1116
1014void 1117void
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1128}
1026 1129
1027void 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 }
1167}
1168
1169void
1028render (CFPlus::Layout self, float x, float y) 1170render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1171 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1172 pango_opengl_render_layout_subpixel (
1031 self->pl, 1173 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1174 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1175 self->r, self->g, self->b, self->a,
1176 flags
1034 ); 1177 );
1035 1178
1036MODULE = CFPlus PACKAGE = CFPlus::Texture 1179MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1180
1038void 1181void
… …
1122} 1265}
1123 1266
1124MODULE = CFPlus PACKAGE = CFPlus::Map 1267MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1268
1126CFPlus::Map 1269CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1270new (SV *class)
1128 CODE: 1271 CODE:
1129 New (0, RETVAL, 1, struct map); 1272 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1273 RETVAL->x = 0;
1131 RETVAL->y = 0; 1274 RETVAL->y = 0;
1132 RETVAL->w = map_width; 1275 RETVAL->w = 0;
1133 RETVAL->h = map_height; 1276 RETVAL->h = 0;
1134 RETVAL->ox = 0; 1277 RETVAL->ox = 0;
1135 RETVAL->oy = 0; 1278 RETVAL->oy = 0;
1136 RETVAL->faces = 8192; 1279 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1137 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1280 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1138 RETVAL->texs = 8192;
1139 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1140 RETVAL->rows = 0; 1281 RETVAL->rows = 0;
1141 RETVAL->row = 0; 1282 RETVAL->row = 0;
1142 OUTPUT: 1283 OUTPUT:
1143 RETVAL 1284 RETVAL
1144 1285
1145void 1286void
1146DESTROY (CFPlus::Map self) 1287DESTROY (CFPlus::Map self)
1147 CODE: 1288 CODE:
1148{ 1289{
1149 map_clear (self); 1290 map_clear (self);
1150 Safefree (self->face); 1291 Safefree (self->face2tile);
1151 Safefree (self->tex); 1292 Safefree (self->tex);
1152 Safefree (self); 1293 Safefree (self);
1153} 1294}
1154 1295
1155void 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
1156clear (CFPlus::Map self) 1303clear (CFPlus::Map self)
1157 CODE: 1304 CODE:
1158 map_clear (self); 1305 map_clear (self);
1159 1306
1160void 1307void
1161set_face (CFPlus::Map self, int face, int texid) 1308set_tileid (CFPlus::Map self, int face, int tile)
1162 CODE: 1309 CODE:
1163{ 1310{
1164 while (self->faces <= face) 1311 need_facenum (self, face); self->face2tile [face] = tile;
1165 { 1312 need_texid (self, tile);
1166 Append (mapface, self->face, self->faces, self->faces); 1313}
1167 self->faces *= 2;
1168 }
1169 1314
1170 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;
1171} 1336}
1172 1337
1173void 1338void
1174set_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)
1175 CODE: 1340 CODE:
1176{ 1341{
1177 while (self->texs <= texid) 1342 need_texid (self, texid);
1178 {
1179 Append (maptex, self->tex, self->texs, self->texs);
1180 self->texs *= 2;
1181 }
1182 1343
1183 { 1344 {
1184 maptex *tex = self->tex + texid; 1345 maptex *tex = self->tex + texid;
1185 1346
1186 tex->name = name; 1347 tex->name = name;
… …
1228void 1389void
1229scroll (CFPlus::Map self, int dx, int dy) 1390scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1391 CODE:
1231{ 1392{
1232 if (dx > 0) 1393 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1394 map_blank (self, self->x, self->y, dx, self->h);
1234 else if (dx < 0) 1395 else if (dx < 0)
1235 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);
1236 1397
1237 if (dy > 0) 1398 if (dy > 0)
1238 map_blank (self, self->x, self->y, self->w, dy - 1); 1399 map_blank (self, self->x, self->y, self->w, dy);
1239 else if (dy < 0) 1400 else if (dy < 0)
1240 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);
1241 1402
1242 self->ox += dx; self->x += dx; 1403 self->ox += dx; self->x += dx;
1243 self->oy += dy; self->y += dy; 1404 self->oy += dy; self->y += dy;
1244 1405
1245 while (self->y < 0) 1406 while (self->y < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1411 self->y += MAP_EXTEND_Y;
1251 } 1412 }
1252} 1413}
1253 1414
1254void 1415void
1255map1a_update (CFPlus::Map self, SV *data_) 1416map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1417 CODE:
1257{ 1418{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1419 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1420 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1421 mapcell *cell;
1261 int x, y, flags; 1422 int x, y, flags;
1262 1423
1263 while (data < data_end) 1424 while (data < data_end - 1)
1264 { 1425 {
1265 flags = (data [0] << 8) + data [1]; data += 2; 1426 flags = (data [0] << 8) + data [1]; data += 2;
1266 1427
1267 x = self->x + ((flags >> 10) & 63); 1428 x = self->x + ((flags >> 10) & 63);
1268 y = self->y + ((flags >> 4) & 63); 1429 y = self->y + ((flags >> 4) & 63);
1269 1430
1270 cell = map_get_cell (self, x, y); 1431 cell = map_get_cell (self, x, y);
1271 1432
1272 if (flags & 15) 1433 if (flags & 15)
1273 { 1434 {
1274 if (cell->darkness < 0) 1435 if (!cell->darkness)
1275 { 1436 {
1437 memset (cell, 0, sizeof (*cell));
1276 cell->darkness = 0; 1438 cell->darkness = 256;
1277 cell->face [0] = 0;
1278 cell->face [1] = 0;
1279 cell->face [2] = 0;
1280 } 1439 }
1281 1440
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //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 }
1285 1482
1286 if (flags & 4) 1483 if (flags & 4)
1287 { 1484 {
1288 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];
1289 } 1488 }
1290 1489
1291 if (flags & 2) 1490 if (flags & 2)
1292 { 1491 {
1293 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];
1294 } 1495 }
1295 1496
1296 if (flags & 1) 1497 if (flags & 1)
1297 { 1498 {
1298 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];
1299 } 1502 }
1300 } 1503 }
1301 else 1504 else
1302 cell->darkness = -1; 1505 cell->darkness = 0;
1303 } 1506 }
1304} 1507}
1305 1508
1306SV * 1509SV *
1307mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1333 { 1536 {
1334 mapcell *cell = row->col + (x - row->c0); 1537 mapcell *cell = row->col + (x - row->c0);
1335 1538
1336 for (z = 0; z <= 0; z++) 1539 for (z = 0; z <= 0; z++)
1337 { 1540 {
1338 mapface face = cell->face [z];
1339
1340 if (face)
1341 {
1342 maptex tex = self->tex [face]; 1541 maptex tex = self->tex [cell->tile [z]];
1343 int a0 = 255 - tex.a; 1542 int a0 = 255 - tex.a;
1344 int a1 = tex.a; 1543 int a1 = tex.a;
1345 1544
1346 r = (r * a0 + tex.r * a1) / 255; 1545 r = (r * a0 + tex.r * a1) / 255;
1347 g = (g * a0 + tex.g * a1) / 255; 1546 g = (g * a0 + tex.g * a1) / 255;
1348 b = (b * a0 + tex.b * a1) / 255; 1547 b = (b * a0 + tex.b * a1) / 255;
1349 a = (a * a0 + tex.a * a1) / 255; 1548 a = (a * a0 + tex.a * a1) / 255;
1350 }
1351 } 1549 }
1352 } 1550 }
1353 1551
1354 *map++ = (r ) 1552 *map++ = (r )
1355 | (g << 8) 1553 | (g << 8)
… …
1362} 1560}
1363 OUTPUT: 1561 OUTPUT:
1364 RETVAL 1562 RETVAL
1365 1563
1366void 1564void
1367draw (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)
1368 CODE: 1566 CODE:
1369{ 1567{
1370 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;
1371 int x, y, z; 1572 int x, y, z;
1372 int last_name; 1573 int last_name;
1373 mapface face;
1374 1574
1375 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1575 // thats current max. sorry.
1376 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1576 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255;
1377 1578
1378 /* 1579 // clear key, in case of extra padding
1379 int vx = self->vx = self->w >= sw 1580 memset (&skey, 0, sizeof (skey));
1380 ? self->x + (self->w - sw) / 2
1381 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1382
1383 int vy = self->vy = self->h >= sh
1384 ? self->y + (self->h - sh) / 2
1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1386 */
1387 1581
1388 glColor4ub (255, 255, 255, 255); 1582 glColor4ub (255, 255, 255, 255);
1389 1583
1390 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1394 1588
1395 glBegin (GL_QUADS); 1589 glBegin (GL_QUADS);
1396 1590
1397 last_name = 0; 1591 last_name = 0;
1398 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
1399 for (z = 0; z < 3; z++) 1618 for (z = 0; z <= 2; z++)
1619 {
1620 memset (smooth_level, 0, sizeof (smooth_level));
1621
1400 for (y = 0; y < sh; y++) 1622 for (y = 0; y < sh; y++)
1401 if (0 <= y + vy && y + vy < self->rows) 1623 if (0 <= y + my && y + my < self->rows)
1402 { 1624 {
1403 maprow *row = self->row + (y + vy); 1625 maprow *row = self->row + (y + my);
1404 1626
1405 for (x = 0; x < sw; x++) 1627 for (x = 0; x < sw; x++)
1406 if (row->c0 <= x + vx && x + vx < row->c1) 1628 if (row->c0 <= x + mx && x + mx < row->c1)
1407 { 1629 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1630 mapcell *cell = row->col + (x + mx - row->c0);
1409
1410 face = cell->face [z]; 1631 tileid tile = cell->tile [z];
1411 1632
1412 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 // bits is ___n cccc CCCC bbbb
1687 // n do not draw borders&corners
1688 // c draw these corners, but...
1689 // C ... not these
1690 // b draw these borders
1691
1692 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1693 // ┃· ·· ·┃ ━━
1694
1695 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1696 // ·· ·· ·┏ ┓·
1697
1698 // full tile
1699 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1700
1701 // borders
1702 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1703 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1704 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1705 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1706
1707 // corners
1708 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1709 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1710 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1711 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1712 }
1713 }
1714 }
1715 }
1716
1717 // go through all smoothlevels, lowest to highest, then draw.
1718 // this is basically counting sort
1719 {
1720 int w, b;
1721
1722 for (w = 0; w < 256 / 32; ++w)
1723 {
1724 uint32_t smask = smooth_level [w];
1725 if (smask)
1726 for (b = 0; b < 32; ++b)
1727 if (smask & (((uint32_t)1) << b))
1413 { 1728 {
1414 maptex tex = self->tex [face]; 1729 int level = (w << 5) | b;
1730 HE *he;
1415 1731
1416 int px = (x + 1) * 32 - tex.w; 1732 hv_iterinit (smooth);
1417 int py = (y + 1) * 32 - tex.h; 1733 while ((he = hv_iternext (smooth)))
1418
1419 if (last_name != tex.name)
1420 { 1734 {
1735 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he));
1737
1738 if (!(bits & 0x1000)
1739 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y])
1741 {
1742 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15;
1746 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1747 float dx = tex.s * .0625f; // 16 images/row
1748 float dy = tex.t * .5f ; // 2 images/column
1749
1750 // this time naively avoiding texture state changes
1751 // save gobs of state changes.
1752 if (last_name != tex.name)
1753 {
1754 if (!tex.name)
1755 continue; // smoothing not yet available
1756
1421 glEnd (); 1757 glEnd ();
1422 last_name = tex.name;
1423 glBindTexture (GL_TEXTURE_2D, last_name); 1758 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424 glBegin (GL_QUADS); 1759 glBegin (GL_QUADS);
1760 }
1761
1762 if (border)
1763 {
1764 float ox = border * dx;
1765
1766 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1767 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1768 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1769 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1770 }
1771
1772 if (corner)
1773 {
1774 float ox = corner * dx;
1775
1776 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1777 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1778 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1779 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1780 }
1781 }
1425 } 1782 }
1426
1427 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431 } 1783 }
1432 }
1433 } 1784 }
1785 }
1786
1787 hv_clear (smooth);
1788 }
1434 1789
1435 glEnd (); 1790 glEnd ();
1436 1791
1437 glDisable (GL_TEXTURE_2D); 1792 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1793 glDisable (GL_BLEND);
1794
1795 // top layer: overlays such as the health bar
1796 for (y = 0; y < sh; y++)
1797 if (0 <= y + my && y + my < self->rows)
1798 {
1799 maprow *row = self->row + (y + my);
1800
1801 for (x = 0; x < sw; x++)
1802 if (row->c0 <= x + mx && x + mx < row->c1)
1803 {
1804 mapcell *cell = row->col + (x + mx - row->c0);
1805
1806 int px = x * T;
1807 int py = y * T;
1808
1809 if (cell->stat_hp)
1810 {
1811 int width = cell->stat_width * T;
1812 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1813
1814 glColor3ub (0, 0, 0);
1815 glRectf (px + 1, py - thick - 2,
1816 px + width - 1, py);
1817
1818 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1819 glRectf (px + 2,
1820 py - thick - 1,
1821 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1822 }
1823 }
1824 }
1439} 1825}
1440 1826
1441void 1827void
1442draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1828draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1829 CODE:
… …
1497 glDisable (GL_BLEND); 1883 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1499} 1885}
1500 1886
1501void 1887void
1502fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1888fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503 PPCODE: 1889 PPCODE:
1504{ 1890{
1505 int vx, vy;
1506 int x, y; 1891 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1892 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1893 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1894 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510 1895
1511 memset (darkness, 255, sw4 * sh); 1896 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv); 1897 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh); 1898 SvCUR_set (darkness_sv, sw4 * sh);
1514 1899
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1900 mx += self->x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1901 my += self->y;
1517 1902
1518 for (y = 0; y < sh; y++) 1903 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1904 if (0 <= y + my && y + my < self->rows)
1520 { 1905 {
1521 maprow *row = self->row + (y + vy); 1906 maprow *row = self->row + (y + my);
1522 1907
1523 for (x = 0; x < sw; x++) 1908 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1909 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1910 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1911 mapcell *cell = row->col + (x + mx - row->c0);
1527 1912
1528 darkness[y * sw4 + x] = cell->darkness < 0 1913 darkness[y * sw4 + x] = cell->darkness
1914 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 1915 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 1916 }
1532 } 1917 }
1533 1918
1534 EXTEND (SP, 3); 1919 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 1920 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1571 if (row && row->c0 <= x && x < row->c1) 1956 if (row && row->c0 <= x && x < row->c1)
1572 { 1957 {
1573 mapcell *cell = row->col + (x - row->c0); 1958 mapcell *cell = row->col + (x - row->c0);
1574 uint8_t flags = 0; 1959 uint8_t flags = 0;
1575 1960
1576 if (cell->face [0]) flags |= 1; 1961 if (cell->tile [0]) flags |= 1;
1577 if (cell->face [1]) flags |= 2; 1962 if (cell->tile [1]) flags |= 2;
1578 if (cell->face [2]) flags |= 4; 1963 if (cell->tile [2]) flags |= 4;
1579 1964
1580 *data++ = flags; 1965 *data++ = flags;
1581 1966
1582 if (flags & 1) 1967 if (flags & 1)
1583 { 1968 {
1969 tileid tile = cell->tile [0];
1584 *data++ = cell->face [0] >> 8; 1970 *data++ = tile >> 8;
1585 *data++ = cell->face [0]; 1971 *data++ = tile;
1586 } 1972 }
1587 1973
1588 if (flags & 2) 1974 if (flags & 2)
1589 { 1975 {
1976 tileid tile = cell->tile [1];
1590 *data++ = cell->face [1] >> 8; 1977 *data++ = tile >> 8;
1591 *data++ = cell->face [1]; 1978 *data++ = tile;
1592 } 1979 }
1593 1980
1594 if (flags & 4) 1981 if (flags & 4)
1595 { 1982 {
1983 tileid tile = cell->tile [2];
1596 *data++ = cell->face [2] >> 8; 1984 *data++ = tile >> 8;
1597 *data++ = cell->face [2]; 1985 *data++ = tile;
1598 } 1986 }
1599 } 1987 }
1600 else 1988 else
1601 *data++ = 0; 1989 *data++ = 0;
1602 } 1990 }
… …
1642 { 2030 {
1643 uint8_t flags = *data++; 2031 uint8_t flags = *data++;
1644 2032
1645 if (flags) 2033 if (flags)
1646 { 2034 {
1647 mapface face[3] = { 0, 0, 0 };
1648
1649 mapcell *cell = row_get_cell (row, x); 2035 mapcell *cell = row_get_cell (row, x);
2036 tileid tile[3] = { 0, 0, 0 };
1650 2037
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2038 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2039 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2040 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1654 2041
1655 if (cell->darkness <= 0) 2042 if (cell->darkness == 0)
1656 { 2043 {
1657 cell->darkness = -1; 2044 cell->darkness = 0;
1658 2045
1659 for (z = 0; z <= 2; z++) 2046 for (z = 0; z <= 2; z++)
1660 { 2047 {
1661 cell->face[z] = face[z]; 2048 tileid t = tile [z];
1662 2049
1663 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2050 if (t >= self->texs || (t && !self->tex [t].name))
2051 {
1664 XPUSHs (sv_2mortal (newSViv (face[z]))); 2052 XPUSHs (sv_2mortal (newSViv (t)));
2053 need_texid (self, t);
2054 }
2055
2056 cell->tile [z] = t;
1665 } 2057 }
1666 } 2058 }
1667 } 2059 }
1668 } 2060 }
1669 } 2061 }
… …
1800 const_iv (GL_SEPARABLE_2D), 2192 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 2193 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 2194 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 2195 const_iv (GL_CONSTANT_BORDER),
1804 const_iv (GL_LINES), 2196 const_iv (GL_LINES),
2197 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 2198 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 2199 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 2200 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 2201 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 2202 const_iv (GL_TRIANGLE_STRIP),
… …
2006 2399
2007void glEndList () 2400void glEndList ()
2008 2401
2009void glCallList (int list) 2402void glCallList (int list)
2010 2403
2011

Diff Legend

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