ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.251 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib.h>
48		54
49	#include <pango/pango.h>	55	#include <pango/pango.h>
50		56
51	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))	57	#ifndef PANGO_VERSION_CHECK
		58	# define PANGO_VERSION_CHECK(a,b,c) 0
		59	#endif
		60
		61	#if !PANGO_VERSION_CHECK (1, 15, 2)
52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly	62	# define pango_layout_get_line_readonly pango_layout_get_line
53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly	63	# define pango_layout_get_lines_readonly pango_layout_get_lines
54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly	64	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly	65	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56	#endif	66	#endif
57		67
58	#ifndef _WIN32	68	#ifndef _WIN32
59	# include <sys/types.h>	69	# include <sys/types.h>
60	# include <sys/socket.h>	70	# include <sys/socket.h>
61	# include <netinet/in.h>	71	# include <netinet/in.h>
62	# include <netinet/tcp.h>	72	# include <netinet/tcp.h>
63	# include <inttypes.h>	73	# include <inttypes.h>
64	#endif	74	#endif
65		75
		76	#if __GNUC__ >= 4
		77	# define expect(expr,value) __builtin_expect ((expr),(value))
		78	#else
		79	# define expect(expr,value) (expr)
		80	#endif
		81
		82	#define expect_false(expr) expect ((expr) != 0, 0)
		83	#define expect_true(expr) expect ((expr) != 0, 1)
		84
66	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
68	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
69		91
70	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
71	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
72		94
73	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
74		96
75	#if 0	97	/* mask out modifiers we are not interested in */
76	# define PARACHUTE SDL_INIT_NOPARACHUTE	98	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77	#else	99
78	# define PARACHUTE 0	100	#define KMOD_LRAM 0x10000 // our extension
79	#endif	101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
		104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
80		123
81	static AV *texture_av;	124	static AV *texture_av;
82		125
83	static struct	126	static struct
84	{	127	{
…		…
141	{	184	{
142	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
143		186
144	while (attrs)	187	while (attrs)
145	{	188	{
146	PangoAttribute *attr = attrs->data;	189	PangoAttribute *attr = (PangoAttribute *)attrs->data;
147		190
148	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
149	return 1;	192	return 1;
150		193
151	attrs = attrs->next;	194	attrs = attrs->next;
…		…
178		221
179	static void	222	static void
180	layout_update_font (DC__Layout self)	223	layout_update_font (DC__Layout self)
181	{	224	{
182	/* use a random scale factor to account for unknown descenders, 0.8 works	225	/* use a random scale factor to account for unknown descenders, 0.8 works
183	* reasonably well with bitstream vera	226	* reasonably well with dejavu/bistream fonts
184	*/	227	*/
185	PangoFontDescription *font = self->font ? self->font : default_font;	228	PangoFontDescription *font = self->font ? self->font : default_font;
186		229
187	pango_font_description_set_absolute_size (font,	230	pango_font_description_set_absolute_size (font,
188	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	231	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
216	int w, h;	259	int w, h;
217	float s, t;	260	float s, t;
218	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
219	tileid smoothtile;	262	tileid smoothtile;
220	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
221	} maptex;	265	} maptex;
222		266
223	typedef struct {	267	typedef struct {
224	uint32_t player;	268	uint32_t player;
225	tileid tile[3];	269	tileid tile[3];
…		…
357	self->oy = 0;	401	self->oy = 0;
358	self->row = 0;	402	self->row = 0;
359	self->rows = 0;	403	self->rows = 0;
360	}	404	}
361		405
		406	#define CELL_CLEAR(cell) \
		407	do { \
		408	if ((cell)->player) \
		409	(cell)->tile [2] = 0; \
		410	(cell)->darkness = 0; \
		411	(cell)->stat_hp = 0; \
		412	(cell)->flags = 0; \
		413	(cell)->player = 0; \
		414	} while (0)
		415
362	static void	416	static void
363	map_blank (DC__Map self, int x0, int y0, int w, int h)	417	map_blank (DC__Map self, int x0, int y0, int w, int h)
364	{	418	{
365	int x, y;	419	int x, y;
366	maprow *row;	420	maprow *row;
…		…
380	if (x >= row->c1)	434	if (x >= row->c1)
381	break;	435	break;
382		436
383	cell = row->col + x - row->c0;	437	cell = row->col + x - row->c0;
384		438
385	cell->darkness = 0;	439	CELL_CLEAR (cell);
386	cell->stat_hp = 0;
387	cell->flags = 0;
388	cell->player = 0;
389	}	440	}
390	}	441	}
391	}	442	}
392		443
393	typedef struct {	444	typedef struct {
…		…
428	ev.code = 1;	479	ev.code = 1;
429	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
430	ev.data2 = 0;	481	ev.data2 = 0;
431		482
432	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
433	}	490	}
434		491
435	static unsigned int	492	static unsigned int
436	minpot (unsigned int n)	493	minpot (unsigned int n)
437	{	494	{
…		…
504	if (!svp || !SvTRUE (*svp))	561	if (!svp || !SvTRUE (*svp))
505	return 0;	562	return 0;
506		563
507	return 1;	564	return 1;
508	}	565	}
		566
		567	/******************************************************************************/
		568
		569	/* process keyboard modifiers */
		570	static int
		571	mod_munge (int mod)
		572	{
		573	mod &= MOD_MASK;
		574
		575	if (mod & (KMOD_META | KMOD_ALT))
		576	mod |= KMOD_LRAM;
		577
		578	return mod;
		579	}
		580
		581	static void
		582	deliantra_main (SV *real_main)
		583	{
		584	dSP;
		585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD | G_VOID);
		588	}
		589
		590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
		593	/* to due surprising braindamage on the side of SDL design, we
		594	* do some mind-boggling hack here: SDL requires a custom main()
		595	* on OS X, so... we provide one and call the original main(), which,
		596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
		597	* and which calls our main (== SDL_main) back.
		598	*/
		599	extern C_LINKAGE int
		600	main (int argc, char *argv[])
		601	{
		602	deliantra_main (real_main);
		603	}
		604
		605	#undef main
		606
		607	extern C_LINKAGE int main (int argc, char *argv[]);
		608
		609	static void
		610	SDL_main_hack (SV *real_main_)
		611	{
		612	real_main = real_main_;
		613
		614	char *argv[] = { "deliantra client", 0 };
		615	(main) (1, argv);
		616	}
		617	#else
		618	static void
		619	SDL_main_hack (SV *real_main)
		620	{
		621	deliantra_main (real_main);
		622	}
		623	#endif
509		624
510	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
511		626
512	PROTOTYPES: ENABLE	627	PROTOTYPES: ENABLE
513		628
…		…
542	const_iv (SDL_USEREVENT),	657	const_iv (SDL_USEREVENT),
543		658
544	const_iv (SDL_APPINPUTFOCUS),	659	const_iv (SDL_APPINPUTFOCUS),
545	const_iv (SDL_APPMOUSEFOCUS),	660	const_iv (SDL_APPMOUSEFOCUS),
546	const_iv (SDL_APPACTIVE),	661	const_iv (SDL_APPACTIVE),
		662
		663
		664	const_iv (SDLK_UNKNOWN),
		665	const_iv (SDLK_FIRST),
		666	const_iv (SDLK_BACKSPACE),
		667	const_iv (SDLK_TAB),
		668	const_iv (SDLK_CLEAR),
		669	const_iv (SDLK_RETURN),
		670	const_iv (SDLK_PAUSE),
		671	const_iv (SDLK_ESCAPE),
		672	const_iv (SDLK_SPACE),
		673	const_iv (SDLK_EXCLAIM),
		674	const_iv (SDLK_QUOTEDBL),
		675	const_iv (SDLK_HASH),
		676	const_iv (SDLK_DOLLAR),
		677	const_iv (SDLK_AMPERSAND),
		678	const_iv (SDLK_QUOTE),
		679	const_iv (SDLK_LEFTPAREN),
		680	const_iv (SDLK_RIGHTPAREN),
		681	const_iv (SDLK_ASTERISK),
		682	const_iv (SDLK_PLUS),
		683	const_iv (SDLK_COMMA),
		684	const_iv (SDLK_MINUS),
		685	const_iv (SDLK_PERIOD),
		686	const_iv (SDLK_SLASH),
		687	const_iv (SDLK_0),
		688	const_iv (SDLK_1),
		689	const_iv (SDLK_2),
		690	const_iv (SDLK_3),
		691	const_iv (SDLK_4),
		692	const_iv (SDLK_5),
		693	const_iv (SDLK_6),
		694	const_iv (SDLK_7),
		695	const_iv (SDLK_8),
		696	const_iv (SDLK_9),
		697	const_iv (SDLK_COLON),
		698	const_iv (SDLK_SEMICOLON),
		699	const_iv (SDLK_LESS),
		700	const_iv (SDLK_EQUALS),
		701	const_iv (SDLK_GREATER),
		702	const_iv (SDLK_QUESTION),
		703	const_iv (SDLK_AT),
		704
		705	const_iv (SDLK_LEFTBRACKET),
		706	const_iv (SDLK_BACKSLASH),
		707	const_iv (SDLK_RIGHTBRACKET),
		708	const_iv (SDLK_CARET),
		709	const_iv (SDLK_UNDERSCORE),
		710	const_iv (SDLK_BACKQUOTE),
		711	const_iv (SDLK_DELETE),
547		712
548	const_iv (SDLK_FIRST),	713	const_iv (SDLK_FIRST),
549	const_iv (SDLK_LAST),	714	const_iv (SDLK_LAST),
550	const_iv (SDLK_KP0),	715	const_iv (SDLK_KP0),
551	const_iv (SDLK_KP1),	716	const_iv (SDLK_KP1),
…		…
627	const_iv (KMOD_RMETA),	792	const_iv (KMOD_RMETA),
628	const_iv (KMOD_NUM),	793	const_iv (KMOD_NUM),
629	const_iv (KMOD_CAPS),	794	const_iv (KMOD_CAPS),
630	const_iv (KMOD_MODE),	795	const_iv (KMOD_MODE),
631		796
		797	const_iv (KMOD_LRAM),
		798
632	const_iv (MIX_DEFAULT_FORMAT),	799	const_iv (MIX_DEFAULT_FORMAT),
		800
		801	const_iv (SDL_INIT_TIMER),
		802	const_iv (SDL_INIT_AUDIO),
		803	const_iv (SDL_INIT_VIDEO),
		804	const_iv (SDL_INIT_CDROM),
		805	const_iv (SDL_INIT_JOYSTICK),
		806	const_iv (SDL_INIT_EVERYTHING),
		807	const_iv (SDL_INIT_NOPARACHUTE),
		808	const_iv (SDL_INIT_EVENTTHREAD),
		809
		810	const_iv (SDL_GL_RED_SIZE),
		811	const_iv (SDL_GL_GREEN_SIZE),
		812	const_iv (SDL_GL_BLUE_SIZE),
		813	const_iv (SDL_GL_ALPHA_SIZE),
		814	const_iv (SDL_GL_DOUBLEBUFFER),
		815	const_iv (SDL_GL_BUFFER_SIZE),
		816	const_iv (SDL_GL_DEPTH_SIZE),
		817	const_iv (SDL_GL_STENCIL_SIZE),
		818	const_iv (SDL_GL_ACCUM_RED_SIZE),
		819	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		820	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		821	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		822	const_iv (SDL_GL_STEREO),
		823	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		824	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		825	const_iv (SDL_GL_ACCELERATED_VISUAL),
		826	const_iv (SDL_GL_SWAP_CONTROL),
		827
		828	const_iv (FOW_DARKNESS)
633	# undef const_iv	829	# undef const_iv
634	};	830	};
635		831
636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	832	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638		834
639	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641	}	837	}
642		838
…		…
658	NV ceil (NV x)	854	NV ceil (NV x)
659		855
660	IV minpot (UV n)	856	IV minpot (UV n)
661		857
662	IV popcount (UV n)	858	IV popcount (UV n)
		859
		860	NV distance (NV dx, NV dy)
		861	CODE:
		862	RETVAL = pow (dx * dx + dy * dy, 0.5);
		863	OUTPUT:
		864	RETVAL
