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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.128 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 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)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
		19	#include <assert.h>
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
15	#include <stdlib.h>	23	#include <stdlib.h>
16		24
31	# include <sys/types.h>	39	# include <sys/types.h>
32	# include <sys/socket.h>	40	# include <sys/socket.h>
33	# include <netinet/in.h>	41	# include <netinet/in.h>
34	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
35	# include <inttypes.h>	43	# 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	44	#endif
44		45
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		47
49	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
50		49
51	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
…		…
57	# define PARACHUTE SDL_INIT_NOPARACHUTE	56	# define PARACHUTE SDL_INIT_NOPARACHUTE
58	#else	57	#else
59	# define PARACHUTE 0	58	# define PARACHUTE 0
60	#endif	59	#endif
61		60
		61	static AV *texture_av;
		62
62	static struct	63	static struct
63	{	64	{
64	#define GL_FUNC(ptr,name) ptr name;	65	#define GL_FUNC(ptr,name) ptr name;
65	#include "glfunc.h"	66	#include "glfunc.h"
66	#undef GL_FUNC	67	#undef GL_FUNC
67	} gl;	68	} gl;
68		69
		70	static void
69	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	71	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70	{	72	{
71	if (gl.BlendFuncSeparate)	73	if (gl.BlendFuncSeparate)
72	gl.BlendFuncSeparate (sa, da, saa, daa);	74	gl.BlendFuncSeparate (sa, da, saa, daa);
73	else if (gl.BlendFuncSeparateEXT)	75	else if (gl.BlendFuncSeparateEXT)
74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	76	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75	else	77	else
76	glBlendFunc (sa, da);	78	glBlendFunc (sa, da);
77	}	79	}
78		80
		81	static GLuint
		82	gen_texture ()
		83	{
		84	GLuint name;
		85
		86	if (AvFILL (texture_av) >= 0)
		87	name = (GLuint)(size_t)av_pop (texture_av);
		88	else
		89	glGenTextures (1, &name);
		90
		91	return name;
		92	}
		93
		94	static void
		95	del_texture (GLuint name)
		96	{
		97	/* make a half-assed attempt at returning the memory used by the texture */
		98	/* textures are frequently being reused by cfplus anyway */
		99	/glBindTexture (GL_TEXTURE_2D, name);/
		100	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		101	av_push (texture_av, (SV *)(size_t)name);
		102	glDeleteTextures (1, &name);
		103	}
		104
79	#include "texcache.c"	105	#include "texcache.c"
80		106
81	#include "pango-font.c"	107	#include "pango-font.c"
82	#include "pango-fontmap.c"	108	#include "pango-fontmap.c"
83	#include "pango-render.c"	109	#include "pango-render.c"
84		110
85	typedef Mix_Chunk *CFClient__MixChunk;	111	typedef Mix_Chunk *CFPlus__MixChunk;
86	typedef Mix_Music *CFClient__MixMusic;	112	typedef Mix_Music *CFPlus__MixMusic;
87		113
88	typedef PangoFontDescription *CFClient__Font;	114	typedef PangoFontDescription *CFPlus__Font;
89		115
90	static int	116	static int
91	shape_attr_p (PangoLayoutRun *run)	117	shape_attr_p (PangoLayoutRun *run)
92	{	118	{
93	GSList *attrs = run->item->analysis.extra_attrs;	119	GSList *attrs = run->item->analysis.extra_attrs;
…		…
107		133
108	typedef struct cf_layout {	134	typedef struct cf_layout {
109	PangoLayout *pl;	135	PangoLayout *pl;
110	float r, g, b, a; // default color for rgba mode	136	float r, g, b, a; // default color for rgba mode
111	int base_height;	137	int base_height;
112	CFClient__Font font;	138	CFPlus__Font font;
113	} *CFClient__Layout;	139	} *CFPlus__Layout;
114		140
115	static CFClient__Font default_font;	141	static CFPlus__Font default_font;
116	static PangoContext *opengl_context;	142	static PangoContext *opengl_context;
117	static PangoFontMap *opengl_fontmap;	143	static PangoFontMap *opengl_fontmap;
118		144
119	static void	145	static void
120	substitute_func (FcPattern *pattern, gpointer data)	146	substitute_func (FcPattern *pattern, gpointer data)
…		…
125	#endif	151	#endif
126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	152	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127	}	153	}
128		154
129	static void	155	static void
130	layout_update_font (CFClient__Layout self)	156	layout_update_font (CFPlus__Layout self)
131	{	157	{
132	/* use a random scale factor to account for unknown descenders, 0.8 works	158	/* use a random scale factor to account for unknown descenders, 0.8 works
133	* reasonably well with bitstream vera	159	* reasonably well with bitstream vera
134	*/	160	*/
135	PangoFontDescription *font = self->font ? self->font : default_font;	161	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
139		165
140	pango_layout_set_font_description (self->pl, font);	166	pango_layout_set_font_description (self->pl, font);
141	}	167	}
142		168
143	static void	169	static void
144	layout_get_pixel_size (CFClient__Layout self, int w, int h)	170	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
145	{	171	{
		172	PangoRectangle rect;
		173
		174	// get_pixel_* wrongly rounds down
146	pango_layout_get_pixel_size (self->pl, w, h);	175	pango_layout_get_extents (self->pl, 0, &rect);
147		176
148	if (!w) w = 1;	177	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149	if (!h) h = 1;	178	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150		179
151	w = (w + 3) & ~3;	180	if (!rect.width) rect.width = 1;
152	}	181	if (!rect.height) rect.height = 1;
153		182
		183	*w = rect.width;
		184	*h = rect.height;
		185	}
		186
		187	typedef uint16_t tileid;
154	typedef uint16_t mapface;	188	typedef uint16_t faceid;
155		189
156	typedef struct {	190	typedef struct {
157	GLint name;	191	int name;
158	int w, h;	192	int w, h;
159	float s, t;	193	float s, t;
160	uint8_t r, g, b, a;	194	uint8_t r, g, b, a;
		195	tileid smoothtile;
		196	uint8_t smoothlevel;
161	} maptex;	197	} maptex;
162		198
163	typedef struct {	199	typedef struct {
		200	uint32_t player;
		201	tileid tile[3];
164	int16_t darkness;	202	uint16_t darkness;
165	mapface face[3];	203	uint8_t stat_width, stat_hp, flags, smoothmax;
166	} mapcell;	204	} mapcell;
167		205
168	typedef struct {	206	typedef struct {
169	int32_t c0, c1;	207	int32_t c0, c1;
170	mapcell *col;	208	mapcell *col;
171	} maprow;	209	} maprow;
172		210
173	typedef struct map {	211	typedef struct map {
174	int x, y, w, h;	212	int x, y, w, h;
175	int ox, oy; /* offset to virtual global coordinate system */	213	int ox, oy; /* offset to virtual global coordinate system */
176	int faces;	214	int faces; tileid *face2tile; // [faceid]
177	mapface *face;	215	int texs; maptex *tex; // [tileid]
178
179	int texs;
180	maptex *tex;
181		216
182	int32_t rows;	217	int32_t rows;
183	maprow *row;	218	maprow *row;
184	} *CFClient__Map;	219	} *CFPlus__Map;
185		220
186	static char *	221	static char *
187	prepend (char *ptr, int sze, int inc)	222	prepend (char *ptr, int sze, int inc)
188	{	223	{
189	char *p;	224	char *p;
…		…
206	}	241	}
207		242
208	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	243	#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))	244	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210		245
		246	static void
		247	need_facenum (struct map *self, faceid face)
		248	{
		249	while (self->faces <= face)
		250	{
		251	Append (tileid, self->face2tile, self->faces, self->faces);
		252	self->faces *= 2;
		253	}
		254	}
		255
		256	static void
		257	need_texid (struct map *self, int texid)
		258	{
		259	while (self->texs <= texid)
		260	{
		261	Append (maptex, self->tex, self->texs, self->texs);
		262	self->texs *= 2;
		263	}
		264	}
		265
