[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.194 by root, Thu Jul 12 17:56:50 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	2	# define WIN32_LEAN_AND_MEAN
		3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# 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>
6	#endif	14	#endif
7		15
8	#include "EXTERN.h"	16	#include "EXTERN.h"
9	#include "perl.h"	17	#include "perl.h"
10	#include "XSUB.h"	18	#include "XSUB.h"
11		19
		20	#ifdef _WIN32
		21	# undef pipe
		22	#endif
		23
		24	#include <assert.h>
12	#include <math.h>	25	#include <math.h>
13	#include <string.h>	26	#include <string.h>
14	#include <stdio.h>	27	#include <stdio.h>
15	#include <stdlib.h>	28	#include <stdlib.h>
16		29
31	# include <sys/types.h>	44	# include <sys/types.h>
32	# include <sys/socket.h>	45	# include <sys/socket.h>
33	# include <netinet/in.h>	46	# include <netinet/in.h>
34	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
35	# include <inttypes.h>	48	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	49	#endif
44		50
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		52
49	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
50		54
51	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
57	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
58	#else	62	#else
59	# define PARACHUTE 0	63	# define PARACHUTE 0
60	#endif	64	#endif
61		65
		66	static AV *texture_av;
		67
62	static struct	68	static struct
63	{	69	{
64	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
65	#include "glfunc.h"	71	#include "glfunc.h"
66	#undef GL_FUNC	72	#undef GL_FUNC
67	} gl;	73	} gl;
68		74
		75	static void
69	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70	{	77	{
71	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
72	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
73	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75	else	82	else
76	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
77	}	84	}
78		85
		86	static GLuint
		87	gen_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
		99	static void
		100	del_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
79	#include "texcache.c"	110	#include "texcache.c"
80		111
81	#include "pango-font.c"	112	#include "pango-font.c"
82	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
83	#include "pango-render.c"	114	#include "pango-render.c"
84		115
85	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
86	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
87		118
88	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
89		120
90	static int	121	static int
91	shape_attr_p (PangoLayoutRun *run)	122	shape_attr_p (PangoLayoutRun *run)
92	{	123	{
93	GSList *attrs = run->item->analysis.extra_attrs;	124	GSList *attrs = run->item->analysis.extra_attrs;
…		…
107		138
108	typedef struct cf_layout {	139	typedef struct cf_layout {
109	PangoLayout *pl;	140	PangoLayout *pl;
110	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
111	int base_height;	142	int base_height;
112	CFClient__Font font;	143	CFPlus__Font font;
113	} *CFClient__Layout;	144	} *CFPlus__Layout;
114		145
115	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
116	static PangoContext *opengl_context;	147	static PangoContext *opengl_context;
117	static PangoFontMap *opengl_fontmap;	148	static PangoFontMap *opengl_fontmap;
118		149
119	static void	150	static void
120	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
…		…
125	#endif	156	#endif
126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127	}	158	}
128		159
129	static void	160	static void
130	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
131	{	162	{
132	/* use a random scale factor to account for unknown descenders, 0.8 works	163	/* use a random scale factor to account for unknown descenders, 0.8 works
133	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
134	*/	165	*/
135	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
139		170
140	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
141	}	172	}
142		173
143	static void	174	static void
144	layout_get_pixel_size (CFClient__Layout self, int w, int h)	175	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
145	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
146	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
147		181
148	if (!w) w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149	if (!h) h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150		184
151	w = (w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
152	}	186	if (!rect.height) rect.height = 1;
153		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
154	typedef uint16_t mapface;	193	typedef uint16_t faceid;
155		194
156	typedef struct {	195	typedef struct {
157	GLint name;	196	int name;
158	int w, h;	197	int w, h;
159	float s, t;	198	float s, t;
160	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
161	} maptex;	202	} maptex;
162		203
163	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
164	int16_t darkness;	207	uint16_t darkness;
165	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
166	} mapcell;	209	} mapcell;
167		210
168	typedef struct {	211	typedef struct {
169	int32_t c0, c1;	212	int32_t c0, c1;
170	mapcell *col;	213	mapcell *col;
171	} maprow;	214	} maprow;
172		215
173	typedef struct map {	216	typedef struct map {
174	int x, y, w, h;	217	int x, y, w, h;
175	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
176	int faces;	219	int faces; tileid *face2tile; // [faceid]
177	mapface *face;	220	int texs; maptex *tex; // [tileid]
178
179	int texs;
180	maptex *tex;
181		221
182	int32_t rows;	222	int32_t rows;
183	maprow *row;	223	maprow *row;
184	} *CFClient__Map;	224	} *CFPlus__Map;
185		225
186	static char *	226	static char *
187	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
188	{	228	{
189	char *p;	229	char *p;
…		…
206	}	246	}
207		247
208	#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))
209	#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))
210		250
		251	static void
		252	need_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
		261	static void
		262	need_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	}
		270