663		865
664	void	866	void
665	pango_init ()	867	pango_init ()
666	CODE:	868	CODE:
667	{	869	{
668	opengl_fontmap = pango_opengl_font_map_new ();	870	opengl_fontmap = pango_opengl_font_map_new ();
669	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	871	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
670	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	872	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)	873	/*pango_context_set_font_description (opengl_context, default_font);*/
		874	#if PANGO_VERSION_CHECK (1, 15, 2)
672	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	875	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/	876	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674	#endif	877	#endif
675	}	878	}
676		879
677	char *
678	SDL_GetError ()	880	char *SDL_GetError ()
679		881
680	int	882	void SDL_main_hack (SV *real_main)
681	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)	883	PROTOTYPE: &
682		884
683	void	885	int SDL_Init (U32 flags)
		886
		887	int SDL_InitSubSystem (U32 flags)
		888
		889	void SDL_QuitSubSystem (U32 flags)
		890
684	SDL_Quit ()	891	void SDL_Quit ()
		892
		893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
		895
		896	int SDL_GL_GetAttribute (int attr)
		897	CODE:
		898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
		899	XSRETURN_UNDEF;
		900	OUTPUT:
		901	RETVAL
685		902
686	void	903	void
687	SDL_ListModes (int rgb, int alpha)	904	SDL_ListModes (int rgb, int alpha)
688	PPCODE:	905	PPCODE:
689	{	906	{
…		…
701	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	918	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	919	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	920	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704		921
705	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	922	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706	#if SDL_VERSION_ATLEAST(1,2,10)
707	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	923	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709	#endif
710		924
711	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	925	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712		926
713	if (m && m != (SDL_Rect **)-1)	927	if (m && m != (SDL_Rect **)-1)
714	while (*m)	928	while (*m)
715	{	929	{
716	if ((*m)->w >= 800 && (*m)->h >= 480)	930	if ((*m)->w >= 400 && (*m)->h >= 300)
717	{	931	{
718	AV *av = newAV ();	932	AV *av = newAV ();
719	av_push (av, newSViv ((*m)->w));	933	av_push (av, newSViv ((*m)->w));
720	av_push (av, newSViv ((*m)->h));	934	av_push (av, newSViv ((*m)->h));
721	av_push (av, newSViv (rgb));	935	av_push (av, newSViv (rgb));
…		…
744	);	958	);
745		959
746	if (RETVAL)	960	if (RETVAL)
747	{	961	{
748	av_clear (texture_av);	962	av_clear (texture_av);
749
750	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	963	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752	#include "glfunc.h"	964	#include "glfunc.h"
753	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754	}	968	}
755	}	969	}
756	OUTPUT:	970	OUTPUT:
757	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char *title, const char *icon)
758		975
759	void	976	void
760	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
761		978
762	char *	979	char *
763	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
764		982
765	int	983	int
766	SDL_GetAppState ()	984	SDL_GetAppState ()
767		985
		986	int
		987	SDL_GetModState ()
		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
768	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
769	poll_events ()	997	peep_events ()
770	PPCODE:	998	PPCODE:
771	{	999	{
772	SDL_Event ev;	1000	SDL_Event ev;
773		1001
774	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
781	{	1009	{
782	case SDL_KEYDOWN:	1010	case SDL_KEYDOWN:
783	case SDL_KEYUP:	1011	case SDL_KEYUP:
784	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	1012	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	1013	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	1014	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	1015	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1016	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789	break;	1017	break;
790		1018
791	case SDL_ACTIVEEVENT:	1019	case SDL_ACTIVEEVENT:
792	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1020	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
810	x = ev.motion.x;	1038	x = ev.motion.x;
811	y = ev.motion.y;	1039	y = ev.motion.y;
812	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1040	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813	}	1041	}
814		1042
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1043	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816	hv_store (hv, "state", 5, newSViv (state), 0);	1044	hv_store (hv, "state", 5, newSViv (state), 0);
817	hv_store (hv, "x", 1, newSViv (x), 0);	1045	hv_store (hv, "x", 1, newSViv (x), 0);
818	hv_store (hv, "y", 1, newSViv (y), 0);	1046	hv_store (hv, "y", 1, newSViv (y), 0);
819	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1047	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1048	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821	}	1049	}
822	break;	1050	break;
823		1051
824	case SDL_MOUSEBUTTONDOWN:	1052	case SDL_MOUSEBUTTONDOWN:
825	case SDL_MOUSEBUTTONUP:	1053	case SDL_MOUSEBUTTONUP:
826	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1054	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827		1055
828	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1056	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1057	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1058	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1059	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
839	}	1067	}
840		1068
841	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1069	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
842	}	1070	}
843	}	1071	}
		1072
		1073	char *
		1074	SDL_AudioDriverName ()
		1075	CODE:
		1076	{
		1077	char buf [256];
		1078	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1079	XSRETURN_UNDEF;
		1080
		1081	RETVAL = buf;
		1082	}
		1083	OUTPUT:
		1084	RETVAL