211	static maprow *	266	static maprow *
212	map_get_row (CFClient__Map self, int y)	267	map_get_row (CFPlus__Map self, int y)
213	{	268	{
214	if (0 > y)	269	if (0 > y)
215	{	270	{
216	int extend = - y + MAP_EXTEND_Y;	271	int extend = - y + MAP_EXTEND_Y;
217	Prepend (maprow, self->row, self->rows, extend);	272	Prepend (maprow, self->row, self->rows, extend);
…		…
255		310
256	return row->col + (x - row->c0);	311	return row->col + (x - row->c0);
257	}	312	}
258		313
259	static mapcell *	314	static mapcell *
260	map_get_cell (CFClient__Map self, int x, int y)	315	map_get_cell (CFPlus__Map self, int x, int y)
261	{	316	{
262	return row_get_cell (map_get_row (self, y), x);	317	return row_get_cell (map_get_row (self, y), x);
263	}	318	}
264		319
265	static void	320	static void
266	map_clear (CFClient__Map self)	321	map_clear (CFPlus__Map self)
267	{	322	{
268	int r;	323	int r;
269		324
270	for (r = 0; r < self->rows; r++)	325	for (r = 0; r < self->rows; r++)
271	Safefree (self->row[r].col);	326	Safefree (self->row[r].col);
…		…
279	self->row = 0;	334	self->row = 0;
280	self->rows = 0;	335	self->rows = 0;
281	}	336	}
282		337
283	static void	338	static void
284	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	339	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285	{	340	{
286	int x, y;	341	int x, y;
287	maprow *row;	342	maprow *row;
		343	mapcell *cell;
288		344
289	for (y = y0; y < y0 + h; y++)	345	for (y = y0; y < y0 + h; y++)
290	if (y >= 0)	346	if (y >= 0)
291	{	347	{
292	if (y >= self->rows)	348	if (y >= self->rows)
…		…
298	if (x >= row->c0)	354	if (x >= row->c0)
299	{	355	{
300	if (x >= row->c1)	356	if (x >= row->c1)
301	break;	357	break;
302		358
303	row->col[x - row->c0].darkness = -1;	359	cell = row->col + x - row->c0;
		360
		361	cell->darkness = 0;
		362	cell->stat_hp = 0;
		363	cell->flags = 0;
		364	cell->player = 0;
304	}	365	}
305	}	366	}
		367	}
		368
		369	typedef struct {
		370	tileid tile;
		371	uint8_t x, y, level;
		372	} smooth_key;
		373
		374	static void
		375	smooth_or_bits (HV hv, smooth_key key, IV bits)
		376	{
		377	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		378
		379	if (SvIOK (*sv))
		380	SvIV_set (sv, SvIVX (sv) \| bits);
		381	else
		382	sv_setiv (*sv, bits);
306	}	383	}
307		384
308	static void	385	static void
309	music_finished (void)	386	music_finished (void)
310	{	387	{
…		…
346	n \|= n >> 16;	423	n \|= n >> 16;
347		424
348	return n + 1;	425	return n + 1;
349	}	426	}
350		427
		428	/* SDL should provide this, really. */
		429	#define SDLK_MODIFIER_MIN 300
		430	#define SDLK_MODIFIER_MAX 314
		431
351	MODULE = CFClient PACKAGE = CFClient	432	MODULE = CFPlus PACKAGE = CFPlus
352		433
353	PROTOTYPES: ENABLE	434	PROTOTYPES: ENABLE
354		435
355	BOOT:	436	BOOT:
356	{	437	{
357	HV *stash = gv_stashpv ("CFClient", 1);	438	HV *stash = gv_stashpv ("CFPlus", 1);
358	static const struct {	439	static const struct {
359	const char *name;	440	const char *name;
360	IV iv;	441	IV iv;
361	} *civ, const_iv[] = {	442	} *civ, const_iv[] = {
362	# define const_iv(name) { # name, (IV)name }	443	# define const_iv(name) { # name, (IV)name }
		444	const_iv (SDLK_MODIFIER_MIN),
		445	const_iv (SDLK_MODIFIER_MAX),
		446
363	const_iv (SDL_ACTIVEEVENT),	447	const_iv (SDL_ACTIVEEVENT),
364	const_iv (SDL_KEYDOWN),	448	const_iv (SDL_KEYDOWN),
365	const_iv (SDL_KEYUP),	449	const_iv (SDL_KEYUP),
366	const_iv (SDL_MOUSEMOTION),	450	const_iv (SDL_MOUSEMOTION),
367	const_iv (SDL_MOUSEBUTTONDOWN),	451	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
376	const_iv (SDL_EVENT_RESERVEDA),	460	const_iv (SDL_EVENT_RESERVEDA),
377	const_iv (SDL_EVENT_RESERVEDB),	461	const_iv (SDL_EVENT_RESERVEDB),
378	const_iv (SDL_VIDEORESIZE),	462	const_iv (SDL_VIDEORESIZE),
379	const_iv (SDL_VIDEOEXPOSE),	463	const_iv (SDL_VIDEOEXPOSE),
380	const_iv (SDL_USEREVENT),	464	const_iv (SDL_USEREVENT),
		465
		466	const_iv (SDL_APPINPUTFOCUS),
		467	const_iv (SDL_APPMOUSEFOCUS),
		468	const_iv (SDL_APPACTIVE),
		469
381	const_iv (SDLK_KP0),	470	const_iv (SDLK_KP0),
382	const_iv (SDLK_KP1),	471	const_iv (SDLK_KP1),
383	const_iv (SDLK_KP2),	472	const_iv (SDLK_KP2),
384	const_iv (SDLK_KP3),	473	const_iv (SDLK_KP3),
385	const_iv (SDLK_KP4),	474	const_iv (SDLK_KP4),
…		…
440	const_iv (SDLK_BREAK),	529	const_iv (SDLK_BREAK),
441	const_iv (SDLK_MENU),	530	const_iv (SDLK_MENU),
442	const_iv (SDLK_POWER),	531	const_iv (SDLK_POWER),
443	const_iv (SDLK_EURO),	532	const_iv (SDLK_EURO),
444	const_iv (SDLK_UNDO),	533	const_iv (SDLK_UNDO),
		534
445	const_iv (KMOD_NONE),	535	const_iv (KMOD_NONE),
		536	const_iv (KMOD_SHIFT),
446	const_iv (KMOD_LSHIFT),	537	const_iv (KMOD_LSHIFT),
447	const_iv (KMOD_RSHIFT),	538	const_iv (KMOD_RSHIFT),
		539	const_iv (KMOD_CTRL),
448	const_iv (KMOD_LCTRL),	540	const_iv (KMOD_LCTRL),
449	const_iv (KMOD_RCTRL),	541	const_iv (KMOD_RCTRL),
		542	const_iv (KMOD_ALT),
450	const_iv (KMOD_LALT),	543	const_iv (KMOD_LALT),
451	const_iv (KMOD_RALT),	544	const_iv (KMOD_RALT),
		545	const_iv (KMOD_META),
452	const_iv (KMOD_LMETA),	546	const_iv (KMOD_LMETA),
453	const_iv (KMOD_RMETA),	547	const_iv (KMOD_RMETA),
454	const_iv (KMOD_NUM),	548	const_iv (KMOD_NUM),
455	const_iv (KMOD_CAPS),	549	const_iv (KMOD_CAPS),
456	const_iv (KMOD_MODE),	550	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	551	# undef const_iv
462	};	552	};
463		553
464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	554	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	555	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		556
		557	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		558	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466	}	559	}
		560
		561	void
		562	weaken (SV *rv)
		563	PROTOTYPE: $
		564	CODE:
		565	sv_rvweaken (rv);
		566
		567	int
		568	in_destruct ()
		569	CODE:
		570	RETVAL = PL_main_cv == Nullcv;
		571	OUTPUT:
		572	RETVAL
467		573
468	NV floor (NV x)	574	NV floor (NV x)
469		575
470	NV ceil (NV x)	576	NV ceil (NV x)
471		577
…		…
502	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	608	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	609	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
504	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	610	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505		611
506	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	612	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		613	#if SDL_VERSION_ATLEAST(1,2,10)
		614	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		615	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		616	#endif
507		617
508	SDL_EnableUNICODE (1);	618	SDL_EnableUNICODE (1);
509	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	619	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510		620
511	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	621	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
531	RETVAL = !!SDL_SetVideoMode (	641	RETVAL = !!SDL_SetVideoMode (
532	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	642	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
533	);	643	);
534	if (RETVAL)	644	if (RETVAL)
535	{	645	{
		646	av_clear (texture_av);
		647
536	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	648	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	649	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538	# include "glfunc.h"	650	# include "glfunc.h"
539	# undef GL_FUNC	651	# undef GL_FUNC
		652
540	}	653	}
541	OUTPUT:	654	OUTPUT:
542	RETVAL	655	RETVAL
543		656
544	void	657	void
…		…
563	case SDL_KEYDOWN:	676	case SDL_KEYDOWN:
564	case SDL_KEYUP:	677	case SDL_KEYUP:
565	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	678	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	679	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	680	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		681	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
568	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	682	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569	break;	683	break;
570		684
571	case SDL_ACTIVEEVENT:	685	case SDL_ACTIVEEVENT:
572	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	686	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
598	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	712	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	713	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600	break;	714	break;
601	}	715	}
602		716
603	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	717	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604	}	718	}
605	}	719	}
606		720
607	int	721	int
608	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	722	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
617	Mix_AllocateChannels (int numchans = -1)	731	Mix_AllocateChannels (int numchans = -1)
618		732
619	void	733	void
620	lowdelay (int fd, int val = 1)	734	lowdelay (int fd, int val = 1)
621	CODE:	735	CODE:
		736	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		737
		738	void
		739	win32_proxy_info ()
		740	PPCODE:
		741	{
622	#ifndef _WIN32	742	#ifdef _WIN32
623	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	743	char buffer[2048];
		744	DWORD buflen;
		745
		746	EXTEND (SP, 3);
		747
		748	buflen = sizeof (buffer);
		749	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		750	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		751	{
		752	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		753
		754	buflen = sizeof (buffer);
		755	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		756	{
		757	PUSHs (newSVpv (buffer, 0));
		758
		759	buflen = sizeof (buffer);
		760	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		761	PUSHs (newSVpv (buffer, 0));
		762	}
		763	}
624	#endif	764	#endif
		765	}
