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

Diff Legend

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