844		1085
845	int	1086	int
846	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1087	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
847	POSTCALL:	1088	POSTCALL:
848	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
…		…
905	}	1146	}
906	}	1147	}
907	#endif	1148	#endif
908	}	1149	}
909		1150
910	void	1151	int
911	add_font (char *file)	1152	add_font (char *file)
912	CODE:	1153	CODE:
913	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1155	OUTPUT:
		1156	RETVAL
		1157
		1158	void
		1159	IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
		1160
		1161	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1162	void
		1163	Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
914		1164
915	void	1165	void
916	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
917	ALIAS:	1167	ALIAS:
918	load_image_file = 1	1168	load_image_file = 1
…		…
964		1214
965	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
966	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
967	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
968	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
969	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
970	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1220	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
971	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
972	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
973	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
974		1224
…		…
1034	#if DEBUG	1284	#if DEBUG
1035	VALGRIND_DO_LEAK_CHECK;	1285	VALGRIND_DO_LEAK_CHECK;
1036	#endif	1286	#endif
1037	}	1287	}
1038		1288
		1289	int
		1290	SvREFCNT (SV *sv)
		1291	CODE:
		1292	RETVAL = SvREFCNT (sv);
		1293	OUTPUT:
		1294	RETVAL
		1295
1039	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1040		1297
1041	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1042		1299
1043	DC::Font	1300	DC::Font
1044	new_from_file (SV *class, char *path, int id = 0)	1301	new_from_file (SV *klass, char *path, int id = 0)
1045	CODE:	1302	CODE:
1046	{	1303	{
1047	int count;	1304	int count;
1048	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1305	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1049	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1078	PROTOTYPE:	1335	PROTOTYPE:
1079	CODE:	1336	CODE:
1080	tc_restore ();	1337	tc_restore ();
1081		1338
1082	DC::Layout	1339	DC::Layout
1083	new (SV *class)	1340	new (SV *klass)
1084	CODE:	1341	CODE:
1085	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1086		1343
1087	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1088	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1237		1494
1238	void	1495	void
1239	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1240	CODE:	1497	CODE:
1241	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1242	{	1499	{
1243	self->base_height = base_height;	1500	self->base_height = base_height;
1244	layout_update_font (self);	1501	layout_update_font (self);
1245	}	1502	}
1246		1503
1247	void	1504	void
…		…
1313	void	1570	void
1314	cursor_pos (DC::Layout self, int index)	1571	cursor_pos (DC::Layout self, int index)
1315	PPCODE:	1572	PPCODE:
1316	{	1573	{
1317	PangoRectangle pos;	1574	PangoRectangle pos;
1318	pango_layout_get_cursor_pos (self->pl, index, 0, &pos);	1575	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319		1576
1320	EXTEND (SP, 3);	1577	EXTEND (SP, 3);
1321	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));	1578	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));	1579	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));	1580	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
…		…
1328	PPCODE:	1585	PPCODE:
1329	{	1586	{
1330	int line, x;	1587	int line, x;
1331		1588
1332	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1589	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1590	#if !PANGO_VERSION_CHECK (1, 17, 3)
1334	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1591	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335	--line;	1592	--line;
1336	#endif	1593	#endif
1337	EXTEND (SP, 2);	1594	EXTEND (SP, 2);
1338	PUSHs (sv_2mortal (newSViv (line)));	1595	PUSHs (sv_2mortal (newSViv (line)));
…		…
1474	glDisable (GL_ALPHA_TEST);	1731	glDisable (GL_ALPHA_TEST);
1475	glDisable (GL_BLEND);	1732	glDisable (GL_BLEND);
1476	}	1733	}
1477	}	1734	}
1478		1735
		1736	void
		1737	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
		1738	PROTOTYPE: @
		1739	CODE:
		1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1743	glEnable (GL_TEXTURE_2D);
		1744	glBindTexture (GL_TEXTURE_2D, name1);
		1745
		1746	glColor3f (intensity, intensity, intensity);
		1747	glPushMatrix ();
		1748	glScalef (1./3, 1./3, 1.);
		1749
		1750	if (blend > 0.f)
		1751	{
		1752	float dx3 = dx * -3.f / w;
		1753	float dy3 = dy * -3.f / h;
		1754	GLfloat env_color[4] = { 0., 0., 0., blend };
		1755
		1756	/* interpolate the two shadow textures */
		1757	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1759
		1760	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1761	gl.ActiveTexture (GL_TEXTURE1);
		1762	glEnable (GL_TEXTURE_2D);
		1763	glBindTexture (GL_TEXTURE_2D, name2);
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1765
		1766	/* rgb == rgb(glcolor) */
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1770
		1771	/* alpha = interpolate t0, t1 by env_alpha */
		1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1773
		1774	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1775	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1777
		1778	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1780
		1781	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1782	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1783
		1784	glBegin (GL_QUADS);
		1785	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1787	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1788	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1789	glEnd ();
		1790
		1791	glDisable (GL_TEXTURE_2D);
		1792	gl.ActiveTexture (GL_TEXTURE0);
		1793	}
		1794	else
		1795	{
		1796	/* simple blending of one texture, also opengl <1.3 path */
		1797	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1798
		1799	glBegin (GL_QUADS);
		1800	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1801	glTexCoord2f (0, t); glVertex2f (0, h);
		1802	glTexCoord2f (s, t); glVertex2f (w, h);
		1803	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1804	glEnd ();
		1805	}
		1806
		1807	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1808	{
		1809	int x, y;
		1810	int dx3 = dx * 3;
		1811	int dy3 = dy * 3;
		1812
		1813	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1814	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1815	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1816	glTranslatef (-1., -1., 0);
		1817	glBegin (GL_QUADS);
		1818
		1819	for (y = 1; y < h; y += 3)
		1820	{
		1821	int y1 = y - dy3;
		1822	int y1valid = y1 >= 0 && y1 < h;
		1823
		1824	for (x = 1; x < w; x += 3)
		1825	{
		1826	int x1 = x - dx3;
		1827	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1828	uint8_t h2;
		1829
		1830	if (y1valid && x1 >= 0 && x1 < w)
		1831	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1832	else
		1833	h2 = 1; /* out of range == invisible */
		1834
		1835	if (h1 || h2)
		1836	{
		1837	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1838	glColor4f (1., 1., 1., alpha);
		1839
		1840	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1841	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1842	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1843	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1844	}
		1845	}
		1846	}
		1847	}
		1848
		1849	glEnd ();
		1850
		1851	glPopMatrix ();
		1852
		1853	glDisable (GL_TEXTURE_2D);
		1854	glDisable (GL_BLEND);
		1855	}
		1856