625		766
626	void	767	void
627	add_font (char *file)	768	add_font (char *file)
628	CODE:	769	CODE:
629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	770	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630		771
631	void	772	void
632	load_image_inline (SV *image_)	773	load_image_inline (SV *image_)
633	ALIAS:	774	ALIAS:
634	load_image_file = 1	775	load_image_file = 1
…		…
676		817
677	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	818	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678		819
679	assert (surface2->pitch == surface2->w * 4);	820	assert (surface2->pitch == surface2->w * 4);
680		821
		822	SDL_LockSurface (surface2);
681	EXTEND (SP, 5);	823	EXTEND (SP, 6);
682	PUSHs (sv_2mortal (newSViv (surface2->w)));	824	PUSHs (sv_2mortal (newSViv (surface2->w)));
683	PUSHs (sv_2mortal (newSViv (surface2->h)));	825	PUSHs (sv_2mortal (newSViv (surface2->h)));
684	SDL_LockSurface (surface2);
685	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	826	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686	SDL_UnlockSurface (surface2);
687	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	827	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	828	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	829	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		830	SDL_UnlockSurface (surface2);
690		831
691	SDL_FreeSurface (surface);	832	SDL_FreeSurface (surface);
692	SDL_FreeSurface (surface2);	833	SDL_FreeSurface (surface2);
693	}	834	}
694		835
…		…
733	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	874	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
734	#endif	875	#endif
735	_exit (1);	876	_exit (1);
736		877
737	void	878	void
738	_exit (int retval)	879	_exit (int retval = 0)
739	CODE:	880	CODE:
		881	#ifdef WIN32
		882	ExitThread (retval); // unclean, please beam me up
		883	#else
740	_exit (retval);	884	_exit (retval);
		885	#endif