211	static maprow *	271	static maprow *
212	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
213	{	273	{
214	if (0 > y)	274	if (0 > y)
215	{	275	{
216	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
217	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
255		315
256	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
257	}	317	}
258		318
259	static mapcell *	319	static mapcell *
260	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
261	{	321	{
262	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
263	}	323	}
264		324
265	static void	325	static void
266	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
267	{	327	{
268	int r;	328	int r;
269		329
270	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
271	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
279	self->row = 0;	339	self->row = 0;
280	self->rows = 0;	340	self->rows = 0;
281	}	341	}
282		342
283	static void	343	static void
284	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	344	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285	{	345	{
286	int x, y;	346	int x, y;
287	maprow *row;	347	maprow *row;
		348	mapcell *cell;
288		349
289	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
290	if (y >= 0)	351	if (y >= 0)
291	{	352	{
292	if (y >= self->rows)	353	if (y >= self->rows)
…		…
298	if (x >= row->c0)	359	if (x >= row->c0)
299	{	360	{
300	if (x >= row->c1)	361	if (x >= row->c1)
301	break;	362	break;
302		363
303	row->col[x - row->c0].darkness = -1;	364	cell = row->col + x - row->c0;
		365
		366	cell->darkness = 0;
		367	cell->stat_hp = 0;
		368	cell->flags = 0;
		369	cell->player = 0;
304	}	370	}
305	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_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);
306	}	388	}
307		389
308	static void	390	static void
309	music_finished (void)	391	music_finished (void)
310	{	392	{
…		…
346	n \|= n >> 16;	428	n \|= n >> 16;
347		429
348	return n + 1;	430	return n + 1;
349	}	431	}
350		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
351	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
352		438
353	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
354		440
355	BOOT:	441	BOOT:
356	{	442	{
357	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
358	static const struct {	444	static const struct {
359	const char *name;	445	const char *name;
360	IV iv;	446	IV iv;
361	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
362	# 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
363	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
364	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
365	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
366	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
367	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
376	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
377	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
378	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
379	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
380	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
381	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
382	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
383	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
384	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
385	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
440	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
441	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
442	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
443	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
444	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
445	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
446	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
447	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
448	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
449	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
450	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
451	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
452	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
453	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
454	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
455	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
456	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
457	const_iv (KMOD_CTRL),
458	const_iv (KMOD_SHIFT),
459	const_iv (KMOD_ALT),
460	const_iv (KMOD_META)
461	# undef const_iv	556	# undef const_iv
462	};	557	};
463		558
464	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; )
465	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);
466	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
467		571
468	int	572	int
469	in_destruct ()	573	in_destruct ()
470	CODE:	574	CODE:
471	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
509	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
510	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
511	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
512		616
513	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	617	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		618	#if SDL_VERSION_ATLEAST(1,2,10)
		619	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		620	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		621	#endif
514		622
515	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
516	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
517		625
518	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
538	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
539	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
540	);	648	);
541	if (RETVAL)	649	if (RETVAL)
542	{	650	{
		651	av_clear (texture_av);
		652
543	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
544	# 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);
545	# include "glfunc.h"	655	# include "glfunc.h"
546	# undef GL_FUNC	656	# undef GL_FUNC
		657
547	}	658	}
548	OUTPUT:	659	OUTPUT:
549	RETVAL	660	RETVAL
550		661
551	void	662	void
…		…
570	case SDL_KEYDOWN:	681	case SDL_KEYDOWN:
571	case SDL_KEYUP:	682	case SDL_KEYUP:
572	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	683	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
573	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	684	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
574	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 */
575	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	687	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
576	break;	688	break;
577		689
578	case SDL_ACTIVEEVENT:	690	case SDL_ACTIVEEVENT:
579	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
605	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	717	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
606	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	718	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
607	break;	719	break;
608	}	720	}
609		721
610	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	722	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
611	}	723	}
612	}	724	}
613		725
614	int	726	int
615	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	727	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
624	Mix_AllocateChannels (int numchans = -1)	736	Mix_AllocateChannels (int numchans = -1)
625		737
626	void	738	void
627	lowdelay (int fd, int val = 1)	739	lowdelay (int fd, int val = 1)
628	CODE:	740	CODE:
		741	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		742
		743	void
		744	win32_proxy_info ()
		745	PPCODE:
		746	{
629	#ifndef _WIN32	747	#ifdef _WIN32
630	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	}
631	#endif	769	#endif
		770	}
632		771
633	void	772	void
634	add_font (char *file)	773	add_font (char *file)
635	CODE:	774	CODE:
636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	775	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
740	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	879	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
741	#endif	880	#endif
742	_exit (1);	881	_exit (1);
743		882
744	void	883	void
745	_exit (int retval)	884	_exit (int retval = 0)
746	CODE:	885	CODE:
		886	#ifdef WIN32
		887	ExitThread (retval); // unclean, please beam me up
		888	#else
747	_exit (retval);	889	_exit (retval);
		890	#endif
748		891
		892	void
		893	debug ()
		894	CODE:
		895	{
		896	#if DEBUG
		897	VALGRIND_DO_LEAK_CHECK;
		898	#endif
		899	}
		900