1479	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1857	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1480	CODE:	1858	CODE:
1481	{	1859	{
1482	GLint width;	1860	GLint width;
1483	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1861	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1490	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1491		1869
1492	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1493		1871
1494	DC::Map	1872	DC::Map
1495	new (SV *class)	1873	new (SV *klass)
1496	CODE:	1874	CODE:
1497	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1498	RETVAL->x = 0;	1876	RETVAL->x = 0;
1499	RETVAL->y = 0;	1877	RETVAL->y = 0;
1500	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1587	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1965	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1588	// use uglier nearest interpolation because linear suffers	1966	// use uglier nearest interpolation because linear suffers
1589	// from transparent color bleeding and ugly wrapping effects.	1967	// from transparent color bleeding and ugly wrapping effects.
1590	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1968	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591	}	1969	}
		1970
		1971	void
		1972	expire_textures (DC::Map self, int texid, int count)
		1973	PPCODE:
		1974	for (; texid < self->texs && count; ++texid, --count)
		1975	{
		1976	maptex *tex = self->tex + texid;
		1977
		1978	if (tex->name)
		1979	{
		1980	if (tex->unused)
		1981	{
		1982	tex->name = 0;
		1983	tex->unused = 0;
		1984	XPUSHs (sv_2mortal (newSViv (texid)));
		1985	}
		1986	else
		1987	tex->unused = 1;
		1988	}
		1989	}