741		886
742	MODULE = CFClient PACKAGE = CFClient::Font	887	MODULE = CFPlus PACKAGE = CFPlus::Font
743		888
744	CFClient::Font	889	CFPlus::Font
745	new_from_file (SV class, char path, int id = 0)	890	new_from_file (SV class, char path, int id = 0)
746	CODE:	891	CODE:
747	{	892	{
748	int count;	893	int count;
749	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	894	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
752	}	897	}
753	OUTPUT:	898	OUTPUT:
754	RETVAL	899	RETVAL
755		900
756	void	901	void
757	DESTROY (CFClient::Font self)	902	DESTROY (CFPlus::Font self)
758	CODE:	903	CODE:
759	pango_font_description_free (self);	904	pango_font_description_free (self);
760		905
761	void	906	void
762	make_default (CFClient::Font self)	907	make_default (CFPlus::Font self)
763	CODE:	908	CODE:
764	default_font = self;	909	default_font = self;
765		910
766	MODULE = CFClient PACKAGE = CFClient::Layout	911	MODULE = CFPlus PACKAGE = CFPlus::Layout
767		912
768	void	913	void
769	clear_font_cache ()	914	reset_glyph_cache ()
770	CODE:	915	CODE:
771	tc_clear ();	916	tc_clear ();
772		917
773	CFClient::Layout	918	CFPlus::Layout
774	new (SV *class)	919	new (SV *class)
775	CODE:	920	CODE:
776	New (0, RETVAL, 1, struct cf_layout);	921	New (0, RETVAL, 1, struct cf_layout);
777		922
778	RETVAL->pl = pango_layout_new (opengl_context);	923	RETVAL->pl = pango_layout_new (opengl_context);
…		…
787	layout_update_font (RETVAL);	932	layout_update_font (RETVAL);
788	OUTPUT:	933	OUTPUT:
789	RETVAL	934	RETVAL
790		935
791	void	936	void
792	DESTROY (CFClient::Layout self)	937	DESTROY (CFPlus::Layout self)
793	CODE:	938	CODE:
794	g_object_unref (self->pl);	939	g_object_unref (self->pl);
795	Safefree (self);	940	Safefree (self);
796		941
797	void	942	void
798	set_text (CFClient::Layout self, SV *text_)	943	set_text (CFPlus::Layout self, SV *text_)
799	CODE:	944	CODE:
800	{	945	{
801	STRLEN textlen;	946	STRLEN textlen;
802	char *text = SvPVutf8 (text_, textlen);	947	char *text = SvPVutf8 (text_, textlen);
803		948
804	pango_layout_set_text (self->pl, text, textlen);	949	pango_layout_set_text (self->pl, text, textlen);
805	}	950	}
806		951
807	void	952	void
808	set_markup (CFClient::Layout self, SV *text_)	953	set_markup (CFPlus::Layout self, SV *text_)
809	CODE:	954	CODE:
810	{	955	{
811	STRLEN textlen;	956	STRLEN textlen;
812	char *text = SvPVutf8 (text_, textlen);	957	char *text = SvPVutf8 (text_, textlen);
813		958
814	pango_layout_set_markup (self->pl, text, textlen);	959	pango_layout_set_markup (self->pl, text, textlen);
815	}	960	}
816		961
817	void	962	void
818	set_shapes (CFClient::Layout self, ...)	963	set_shapes (CFPlus::Layout self, ...)
819	CODE:	964	CODE:
820	{	965	{
821	PangoAttrList *attrs = 0;	966	PangoAttrList *attrs = 0;
822	const char *text = pango_layout_get_text (self->pl);	967	const char *text = pango_layout_get_text (self->pl);
823	const char *pos = text;	968	const char *pos = text;
…		…
858	if (attrs)	1003	if (attrs)
859	pango_layout_set_attributes (self->pl, attrs);	1004	pango_layout_set_attributes (self->pl, attrs);
860	}	1005	}
861		1006
862	void	1007	void
863	get_shapes (CFClient::Layout self)	1008	get_shapes (CFPlus::Layout self)
864	PPCODE:	1009	PPCODE:
865	{	1010	{
866	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1011	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867		1012
868	do	1013	do
…		…
872	if (run && shape_attr_p (run))	1017	if (run && shape_attr_p (run))
873	{	1018	{
874	PangoRectangle extents;	1019	PangoRectangle extents;
875	pango_layout_iter_get_run_extents (iter, 0, &extents);	1020	pango_layout_iter_get_run_extents (iter, 0, &extents);
876		1021
		1022	EXTEND (SP, 2);
877	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	1023	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	1024	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879	}	1025	}
880	}	1026	}
881	while (pango_layout_iter_next_run (iter));	1027	while (pango_layout_iter_next_run (iter));
882		1028
883	pango_layout_iter_free (iter);	1029	pango_layout_iter_free (iter);
884	}	1030	}
885		1031
886	int	1032	int
887	has_wrapped (CFClient::Layout self)	1033	has_wrapped (CFPlus::Layout self)
888	CODE:	1034	CODE:
889	{	1035	{
890	int lines = 1;	1036	int lines = 1;
891	const char *text = pango_layout_get_text (self->pl);	1037	const char *text = pango_layout_get_text (self->pl);
892		1038
…		…
897	}	1043	}
898	OUTPUT:	1044	OUTPUT:
899	RETVAL	1045	RETVAL
900		1046
901	SV *	1047	SV *
902	get_text (CFClient::Layout self)	1048	get_text (CFPlus::Layout self)
903	CODE:	1049	CODE:
904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1050	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905	sv_utf8_decode (RETVAL);	1051	sv_utf8_decode (RETVAL);
906	OUTPUT:	1052	OUTPUT:
907	RETVAL	1053	RETVAL
908		1054
909	void	1055	void
910	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1056	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
911	CODE:	1057	CODE:
912	self->r = r;	1058	self->r = r;
913	self->g = g;	1059	self->g = g;
914	self->b = b;	1060	self->b = b;
915	self->a = a;	1061	self->a = a;
916		1062
917	void	1063	void
918	set_font (CFClient::Layout self, CFClient::Font font = 0)	1064	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919	CODE:	1065	CODE:
920	if (self->font != font)	1066	if (self->font != font)
921	{	1067	{
922	self->font = font;	1068	self->font = font;
923	layout_update_font (self);	1069	layout_update_font (self);
924	}	1070	}
925		1071
926	void	1072	void
927	set_height (CFClient::Layout self, int base_height)	1073	set_height (CFPlus::Layout self, int base_height)
928	CODE:	1074	CODE:
929	if (self->base_height != base_height)	1075	if (self->base_height != base_height)
930	{	1076	{
931	self->base_height = base_height;	1077	self->base_height = base_height;
932	layout_update_font (self);	1078	layout_update_font (self);
933	}	1079	}
934		1080
935	void	1081	void
936	set_width (CFClient::Layout self, int max_width = -1)	1082	set_width (CFPlus::Layout self, int max_width = -1)
937	CODE:	1083	CODE:
938	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1084	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939		1085
940	void	1086	void
941	set_indent (CFClient::Layout self, int indent)	1087	set_indent (CFPlus::Layout self, int indent)
942	CODE:	1088	CODE:
943	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1089	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944		1090
945	void	1091	void
946	set_spacing (CFClient::Layout self, int spacing)	1092	set_spacing (CFPlus::Layout self, int spacing)
947	CODE:	1093	CODE:
948	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1094	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949		1095
950	void	1096	void
951	set_ellipsise (CFClient::Layout self, int ellipsise)	1097	set_ellipsise (CFPlus::Layout self, int ellipsise)
952	CODE:	1098	CODE:
953	pango_layout_set_ellipsize (self->pl,	1099	pango_layout_set_ellipsize (self->pl,
954	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1100	ellipsise == 1 ? PANGO_ELLIPSIZE_START
955	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1101	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1102	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
957	: PANGO_ELLIPSIZE_NONE	1103	: PANGO_ELLIPSIZE_NONE
958	);	1104	);
959		1105
960	void	1106	void
961	set_single_paragraph_mode (CFClient::Layout self, int spm)	1107	set_single_paragraph_mode (CFPlus::Layout self, int spm)
962	CODE:	1108	CODE:
963	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1109	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964		1110
965	void	1111	void
966	size (CFClient::Layout self)	1112	size (CFPlus::Layout self)
967	PPCODE:	1113	PPCODE:
968	{	1114	{
969	int w, h;	1115	int w, h;
970		1116
971	layout_get_pixel_size (self, &w, &h);	1117	layout_get_pixel_size (self, &w, &h);
…		…
974	PUSHs (sv_2mortal (newSViv (w)));	1120	PUSHs (sv_2mortal (newSViv (w)));
975	PUSHs (sv_2mortal (newSViv (h)));	1121	PUSHs (sv_2mortal (newSViv (h)));
976	}	1122	}
977		1123
978	int	1124	int
979	descent (CFClient::Layout self)	1125	descent (CFPlus::Layout self)
980	CODE:	1126	CODE:
981	{	1127	{
982	PangoRectangle rect;	1128	PangoRectangle rect;
983	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1129	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984	pango_layout_line_get_pixel_extents (line, 0, &rect);	1130	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
986	}	1132	}
987	OUTPUT:	1133	OUTPUT:
988	RETVAL	1134	RETVAL
989		1135
990	int	1136	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1137	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1138	CODE:
993	{	1139	{
994	int index, trailing;	1140	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1141	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1142	RETVAL = index + trailing;
997	}	1143	}
998	OUTPUT:	1144	OUTPUT:
999	RETVAL	1145	RETVAL
1000		1146
1001	void	1147	void
1002	cursor_pos (CFClient::Layout self, int index)	1148	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1149	PPCODE:
1004	{	1150	{
1005	PangoRectangle strong_pos;	1151	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1152	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1153
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1156	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1157	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1158	}
1013		1159
1014	void	1160	void
		1161	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1162	PPCODE:
		1163	{
		1164	int line, x;
		1165
		1166	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1167	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1168
		1169	EXTEND (SP, 2);
		1170	PUSHs (sv_2mortal (newSViv (line - 1)));
		1171	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1172	}
		1173
		1174	void
		1175	line_x_to_index (CFPlus::Layout self, int line, int x)
		1176	PPCODE:
		1177	{
		1178	PangoLayoutLine *lp;
		1179	int index, trailing;
		1180
		1181	if (line < 0)
		1182	XSRETURN_EMPTY;
		1183
		1184	if (!(lp = pango_layout_get_line (self->pl, line)))
		1185	XSRETURN_EMPTY; /* do better */
		1186
		1187	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1188
		1189	EXTEND (SP, 2);
		1190	if (GIMME_V == G_SCALAR)
		1191	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1192	else
		1193	{
		1194	PUSHs (sv_2mortal (newSViv (index)));
		1195	PUSHs (sv_2mortal (newSViv (trailing)));
		1196	}
		1197	}
		1198
		1199	void
1015	render (CFClient::Layout self, float x, float y)	1200	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1201	PPCODE:
1017	pango_opengl_render_layout_subpixel (	1202	pango_opengl_render_layout_subpixel (
1018	self->pl,	1203	self->pl,
1019	x * PANGO_SCALE, y * PANGO_SCALE,	1204	x * PANGO_SCALE, y * PANGO_SCALE,
1020	self->r, self->g, self->b, self->a	1205	self->r, self->g, self->b, self->a,
		1206	flags
1021	);	1207	);
1022		1208
1023	MODULE = CFClient PACKAGE = CFClient::Texture	1209	MODULE = CFPlus PACKAGE = CFPlus::Texture
1024		1210
1025	void	1211	void
1026	pad2pot (SV data_, SV w_, SV *h_)	1212	pad2pot (SV data_, SV w_, SV *h_)
1027	CODE:	1213	CODE:
1028	{	1214	{
…		…
1106	glDisable (GL_ALPHA_TEST);	1292	glDisable (GL_ALPHA_TEST);
1107	glDisable (GL_BLEND);	1293	glDisable (GL_BLEND);
1108	}	1294	}
1109	}	1295	}
1110		1296
1111	MODULE = CFClient PACKAGE = CFClient::Map	1297	MODULE = CFPlus PACKAGE = CFPlus::Map
1112		1298
1113	CFClient::Map	1299	CFPlus::Map
1114	new (SV *class, int map_width, int map_height)	1300	new (SV *class)
1115	CODE:	1301	CODE:
1116	New (0, RETVAL, 1, struct map);	1302	New (0, RETVAL, 1, struct map);
1117	RETVAL->x = 0;	1303	RETVAL->x = 0;
1118	RETVAL->y = 0;	1304	RETVAL->y = 0;
1119	RETVAL->w = map_width;	1305	RETVAL->w = 0;
1120	RETVAL->h = map_height;	1306	RETVAL->h = 0;
1121	RETVAL->ox = 0;	1307	RETVAL->ox = 0;
1122	RETVAL->oy = 0;	1308	RETVAL->oy = 0;
1123	RETVAL->faces = 8192;	1309	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1310	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125	RETVAL->texs = 8192;
1126	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127	RETVAL->rows = 0;	1311	RETVAL->rows = 0;
1128	RETVAL->row = 0;	1312	RETVAL->row = 0;
1129	OUTPUT:	1313	OUTPUT:
1130	RETVAL	1314	RETVAL
1131		1315
1132	void	1316	void
1133	DESTROY (CFClient::Map self)	1317	DESTROY (CFPlus::Map self)
1134	CODE:	1318	CODE:
1135	{	1319	{
1136	map_clear (self);	1320	map_clear (self);
1137	Safefree (self->face);	1321	Safefree (self->face2tile);
1138	Safefree (self->tex);	1322	Safefree (self->tex);
1139	Safefree (self);	1323	Safefree (self);
1140	}	1324	}
1141		1325
1142	void	1326	void
		1327	resize (CFPlus::Map self, int map_width, int map_height)
		1328	CODE:
		1329	self->w = map_width;
		1330	self->h = map_height;
		1331
		1332	void