749	MODULE = CFClient PACKAGE = CFClient::Font	901	MODULE = CFPlus PACKAGE = CFPlus::Font
750		902
751	CFClient::Font	903	CFPlus::Font
752	new_from_file (SV class, char path, int id = 0)	904	new_from_file (SV class, char path, int id = 0)
753	CODE:	905	CODE:
754	{	906	{
755	int count;	907	int count;
756	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	908	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
759	}	911	}
760	OUTPUT:	912	OUTPUT:
761	RETVAL	913	RETVAL
762		914
763	void	915	void
764	DESTROY (CFClient::Font self)	916	DESTROY (CFPlus::Font self)
765	CODE:	917	CODE:
766	pango_font_description_free (self);	918	pango_font_description_free (self);
767		919
768	void	920	void
769	make_default (CFClient::Font self)	921	make_default (CFPlus::Font self)
770	CODE:	922	CODE:
771	default_font = self;	923	default_font = self;
772		924
773	MODULE = CFClient PACKAGE = CFClient::Layout	925	MODULE = CFPlus PACKAGE = CFPlus::Layout
774		926
775	void	927	void
776	reset_glyph_cache ()	928	reset_glyph_cache ()
777	CODE:	929	CODE:
778	tc_clear ();	930	tc_clear ();
779		931
780	CFClient::Layout	932	CFPlus::Layout
781	new (SV *class)	933	new (SV *class)
782	CODE:	934	CODE:
783	New (0, RETVAL, 1, struct cf_layout);	935	New (0, RETVAL, 1, struct cf_layout);
784		936
785	RETVAL->pl = pango_layout_new (opengl_context);	937	RETVAL->pl = pango_layout_new (opengl_context);
…		…
794	layout_update_font (RETVAL);	946	layout_update_font (RETVAL);
795	OUTPUT:	947	OUTPUT:
796	RETVAL	948	RETVAL
797		949
798	void	950	void
799	DESTROY (CFClient::Layout self)	951	DESTROY (CFPlus::Layout self)
800	CODE:	952	CODE:
801	g_object_unref (self->pl);	953	g_object_unref (self->pl);
802	Safefree (self);	954	Safefree (self);
803		955
804	void	956	void
805	set_text (CFClient::Layout self, SV *text_)	957	set_text (CFPlus::Layout self, SV *text_)
806	CODE:	958	CODE:
807	{	959	{
808	STRLEN textlen;	960	STRLEN textlen;
809	char *text = SvPVutf8 (text_, textlen);	961	char *text = SvPVutf8 (text_, textlen);
810		962
811	pango_layout_set_text (self->pl, text, textlen);	963	pango_layout_set_text (self->pl, text, textlen);
812	}	964	}
813		965
814	void	966	void
815	set_markup (CFClient::Layout self, SV *text_)	967	set_markup (CFPlus::Layout self, SV *text_)
816	CODE:	968	CODE:
817	{	969	{
818	STRLEN textlen;	970	STRLEN textlen;
819	char *text = SvPVutf8 (text_, textlen);	971	char *text = SvPVutf8 (text_, textlen);
820		972
821	pango_layout_set_markup (self->pl, text, textlen);	973	pango_layout_set_markup (self->pl, text, textlen);
822	}	974	}
823		975
824	void	976	void
825	set_shapes (CFClient::Layout self, ...)	977	set_shapes (CFPlus::Layout self, ...)
826	CODE:	978	CODE:
827	{	979	{
828	PangoAttrList *attrs = 0;	980	PangoAttrList *attrs = 0;
829	const char *text = pango_layout_get_text (self->pl);	981	const char *text = pango_layout_get_text (self->pl);
830	const char *pos = text;	982	const char *pos = text;
…		…
865	if (attrs)	1017	if (attrs)
866	pango_layout_set_attributes (self->pl, attrs);	1018	pango_layout_set_attributes (self->pl, attrs);
867	}	1019	}
868		1020
869	void	1021	void
870	get_shapes (CFClient::Layout self)	1022	get_shapes (CFPlus::Layout self)
871	PPCODE:	1023	PPCODE:
872	{	1024	{
873	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1025	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
874		1026
875	do	1027	do
…		…
890		1042
891	pango_layout_iter_free (iter);	1043	pango_layout_iter_free (iter);
892	}	1044	}
893		1045
894	int	1046	int
895	has_wrapped (CFClient::Layout self)	1047	has_wrapped (CFPlus::Layout self)
896	CODE:	1048	CODE:
897	{	1049	{
898	int lines = 1;	1050	int lines = 1;
899	const char *text = pango_layout_get_text (self->pl);	1051	const char *text = pango_layout_get_text (self->pl);
900		1052
…		…
905	}	1057	}
906	OUTPUT:	1058	OUTPUT:
907	RETVAL	1059	RETVAL
908		1060
909	SV *	1061	SV *
910	get_text (CFClient::Layout self)	1062	get_text (CFPlus::Layout self)
911	CODE:	1063	CODE:
912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1064	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
913	sv_utf8_decode (RETVAL);	1065	sv_utf8_decode (RETVAL);
914	OUTPUT:	1066	OUTPUT:
915	RETVAL	1067	RETVAL
916		1068
917	void	1069	void
918	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1070	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
919	CODE:	1071	CODE:
920	self->r = r;	1072	self->r = r;
921	self->g = g;	1073	self->g = g;
922	self->b = b;	1074	self->b = b;
923	self->a = a;	1075	self->a = a;
924		1076
925	void	1077	void
926	set_font (CFClient::Layout self, CFClient::Font font = 0)	1078	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
927	CODE:	1079	CODE:
928	if (self->font != font)	1080	if (self->font != font)
929	{	1081	{
930	self->font = font;	1082	self->font = font;
931	layout_update_font (self);	1083	layout_update_font (self);
932	}	1084	}
933		1085
934	void	1086	void
935	set_height (CFClient::Layout self, int base_height)	1087	set_height (CFPlus::Layout self, int base_height)
936	CODE:	1088	CODE:
937	if (self->base_height != base_height)	1089	if (self->base_height != base_height)
938	{	1090	{
939	self->base_height = base_height;	1091	self->base_height = base_height;
940	layout_update_font (self);	1092	layout_update_font (self);
941	}	1093	}
942		1094
943	void	1095	void
944	set_width (CFClient::Layout self, int max_width = -1)	1096	set_width (CFPlus::Layout self, int max_width = -1)
945	CODE:	1097	CODE:
946	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1098	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
947		1099
948	void	1100	void
949	set_indent (CFClient::Layout self, int indent)	1101	set_indent (CFPlus::Layout self, int indent)
950	CODE:	1102	CODE:
951	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1103	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
952		1104
953	void	1105	void
954	set_spacing (CFClient::Layout self, int spacing)	1106	set_spacing (CFPlus::Layout self, int spacing)
955	CODE:	1107	CODE:
956	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1108	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
957		1109
958	void	1110	void
959	set_ellipsise (CFClient::Layout self, int ellipsise)	1111	set_ellipsise (CFPlus::Layout self, int ellipsise)
960	CODE:	1112	CODE:
961	pango_layout_set_ellipsize (self->pl,	1113	pango_layout_set_ellipsize (self->pl,
962	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1114	ellipsise == 1 ? PANGO_ELLIPSIZE_START
963	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1115	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
964	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1116	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
965	: PANGO_ELLIPSIZE_NONE	1117	: PANGO_ELLIPSIZE_NONE
966	);	1118	);
967		1119
968	void	1120	void
969	set_single_paragraph_mode (CFClient::Layout self, int spm)	1121	set_single_paragraph_mode (CFPlus::Layout self, int spm)
970	CODE:	1122	CODE:
971	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1123	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
972		1124
973	void	1125	void
974	size (CFClient::Layout self)	1126	size (CFPlus::Layout self)
975	PPCODE:	1127	PPCODE:
976	{	1128	{
977	int w, h;	1129	int w, h;
978		1130
979	layout_get_pixel_size (self, &w, &h);	1131	layout_get_pixel_size (self, &w, &h);
…		…
982	PUSHs (sv_2mortal (newSViv (w)));	1134	PUSHs (sv_2mortal (newSViv (w)));
983	PUSHs (sv_2mortal (newSViv (h)));	1135	PUSHs (sv_2mortal (newSViv (h)));
984	}	1136	}
985		1137
986	int	1138	int
987	descent (CFClient::Layout self)	1139	descent (CFPlus::Layout self)
988	CODE:	1140	CODE:
989	{	1141	{
990	PangoRectangle rect;	1142	PangoRectangle rect;
991	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1143	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
992	pango_layout_line_get_pixel_extents (line, 0, &rect);	1144	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
994	}	1146	}
995	OUTPUT:	1147	OUTPUT:
996	RETVAL	1148	RETVAL
997		1149
998	int	1150	int
999	xy_to_index (CFClient::Layout self, int x, int y)	1151	xy_to_index (CFPlus::Layout self, int x, int y)
1000	CODE:	1152	CODE:
1001	{	1153	{
1002	int index, trailing;	1154	int index, trailing;
1003	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);
1004	RETVAL = index;	1156	RETVAL = index + trailing;
1005	}	1157	}
1006	OUTPUT:	1158	OUTPUT:
1007	RETVAL	1159	RETVAL
1008		1160
1009	void	1161	void
1010	cursor_pos (CFClient::Layout self, int index)	1162	cursor_pos (CFPlus::Layout self, int index)
1011	PPCODE:	1163	PPCODE:
1012	{	1164	{
1013	PangoRectangle strong_pos;	1165	PangoRectangle strong_pos;
1014	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1166	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1015		1167
…		…
1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1170	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1171	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1020	}	1172	}
1021		1173
1022	void	1174	void
		1175	index_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
		1188	void
		1189	line_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	}
		1211	}
		1212
		1213	void
