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

Diff Legend

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