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.152 by root, Sat Aug 19 18:18:36 2006 UTC vs.
Revision 1.193 by root, Sun Jul 1 03:12:34 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)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
… …
36# include <sys/types.h> 44# include <sys/types.h>
37# include <sys/socket.h> 45# include <sys/socket.h>
38# include <netinet/in.h> 46# include <netinet/in.h>
39# include <netinet/tcp.h> 47# include <netinet/tcp.h>
40# include <inttypes.h> 48# 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 49#endif
49 50
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 52
52#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
53 54
54#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
… …
60# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 62#else
62# define PARACHUTE 0 63# define PARACHUTE 0
63#endif 64#endif
64 65
66static AV *texture_av;
67
65static struct 68static struct
66{ 69{
67#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 71#include "glfunc.h"
69#undef GL_FUNC 72#undef GL_FUNC
70} gl; 73} gl;
71 74
75static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 77{
74 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 82 else
79 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
80} 84}
81 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
82#include "texcache.c" 110#include "texcache.c"
83 111
84#include "pango-font.c" 112#include "pango-font.c"
85#include "pango-fontmap.c" 113#include "pango-fontmap.c"
86#include "pango-render.c" 114#include "pango-render.c"
… …
159 187
160 *w = rect.width; 188 *w = rect.width;
161 *h = rect.height; 189 *h = rect.height;
162} 190}
163 191
192typedef uint16_t tileid;
164typedef uint16_t mapface; 193typedef uint16_t faceid;
165 194
166typedef struct { 195typedef struct {
167 GLint name; 196 int name;
168 int w, h; 197 int w, h;
169 float s, t; 198 float s, t;
170 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
171} maptex; 202} maptex;
172 203
173typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
174 uint16_t darkness; 207 uint16_t darkness;
175 mapface face[3];
176 uint8_t stat_width, stat_hp; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
177} mapcell; 209} mapcell;
178 210
179typedef struct { 211typedef struct {
180 int32_t c0, c1; 212 int32_t c0, c1;
181 mapcell *col; 213 mapcell *col;
182} maprow; 214} maprow;
183 215
184typedef struct map { 216typedef struct map {
185 int x, y, w, h; 217 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 219 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 220 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 221
193 int32_t rows; 222 int32_t rows;
194 maprow *row; 223 maprow *row;
195} *CFPlus__Map; 224} *CFPlus__Map;
196 225
… …
216 return ptr; 245 return ptr;
217} 246}
218 247
219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
221 270
222static maprow * 271static maprow *
223map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
224{ 273{
225 if (0 > y) 274 if (0 > y)
… …
314 363
315 cell = row->col + x - row->c0; 364 cell = row->col + x - row->c0;
316 365
317 cell->darkness = 0; 366 cell->darkness = 0;
318 cell->stat_hp = 0; 367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
319 } 370 }
320 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
321} 388}
322 389
323static void 390static void
324music_finished (void) 391music_finished (void)
325{ 392{
… …
360 n |= n >> 8; 427 n |= n >> 8;
361 n |= n >> 16; 428 n |= n >> 16;
362 429
363 return n + 1; 430 return n + 1;
364} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
365 436
366MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
367 438
368PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
369 440
… …
373 static const struct { 444 static const struct {
374 const char *name; 445 const char *name;
375 IV iv; 446 IV iv;
376 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
377# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
378 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
379 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
380 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
381 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
382 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
… …
391 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
392 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
393 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
394 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
395 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
396 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
397 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
398 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
399 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
400 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
… …
455 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
456 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
457 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
458 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
459 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
460 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
461 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
462 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
463 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
464 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
465 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
466 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
467 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
468 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
469 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
470 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
471 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
472 const_iv (KMOD_CTRL),
473 const_iv (KMOD_SHIFT),
474 const_iv (KMOD_ALT),
475 const_iv (KMOD_META)
476# undef const_iv 556# undef const_iv
477 }; 557 };
478 558
479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
481} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
482 571
483int 572int
484in_destruct () 573in_destruct ()
485 CODE: 574 CODE:
486 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
… …
557 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
559 ); 648 );
560 if (RETVAL) 649 if (RETVAL)
561 { 650 {
651 av_clear (texture_av);
652
562 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
563# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
564# include "glfunc.h" 655# include "glfunc.h"
565# undef GL_FUNC 656# undef GL_FUNC
657
566 } 658 }
567 OUTPUT: 659 OUTPUT:
568 RETVAL 660 RETVAL
569 661
570void 662void
… …
589 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
590 case SDL_KEYUP: 682 case SDL_KEYUP:
591 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
594 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595 break; 688 break;
596 689
597 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
643Mix_AllocateChannels (int numchans = -1) 736Mix_AllocateChannels (int numchans = -1)
644 737
645void 738void
646lowdelay (int fd, int val = 1) 739lowdelay (int fd, int val = 1)
647 CODE: 740 CODE:
741 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
742
743void
744win32_proxy_info ()
745 PPCODE:
746{
648#ifndef _WIN32 747#ifdef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 748 char buffer[2048];
749 DWORD buflen;
750
751 EXTEND (SP, 3);
752
753 buflen = sizeof (buffer);
754 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
755 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
756 {
757 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
758
759 buflen = sizeof (buffer);
760 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
761 {
762 PUSHs (newSVpv (buffer, 0));
763
764 buflen = sizeof (buffer);
765 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
766 PUSHs (newSVpv (buffer, 0));
767 }
768 }
650#endif 769#endif
770}
651 771
652void 772void
653add_font (char *file) 773add_font (char *file)
654 CODE: 774 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 775 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 879 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 880#endif
761 _exit (1); 881 _exit (1);
762 882
763void 883void
764_exit (int retval) 884_exit (int retval = 0)
765 CODE: 885 CODE:
886#ifdef WIN32
887 ExitThread (retval); // unclean, please beam me up
888#else
766 _exit (retval); 889 _exit (retval);
890#endif
891
892void
893debug ()
894 CODE:
895{
896#if DEBUG
897 VALGRIND_DO_LEAK_CHECK;
898#endif
899}
767 900
768MODULE = CFPlus PACKAGE = CFPlus::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
769 902
770CFPlus::Font 903CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
… …
1018xy_to_index (CFPlus::Layout self, int x, int y) 1151xy_to_index (CFPlus::Layout self, int x, int y)
1019 CODE: 1152 CODE:
1020{ 1153{
1021 int index, trailing; 1154 int index, trailing;
1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1155 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023 RETVAL = index; 1156 RETVAL = index + trailing;
1024} 1157}
1025 OUTPUT: 1158 OUTPUT:
1026 RETVAL 1159 RETVAL
1027 1160
1028void 1161void
… …
1034 1167
1035 EXTEND (SP, 3); 1168 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1169 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1170 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1171 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1172}
1173
1174void
1175index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1176 PPCODE:
1177{
1178 int line, x;
1179
1180 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1181 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1182
1183 EXTEND (SP, 2);
1184 PUSHs (sv_2mortal (newSViv (line - 1)));
1185 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1186}
1187
1188void
1189line_x_to_index (CFPlus::Layout self, int line, int x)
1190 PPCODE:
1191{
1192 PangoLayoutLine *lp;
1193 int index, trailing;
1194
1195 if (line < 0)
1196 XSRETURN_EMPTY;
1197
1198 if (!(lp = pango_layout_get_line (self->pl, line)))
1199 XSRETURN_EMPTY; /* do better */
1200
1201 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1202
1203 EXTEND (SP, 2);
1204 if (GIMME_V == G_SCALAR)
1205 PUSHs (sv_2mortal (newSViv (index + trailing)));
1206 else
1207 {
1208 PUSHs (sv_2mortal (newSViv (index)));
1209 PUSHs (sv_2mortal (newSViv (trailing)));
1210 }
1039} 1211}
1040 1212
1041void 1213void
1042render (CFPlus::Layout self, float x, float y, int flags = 0) 1214render (CFPlus::Layout self, float x, float y, int flags = 0)
1043 PPCODE: 1215 PPCODE:
… …
1137} 1309}
1138 1310
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1311MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1312
1141CFPlus::Map 1313CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1314new (SV *class)
1143 CODE: 1315 CODE:
1144 New (0, RETVAL, 1, struct map); 1316 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1317 RETVAL->x = 0;
1146 RETVAL->y = 0; 1318 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1319 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1320 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1321 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1322 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1323 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1324 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1153 RETVAL->texs = 8192;
1154 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1155 RETVAL->rows = 0; 1325 RETVAL->rows = 0;
1156 RETVAL->row = 0; 1326 RETVAL->row = 0;
1157 OUTPUT: 1327 OUTPUT:
1158 RETVAL 1328 RETVAL
1159 1329
1160void 1330void
1161DESTROY (CFPlus::Map self) 1331DESTROY (CFPlus::Map self)
1162 CODE: 1332 CODE:
1163{ 1333{
1164 map_clear (self); 1334 map_clear (self);
1165 Safefree (self->face); 1335 Safefree (self->face2tile);
1166 Safefree (self->tex); 1336 Safefree (self->tex);
1167 Safefree (self); 1337 Safefree (self);
1168} 1338}
1169 1339
1170void 1340void
1341resize (CFPlus::Map self, int map_width, int map_height)
1342 CODE:
1343 self->w = map_width;
1344 self->h = map_height;
1345
1346void
1171clear (CFPlus::Map self) 1347clear (CFPlus::Map self)
1172 CODE: 1348 CODE:
1173 map_clear (self); 1349 map_clear (self);
1174 1350
1175void 1351void
1176set_face (CFPlus::Map self, int face, int texid) 1352set_tileid (CFPlus::Map self, int face, int tile)
1177 CODE: 1353 CODE:
1178{ 1354{
1179 while (self->faces <= face) 1355 need_facenum (self, face); self->face2tile [face] = tile;
1180 { 1356 need_texid (self, tile);
1181 Append (mapface, self->face, self->faces, self->faces); 1357}
1182 self->faces *= 2;
1183 }
1184 1358
1185 self->face [face] = texid; 1359void
1360set_smooth (CFPlus::Map self, int face, int smooth, int level)
1361 CODE:
1362{
1363 tileid texid;
1364 maptex *tex;
1365
1366 if (face < 0 || face >= self->faces)
1367 return;
1368
1369 if (smooth < 0 || smooth >= self->faces)
1370 return;
1371
1372 texid = self->face2tile [face];
1373
1374 if (!texid)
1375 return;
1376
1377 tex = self->tex + texid;
1378 tex->smoothtile = self->face2tile [smooth];
1379 tex->smoothlevel = level;
1186} 1380}
1187 1381
1188void 1382void
1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1383set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1190 CODE: 1384 CODE:
1191{ 1385{
1192 while (self->texs <= texid) 1386 need_texid (self, texid);
1193 {
1194 Append (maptex, self->tex, self->texs, self->texs);
1195 self->texs *= 2;
1196 }
1197 1387
1198 { 1388 {
1199 maptex *tex = self->tex + texid; 1389 maptex *tex = self->tex + texid;
1200 1390
1201 tex->name = name; 1391 tex->name = name;
… …
1243void 1433void
1244scroll (CFPlus::Map self, int dx, int dy) 1434scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1435 CODE:
1246{ 1436{
1247 if (dx > 0) 1437 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1439 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1440 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1251 1441
1252 if (dy > 0) 1442 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1443 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1444 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1445 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1256 1446
1257 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1259 1449
1260 while (self->y < 0) 1450 while (self->y < 0)
… …
1286 1476
1287 if (flags & 15) 1477 if (flags & 15)
1288 { 1478 {
1289 if (!cell->darkness) 1479 if (!cell->darkness)
1290 { 1480 {
1481 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1482 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1483 }
1296 1484
1297 //TODO: don't trust server data to be in-range(!) 1485 //TODO: don't trust server data to be in-range(!)
1298 1486
1299 if (flags & 8) 1487 if (flags & 8)
… …
1314 cell->stat_width = 1; 1502 cell->stat_width = 1;
1315 cell->stat_hp = *data++; 1503 cell->stat_hp = *data++;
1316 } 1504 }
1317 else if (cmd == 6) // monster width 1505 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1; 1506 cell->stat_width = *data++ + 1;
1507 else if (cmd == 0x47)
1508 {
1509 if (*data == 4)
1510 ; // decode player count
1511
1512 data += *data + 1;
1513 }
1514 else if (cmd == 8) // cell flags
1515 cell->flags = *data++;
1319 else if (ext & 0x40) // unknown, multibyte => skip 1516 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1; 1517 data += *data + 1;
1321 else 1518 else
1322 data++; 1519 data++;
1323 } 1520 }
… …
1327 cell->darkness = *data++ + 1; 1524 cell->darkness = *data++ + 1;
1328 } 1525 }
1329 1526
1330 if (flags & 4) 1527 if (flags & 4)
1331 { 1528 {
1332 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [0] = self->face2tile [face];
1333 } 1532 }
1334 1533
1335 if (flags & 2) 1534 if (flags & 2)
1336 { 1535 {
1337 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1536 faceid face = (data [0] << 8) + data [1]; data += 2;
1537 need_facenum (self, face);
1538 cell->tile [1] = self->face2tile [face];
1338 } 1539 }
1339 1540
1340 if (flags & 1) 1541 if (flags & 1)
1341 { 1542 {
1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1543 faceid face = (data [0] << 8) + data [1]; data += 2;
1544 need_facenum (self, face);
1545 cell->tile [2] = self->face2tile [face];
1343 } 1546 }
1344 } 1547 }
1345 else 1548 else
1346 {
1347 cell->darkness = 0; 1549 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1350 } 1550 }
1351} 1551}
1352 1552
1353SV * 1553SV *
1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1554mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1380 { 1580 {
1381 mapcell *cell = row->col + (x - row->c0); 1581 mapcell *cell = row->col + (x - row->c0);
1382 1582
1383 for (z = 0; z <= 0; z++) 1583 for (z = 0; z <= 0; z++)
1384 { 1584 {
1385 mapface face = cell->face [z];
1386
1387 if (face)
1388 {
1389 maptex tex = self->tex [face]; 1585 maptex tex = self->tex [cell->tile [z]];
1390 int a0 = 255 - tex.a; 1586 int a0 = 255 - tex.a;
1391 int a1 = tex.a; 1587 int a1 = tex.a;
1392 1588
1393 r = (r * a0 + tex.r * a1) / 255; 1589 r = (r * a0 + tex.r * a1) / 255;
1394 g = (g * a0 + tex.g * a1) / 255; 1590 g = (g * a0 + tex.g * a1) / 255;
1395 b = (b * a0 + tex.b * a1) / 255; 1591 b = (b * a0 + tex.b * a1) / 255;
1396 a = (a * a0 + tex.a * a1) / 255; 1592 a = (a * a0 + tex.a * a1) / 255;
1397 }
1398 } 1593 }
1399 } 1594 }
1400 1595
1401 *map++ = (r ) 1596 *map++ = (r )
1402 | (g << 8) 1597 | (g << 8)
… …
1409} 1604}
1410 OUTPUT: 1605 OUTPUT:
1411 RETVAL 1606 RETVAL
1412 1607
1413void 1608void
1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1609draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1415 CODE: 1610 CODE:
1416{ 1611{
1417 int vx, vy; 1612 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1613 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1614 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1615 smooth_key skey;
1418 int x, y, z; 1616 int x, y, z;
1419 int last_name; 1617 int last_name;
1420 mapface face;
1421 1618
1422 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1619 // thats current max. sorry.
1423 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1620 if (sw > 255) sw = 255;
1621 if (sh > 255) sh = 255;
1424 1622
1425 /* 1623 // clear key, in case of extra padding
1426 int vx = self->vx = self->w >= sw 1624 memset (&skey, 0, sizeof (skey));
1427 ? self->x + (self->w - sw) / 2
1428 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1429
1430 int vy = self->vy = self->h >= sh
1431 ? self->y + (self->h - sh) / 2
1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1433 */
1434 1625
1435 glColor4ub (255, 255, 255, 255); 1626 glColor4ub (255, 255, 255, 255);
1436 1627
1437 glEnable (GL_BLEND); 1628 glEnable (GL_BLEND);
1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1629 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1441 1632
1442 glBegin (GL_QUADS); 1633 glBegin (GL_QUADS);
1443 1634
1444 last_name = 0; 1635 last_name = 0;
1445 1636
1637 mx += self->x;
1638 my += self->y;
1639
1640 // first pass: determine smooth_max
1641 // rather ugly, if you ask me
1642 // could also be stored inside mapcell and updated on change
1643 memset (smooth_max, 0, sizeof (smooth_max));
1644
1645 for (y = 0; y < sh; y++)
1646 if (0 <= y + my && y + my < self->rows)
1647 {
1648 maprow *row = self->row + (y + my);
1649
1650 for (x = 0; x < sw; x++)
1651 if (row->c0 <= x + mx && x + mx < row->c1)
1652 {
1653 mapcell *cell = row->col + (x + mx - row->c0);
1654
1655 smooth_max[x + 1][y + 1] =
1656 MAX (self->tex [cell->tile [0]].smoothlevel,
1657 MAX (self->tex [cell->tile [1]].smoothlevel,
1658 self->tex [cell->tile [2]].smoothlevel));
1659 }
1660 }
1661
1446 for (z = 0; z < 3; z++) 1662 for (z = 0; z <= 2; z++)
1663 {
1664 memset (smooth_level, 0, sizeof (smooth_level));
1665
1447 for (y = 0; y < sh; y++) 1666 for (y = 0; y < sh; y++)
1448 if (0 <= y + vy && y + vy < self->rows) 1667 if (0 <= y + my && y + my < self->rows)
1449 { 1668 {
1450 maprow *row = self->row + (y + vy); 1669 maprow *row = self->row + (y + my);
1451 1670
1452 for (x = 0; x < sw; x++) 1671 for (x = 0; x < sw; x++)
1453 if (row->c0 <= x + vx && x + vx < row->c1) 1672 if (row->c0 <= x + mx && x + mx < row->c1)
1454 { 1673 {
1455 mapcell *cell = row->col + (x + vx - row->c0); 1674 mapcell *cell = row->col + (x + mx - row->c0);
1456
1457 face = cell->face [z]; 1675 tileid tile = cell->tile [z];
1676
1677 if (tile)
1678 {
1679 maptex tex = self->tex [tile];
1680 int px = (x + 1) * T - tex.w;
1681 int py = (y + 1) * T - tex.h;
1458 1682
1459 if (face && face < self->texs) 1683 // suppressing texture state switches here
1684 // is only moderately effective, but worth the extra effort
1685 if (last_name != tex.name)
1686 {
1687 if (!tex.name)
1688 tex = self->tex [2]; /* missing, replace by noface */
1689
1690 glEnd ();
1691 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1692 glBegin (GL_QUADS);
1693 }
1694
1695 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1696 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1697 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1698 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1699
1700 if (cell->flags && z == 2)
1701 {
1702 if (cell->flags & 1)
1703 {
1704 maptex tex = self->tex [1];
1705 int px = x * T + T * 2 / 32;
1706 int py = y * T - T * 6 / 32;
1707
1708 glEnd ();
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711
1712 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1713 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1714 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1715 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1716 }
1717 }
1718
1719 // update smooth hash
1720 if (tex.smoothtile)
1721 {
1722 skey.tile = tex.smoothtile;
1723 skey.level = tex.smoothlevel;
1724
1725 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1726
1727 // add bits to current tile and all neighbours. skey.x|y is
1728 // shifted +1|+1 so we always stay positive.
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 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1737 // ┃· ·· ·┃ ━━
1738
1739 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1740 // ·· ·· ·┏ ┓·
1741
1742 // full tile
1743 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1744
1745 // borders
1746 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1747 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1748 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1749 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1750
1751 // corners
1752 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1753 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1754 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1755 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1756 }
1757 }
1758 }
1759 }
1760
1761 // go through all smoothlevels, lowest to highest, then draw.
1762 // this is basically counting sort
1763 {
1764 int w, b;
1765
1766 for (w = 0; w < 256 / 32; ++w)
1767 {
1768 uint32_t smask = smooth_level [w];
1769 if (smask)
1770 for (b = 0; b < 32; ++b)
1771 if (smask & (((uint32_t)1) << b))
1460 { 1772 {
1461 maptex tex = self->tex [face]; 1773 int level = (w << 5) | b;
1774 HE *he;
1462 1775
1463 int px = (x + 1) * 32 - tex.w; 1776 hv_iterinit (smooth);
1464 int py = (y + 1) * 32 - tex.h; 1777 while ((he = hv_iternext (smooth)))
1465
1466 if (last_name != tex.name)
1467 { 1778 {
1779 smooth_key *skey = (smooth_key *)HeKEY (he);
1780 IV bits = SvIVX (HeVAL (he));
1781
1782 if (!(bits & 0x1000)
1783 && skey->level == level
1784 && level > smooth_max [skey->x][skey->y])
1785 {
1786 maptex tex = self->tex [skey->tile];
1787 int px = (((int)skey->x) - 1) * T;
1788 int py = (((int)skey->y) - 1) * T;
1789 int border = bits & 15;
1790 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1791 float dx = tex.s * .0625f; // 16 images/row
1792 float dy = tex.t * .5f ; // 2 images/column
1793
1794 // this time naively avoiding texture state changes
1795 // save gobs of state changes.
1796 if (last_name != tex.name)
1797 {
1798 if (!tex.name)
1799 continue; // smoothing not yet available
1800
1468 glEnd (); 1801 glEnd ();
1469 last_name = tex.name;
1470 glBindTexture (GL_TEXTURE_2D, last_name); 1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1471 glBegin (GL_QUADS); 1803 glBegin (GL_QUADS);
1804 }
1805
1806 if (border)
1807 {
1808 float ox = border * dx;
1809
1810 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1811 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1812 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1813 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1814 }
1815
1816 if (corner)
1817 {
1818 float ox = corner * dx;
1819
1820 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1821 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1822 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1823 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1824 }
1825 }
1472 } 1826 }
1473
1474 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1478 } 1827 }
1479 }
1480 } 1828 }
1829 }
1830
1831 hv_clear (smooth);
1832 }
1481 1833
1482 glEnd (); 1834 glEnd ();
1483 1835
1484 glDisable (GL_TEXTURE_2D); 1836 glDisable (GL_TEXTURE_2D);
1485 glDisable (GL_BLEND); 1837 glDisable (GL_BLEND);
1486 1838
1487 // top layer: overlays such as the health bar 1839 // top layer: overlays such as the health bar
1488 for (y = 0; y < sh; y++) 1840 for (y = 0; y < sh; y++)
1489 if (0 <= y + vy && y + vy < self->rows) 1841 if (0 <= y + my && y + my < self->rows)
1490 { 1842 {
1491 maprow *row = self->row + (y + vy); 1843 maprow *row = self->row + (y + my);
1492 1844
1493 for (x = 0; x < sw; x++) 1845 for (x = 0; x < sw; x++)
1494 if (row->c0 <= x + vx && x + vx < row->c1) 1846 if (row->c0 <= x + mx && x + mx < row->c1)
1495 { 1847 {
1496 mapcell *cell = row->col + (x + vx - row->c0); 1848 mapcell *cell = row->col + (x + mx - row->c0);
1497 1849
1498 int px = x * 32; 1850 int px = x * T;
1499 int py = y * 32; 1851 int py = y * T;
1500 1852
1501 if (cell->stat_hp) 1853 if (cell->stat_hp)
1502 { 1854 {
1503 int width = cell->stat_width * 32; 1855 int width = cell->stat_width * T;
1504 int thick = sh / 28 + 1 + cell->stat_width; 1856 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1505 1857
1506 glColor3ub (0, 0, 0); 1858 glColor3ub (0, 0, 0);
1507 glRectf (px + 1, py - thick - 2, 1859 glRectf (px + 1, py - thick - 2,
1508 px + width - 1, py); 1860 px + width - 1, py);
1509 1861
… …
1575 glDisable (GL_BLEND); 1927 glDisable (GL_BLEND);
1576 glDisable (GL_TEXTURE_2D); 1928 glDisable (GL_TEXTURE_2D);
1577} 1929}
1578 1930
1579void 1931void
1580fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1932fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1581 PPCODE: 1933 PPCODE:
1582{ 1934{
1583 int vx, vy;
1584 int x, y; 1935 int x, y;
1585 int sw4 = (sw + 3) & ~3; 1936 int sw4 = (sw + 3) & ~3;
1586 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1937 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1587 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1938 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1588 1939
1589 memset (darkness, 255, sw4 * sh); 1940 memset (darkness, 255, sw4 * sh);
1590 SvPOK_only (darkness_sv); 1941 SvPOK_only (darkness_sv);
1591 SvCUR_set (darkness_sv, sw4 * sh); 1942 SvCUR_set (darkness_sv, sw4 * sh);
1592 1943
1593 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1944 mx += self->x;
1594 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1945 my += self->y;
1595 1946
1596 for (y = 0; y < sh; y++) 1947 for (y = 0; y < sh; y++)
1597 if (0 <= y + vy && y + vy < self->rows) 1948 if (0 <= y + my && y + my < self->rows)
1598 { 1949 {
1599 maprow *row = self->row + (y + vy); 1950 maprow *row = self->row + (y + my);
1600 1951
1601 for (x = 0; x < sw; x++) 1952 for (x = 0; x < sw; x++)
1602 if (row->c0 <= x + vx && x + vx < row->c1) 1953 if (row->c0 <= x + mx && x + mx < row->c1)
1603 { 1954 {
1604 mapcell *cell = row->col + (x + vx - row->c0); 1955 mapcell *cell = row->col + (x + mx - row->c0);
1605 1956
1606 darkness[y * sw4 + x] = cell->darkness 1957 darkness[y * sw4 + x] = cell->darkness
1607 ? 255 - (cell->darkness - 1) 1958 ? 255 - (cell->darkness - 1)
1608 : 255 - FOW_DARKNESS; 1959 : 255 - FOW_DARKNESS;
1609 } 1960 }
… …
1649 if (row && row->c0 <= x && x < row->c1) 2000 if (row && row->c0 <= x && x < row->c1)
1650 { 2001 {
1651 mapcell *cell = row->col + (x - row->c0); 2002 mapcell *cell = row->col + (x - row->c0);
1652 uint8_t flags = 0; 2003 uint8_t flags = 0;
1653 2004
1654 if (cell->face [0]) flags |= 1; 2005 if (cell->tile [0]) flags |= 1;
1655 if (cell->face [1]) flags |= 2; 2006 if (cell->tile [1]) flags |= 2;
1656 if (cell->face [2]) flags |= 4; 2007 if (cell->tile [2]) flags |= 4;
1657 2008
1658 *data++ = flags; 2009 *data++ = flags;
1659 2010
1660 if (flags & 1) 2011 if (flags & 1)
1661 { 2012 {
2013 tileid tile = cell->tile [0];
1662 *data++ = cell->face [0] >> 8; 2014 *data++ = tile >> 8;
1663 *data++ = cell->face [0]; 2015 *data++ = tile;
1664 } 2016 }
1665 2017
1666 if (flags & 2) 2018 if (flags & 2)
1667 { 2019 {
2020 tileid tile = cell->tile [1];
1668 *data++ = cell->face [1] >> 8; 2021 *data++ = tile >> 8;
1669 *data++ = cell->face [1]; 2022 *data++ = tile;
1670 } 2023 }
1671 2024
1672 if (flags & 4) 2025 if (flags & 4)
1673 { 2026 {
2027 tileid tile = cell->tile [2];
1674 *data++ = cell->face [2] >> 8; 2028 *data++ = tile >> 8;
1675 *data++ = cell->face [2]; 2029 *data++ = tile;
1676 } 2030 }
1677 } 2031 }
1678 else 2032 else
1679 *data++ = 0; 2033 *data++ = 0;
1680 } 2034 }
… …
1720 { 2074 {
1721 uint8_t flags = *data++; 2075 uint8_t flags = *data++;
1722 2076
1723 if (flags) 2077 if (flags)
1724 { 2078 {
1725 mapface face[3] = { 0, 0, 0 };
1726
1727 mapcell *cell = row_get_cell (row, x); 2079 mapcell *cell = row_get_cell (row, x);
2080 tileid tile[3] = { 0, 0, 0 };
1728 2081
1729 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2082 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1730 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2083 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1731 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2084 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1732 2085
1733 if (cell->darkness == 0) 2086 if (cell->darkness == 0)
1734 { 2087 {
1735 cell->darkness = 0; 2088 cell->darkness = 0;
1736 2089
1737 for (z = 0; z <= 2; z++) 2090 for (z = 0; z <= 2; z++)
1738 { 2091 {
1739 cell->face[z] = face[z]; 2092 tileid t = tile [z];
1740 2093
1741 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2094 if (t >= self->texs || (t && !self->tex [t].name))
2095 {
1742 XPUSHs (sv_2mortal (newSViv (face[z]))); 2096 XPUSHs (sv_2mortal (newSViv (t)));
2097 need_texid (self, t);
2098 }
2099
2100 cell->tile [z] = t;
1743 } 2101 }
1744 } 2102 }
1745 } 2103 }
1746 } 2104 }
1747 } 2105 }
… …
1896# undef const_iv 2254# undef const_iv
1897 }; 2255 };
1898 2256
1899 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2257 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1900 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2258 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2259
2260 texture_av = newAV ();
2261 AvREAL_off (texture_av);
1901} 2262}
1902 2263
1903char * 2264char *
1904gl_vendor () 2265gl_vendor ()
1905 CODE: 2266 CODE:
… …
2054 2415
2055void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2416void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2056 2417
2057int glGenTexture () 2418int glGenTexture ()
2058 CODE: 2419 CODE:
2059{ 2420 RETVAL = gen_texture ();
2060 GLuint name;
2061 glGenTextures (1, &name);
2062 RETVAL = name;
2063}
2064 OUTPUT: 2421 OUTPUT:
2065 RETVAL 2422 RETVAL
2066 2423
2067void glDeleteTexture (int name) 2424void glDeleteTexture (int name)
2068 CODE: 2425 CODE:
2069{
2070 GLuint name_ = name;
2071 glDeleteTextures (1, &name_); 2426 del_texture (name);
2072} 2427
2073
2074int glGenList () 2428int glGenList ()
2075 CODE: 2429 CODE:
2076 RETVAL = glGenLists (1); 2430 RETVAL = glGenLists (1);
2077 OUTPUT: 2431 OUTPUT:
2078 RETVAL 2432 RETVAL

Diff Legend

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