1143	clear (CFClient::Map self)	1333	clear (CFPlus::Map self)
1144	CODE:	1334	CODE:
1145	map_clear (self);	1335	map_clear (self);
1146		1336
1147	void	1337	void
1148	set_face (CFClient::Map self, int face, int texid)	1338	set_tileid (CFPlus::Map self, int face, int tile)
1149	CODE:	1339	CODE:
1150	{	1340	{
1151	while (self->faces <= face)	1341	need_facenum (self, face); self->face2tile [face] = tile;
1152	{	1342	need_texid (self, tile);
1153	Append (mapface, self->face, self->faces, self->faces);
1154	self->faces *= 2;
1155	}
1156
1157	self->face [face] = texid;
1158	}	1343	}
1159		1344
1160	void	1345	void
		1346	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1347	CODE:
		1348	{
		1349	tileid texid;
		1350	maptex *tex;
		1351
		1352	if (face < 0 \|\| face >= self->faces)
		1353	return;
		1354
		1355	if (smooth < 0 \|\| smooth >= self->faces)
		1356	return;
		1357
		1358	texid = self->face2tile [face];
		1359
		1360	if (!texid)
		1361	return;
		1362
		1363	tex = self->tex + texid;
		1364	tex->smoothtile = self->face2tile [smooth];
		1365	tex->smoothlevel = level;
		1366	}
		1367
		1368	void