1592		1990
1593	int	1991	int
1594	ox (DC::Map self)	1992	ox (DC::Map self)
1595	ALIAS:	1993	ALIAS:
1596	oy = 1	1994	oy = 1
…		…
1636	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1637	}	2035	}
1638	}	2036	}
1639		2037
1640	SV *	2038	SV *
1641	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1642	CODE:	2040	CODE:
1643	{	2041	{
1644	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	2042	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1645	uint8_t *data_end = (uint8_t *)SvEND (data_);	2043	uint8_t *data_end = (uint8_t *)SvEND (data_);
1646	mapcell *cell;	2044	mapcell *cell;
…		…
1667		2065
1668	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
1669		2067
1670	if (flags & 8)	2068	if (flags & 8)
1671	{	2069	{
		2070	uint8_t ext, cmd;
		2071
1672	if (extmap)	2072	do
1673	{	2073	{
1674	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
1675		2076
1676	do	2077	if (cmd < 4)
		2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2079	else if (cmd == 5) // health
1677	{	2080	{
1678	ext = *data++;
1679	cmd = ext & 0x3f;
1680
1681	if (cmd < 4)
1682	cell->darkness = 255 - ext * 64 + 1;
1683	else if (cmd == 5) // health
1684	{
1685	cell->stat_width = 1;	2081	cell->stat_width = 1;
1686	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1687	}
1688	else if (cmd == 6) // monster width
1689	cell->stat_width = *data++ + 1;
1690	else if (cmd == 0x47)
1691	{
1692	if (*data == 4)
1693	; // decode player count
1694
1695	data += *data + 1;
1696	}
1697	else if (cmd == 8) // cell flags
1698	cell->flags = *data++;
1699	else if (ext & 0x40) // unknown, multibyte => skip
1700	data += *data + 1;
1701	else
1702	data++;
1703	}	2083	}
1704	while (ext & 0x80);	2084	else if (cmd == 6) // monster width
		2085	cell->stat_width = *data++ + 1;
		2086	else if (cmd == 0x47)
		2087	{
		2088	if (*data == 1) cell->player = data [1];
		2089	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2090	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2091	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2092
		2093	data += *data + 1;
		2094	}
		2095	else if (cmd == 8) // cell flags
		2096	cell->flags = *data++;
		2097	else if (ext & 0x40) // unknown, multibyte => skip
		2098	data += *data + 1;
		2099	else
		2100	data++;
1705	}	2101	}
1706	else	2102	while (ext & 0x80);
1707	cell->darkness = *data++ + 1;
1708	}	2103	}
1709		2104
1710	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
1711	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
1712	{	2107	{
…		…
1715	cell->tile [z] = self->face2tile [face];	2110	cell->tile [z] = self->face2tile [face];
1716		2111
1717	if (cell->tile [z])	2112	if (cell->tile [z])
1718	{	2113	{
1719	maptex *tex = self->tex + cell->tile [z];	2114	maptex *tex = self->tex + cell->tile [z];
		2115	tex->unused = 0;
1720	if (!tex->name)	2116	if (!tex->name)
1721	av_push (missing, newSViv (cell->tile [z]));	2117	av_push (missing, newSViv (cell->tile [z]));
1722		2118
1723	if (tex->smoothtile)	2119	if (tex->smoothtile)
1724	{	2120	{
1725	maptex *smooth = self->tex + tex->smoothtile;	2121	maptex *smooth = self->tex + tex->smoothtile;
		2122	smooth->unused = 0;
1726	if (!smooth->name)	2123	if (!smooth->name)
1727	av_push (missing, newSViv (tex->smoothtile));	2124	av_push (missing, newSViv (tex->smoothtile));
1728	}	2125	}
1729	}	2126	}
1730	}	2127	}
1731	}	2128	}
1732	else	2129	else
1733	cell->darkness = 0;	2130	CELL_CLEAR (cell);
1734	}	2131	}
1735	}	2132	}
1736	OUTPUT:	2133	OUTPUT:
1737	RETVAL	2134	RETVAL
1738		2135
…		…
1758	? self->row + y	2155	? self->row + y
1759	: 0;	2156	: 0;
1760		2157
1761	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
1762	{	2159	{
1763	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
1764		2161
1765	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
1766	{	2163	{
1767	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
1768		2165
…		…
1770	{	2167	{
1771	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
1772	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
1773	int a1 = tex.a;	2170	int a1 = tex.a;
1774		2171
1775	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
1776	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
1777	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
1778	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
1779	}	2176	}
1780	}	2177	}
1781		2178
1782	*map++ = (r )	2179	*map++ = (r )
1783	| (g << 8)	2180	| (g << 8)
…		…
1790	}	2187	}
1791	OUTPUT:	2188	OUTPUT:
1792	RETVAL	2189	RETVAL
1793		2190
1794	void	2191	void
1795	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	2192	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796	CODE:	2193	CODE:
1797	{	2194	{
1798	int x, y, z;	2195	int x, y, z;
1799		2196
1800	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2197	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2198	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2199	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803	smooth_key skey;	2200	smooth_key skey;
1804		2201	int pl_x, pl_y;
		2202	maptex pl_tex;
1805	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
		2204	rc_t *rc_ov = rc_alloc ();
1806	rc_key_t key;	2205	rc_key_t key;
1807	rc_array_t *arr;	2206	rc_array_t *arr;
1808		2207
		2208	pl_tex.name = 0;
		2209
1809	// thats current max. sorry.	2210	// that's current max. sorry.
1810	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
1811	if (sh > 255) sh = 255;	2212	if (sh > 255) sh = 255;
1812		2213
1813	// clear key, in case of extra padding	2214	// clear key, in case of extra padding
1814	memset (&skey, 0, sizeof (skey));	2215	memset (&skey, 0, sizeof (skey));
…		…
1818	key.g = 255;	2219	key.g = 255;
1819	key.b = 255;	2220	key.b = 255;
1820	key.a = 255;	2221	key.a = 255;
1821	key.mode = GL_QUADS;	2222	key.mode = GL_QUADS;
1822	key.format = GL_T2F_V3F;	2223	key.format = GL_T2F_V3F;
1823	key.texname = -1;
1824		2224
1825	mx += self->x;	2225	mx += self->x;
1826	my += self->y;	2226	my += self->y;
1827		2227
1828	// first pass: determine smooth_max	2228	// first pass: determine smooth_max
…		…
1852	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853		2253
1854	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
1855	{	2255	{
1856	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
		2257	key.texname = -1;
1857		2258
1858	for (y = 0; y < sh; y++)	2259	for (y = 0; y < sh; y++)
1859	if (0 <= y + my && y + my < self->rows)	2260	if (0 <= y + my && y + my < self->rows)
1860	{	2261	{
1861	maprow *row = self->row + (y + my);	2262	maprow *row = self->row + (y + my);
…		…
1871	maptex tex = self->tex [tile];	2272	maptex tex = self->tex [tile];
1872	int px, py;	2273	int px, py;
1873		2274
1874	if (key.texname != tex.name)	2275	if (key.texname != tex.name)
1875	{	2276	{
		2277	self->tex [tile].unused = 0;
		2278
1876	if (!tex.name)	2279	if (!tex.name)
1877	tex = self->tex [2]; /* missing, replace by noface */	2280	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878		2281
1879	key.texname = tex.name;	2282	key.texname = tex.name;
1880	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
1881	}	2284	}
1882		2285
1883	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
1884	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
		2288
		2289	if (expect_false (cell->player == player) && expect_false (z == 2))
		2290	{
		2291	pl_x = px;
		2292	pl_y = py;
		2293	pl_tex = tex;
		2294	continue;
		2295	}
1885		2296
1886	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2297	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2298	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2299	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2300	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890
1891	if (cell->flags && z == 2)
1892	{
1893	// overlays such as the speech bubble, probably more to come
1894	if (cell->flags & 1)
1895	{
1896	maptex tex = self->tex [1];
1897	int px = x * T + T * 2 / 32;
1898	int py = y * T - T * 6 / 32;
1899
1900	if (tex.name)
1901	{
1902	if (key.texname != tex.name)
1903	{
1904	key.texname = tex.name;
1905	arr = rc_array (rc, &key);
1906	}
1907
1908	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912	}
1913	}
1914	}
1915		2301
1916	// update smooth hash	2302	// update smooth hash
1917	if (tex.smoothtile)	2303	if (tex.smoothtile)
1918	{	2304	{
1919	skey.tile = tex.smoothtile;	2305	skey.tile = tex.smoothtile;
…		…
1948	// corners	2334	// corners
1949	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2335	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1950	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2336	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1951	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2337	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1952	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2338	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2339	}
		2340	}
		2341
		2342	if (expect_false (z == 2) && expect_false (cell->flags))
		2343	{
		2344	// overlays such as the speech bubble, probably more to come
		2345	if (cell->flags & 1)
		2346	{
		2347	rc_key_t key_ov = key;
		2348	maptex tex = self->tex [TEXID_SPEECH];
		2349	rc_array_t *arr;
		2350	int px = x * Tw + Tw * 2 / 32;
		2351	int py = y * Th - Th * 6 / 32;
		2352
		2353	key_ov.texname = tex.name;
		2354	arr = rc_array (rc_ov, &key_ov);
		2355
		2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2358	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1953	}	2360	}
1954	}	2361	}
1955	}	2362	}
1956	}	2363	}
1957		2364
…		…
1984	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
1985	&& skey->level == level	2392	&& skey->level == level
1986	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
1987	{	2394	{
1988	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
1989	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
1990	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
1991	int border = bits & 15;	2398	int border = bits & 15;
1992	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
1994	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
1995		2402
…		…
1997	{	2404	{
1998	// this time avoiding texture state changes	2405	// this time avoiding texture state changes
1999	// save gobs of state changes.	2406	// save gobs of state changes.
2000	if (key.texname != tex.name)	2407	if (key.texname != tex.name)
2001	{	2408	{
		2409	self->tex [skey->tile].unused = 0;
		2410
2002	glEnd ();	2411	glEnd ();
2003	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2412	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004	glBegin (GL_QUADS);	2413	glBegin (GL_QUADS);
2005	}	2414	}
2006		2415
2007	if (border)	2416	if (border)
2008	{	2417	{
2009	float ox = border * dx;	2418	float ox = border * dx;
2010		2419
2011	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015	}	2424	}
2016		2425
2017	if (corner)	2426	if (corner)
2018	{	2427	{
2019	float ox = corner * dx;	2428	float ox = corner * dx;
2020		2429
2021	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025	}	2434	}
2026	}	2435	}
2027	}	2436	}
2028	}	2437	}
2029	}	2438	}
…		…
2035	}	2444	}
2036		2445
2037	hv_clear (smooth);	2446	hv_clear (smooth);
2038	}	2447	}
2039		2448
		2449	if (pl_tex.name)
		2450	{
		2451	maptex tex = pl_tex;
		2452	int px = pl_x + sdx;
		2453	int py = pl_y + sdy;
		2454
		2455	key.texname = tex.name;
		2456	arr = rc_array (rc, &key);
		2457
		2458	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2459	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2460	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2461	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2462
		2463	rc_draw (rc);
		2464	}
		2465
		2466	rc_draw (rc_ov);
		2467	rc_clear (rc_ov);
		2468
2040	glDisable (GL_BLEND);	2469	glDisable (GL_BLEND);
2041	rc_free (rc);	2470	rc_free (rc);
		2471	rc_free (rc_ov);
2042		2472
2043	// top layer: overlays such as the health bar	2473	// top layer: overlays such as the health bar
2044	for (y = 0; y < sh; y++)	2474	for (y = 0; y < sh; y++)
2045	if (0 <= y + my && y + my < self->rows)	2475	if (0 <= y + my && y + my < self->rows)
2046	{	2476	{
…		…
2049	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2050	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2051	{	2481	{
2052	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2053		2483
2054	int px = x * T;	2484	int px = x * Tw;
2055	int py = y * T;	2485	int py = y * Th;
		2486
		2487	if (expect_false (cell->player == player))
		2488	{
		2489	px += sdx;
		2490	py += sdy;
		2491	}
2056		2492
2057	if (cell->stat_hp)	2493	if (cell->stat_hp)
2058	{	2494	{
2059	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2060	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061		2497
2062	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2063	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2064	px + width - 1, py);	2500	px + width - 1, py);
2065		2501
…		…
2071	}	2507	}
2072	}	2508	}
2073	}	2509	}
2074		2510
2075	void	2511	void
2076	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2512	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2077	CODE:	2513	CODE:
2078	{	2514	{
2079	static float color[16][3] = {	2515	static float color[16][3] = {
2080	{ 0.00F, 0.00F, 0.00F },	2516	{ 0.00f, 0.00f, 0.00f },
2081	{ 1.00F, 1.00F, 1.00F },	2517	{ 1.00f, 1.00f, 1.00f },
2082	{ 0.00F, 0.00F, 0.55F },	2518	{ 0.00f, 0.00f, 0.55f },
2083	{ 1.00F, 0.00F, 0.00F },	2519	{ 1.00f, 0.00f, 0.00f },
2084		2520
2085	{ 1.00F, 0.54F, 0.00F },	2521	{ 1.00f, 0.54f, 0.00f },
2086	{ 0.11F, 0.56F, 1.00F },	2522	{ 0.11f, 0.56f, 1.00f },
2087	{ 0.93F, 0.46F, 0.00F },	2523	{ 0.93f, 0.46f, 0.00f },
2088	{ 0.18F, 0.54F, 0.34F },	2524	{ 0.18f, 0.54f, 0.34f },
2089		2525
2090	{ 0.56F, 0.73F, 0.56F },	2526	{ 0.56f, 0.73f, 0.56f },
2091	{ 0.80F, 0.80F, 0.80F },	2527	{ 0.80f, 0.80f, 0.80f },
2092	{ 0.55F, 0.41F, 0.13F },	2528	{ 0.55f, 0.41f, 0.13f },
2093	{ 0.99F, 0.77F, 0.26F },	2529	{ 0.99f, 0.77f, 0.26f },
2094		2530
2095	{ 0.74F, 0.65F, 0.41F },	2531	{ 0.74f, 0.65f, 0.41f },
2096		2532
2097	{ 0.00F, 1.00F, 1.00F },	2533	{ 0.00f, 1.00f, 1.00f },
2098	{ 1.00F, 0.00F, 1.00F },	2534	{ 1.00f, 0.00f, 1.00f },
2099	{ 1.00F, 1.00F, 0.00F },	2535	{ 1.00f, 1.00f, 0.00f },
2100	};	2536	};
2101		2537
2102	int x, y;	2538	int x, y;
2103		2539
2104	glEnable (GL_TEXTURE_2D);	2540	glEnable (GL_TEXTURE_2D);
		2541	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2542	* but the nvidia driver (185.18.14) mishandles alpha textures
		2543	* and takes the colour from god knows where instead of using
		2544	* Cp. MODULATE results in the same colour, but slightly different
		2545	* alpha, but atcually gives us the correct colour with nvidia.
		2546	*/
2105	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2547	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106	glEnable (GL_BLEND);	2548	glEnable (GL_BLEND);
2107	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2549	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108	glBegin (GL_QUADS);	2550	glBegin (GL_QUADS);
2109		2551
2110	for (y = 0; y < h; y++)	2552	for (y = 0; y < h; y++)
…		…
2114		2556
2115	if (m)	2557	if (m)
2116	{	2558	{
2117	float *c = color [m & 15];	2559	float *c = color [m & 15];
2118		2560
2119	float tx1 = m & 0x40 ? 0.5 : 0.;	2561	float tx1 = m & 0x40 ? 0.5f : 0.f;
2120	float tx2 = tx1 + 0.5;	2562	float tx2 = tx1 + 0.5f;
2121		2563
2122	glColor4f (c[0], c[1], c[2], 0.75);	2564	glColor4f (c[0], c[1], c[2], 1);
2123	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2565	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2566	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2567	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2568	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127	}	2569	}
…		…
2135	void	2577	void
2136	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2578	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2137	PPCODE:	2579	PPCODE:
2138	{	2580	{
2139	int x, y;	2581	int x, y;
2140	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2141	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2142	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2143	int sw34 = (sw * 3 + 3) & ~3;	2585	int sw3 = sw * 3;
		2586	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
		2587	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2144	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2588	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2589	memset (darkness1, 0, sw1*sh1);
2146	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147		2590
2148	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2149	SvCUR_set (darkness3_sv, sw34 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2150		2593
2151	mx += self->x - 1;	2594	mx += self->x - 1;
2152	my += self->y - 1;	2595	my += self->y - 1;
2153
2154	memset (darkness1, 255, sw1 * sh1);
2155		2596
2156	for (y = 0; y < sh1; y++)	2597	for (y = 0; y < sh1; y++)
2157	if (0 <= y + my && y + my < self->rows)	2598	if (0 <= y + my && y + my < self->rows)
2158	{	2599	{
2159	maprow *row = self->row + (y + my);	2600	maprow *row = self->row + (y + my);
…		…
2162	if (row->c0 <= x + mx && x + mx < row->c1)	2603	if (row->c0 <= x + mx && x + mx < row->c1)
2163	{	2604	{
2164	mapcell *cell = row->col + (x + mx - row->c0);	2605	mapcell *cell = row->col + (x + mx - row->c0);
2165		2606
2166	darkness1 [y * sw1 + x] = cell->darkness	2607	darkness1 [y * sw1 + x] = cell->darkness
2167	? 255 - (cell->darkness - 1)	2608	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168	: 255 - FOW_DARKNESS;	2609	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169	}	2610	}
2170	}	2611	}
2171		2612
2172	for (y = 0; y < sh; ++y)	2613	for (y = 0; y < sh; ++y)
2173	for (x = 0; x < sw; ++x)	2614	for (x = 0; x < sw; ++x)
…		…
2192		2633
2193	uint8_t r13 = (d13 + d23 + d12) / 3;	2634	uint8_t r13 = (d13 + d23 + d12) / 3;
2194	uint8_t r23 = d23;	2635	uint8_t r23 = d23;
2195	uint8_t r33 = (d23 + d33 + d32) / 3;	2636	uint8_t r33 = (d23 + d33 + d32) / 3;
2196		2637
2197	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2202	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206	}	2647	}
2207		2648
2208	free (darkness1);	2649	free (darkness1);
2209		2650
2210	EXTEND (SP, 3);	2651	EXTEND (SP, 3);
2211	PUSHs (sv_2mortal (newSViv (sw34)));	2652	PUSHs (sv_2mortal (newSViv (sw3)));
2212	PUSHs (sv_2mortal (newSViv (sh3)));	2653	PUSHs (sv_2mortal (newSViv (sh3)));
2213	PUSHs (darkness3_sv);	2654	PUSHs (darkness3_sv);
2214	}	2655	}
2215		2656
2216	SV *	2657	SV *
…		…
2279	else	2720	else
2280	*data++ = 0;	2721	*data++ = 0;
2281	}	2722	}
2282	}	2723	}
2283		2724
		2725	/* if size is w*h + 5 then no data has been found */
		2726	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2727	{
2284	SvPOK_only (data_sv);	2728	SvPOK_only (data_sv);
2285	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2729	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2730	}
		2731
2286	RETVAL = data_sv;	2732	RETVAL = data_sv;
2287	}	2733	}
2288	OUTPUT:	2734	OUTPUT:
2289	RETVAL	2735	RETVAL
2290		2736
2291	void	2737	void
2292	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2738	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293	PPCODE:	2739	PPCODE:
2294	{	2740	{
2295	int x, y, z;	2741	int x, y, z;
2296	int w, h;	2742	int w, h;
2297	int x1, y1;	2743	int x1, y1;
		2744	STRLEN len;
		2745	uint8_t *data, *end;
		2746
		2747	len = SvLEN (data_sv);
		2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
		2750	end = data + len + 8;
		2751
		2752	if (len < 5)
		2753	XSRETURN_EMPTY;
2298		2754
2299	if (*data++ != 0)	2755	if (*data++ != 0)
2300	XSRETURN_EMPTY; /* version mismatch */	2756	XSRETURN_EMPTY; /* version mismatch */
2301		2757
2302	w = *data++ << 8; w |= *data++;	2758	w = *data++ << 8; w |= *data++;
…		…
2317	{	2773	{
2318	maprow *row = map_get_row (self, y);	2774	maprow *row = map_get_row (self, y);
2319		2775
2320	for (x = x0; x < x1; x++)	2776	for (x = x0; x < x1; x++)
2321	{	2777	{
		2778	uint8_t flags;
		2779
		2780	if (data + 7 >= end)
		2781	XSRETURN_EMPTY;
		2782
2322	uint8_t flags = *data++;	2783	flags = *data++;
2323		2784
2324	if (flags)	2785	if (flags)
2325	{	2786	{
2326	mapcell *cell = row_get_cell (row, x);	2787	mapcell *cell = row_get_cell (row, x);
2327	tileid tile[3] = { 0, 0, 0 };	2788	tileid tile[3] = { 0, 0, 0 };
…		…
2330	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2791	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2792	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332		2793
2333	if (cell->darkness == 0)	2794	if (cell->darkness == 0)
2334	{	2795	{
2335	cell->darkness = 0;	2796	/*cell->darkness = 0;*/
		2797	EXTEND (SP, 3);
2336		2798
2337	for (z = 0; z <= 2; z++)	2799	for (z = 0; z <= 2; z++)
2338	{	2800	{
2339	tileid t = tile [z];	2801	tileid t = tile [z];
2340		2802
2341	if (t >= self->texs || (t && !self->tex [t].name))	2803	if (t >= self->texs || (t && !self->tex [t].name))
2342	{	2804	{
2343	XPUSHs (sv_2mortal (newSViv (t)));	2805	PUSHs (sv_2mortal (newSViv (t)));
2344	need_texid (self, t);	2806	need_texid (self, t);
2345	}	2807	}
2346		2808
2347	cell->tile [z] = t;	2809	cell->tile [z] = t;
2348	}	2810	}
…		…
2353	}	2815	}
2354		2816
2355	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2356		2818
2357	DC::RW	2819	DC::RW
2358	new (SV *class, SV *data_sv)	2820	new (SV *klass, SV *data_sv)
2359	CODE:	2821	CODE:
2360	{	2822	{
2361	STRLEN datalen;	2823	STRLEN datalen;
2362	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2363		2825
…		…
2365	}	2827	}
2366	OUTPUT:	2828	OUTPUT:
2367	RETVAL	2829	RETVAL
2368		2830
2369	DC::RW	2831	DC::RW
2370	new_from_file (SV *class, const char *path, const char *mode = "rb")	2832	new_from_file (SV *klass, const char *path, const char *mode = "rb")
2371	CODE:	2833	CODE:
2372	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2373	OUTPUT:	2835	OUTPUT:
2374	RETVAL	2836	RETVAL
2375		2837
…		…
2393	if (RETVAL < 0)	2855	if (RETVAL < 0)
2394	{	2856	{
2395	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2396		2858
2397	if (RETVAL < 0)	2859	if (RETVAL < 0)
		2860	{
		2861	// happens sometimes, maybe it just stopped playing(?)
		2862	RETVAL = Mix_GroupAvailable (-1);
		2863
		2864	if (RETVAL < 0)
2398	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2399		2866	}
		2867	else
2400	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2401	}	2869	}
2402		2870
2403	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2404	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2405	}	2873	}
…		…
2452	void	2920	void
2453	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2921	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454	CODE:	2922	CODE:
2455	{	2923	{
2456	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2924	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2457	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2925	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2458	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2926	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459	}	2927	}
2460		2928
2461	void	2929	void
2462	set_reverse_stereo (DC::Channel self, int flip)	2930	set_reverse_stereo (DC::Channel self, int flip)
…		…
2465		2933
2466	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467		2935
2468	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2469		2937
		2938	void
		2939	decoders ()
		2940	PPCODE:
		2941	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2942	int i, num = Mix_GetNumChunkDecoders ();
		2943	EXTEND (SP, num);
		2944	for (i = 0; i < num; ++i)
		2945	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2946	#else
		2947	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2948	#endif
		2949
2470	DC::MixChunk	2950	DC::MixChunk
2471	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2472	CODE:	2952	CODE:
2473	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474	OUTPUT:	2954	OUTPUT:
2475	RETVAL	2955	RETVAL
2476		2956
…		…
2506	OUTPUT:	2986	OUTPUT:
2507	RETVAL	2987	RETVAL
2508		2988
2509	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510		2990
		2991	void
		2992	decoders ()
		2993	PPCODE:
		2994	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2995	int i, num = Mix_GetNumMusicDecoders ();
		2996	EXTEND (SP, num);
		2997	for (i = 0; i < num; ++i)
		2998	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2999	#else
		3000	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3001	#endif
		3002
2511	int	3003	int
2512	volume (int volume = -1)	3004	volume (int volume = -1)
2513	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2514	CODE:	3006	CODE:
2515	if (items > 0)	3007	if (items > 0)
…		…
2526	void	3018	void
2527	halt ()	3019	halt ()
2528	CODE:	3020	CODE:
2529	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2530		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2531	DC::MixMusic	3030	DC::MixMusic
2532	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2533	CODE:	3032	CODE:
2534	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2535	OUTPUT:	3034	OUTPUT:
2536	RETVAL	3035	RETVAL
2537		3036
…		…
2565	} *civ, const_iv[] = {	3064	} *civ, const_iv[] = {
2566	# define const_iv(name) { # name, (IV)name }	3065	# define const_iv(name) { # name, (IV)name }
2567	const_iv (GL_VENDOR),	3066	const_iv (GL_VENDOR),
2568	const_iv (GL_VERSION),	3067	const_iv (GL_VERSION),
2569	const_iv (GL_EXTENSIONS),	3068	const_iv (GL_EXTENSIONS),
		3069	const_iv (GL_MAX_TEXTURE_UNITS),
2570	const_iv (GL_COLOR_MATERIAL),	3070	const_iv (GL_COLOR_MATERIAL),
2571	const_iv (GL_SMOOTH),	3071	const_iv (GL_SMOOTH),
2572	const_iv (GL_FLAT),	3072	const_iv (GL_FLAT),
2573	const_iv (GL_DITHER),	3073	const_iv (GL_DITHER),
2574	const_iv (GL_BLEND),	3074	const_iv (GL_BLEND),
…		…
2586	const_iv (GL_ZERO),	3086	const_iv (GL_ZERO),
2587	const_iv (GL_SRC_ALPHA),	3087	const_iv (GL_SRC_ALPHA),
2588	const_iv (GL_DST_ALPHA),	3088	const_iv (GL_DST_ALPHA),
2589	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3089	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590	const_iv (GL_ONE_MINUS_DST_ALPHA),	3090	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3091	const_iv (GL_SRC_COLOR),
		3092	const_iv (GL_DST_COLOR),
		3093	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3094	const_iv (GL_ONE_MINUS_DST_COLOR),
2591	const_iv (GL_SRC_ALPHA_SATURATE),	3095	const_iv (GL_SRC_ALPHA_SATURATE),
2592	const_iv (GL_RGB),	3096	const_iv (GL_RGB),
2593	const_iv (GL_RGBA),	3097	const_iv (GL_RGBA),
2594	const_iv (GL_RGBA4),	3098	const_iv (GL_RGBA4),
2595	const_iv (GL_RGBA8),	3099	const_iv (GL_RGBA8),
…		…
2663	const_iv (GL_NICEST),	3167	const_iv (GL_NICEST),
2664	const_iv (GL_V2F),	3168	const_iv (GL_V2F),
2665	const_iv (GL_V3F),	3169	const_iv (GL_V3F),
2666	const_iv (GL_T2F_V3F),	3170	const_iv (GL_T2F_V3F),
2667	const_iv (GL_T2F_N3F_V3F),	3171	const_iv (GL_T2F_N3F_V3F),
		3172	const_iv (GL_FUNC_ADD),
		3173	const_iv (GL_FUNC_SUBTRACT),
		3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2668	# undef const_iv	3175	# undef const_iv
2669	};	3176	};
2670		3177
2671	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3178	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2672	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673		3180
2674	texture_av = newAV ();	3181	texture_av = newAV ();
2675	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
2676	}	3183	}
2677		3184
…		…
2679	disable_GL_EXT_blend_func_separate ()	3186	disable_GL_EXT_blend_func_separate ()
2680	CODE:	3187	CODE:
2681	gl.BlendFuncSeparate = 0;	3188	gl.BlendFuncSeparate = 0;
2682	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
2683		3190
2684	char *	3191	void
		3192	apple_nvidia_bug (int enable)
		3193
		3194	const char *
2685	gl_vendor ()	3195	gl_vendor ()
2686	CODE:	3196	CODE:
2687	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
2688	OUTPUT:	3198	OUTPUT:
2689	RETVAL	3199	RETVAL
2690		3200
2691	char *	3201	const char *
2692	gl_version ()	3202	gl_version ()
2693	CODE:	3203	CODE:
2694	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
2695	OUTPUT:	3205	OUTPUT:
2696	RETVAL	3206	RETVAL
2697		3207
2698	char *	3208	const char *
2699	gl_extensions ()	3209	gl_extensions ()
2700	CODE:	3210	CODE:
2701	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2702	OUTPUT:	3212	OUTPUT:
2703	RETVAL	3213	RETVAL
2704		3214
2705	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
2706		3220
2707	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
2708	CODE:	3222	CODE:
2709	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
2710	OUTPUT:	3224	OUTPUT:
…		…
2718		3232
2719	int glGetError ()	3233	int glGetError ()
2720		3234
2721	void glFinish ()	3235	void glFinish ()
2722		3236
		3237	void glFlush ()
		3238
2723	void glClear (int mask)	3239	void glClear (int mask)
2724		3240
2725	void glClearColor (float r, float g, float b, float a = 1.0)	3241	void glClearColor (float r, float g, float b, float a = 1.0)
2726	PROTOTYPE: @	3242	PROTOTYPE: @
2727		3243
…		…
2736	void glBlendFunc (int sfactor, int dfactor)	3252	void glBlendFunc (int sfactor, int dfactor)
2737		3253
2738	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3254	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739	CODE:	3255	CODE:
2740	gl_BlendFuncSeparate (sa, da, saa, daa);	3256	gl_BlendFuncSeparate (sa, da, saa, daa);
		3257
		3258	# void glBlendEquation (int se)
2741		3259
2742	void glDepthMask (int flag)	3260	void glDepthMask (int flag)
2743		3261
2744	void glLogicOp (int opcode)	3262	void glLogicOp (int opcode)
2745		3263
…		…
2780	void glRotate (float angle, float x, float y, float z)	3298	void glRotate (float angle, float x, float y, float z)
2781	CODE:	3299	CODE:
2782	glRotatef (angle, x, y, z);	3300	glRotatef (angle, x, y, z);
2783		3301
2784	void glColor (float r, float g, float b, float a = 1.0)	3302	void glColor (float r, float g, float b, float a = 1.0)
		3303	PROTOTYPE: @
2785	ALIAS:	3304	ALIAS:
2786	glColor_premultiply = 1	3305	glColor_premultiply = 1
2787	CODE:	3306	CODE:
2788	if (ix)	3307	if (ix)
2789	{	3308	{
…		…
2894	void glNewList (int list, int mode = GL_COMPILE)	3413	void glNewList (int list, int mode = GL_COMPILE)
2895		3414
2896	void glEndList ()	3415	void glEndList ()
2897		3416
2898	void glCallList (int list)	3417	void glCallList (int list)
		3418
		3419	void c_init ()
		3420	CODE:
		3421	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3422	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2899		3423
2900	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3424	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901		3425
2902	PROTOTYPES: DISABLE	3426	PROTOTYPES: DISABLE
2903		3427

Diff Legend

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