1023	render (CFClient::Layout self, float x, float y)	1214	render (CFPlus::Layout self, float x, float y, int flags = 0)
1024	PPCODE:	1215	PPCODE:
1025	pango_opengl_render_layout_subpixel (	1216	pango_opengl_render_layout_subpixel (
1026	self->pl,	1217	self->pl,
1027	x * PANGO_SCALE, y * PANGO_SCALE,	1218	x * PANGO_SCALE, y * PANGO_SCALE,
1028	self->r, self->g, self->b, self->a	1219	self->r, self->g, self->b, self->a,
		1220	flags
1029	);	1221	);
1030		1222
1031	MODULE = CFClient PACKAGE = CFClient::Texture	1223	MODULE = CFPlus PACKAGE = CFPlus::Texture
1032		1224
1033	void	1225	void
1034	pad2pot (SV data_, SV w_, SV *h_)	1226	pad2pot (SV data_, SV w_, SV *h_)
1035	CODE:	1227	CODE:
1036	{	1228	{
…		…
1114	glDisable (GL_ALPHA_TEST);	1306	glDisable (GL_ALPHA_TEST);
1115	glDisable (GL_BLEND);	1307	glDisable (GL_BLEND);
1116	}	1308	}
1117	}	1309	}
1118		1310
1119	MODULE = CFClient PACKAGE = CFClient::Map	1311	MODULE = CFPlus PACKAGE = CFPlus::Map
1120		1312
1121	CFClient::Map	1313	CFPlus::Map
1122	new (SV *class, int map_width, int map_height)	1314	new (SV *class)
1123	CODE:	1315	CODE:
1124	New (0, RETVAL, 1, struct map);	1316	New (0, RETVAL, 1, struct map);
1125	RETVAL->x = 0;	1317	RETVAL->x = 0;
1126	RETVAL->y = 0;	1318	RETVAL->y = 0;
1127	RETVAL->w = map_width;	1319	RETVAL->w = 0;
1128	RETVAL->h = map_height;	1320	RETVAL->h = 0;
1129	RETVAL->ox = 0;	1321	RETVAL->ox = 0;
1130	RETVAL->oy = 0;	1322	RETVAL->oy = 0;
1131	RETVAL->faces = 8192;	1323	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1132	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1324	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1133	RETVAL->texs = 8192;
1134	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1135	RETVAL->rows = 0;	1325	RETVAL->rows = 0;
1136	RETVAL->row = 0;	1326	RETVAL->row = 0;
1137	OUTPUT:	1327	OUTPUT:
1138	RETVAL	1328	RETVAL
1139		1329
1140	void	1330	void
1141	DESTROY (CFClient::Map self)	1331	DESTROY (CFPlus::Map self)
1142	CODE:	1332	CODE:
1143	{	1333	{
1144	map_clear (self);	1334	map_clear (self);
1145	Safefree (self->face);	1335	Safefree (self->face2tile);
1146	Safefree (self->tex);	1336	Safefree (self->tex);
1147	Safefree (self);	1337	Safefree (self);
1148	}	1338	}
1149		1339
1150	void	1340	void
		1341	resize (CFPlus::Map self, int map_width, int map_height)
		1342	CODE:
		1343	self->w = map_width;
		1344	self->h = map_height;
		1345
		1346	void
1151	clear (CFClient::Map self)	1347	clear (CFPlus::Map self)
1152	CODE:	1348	CODE:
1153	map_clear (self);	1349	map_clear (self);
1154		1350
1155	void	1351	void
1156	set_face (CFClient::Map self, int face, int texid)	1352	set_tileid (CFPlus::Map self, int face, int tile)
1157	CODE:	1353	CODE:
1158	{	1354	{
1159	while (self->faces <= face)	1355	need_facenum (self, face); self->face2tile [face] = tile;
1160	{	1356	need_texid (self, tile);
1161	Append (mapface, self->face, self->faces, self->faces);
1162	self->faces *= 2;
1163	}
1164
1165	self->face [face] = texid;
1166	}	1357	}
1167		1358
1168	void	1359	void
		1360	set_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;
		1380	}
		1381
		1382	void
1169	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1383	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1170	CODE:	1384	CODE:
1171	{	1385	{
1172	while (self->texs <= texid)	1386	need_texid (self, texid);
1173	{
1174	Append (maptex, self->tex, self->texs, self->texs);
1175	self->texs *= 2;
1176	}
1177		1387
1178	{	1388	{
1179	maptex *tex = self->tex + texid;	1389	maptex *tex = self->tex + texid;
1180		1390
1181	tex->name = name;	1391	tex->name = name;
…		…
1198	// from transparent color bleeding and ugly wrapping effects.	1408	// from transparent color bleeding and ugly wrapping effects.
1199	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1409	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1200	}	1410	}
1201		1411
1202	int	1412	int
1203	ox (CFClient::Map self)	1413	ox (CFPlus::Map self)
1204	ALIAS:	1414	ALIAS:
1205	oy = 1	1415	oy = 1
1206	x = 2	1416	x = 2
1207	y = 3	1417	y = 3
1208	w = 4	1418	w = 4
…		…
1219	}	1429	}
1220	OUTPUT:	1430	OUTPUT:
1221	RETVAL	1431	RETVAL
1222		1432
1223	void	1433	void
1224	scroll (CFClient::Map self, int dx, int dy)	1434	scroll (CFPlus::Map self, int dx, int dy)
1225	CODE:	1435	CODE:
1226	{	1436	{
1227	if (dx > 0)	1437	if (dx > 0)
1228	map_blank (self, self->x, self->y, dx - 1, self->h);	1438	map_blank (self, self->x, self->y, dx, self->h);
1229	else if (dx < 0)	1439	else if (dx < 0)
1230	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);
1231		1441
1232	if (dy > 0)	1442	if (dy > 0)
1233	map_blank (self, self->x, self->y, self->w, dy - 1);	1443	map_blank (self, self->x, self->y, self->w, dy);
1234	else if (dy < 0)	1444	else if (dy < 0)
1235	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);
1236		1446
1237	self->ox += dx; self->x += dx;	1447	self->ox += dx; self->x += dx;
1238	self->oy += dy; self->y += dy;	1448	self->oy += dy; self->y += dy;
1239		1449
1240	while (self->y < 0)	1450	while (self->y < 0)
…		…
1245	self->y += MAP_EXTEND_Y;	1455	self->y += MAP_EXTEND_Y;
1246	}	1456	}
1247	}	1457	}
1248		1458
1249	void	1459	void
1250	map1a_update (CFClient::Map self, SV *data_)	1460	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1251	CODE:	1461	CODE:
1252	{	1462	{
1253	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1463	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1254	uint8_t data_end = (uint8_t )SvEND (data_);	1464	uint8_t data_end = (uint8_t )SvEND (data_);
1255	mapcell *cell;	1465	mapcell *cell;
1256	int x, y, flags;	1466	int x, y, flags;
1257		1467
1258	while (data < data_end)	1468	while (data < data_end - 1)
1259	{	1469	{
1260	flags = (data [0] << 8) + data [1]; data += 2;	1470	flags = (data [0] << 8) + data [1]; data += 2;
1261		1471
1262	x = self->x + ((flags >> 10) & 63);	1472	x = self->x + ((flags >> 10) & 63);
1263	y = self->y + ((flags >> 4) & 63);	1473	y = self->y + ((flags >> 4) & 63);
1264		1474
1265	cell = map_get_cell (self, x, y);	1475	cell = map_get_cell (self, x, y);
1266		1476
1267	if (flags & 15)	1477	if (flags & 15)
1268	{	1478	{
1269	if (cell->darkness < 0)	1479	if (!cell->darkness)
1270	{	1480	{
		1481	memset (cell, 0, sizeof (*cell));
1271	cell->darkness = 0;	1482	cell->darkness = 256;
1272	cell->face [0] = 0;
1273	cell->face [1] = 0;
1274	cell->face [2] = 0;
1275	}	1483	}
1276		1484
1277	cell->darkness = flags & 8 ? *data++ : 255;
1278
1279	//TODO: don't trust server data to be in-range(!)	1485	//TODO: don't trust server data to be in-range(!)
		1486
		1487	if (flags & 8)
		1488	{
		1489	if (extmap)
		1490	{
		1491	uint8_t ext, cmd;
		1492
		1493	do
		1494	{
		1495	ext = *data++;
		1496	cmd = ext & 0x3f;
		1497
		1498	if (cmd < 4)
		1499	cell->darkness = 255 - ext * 64 + 1;
		1500	else if (cmd == 5) // health
		1501	{
		1502	cell->stat_width = 1;
		1503	cell->stat_hp = *data++;
		1504	}
		1505	else if (cmd == 6) // monster width
		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++;
		1516	else if (ext & 0x40) // unknown, multibyte => skip
		1517	data += *data + 1;
		1518	else
		1519	data++;
		1520	}
		1521	while (ext & 0x80);
		1522	}
		1523	else
		1524	cell->darkness = *data++ + 1;
		1525	}
1280		1526
1281	if (flags & 4)	1527	if (flags & 4)
1282	{	1528	{
1283	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];
1284	}	1532	}
1285		1533
1286	if (flags & 2)	1534	if (flags & 2)
1287	{	1535	{
1288	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];
1289	}	1539	}
1290		1540
1291	if (flags & 1)	1541	if (flags & 1)
1292	{	1542	{
1293	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];
1294	}	1546	}
1295	}	1547	}
1296	else	1548	else
1297	cell->darkness = -1;	1549	cell->darkness = 0;
1298	}	1550	}
1299	}	1551	}
1300		1552
1301	SV *	1553	SV *
1302	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1554	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1303	CODE:	1555	CODE:
1304	{	1556	{
1305	int x1, x;	1557	int x1, x;
1306	int y1, y;	1558	int y1, y;
1307	int z;	1559	int z;
…		…
1328	{	1580	{
1329	mapcell *cell = row->col + (x - row->c0);	1581	mapcell *cell = row->col + (x - row->c0);
1330		1582
1331	for (z = 0; z <= 0; z++)	1583	for (z = 0; z <= 0; z++)
1332	{	1584	{
1333	mapface face = cell->face [z];
1334
1335	if (face)
1336	{
1337	maptex tex = self->tex [face];	1585	maptex tex = self->tex [cell->tile [z]];
1338	int a0 = 255 - tex.a;	1586	int a0 = 255 - tex.a;
1339	int a1 = tex.a;	1587	int a1 = tex.a;
1340		1588
1341	r = (r * a0 + tex.r * a1) / 255;	1589	r = (r * a0 + tex.r * a1) / 255;
1342	g = (g * a0 + tex.g * a1) / 255;	1590	g = (g * a0 + tex.g * a1) / 255;
1343	b = (b * a0 + tex.b * a1) / 255;	1591	b = (b * a0 + tex.b * a1) / 255;
1344	a = (a * a0 + tex.a * a1) / 255;	1592	a = (a * a0 + tex.a * a1) / 255;
1345	}
1346	}	1593	}
1347	}	1594	}
1348		1595
1349	*map++ = (r )	1596	*map++ = (r )
1350	\| (g << 8)	1597	\| (g << 8)
…		…
1357	}	1604	}
1358	OUTPUT:	1605	OUTPUT:
1359	RETVAL	1606	RETVAL
1360		1607
1361	void	1608	void
1362	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1609	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1363	CODE:	1610	CODE:
1364	{	1611	{
1365	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;
1366	int x, y, z;	1616	int x, y, z;
1367	int last_name;	1617	int last_name;
1368	mapface face;
1369		1618
1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1619	// thats current max. sorry.
1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1620	if (sw > 255) sw = 255;
		1621	if (sh > 255) sh = 255;
1372		1622
1373	/*	1623	// clear key, in case of extra padding
1374	int vx = self->vx = self->w >= sw	1624	memset (&skey, 0, sizeof (skey));
1375	? self->x + (self->w - sw) / 2
1376	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1377
1378	int vy = self->vy = self->h >= sh
1379	? self->y + (self->h - sh) / 2
1380	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1381	*/
1382		1625
1383	glColor4ub (255, 255, 255, 255);	1626	glColor4ub (255, 255, 255, 255);
1384		1627
1385	glEnable (GL_BLEND);	1628	glEnable (GL_BLEND);
1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1629	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1389		1632
1390	glBegin (GL_QUADS);	1633	glBegin (GL_QUADS);
1391		1634
1392	last_name = 0;	1635	last_name = 0;
1393		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
1394	for (z = 0; z < 3; z++)	1662	for (z = 0; z <= 2; z++)
		1663	{
		1664	memset (smooth_level, 0, sizeof (smooth_level));
		1665
1395	for (y = 0; y < sh; y++)	1666	for (y = 0; y < sh; y++)
1396	if (0 <= y + vy && y + vy < self->rows)	1667	if (0 <= y + my && y + my < self->rows)
1397	{	1668	{
1398	maprow *row = self->row + (y + vy);	1669	maprow *row = self->row + (y + my);
1399		1670
1400	for (x = 0; x < sw; x++)	1671	for (x = 0; x < sw; x++)
1401	if (row->c0 <= x + vx && x + vx < row->c1)	1672	if (row->c0 <= x + mx && x + mx < row->c1)
1402	{	1673	{
1403	mapcell *cell = row->col + (x + vx - row->c0);	1674	mapcell *cell = row->col + (x + mx - row->c0);
1404
1405	face = cell->face [z];	1675	tileid tile = cell->tile [z];
1406		1676
1407	if (face)	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;
		1682
		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))
1408	{	1772	{
1409	maptex tex = self->tex [face];	1773	int level = (w << 5) \| b;
		1774	HE *he;
1410		1775
1411	int px = (x + 1) * 32 - tex.w;	1776	hv_iterinit (smooth);
1412	int py = (y + 1) * 32 - tex.h;	1777	while ((he = hv_iternext (smooth)))
1413
1414	if (last_name != tex.name)
1415	{	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
1416	glEnd ();	1801	glEnd ();
1417	last_name = tex.name;
1418	glBindTexture (GL_TEXTURE_2D, last_name);	1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1419	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	}
1420	}	1826	}
1421
1422	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1423	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1424	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1425	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1426	}	1827	}
1427	}
1428	}	1828	}
		1829	}
		1830
		1831	hv_clear (smooth);
		1832	}
1429		1833
1430	glEnd ();	1834	glEnd ();
1431		1835
1432	glDisable (GL_TEXTURE_2D);	1836	glDisable (GL_TEXTURE_2D);
1433	glDisable (GL_BLEND);	1837	glDisable (GL_BLEND);
1434	}
1435		1838
		1839	// top layer: overlays such as the health bar
		1840	for (y = 0; y < sh; y++)
		1841	if (0 <= y + my && y + my < self->rows)
		1842	{
		1843	maprow *row = self->row + (y + my);
		1844
		1845	for (x = 0; x < sw; x++)
		1846	if (row->c0 <= x + mx && x + mx < row->c1)
		1847	{
		1848	mapcell *cell = row->col + (x + mx - row->c0);
		1849
		1850	int px = x * T;
		1851	int py = y * T;
		1852
		1853	if (cell->stat_hp)
		1854	{
		1855	int width = cell->stat_width * T;
		1856	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1857
		1858	glColor3ub (0, 0, 0);
		1859	glRectf (px + 1, py - thick - 2,
		1860	px + width - 1, py);
		1861
		1862	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1863	glRectf (px + 2,
		1864	py - thick - 1,
		1865	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1866	}
		1867	}
		1868	}
		1869	}
		1870
1436	void	1871	void
1437	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1872	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1438	CODE:	1873	CODE:
1439	{	1874	{
1440	static float color[16][3] = {	1875	static float color[16][3] = {
1441	{ 0.00F, 0.00F, 0.00F },	1876	{ 0.00F, 0.00F, 0.00F },
1442	{ 1.00F, 1.00F, 1.00F },	1877	{ 1.00F, 1.00F, 1.00F },
…		…
1492	glDisable (GL_BLEND);	1927	glDisable (GL_BLEND);
1493	glDisable (GL_TEXTURE_2D);	1928	glDisable (GL_TEXTURE_2D);
1494	}	1929	}
1495		1930
1496	void	1931	void
1497	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1932	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1498	PPCODE:	1933	PPCODE:
1499	{	1934	{
1500	int vx, vy;
1501	int x, y;	1935	int x, y;
1502	int sw4 = (sw + 3) & ~3;	1936	int sw4 = (sw + 3) & ~3;
1503	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1937	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1504	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1938	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1505		1939
1506	memset (darkness, 255, sw4 * sh);	1940	memset (darkness, 255, sw4 * sh);
1507	SvPOK_only (darkness_sv);	1941	SvPOK_only (darkness_sv);
1508	SvCUR_set (darkness_sv, sw4 * sh);	1942	SvCUR_set (darkness_sv, sw4 * sh);
1509		1943
1510	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1944	mx += self->x;
1511	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1945	my += self->y;
1512		1946
1513	for (y = 0; y < sh; y++)	1947	for (y = 0; y < sh; y++)
1514	if (0 <= y + vy && y + vy < self->rows)	1948	if (0 <= y + my && y + my < self->rows)
1515	{	1949	{
1516	maprow *row = self->row + (y + vy);	1950	maprow *row = self->row + (y + my);
1517		1951
1518	for (x = 0; x < sw; x++)	1952	for (x = 0; x < sw; x++)
1519	if (row->c0 <= x + vx && x + vx < row->c1)	1953	if (row->c0 <= x + mx && x + mx < row->c1)
1520	{	1954	{
1521	mapcell *cell = row->col + (x + vx - row->c0);	1955	mapcell *cell = row->col + (x + mx - row->c0);
1522		1956
1523	darkness[y * sw4 + x] = cell->darkness < 0	1957	darkness[y * sw4 + x] = cell->darkness
		1958	? 255 - (cell->darkness - 1)
1524	? 255 - FOW_DARKNESS	1959	: 255 - FOW_DARKNESS;
1525	: 255 - cell->darkness;
1526	}	1960	}
1527	}	1961	}
1528		1962
1529	EXTEND (SP, 3);	1963	EXTEND (SP, 3);
1530	PUSHs (sv_2mortal (newSViv (sw4)));	1964	PUSHs (sv_2mortal (newSViv (sw4)));
1531	PUSHs (sv_2mortal (newSViv (sh)));	1965	PUSHs (sv_2mortal (newSViv (sh)));
1532	PUSHs (darkness_sv);	1966	PUSHs (darkness_sv);
1533	}	1967	}
1534		1968
1535	SV *	1969	SV *
1536	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1970	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1537	CODE:	1971	CODE:
1538	{	1972	{
1539	int x, y, x1, y1;	1973	int x, y, x1, y1;
1540	SV data_sv = newSV (w h * 7 + 5);	1974	SV data_sv = newSV (w h * 7 + 5);
1541	uint8_t data = (uint8_t )SvPVX (data_sv);	1975	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1566	if (row && row->c0 <= x && x < row->c1)	2000	if (row && row->c0 <= x && x < row->c1)
1567	{	2001	{
1568	mapcell *cell = row->col + (x - row->c0);	2002	mapcell *cell = row->col + (x - row->c0);
1569	uint8_t flags = 0;	2003	uint8_t flags = 0;
1570		2004
1571	if (cell->face [0]) flags \|= 1;	2005	if (cell->tile [0]) flags \|= 1;
1572	if (cell->face [1]) flags \|= 2;	2006	if (cell->tile [1]) flags \|= 2;
1573	if (cell->face [2]) flags \|= 4;	2007	if (cell->tile [2]) flags \|= 4;
1574		2008
1575	*data++ = flags;	2009	*data++ = flags;
1576		2010
1577	if (flags & 1)	2011	if (flags & 1)
1578	{	2012	{
		2013	tileid tile = cell->tile [0];
1579	*data++ = cell->face [0] >> 8;	2014	*data++ = tile >> 8;
1580	*data++ = cell->face [0];	2015	*data++ = tile;
1581	}	2016	}
1582		2017
1583	if (flags & 2)	2018	if (flags & 2)
1584	{	2019	{
		2020	tileid tile = cell->tile [1];
1585	*data++ = cell->face [1] >> 8;	2021	*data++ = tile >> 8;
1586	*data++ = cell->face [1];	2022	*data++ = tile;
1587	}	2023	}
1588		2024
1589	if (flags & 4)	2025	if (flags & 4)
1590	{	2026	{
		2027	tileid tile = cell->tile [2];
1591	*data++ = cell->face [2] >> 8;	2028	*data++ = tile >> 8;
1592	*data++ = cell->face [2];	2029	*data++ = tile;
1593	}	2030	}
1594	}	2031	}
1595	else	2032	else
1596	*data++ = 0;	2033	*data++ = 0;
1597	}	2034	}
…		…
1603	}	2040	}
1604	OUTPUT:	2041	OUTPUT:
1605	RETVAL	2042	RETVAL
1606		2043
1607	void	2044	void
1608	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2045	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1609	PPCODE:	2046	PPCODE:
1610	{	2047	{
1611	int x, y, z;	2048	int x, y, z;
1612	int w, h;	2049	int w, h;
1613	int x1, y1;	2050	int x1, y1;
…		…
1637	{	2074	{
1638	uint8_t flags = *data++;	2075	uint8_t flags = *data++;
1639		2076
1640	if (flags)	2077	if (flags)
1641	{	2078	{
1642	mapface face[3] = { 0, 0, 0 };
1643
1644	mapcell *cell = row_get_cell (row, x);	2079	mapcell *cell = row_get_cell (row, x);
		2080	tileid tile[3] = { 0, 0, 0 };
1645		2081
1646	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2082	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1647	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2083	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1648	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2084	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1649		2085
1650	if (cell->darkness <= 0)	2086	if (cell->darkness == 0)
1651	{	2087	{
1652	cell->darkness = -1;	2088	cell->darkness = 0;
1653		2089
1654	for (z = 0; z <= 2; z++)	2090	for (z = 0; z <= 2; z++)
1655	{	2091	{
1656	cell->face[z] = face[z];	2092	tileid t = tile [z];
1657		2093
1658	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2094	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2095	{
1659	XPUSHs (sv_2mortal (newSViv (face[z])));	2096	XPUSHs (sv_2mortal (newSViv (t)));
		2097	need_texid (self, t);
		2098	}
		2099
		2100	cell->tile [z] = t;
1660	}	2101	}
1661	}	2102	}
1662	}	2103	}
1663	}	2104	}
1664	}	2105	}
1665	}	2106	}
1666		2107
1667	MODULE = CFClient PACKAGE = CFClient::MixChunk	2108	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1668		2109
1669	CFClient::MixChunk	2110	CFPlus::MixChunk
1670	new_from_file (SV class, char path)	2111	new_from_file (SV class, char path)
1671	CODE:	2112	CODE:
1672	RETVAL = Mix_LoadWAV (path);	2113	RETVAL = Mix_LoadWAV (path);
1673	OUTPUT:	2114	OUTPUT:
1674	RETVAL	2115	RETVAL
1675		2116
1676	void	2117	void
1677	DESTROY (CFClient::MixChunk self)	2118	DESTROY (CFPlus::MixChunk self)
1678	CODE:	2119	CODE:
1679	Mix_FreeChunk (self);	2120	Mix_FreeChunk (self);
1680		2121
1681	int	2122	int
1682	volume (CFClient::MixChunk self, int volume = -1)	2123	volume (CFPlus::MixChunk self, int volume = -1)
1683	CODE:	2124	CODE:
1684	RETVAL = Mix_VolumeChunk (self, volume);	2125	RETVAL = Mix_VolumeChunk (self, volume);
1685	OUTPUT:	2126	OUTPUT:
1686	RETVAL	2127	RETVAL
1687		2128
1688	int	2129	int
1689	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2130	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1690	CODE:	2131	CODE:
1691	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2132	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1692	OUTPUT:	2133	OUTPUT:
1693	RETVAL	2134	RETVAL
1694		2135
1695	MODULE = CFClient PACKAGE = CFClient::MixMusic	2136	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1696		2137
1697	int	2138	int
1698	volume (int volume = -1)	2139	volume (int volume = -1)
1699	CODE:	2140	CODE:
1700	RETVAL = Mix_VolumeMusic (volume);	2141	RETVAL = Mix_VolumeMusic (volume);
1701	OUTPUT:	2142	OUTPUT:
1702	RETVAL	2143	RETVAL
1703		2144
		2145	int
		2146	fade_out (int ms)
		2147	CODE:
		2148	RETVAL = Mix_FadeOutMusic (ms);
		2149	OUTPUT:
		2150	RETVAL
		2151
1704	CFClient::MixMusic	2152	CFPlus::MixMusic
1705	new_from_file (SV class, char path)	2153	new_from_file (SV class, char path)
1706	CODE:	2154	CODE:
1707	RETVAL = Mix_LoadMUS (path);	2155	RETVAL = Mix_LoadMUS (path);
1708	OUTPUT:	2156	OUTPUT:
1709	RETVAL	2157	RETVAL
1710		2158
1711	void	2159	void
1712	DESTROY (CFClient::MixMusic self)	2160	DESTROY (CFPlus::MixMusic self)
1713	CODE:	2161	CODE:
1714	Mix_FreeMusic (self);	2162	Mix_FreeMusic (self);
1715		2163
1716	int	2164	int
1717	play (CFClient::MixMusic self, int loops = -1)	2165	play (CFPlus::MixMusic self, int loops = -1)
1718	CODE:	2166	CODE:
1719	RETVAL = Mix_PlayMusic (self, loops);	2167	RETVAL = Mix_PlayMusic (self, loops);
1720	OUTPUT:	2168	OUTPUT:
1721	RETVAL	2169	RETVAL
1722		2170
1723	MODULE = CFClient PACKAGE = CFClient::OpenGL	2171	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1724		2172
1725	BOOT:	2173	BOOT:
1726	{	2174	{
1727	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2175	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1728	static const struct {	2176	static const struct {
1729	const char *name;	2177	const char *name;
1730	IV iv;	2178	IV iv;
1731	} *civ, const_iv[] = {	2179	} *civ, const_iv[] = {
1732	# define const_iv(name) { # name, (IV)name }	2180	# define const_iv(name) { # name, (IV)name }
…		…
1795	const_iv (GL_SEPARABLE_2D),	2243	const_iv (GL_SEPARABLE_2D),
1796	const_iv (GL_CONVOLUTION_2D),	2244	const_iv (GL_CONVOLUTION_2D),
1797	const_iv (GL_CONVOLUTION_BORDER_MODE),	2245	const_iv (GL_CONVOLUTION_BORDER_MODE),
1798	const_iv (GL_CONSTANT_BORDER),	2246	const_iv (GL_CONSTANT_BORDER),
1799	const_iv (GL_LINES),	2247	const_iv (GL_LINES),
		2248	const_iv (GL_LINE_STRIP),
1800	const_iv (GL_LINE_LOOP),	2249	const_iv (GL_LINE_LOOP),
1801	const_iv (GL_QUADS),	2250	const_iv (GL_QUADS),
1802	const_iv (GL_QUAD_STRIP),	2251	const_iv (GL_QUAD_STRIP),
1803	const_iv (GL_TRIANGLES),	2252	const_iv (GL_TRIANGLES),
1804	const_iv (GL_TRIANGLE_STRIP),	2253	const_iv (GL_TRIANGLE_STRIP),
…		…
1812	# undef const_iv	2261	# undef const_iv
1813	};	2262	};
1814		2263
1815	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2264	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1816	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2265	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2266
		2267	texture_av = newAV ();
		2268	AvREAL_off (texture_av);
1817	}	2269	}
1818		2270
1819	char *	2271	char *
1820	gl_vendor ()	2272	gl_vendor ()
1821	CODE:	2273	CODE:
…		…
1914	r *= a;	2366	r *= a;
1915	g *= a;	2367	g *= a;
1916	b *= a;	2368	b *= a;
1917	}	2369	}
1918	// microsoft visual "c" rounds instead of truncating...	2370	// microsoft visual "c" rounds instead of truncating...
1919	glColor4ub (MIN ((int)(r * 256.f), 255),	2371	glColor4f (r, g, b, a);
1920	MIN ((int)(g * 256.f), 255),
1921	MIN ((int)(b * 256.f), 255),
1922	MIN ((int)(a * 256.f), 255));
1923		2372
1924	void glInterleavedArrays (int format, int stride, char *data)	2373	void glInterleavedArrays (int format, int stride, char *data)
1925		2374
1926	void glDrawElements (int mode, int count, int type, char *indices)	2375	void glDrawElements (int mode, int count, int type, char *indices)
1927		2376
…		…
1973		2422
1974	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2423	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1975		2424
1976	int glGenTexture ()	2425	int glGenTexture ()
1977	CODE:	2426	CODE:
1978	{	2427	RETVAL = gen_texture ();
1979	GLuint name;
1980	glGenTextures (1, &name);
1981	RETVAL = name;
1982	}
1983	OUTPUT:	2428	OUTPUT:
1984	RETVAL	2429	RETVAL
1985		2430
1986	void glDeleteTexture (int name)	2431	void glDeleteTexture (int name)
1987	CODE:	2432	CODE:
1988	{
1989	GLuint name_ = name;
1990	glDeleteTextures (1, &name_);	2433	del_texture (name);
1991	}	2434
1992
1993	int glGenList ()	2435	int glGenList ()
1994	CODE:	2436	CODE:
1995	RETVAL = glGenLists (1);	2437	RETVAL = glGenLists (1);
1996	OUTPUT:	2438	OUTPUT:
1997	RETVAL	2439	RETVAL
…		…
2004		2446
2005	void glEndList ()	2447	void glEndList ()
2006		2448
2007	void glCallList (int list)	2449	void glCallList (int list)
2008		2450
2009

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs. Revision 1.194 by root, Thu Jul 12 17:56:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.194 by root, Thu Jul 12 17:56:50 2007 UTC