1161	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)	1369	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)
1162	CODE:	1370	CODE:
1163	{	1371	{
1164	while (self->texs <= texid)	1372	need_texid (self, texid);
1165	{
1166	Append (maptex, self->tex, self->texs, self->texs);
1167	self->texs *= 2;
1168	}
1169		1373
1170	{	1374	{
1171	maptex *tex = self->tex + texid;	1375	maptex *tex = self->tex + texid;
1172		1376
1173	tex->name = name;	1377	tex->name = name;
…		…
1190	// from transparent color bleeding and ugly wrapping effects.	1394	// from transparent color bleeding and ugly wrapping effects.
1191	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1395	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192	}	1396	}
1193		1397
1194	int	1398	int
1195	ox (CFClient::Map self)	1399	ox (CFPlus::Map self)
1196	ALIAS:	1400	ALIAS:
1197	oy = 1	1401	oy = 1
1198	x = 2	1402	x = 2
1199	y = 3	1403	y = 3
1200	w = 4	1404	w = 4
…		…
1211	}	1415	}
1212	OUTPUT:	1416	OUTPUT:
1213	RETVAL	1417	RETVAL
1214		1418
1215	void	1419	void
1216	scroll (CFClient::Map self, int dx, int dy)	1420	scroll (CFPlus::Map self, int dx, int dy)
1217	CODE:	1421	CODE:
1218	{	1422	{
1219	if (dx > 0)	1423	if (dx > 0)
1220	map_blank (self, self->x, self->y, dx - 1, self->h);	1424	map_blank (self, self->x, self->y, dx, self->h);
1221	else if (dx < 0)	1425	else if (dx < 0)
1222	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1426	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1223		1427
1224	if (dy > 0)	1428	if (dy > 0)
1225	map_blank (self, self->x, self->y, self->w, dy - 1);	1429	map_blank (self, self->x, self->y, self->w, dy);
1226	else if (dy < 0)	1430	else if (dy < 0)
1227	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1431	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1228		1432
1229	self->ox += dx; self->x += dx;	1433	self->ox += dx; self->x += dx;
1230	self->oy += dy; self->y += dy;	1434	self->oy += dy; self->y += dy;
1231		1435
1232	while (self->y < 0)	1436	while (self->y < 0)
…		…
1237	self->y += MAP_EXTEND_Y;	1441	self->y += MAP_EXTEND_Y;
1238	}	1442	}
1239	}	1443	}
1240		1444
1241	void	1445	void
1242	map1a_update (CFClient::Map self, SV *data_)	1446	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243	CODE:	1447	CODE:
1244	{	1448	{
1245	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1449	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1246	uint8_t data_end = (uint8_t )SvEND (data_);	1450	uint8_t data_end = (uint8_t )SvEND (data_);
1247	mapcell *cell;	1451	mapcell *cell;
1248	int x, y, flags;	1452	int x, y, flags;
1249		1453
1250	while (data < data_end)	1454	while (data < data_end - 1)
1251	{	1455	{
1252	flags = (data [0] << 8) + data [1]; data += 2;	1456	flags = (data [0] << 8) + data [1]; data += 2;
1253		1457
1254	x = self->x + ((flags >> 10) & 63);	1458	x = self->x + ((flags >> 10) & 63);
1255	y = self->y + ((flags >> 4) & 63);	1459	y = self->y + ((flags >> 4) & 63);
1256		1460
1257	cell = map_get_cell (self, x, y);	1461	cell = map_get_cell (self, x, y);
1258		1462
1259	if (flags & 15)	1463	if (flags & 15)
1260	{	1464	{
1261	if (cell->darkness < 0)	1465	if (!cell->darkness)
1262	{	1466	{
		1467	memset (cell, 0, sizeof (*cell));
1263	cell->darkness = 0;	1468	cell->darkness = 256;
1264	cell->face [0] = 0;
1265	cell->face [1] = 0;
1266	cell->face [2] = 0;
1267	}	1469	}
1268		1470
1269	cell->darkness = flags & 8 ? *data++ : 255;
1270
1271	//TODO: don't trust server data to be in-range(!)	1471	//TODO: don't trust server data to be in-range(!)
		1472
		1473	if (flags & 8)
		1474	{
		1475	if (extmap)
		1476	{
		1477	uint8_t ext, cmd;
		1478
		1479	do
		1480	{
		1481	ext = *data++;
		1482	cmd = ext & 0x3f;
		1483
		1484	if (cmd < 4)
		1485	cell->darkness = 255 - ext * 64 + 1;
		1486	else if (cmd == 5) // health
		1487	{
		1488	cell->stat_width = 1;
		1489	cell->stat_hp = *data++;
		1490	}
		1491	else if (cmd == 6) // monster width
		1492	cell->stat_width = *data++ + 1;
		1493	else if (cmd == 0x47)
		1494	{
		1495	if (*data == 4)
		1496	; // decode player count
		1497
		1498	data += *data + 1;
		1499	}
		1500	else if (cmd == 8) // cell flags
		1501	cell->flags = *data++;
		1502	else if (ext & 0x40) // unknown, multibyte => skip
		1503	data += *data + 1;
		1504	else
		1505	data++;
		1506	}
		1507	while (ext & 0x80);
		1508	}
		1509	else
		1510	cell->darkness = *data++ + 1;
		1511	}
1272		1512
1273	if (flags & 4)	1513	if (flags & 4)
1274	{	1514	{
1275	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1515	faceid face = (data [0] << 8) + data [1]; data += 2;
		1516	need_facenum (self, face);
		1517	cell->tile [0] = self->face2tile [face];
1276	}	1518	}
1277		1519
1278	if (flags & 2)	1520	if (flags & 2)
1279	{	1521	{
1280	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1522	faceid face = (data [0] << 8) + data [1]; data += 2;
		1523	need_facenum (self, face);
		1524	cell->tile [1] = self->face2tile [face];
1281	}	1525	}
1282		1526
1283	if (flags & 1)	1527	if (flags & 1)
1284	{	1528	{
1285	cell->face [2] = 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 [2] = self->face2tile [face];
1286	}	1532	}
1287	}	1533	}
1288	else	1534	else
1289	cell->darkness = -1;	1535	cell->darkness = 0;
1290	}	1536	}
1291	}	1537	}
1292		1538
1293	SV *	1539	SV *
1294	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1540	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295	CODE:	1541	CODE:
1296	{	1542	{
1297	int x1, x;	1543	int x1, x;
1298	int y1, y;	1544	int y1, y;
1299	int z;	1545	int z;
…		…
1320	{	1566	{
1321	mapcell *cell = row->col + (x - row->c0);	1567	mapcell *cell = row->col + (x - row->c0);
1322		1568
1323	for (z = 0; z <= 0; z++)	1569	for (z = 0; z <= 0; z++)
1324	{	1570	{
1325	mapface face = cell->face [z];
1326
1327	if (face)
1328	{
1329	maptex tex = self->tex [face];	1571	maptex tex = self->tex [cell->tile [z]];
1330	int a0 = 255 - tex.a;	1572	int a0 = 255 - tex.a;
1331	int a1 = tex.a;	1573	int a1 = tex.a;
1332		1574
1333	r = (r * a0 + tex.r * a1) / 255;	1575	r = (r * a0 + tex.r * a1) / 255;
1334	g = (g * a0 + tex.g * a1) / 255;	1576	g = (g * a0 + tex.g * a1) / 255;
1335	b = (b * a0 + tex.b * a1) / 255;	1577	b = (b * a0 + tex.b * a1) / 255;
1336	a = (a * a0 + tex.a * a1) / 255;	1578	a = (a * a0 + tex.a * a1) / 255;
1337	}
1338	}	1579	}
1339	}	1580	}
1340		1581
1341	*map++ = (r )	1582	*map++ = (r )
1342	\| (g << 8)	1583	\| (g << 8)
…		…
1349	}	1590	}
1350	OUTPUT:	1591	OUTPUT:
1351	RETVAL	1592	RETVAL
1352		1593
1353	void	1594	void
1354	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1595	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1355	CODE:	1596	CODE:
1356	{	1597	{
1357	int vx, vy;	1598	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1599	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1600	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1601	smooth_key skey;
1358	int x, y, z;	1602	int x, y, z;
1359	int last_name;	1603	int last_name;
1360	mapface face;
1361		1604
1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1605	// thats current max. sorry.
1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1606	if (sw > 255) sw = 255;
		1607	if (sh > 255) sh = 255;
1364		1608
1365	/*	1609	// clear key, in case of extra padding
1366	int vx = self->vx = self->w >= sw	1610	memset (&skey, 0, sizeof (skey));
1367	? self->x + (self->w - sw) / 2
1368	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369
1370	int vy = self->vy = self->h >= sh
1371	? self->y + (self->h - sh) / 2
1372	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1373	*/
1374		1611
1375	glColor4ub (255, 255, 255, 255);	1612	glColor4ub (255, 255, 255, 255);
1376		1613
1377	glEnable (GL_BLEND);	1614	glEnable (GL_BLEND);
1378	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1615	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1381		1618
1382	glBegin (GL_QUADS);	1619	glBegin (GL_QUADS);
1383		1620
1384	last_name = 0;	1621	last_name = 0;
1385		1622
		1623	mx += self->x;
		1624	my += self->y;
		1625
		1626	// first pass: determine smooth_max
		1627	// rather ugly, if you ask me
		1628	// could also be stored inside mapcell and updated on change
		1629	memset (smooth_max, 0, sizeof (smooth_max));
		1630
		1631	for (y = 0; y < sh; y++)
		1632	if (0 <= y + my && y + my < self->rows)
		1633	{
		1634	maprow *row = self->row + (y + my);
		1635
		1636	for (x = 0; x < sw; x++)
		1637	if (row->c0 <= x + mx && x + mx < row->c1)
		1638	{
		1639	mapcell *cell = row->col + (x + mx - row->c0);
		1640
		1641	smooth_max[x + 1][y + 1] =
		1642	MAX (self->tex [cell->tile [0]].smoothlevel,
		1643	MAX (self->tex [cell->tile [1]].smoothlevel,
		1644	self->tex [cell->tile [2]].smoothlevel));
		1645	}
		1646	}
		1647
1386	for (z = 0; z < 3; z++)	1648	for (z = 0; z <= 2; z++)
		1649	{
		1650	memset (smooth_level, 0, sizeof (smooth_level));
		1651
1387	for (y = 0; y < sh; y++)	1652	for (y = 0; y < sh; y++)
1388	if (0 <= y + vy && y + vy < self->rows)	1653	if (0 <= y + my && y + my < self->rows)
1389	{	1654	{
1390	maprow *row = self->row + (y + vy);	1655	maprow *row = self->row + (y + my);
1391		1656
1392	for (x = 0; x < sw; x++)	1657	for (x = 0; x < sw; x++)
1393	if (row->c0 <= x + vx && x + vx < row->c1)	1658	if (row->c0 <= x + mx && x + mx < row->c1)
1394	{	1659	{
1395	mapcell *cell = row->col + (x + vx - row->c0);	1660	mapcell *cell = row->col + (x + mx - row->c0);
1396
1397	face = cell->face [z];	1661	tileid tile = cell->tile [z];
1398		1662
1399	if (face)	1663	if (tile)
		1664	{
		1665	maptex tex = self->tex [tile];
		1666	int px = (x + 1) * T - tex.w;
		1667	int py = (y + 1) * T - tex.h;
		1668
		1669	// suppressing texture state switches here
		1670	// is only moderately effective, but worth the extra effort
		1671	if (last_name != tex.name)
		1672	{
		1673	if (!tex.name)
		1674	tex = self->tex [2]; /* missing, replace by noface */
		1675
		1676	glEnd ();
		1677	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1678	glBegin (GL_QUADS);
		1679	}
		1680
		1681	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1682	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1683	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1684	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1685
		1686	if (cell->flags && z == 2)
		1687	{
		1688	if (cell->flags & 1)
		1689	{
		1690	maptex tex = self->tex [1];
		1691	int px = x * T + T * 2 / 32;
		1692	int py = y * T - T * 6 / 32;
		1693
		1694	glEnd ();
		1695	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1696	glBegin (GL_QUADS);
		1697
		1698	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1699	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1700	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1701	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1702	}
		1703	}
		1704
		1705	// update smooth hash
		1706	if (tex.smoothtile)
		1707	{
		1708	skey.tile = tex.smoothtile;
		1709	skey.level = tex.smoothlevel;
		1710
		1711	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1712
		1713	// add bits to current tile and all neighbours. skey.x\|y is
		1714	// shifted +1\|+1 so we always stay positive.
		1715
		1716	// bits is ___n cccc CCCC bbbb
		1717	// n do not draw borders&corners
		1718	// c draw these corners, but...
		1719	// C ... not these
		1720	// b draw these borders
		1721
		1722	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1723	// ┃· ·· ·┃ ━━
		1724
		1725	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1726	// ·· ·· ·┏ ┓·
		1727
		1728	// full tile
		1729	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1730
		1731	// borders
		1732	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1733	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1734	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1735	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1736
		1737	// corners
		1738	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1739	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1740	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1741	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1742	}
		1743	}
		1744	}
		1745	}
		1746
		1747	// go through all smoothlevels, lowest to highest, then draw.
		1748	// this is basically counting sort
		1749	{
		1750	int w, b;
		1751
		1752	for (w = 0; w < 256 / 32; ++w)
		1753	{
		1754	uint32_t smask = smooth_level [w];
		1755	if (smask)
		1756	for (b = 0; b < 32; ++b)
		1757	if (smask & (((uint32_t)1) << b))
1400	{	1758	{
1401	maptex tex = self->tex [face];	1759	int level = (w << 5) \| b;
		1760	HE *he;
1402		1761
1403	int px = (x + 1) * 32 - tex.w;	1762	hv_iterinit (smooth);
1404	int py = (y + 1) * 32 - tex.h;	1763	while ((he = hv_iternext (smooth)))
1405
1406	if (last_name != tex.name)
1407	{	1764	{
		1765	smooth_key skey = (smooth_key )HeKEY (he);
		1766	IV bits = SvIVX (HeVAL (he));
		1767
		1768	if (!(bits & 0x1000)
		1769	&& skey->level == level
		1770	&& level > smooth_max [skey->x][skey->y])
		1771	{
		1772	maptex tex = self->tex [skey->tile];
		1773	int px = (((int)skey->x) - 1) * T;
		1774	int py = (((int)skey->y) - 1) * T;
		1775	int border = bits & 15;
		1776	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1777	float dx = tex.s * .0625f; // 16 images/row
		1778	float dy = tex.t * .5f ; // 2 images/column
		1779
		1780	// this time naively avoiding texture state changes
		1781	// save gobs of state changes.
		1782	if (last_name != tex.name)
		1783	{
		1784	if (!tex.name)
		1785	continue; // smoothing not yet available
		1786
1408	glEnd ();	1787	glEnd ();
1409	last_name = tex.name;
1410	glBindTexture (GL_TEXTURE_2D, last_name);	1788	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411	glBegin (GL_QUADS);	1789	glBegin (GL_QUADS);
		1790	}
		1791
		1792	if (border)
		1793	{
		1794	float ox = border * dx;
		1795
		1796	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1797	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1798	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1799	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1800	}
		1801
		1802	if (corner)
		1803	{
		1804	float ox = corner * dx;
		1805
		1806	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1807	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1808	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1809	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1810	}
		1811	}
1412	}	1812	}
1413
1414	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418	}	1813	}
1419	}
1420	}	1814	}
		1815	}
		1816
		1817	hv_clear (smooth);
		1818	}
1421		1819
1422	glEnd ();	1820	glEnd ();
1423		1821
1424	glDisable (GL_TEXTURE_2D);	1822	glDisable (GL_TEXTURE_2D);
1425	glDisable (GL_BLEND);	1823	glDisable (GL_BLEND);
1426	}
1427		1824
		1825	// top layer: overlays such as the health bar
		1826	for (y = 0; y < sh; y++)
		1827	if (0 <= y + my && y + my < self->rows)
		1828	{
		1829	maprow *row = self->row + (y + my);
		1830
		1831	for (x = 0; x < sw; x++)
		1832	if (row->c0 <= x + mx && x + mx < row->c1)
		1833	{
		1834	mapcell *cell = row->col + (x + mx - row->c0);
		1835
		1836	int px = x * T;
		1837	int py = y * T;
		1838
		1839	if (cell->stat_hp)
		1840	{
		1841	int width = cell->stat_width * T;
		1842	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1843
		1844	glColor3ub (0, 0, 0);
		1845	glRectf (px + 1, py - thick - 2,
		1846	px + width - 1, py);
		1847
		1848	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1849	glRectf (px + 2,
		1850	py - thick - 1,
		1851	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1852	}
		1853	}
		1854	}
		1855	}
		1856
1428	void	1857	void
1429	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1858	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430	CODE:	1859	CODE:
1431	{	1860	{
1432	static float color[16][3] = {	1861	static float color[16][3] = {
1433	{ 0.00F, 0.00F, 0.00F },	1862	{ 0.00F, 0.00F, 0.00F },
1434	{ 1.00F, 1.00F, 1.00F },	1863	{ 1.00F, 1.00F, 1.00F },
…		…
1484	glDisable (GL_BLEND);	1913	glDisable (GL_BLEND);
1485	glDisable (GL_TEXTURE_2D);	1914	glDisable (GL_TEXTURE_2D);
1486	}	1915	}
1487		1916
1488	void	1917	void
1489	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1918	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1490	PPCODE:	1919	PPCODE:
1491	{	1920	{
1492	int vx, vy;
1493	int x, y;	1921	int x, y;
1494	int sw4 = (sw + 3) & ~3;	1922	int sw4 = (sw + 3) & ~3;
1495	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1923	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1496	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1924	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1497		1925
1498	memset (darkness, 255, sw4 * sh);	1926	memset (darkness, 255, sw4 * sh);
1499	SvPOK_only (darkness_sv);	1927	SvPOK_only (darkness_sv);
1500	SvCUR_set (darkness_sv, sw4 * sh);	1928	SvCUR_set (darkness_sv, sw4 * sh);
1501		1929
1502	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1930	mx += self->x;
1503	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1931	my += self->y;
1504		1932
1505	for (y = 0; y < sh; y++)	1933	for (y = 0; y < sh; y++)
1506	if (0 <= y + vy && y + vy < self->rows)	1934	if (0 <= y + my && y + my < self->rows)
1507	{	1935	{
1508	maprow *row = self->row + (y + vy);	1936	maprow *row = self->row + (y + my);
1509		1937
1510	for (x = 0; x < sw; x++)	1938	for (x = 0; x < sw; x++)
1511	if (row->c0 <= x + vx && x + vx < row->c1)	1939	if (row->c0 <= x + mx && x + mx < row->c1)
1512	{	1940	{
1513	mapcell *cell = row->col + (x + vx - row->c0);	1941	mapcell *cell = row->col + (x + mx - row->c0);
1514		1942
1515	darkness[y * sw4 + x] = cell->darkness < 0	1943	darkness[y * sw4 + x] = cell->darkness
		1944	? 255 - (cell->darkness - 1)
1516	? 255 - FOW_DARKNESS	1945	: 255 - FOW_DARKNESS;
1517	: 255 - cell->darkness;
1518	}	1946	}
1519	}	1947	}
1520		1948
1521	EXTEND (SP, 3);	1949	EXTEND (SP, 3);
1522	PUSHs (sv_2mortal (newSViv (sw4)));	1950	PUSHs (sv_2mortal (newSViv (sw4)));
1523	PUSHs (sv_2mortal (newSViv (sh)));	1951	PUSHs (sv_2mortal (newSViv (sh)));
1524	PUSHs (darkness_sv);	1952	PUSHs (darkness_sv);
1525	}	1953	}
1526		1954
1527	SV *	1955	SV *
1528	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1956	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529	CODE:	1957	CODE:
1530	{	1958	{
1531	int x, y, x1, y1;	1959	int x, y, x1, y1;
1532	SV data_sv = newSV (w h * 7 + 5);	1960	SV data_sv = newSV (w h * 7 + 5);
1533	uint8_t data = (uint8_t )SvPVX (data_sv);	1961	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1558	if (row && row->c0 <= x && x < row->c1)	1986	if (row && row->c0 <= x && x < row->c1)
1559	{	1987	{
1560	mapcell *cell = row->col + (x - row->c0);	1988	mapcell *cell = row->col + (x - row->c0);
1561	uint8_t flags = 0;	1989	uint8_t flags = 0;
1562		1990
1563	if (cell->face [0]) flags \|= 1;	1991	if (cell->tile [0]) flags \|= 1;
1564	if (cell->face [1]) flags \|= 2;	1992	if (cell->tile [1]) flags \|= 2;
1565	if (cell->face [2]) flags \|= 4;	1993	if (cell->tile [2]) flags \|= 4;
1566		1994
1567	*data++ = flags;	1995	*data++ = flags;
1568		1996
1569	if (flags & 1)	1997	if (flags & 1)
1570	{	1998	{
		1999	tileid tile = cell->tile [0];
1571	*data++ = cell->face [0] >> 8;	2000	*data++ = tile >> 8;
1572	*data++ = cell->face [0];	2001	*data++ = tile;
1573	}	2002	}
1574		2003
1575	if (flags & 2)	2004	if (flags & 2)
1576	{	2005	{
		2006	tileid tile = cell->tile [1];
1577	*data++ = cell->face [1] >> 8;	2007	*data++ = tile >> 8;
1578	*data++ = cell->face [1];	2008	*data++ = tile;
1579	}	2009	}
1580		2010
1581	if (flags & 4)	2011	if (flags & 4)
1582	{	2012	{
		2013	tileid tile = cell->tile [2];
1583	*data++ = cell->face [2] >> 8;	2014	*data++ = tile >> 8;
1584	*data++ = cell->face [2];	2015	*data++ = tile;
1585	}	2016	}
1586	}	2017	}
1587	else	2018	else
1588	*data++ = 0;	2019	*data++ = 0;
1589	}	2020	}
…		…
1595	}	2026	}
1596	OUTPUT:	2027	OUTPUT:
1597	RETVAL	2028	RETVAL
1598		2029
1599	void	2030	void
1600	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2031	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601	PPCODE:	2032	PPCODE:
1602	{	2033	{
1603	int x, y, z;	2034	int x, y, z;
1604	int w, h;	2035	int w, h;
1605	int x1, y1;	2036	int x1, y1;
…		…
1629	{	2060	{
1630	uint8_t flags = *data++;	2061	uint8_t flags = *data++;
1631		2062
1632	if (flags)	2063	if (flags)
1633	{	2064	{
1634	mapface face[3] = { 0, 0, 0 };
1635
1636	mapcell *cell = row_get_cell (row, x);	2065	mapcell *cell = row_get_cell (row, x);
		2066	tileid tile[3] = { 0, 0, 0 };
1637		2067
1638	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2068	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1639	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2069	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1640	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2070	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1641		2071
1642	if (cell->darkness <= 0)	2072	if (cell->darkness == 0)
1643	{	2073	{
1644	cell->darkness = -1;	2074	cell->darkness = 0;
1645		2075
1646	for (z = 0; z <= 2; z++)	2076	for (z = 0; z <= 2; z++)
1647	{	2077	{
1648	cell->face[z] = face[z];	2078	tileid t = tile [z];
1649		2079
1650	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2080	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2081	{
1651	XPUSHs (sv_2mortal (newSViv (face[z])));	2082	XPUSHs (sv_2mortal (newSViv (t)));
		2083	need_texid (self, t);
		2084	}
		2085
		2086	cell->tile [z] = t;
1652	}	2087	}
1653	}	2088	}
1654	}	2089	}
1655	}	2090	}
1656	}	2091	}
1657	}	2092	}
1658		2093
1659	MODULE = CFClient PACKAGE = CFClient::MixChunk	2094	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660		2095
1661	CFClient::MixChunk	2096	CFPlus::MixChunk
1662	new_from_file (SV class, char path)	2097	new_from_file (SV class, char path)
1663	CODE:	2098	CODE:
1664	RETVAL = Mix_LoadWAV (path);	2099	RETVAL = Mix_LoadWAV (path);
1665	OUTPUT:	2100	OUTPUT:
1666	RETVAL	2101	RETVAL
1667		2102
1668	void	2103	void
1669	DESTROY (CFClient::MixChunk self)	2104	DESTROY (CFPlus::MixChunk self)
1670	CODE:	2105	CODE:
1671	Mix_FreeChunk (self);	2106	Mix_FreeChunk (self);
1672		2107
1673	int	2108	int
1674	volume (CFClient::MixChunk self, int volume = -1)	2109	volume (CFPlus::MixChunk self, int volume = -1)
1675	CODE:	2110	CODE:
1676	RETVAL = Mix_VolumeChunk (self, volume);	2111	RETVAL = Mix_VolumeChunk (self, volume);
1677	OUTPUT:	2112	OUTPUT:
1678	RETVAL	2113	RETVAL
1679		2114
1680	int	2115	int
1681	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2116	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1682	CODE:	2117	CODE:
1683	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2118	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684	OUTPUT:	2119	OUTPUT:
1685	RETVAL	2120	RETVAL
1686		2121
1687	MODULE = CFClient PACKAGE = CFClient::MixMusic	2122	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688		2123
1689	int	2124	int
1690	volume (int volume = -1)	2125	volume (int volume = -1)
1691	CODE:	2126	CODE:
1692	RETVAL = Mix_VolumeMusic (volume);	2127	RETVAL = Mix_VolumeMusic (volume);
1693	OUTPUT:	2128	OUTPUT:
1694	RETVAL	2129	RETVAL
1695		2130
1696	CFClient::MixMusic	2131	CFPlus::MixMusic
1697	new_from_file (SV class, char path)	2132	new_from_file (SV class, char path)
1698	CODE:	2133	CODE:
1699	RETVAL = Mix_LoadMUS (path);	2134	RETVAL = Mix_LoadMUS (path);
1700	OUTPUT:	2135	OUTPUT:
1701	RETVAL	2136	RETVAL
1702		2137
1703	void	2138	void
1704	DESTROY (CFClient::MixMusic self)	2139	DESTROY (CFPlus::MixMusic self)
1705	CODE:	2140	CODE:
1706	Mix_FreeMusic (self);	2141	Mix_FreeMusic (self);
1707		2142
1708	int	2143	int
1709	play (CFClient::MixMusic self, int loops = -1)	2144	play (CFPlus::MixMusic self, int loops = -1)
1710	CODE:	2145	CODE:
1711	RETVAL = Mix_PlayMusic (self, loops);	2146	RETVAL = Mix_PlayMusic (self, loops);
1712	OUTPUT:	2147	OUTPUT:
1713	RETVAL	2148	RETVAL
1714		2149
1715	MODULE = CFClient PACKAGE = CFClient::OpenGL	2150	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1716		2151
1717	BOOT:	2152	BOOT:
1718	{	2153	{
1719	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2154	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720	static const struct {	2155	static const struct {
1721	const char *name;	2156	const char *name;
1722	IV iv;	2157	IV iv;
1723	} *civ, const_iv[] = {	2158	} *civ, const_iv[] = {
1724	# define const_iv(name) { # name, (IV)name }	2159	# define const_iv(name) { # name, (IV)name }
…		…
1787	const_iv (GL_SEPARABLE_2D),	2222	const_iv (GL_SEPARABLE_2D),
1788	const_iv (GL_CONVOLUTION_2D),	2223	const_iv (GL_CONVOLUTION_2D),
1789	const_iv (GL_CONVOLUTION_BORDER_MODE),	2224	const_iv (GL_CONVOLUTION_BORDER_MODE),
1790	const_iv (GL_CONSTANT_BORDER),	2225	const_iv (GL_CONSTANT_BORDER),
1791	const_iv (GL_LINES),	2226	const_iv (GL_LINES),
		2227	const_iv (GL_LINE_STRIP),
1792	const_iv (GL_LINE_LOOP),	2228	const_iv (GL_LINE_LOOP),
1793	const_iv (GL_QUADS),	2229	const_iv (GL_QUADS),
1794	const_iv (GL_QUAD_STRIP),	2230	const_iv (GL_QUAD_STRIP),
1795	const_iv (GL_TRIANGLES),	2231	const_iv (GL_TRIANGLES),
1796	const_iv (GL_TRIANGLE_STRIP),	2232	const_iv (GL_TRIANGLE_STRIP),
…		…
1804	# undef const_iv	2240	# undef const_iv
1805	};	2241	};
1806		2242
1807	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2243	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2244	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2245
		2246	texture_av = newAV ();
		2247	AvREAL_off (texture_av);
1809	}	2248	}
1810		2249
1811	char *	2250	char *
1812	gl_vendor ()	2251	gl_vendor ()
1813	CODE:	2252	CODE:
…		…
1906	r *= a;	2345	r *= a;
1907	g *= a;	2346	g *= a;
1908	b *= a;	2347	b *= a;
1909	}	2348	}
1910	// microsoft visual "c" rounds instead of truncating...	2349	// microsoft visual "c" rounds instead of truncating...
1911	glColor4ub (MIN ((int)(r * 256.f), 255),	2350	glColor4f (r, g, b, a);
1912	MIN ((int)(g * 256.f), 255),
1913	MIN ((int)(b * 256.f), 255),
1914	MIN ((int)(a * 256.f), 255));
1915		2351
1916	void glInterleavedArrays (int format, int stride, char *data)	2352	void glInterleavedArrays (int format, int stride, char *data)
1917		2353
1918	void glDrawElements (int mode, int count, int type, char *indices)	2354	void glDrawElements (int mode, int count, int type, char *indices)
1919		2355
…		…
1965		2401
1966	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2402	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967		2403
1968	int glGenTexture ()	2404	int glGenTexture ()
1969	CODE:	2405	CODE:
1970	{	2406	RETVAL = gen_texture ();
1971	GLuint name;
1972	glGenTextures (1, &name);
1973	RETVAL = name;
1974	}
1975	OUTPUT:	2407	OUTPUT:
1976	RETVAL	2408	RETVAL
1977		2409
1978	void glDeleteTexture (int name)	2410	void glDeleteTexture (int name)
1979	CODE:	2411	CODE:
1980	{
1981	GLuint name_ = name;
1982	glDeleteTextures (1, &name_);	2412	del_texture (name);
1983	}	2413
1984
1985	int glGenList ()	2414	int glGenList ()
1986	CODE:	2415	CODE:
1987	RETVAL = glGenLists (1);	2416	RETVAL = glGenLists (1);
1988	OUTPUT:	2417	OUTPUT:
1989	RETVAL	2418	RETVAL
…		…
1996		2425
1997	void glEndList ()	2426	void glEndList ()
1998		2427
1999	void glCallList (int list)	2428	void glCallList (int list)
2000		2429
2001

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.128 by root, Wed Jul 5 03:01:01 2006 UTC vs. Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.128 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC