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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.314 by root, Wed Jan 18 15:31:51 2012 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>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	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);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		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 */
86	#define FOW_DARKNESS 64	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
97		101
98	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3	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	}
101		123
102	static AV *texture_av;	124	static AV *texture_av;
103		125
104	static struct	126	static struct
105	{	127	{
…		…
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
462	}	484	}
463		485
464	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
465	minpot (unsigned int n)	493	minpot (unsigned int n)
466	{	494	{
467	if (!n)	495	if (!n)
468	return 0;	496	return 0;
469		497
…		…
549		577
550	return mod;	578	return mod;
551	}	579	}
552		580
553	static void	581	static void
554	deliantra_main ()	582	deliantra_main (SV *real_main)
555	{	583	{
556	char *argv[] = { 0 };	584	dSP;
557	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
558	}	588	}
559		589
560	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
561	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
563	* on OS X, so... we provide one and call the original main(), which,	595	* on OS X, so... we provide one and call the original main(), which,
564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
566	*/	598	*/
567	extern C_LINKAGE int	599	extern C_LINKAGE int
568	main (int argc, char *argv[])	600	main (int argc, char *argv[])
569	{	601	{
570	deliantra_main ();	602	deliantra_main (real_main);
571	}	603	}
572		604
573	#undef main	605	#undef main
574		606
575	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
576		608
577	static void	609	static void
578	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
579	{	611	{
		612	real_main = real_main;
		613
580	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
581	(main) (1, argv);	615	(main) (1, argv);
582	}	616	}
583	#else	617	#else
584	static void	618	static void
585	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
586	{	620	{
587	deliantra_main ();	621	deliantra_main (real_main);
588	}	622	}
589	#endif	623	#endif
590		624
591	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
592		626
…		…
793		827
794	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
795	# undef const_iv	829	# undef const_iv
796	};	830	};
797		831
798	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--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		834
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	837	}
804		838
…		…
820	NV ceil (NV x)	854	NV ceil (NV x)
821		855
822	IV minpot (UV n)	856	IV minpot (UV n)
823		857
824	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
825		865
826	void	866	void
827	pango_init ()	867	pango_init ()
828	CODE:	868	CODE:
829	{	869	{
…		…
837	#endif	877	#endif
838	}	878	}
839		879
840	char *SDL_GetError ()	880	char *SDL_GetError ()
841		881
842	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
843		884
844	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
845		886
846	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
847		888
…		…
916	);	957	);
917		958
918	if (RETVAL)	959	if (RETVAL)
919	{	960	{
920	av_clear (texture_av);	961	av_clear (texture_av);
921
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	962	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924	#include "glfunc.h"	963	#include "glfunc.h"
925	#undef GL_FUNC	964	#undef GL_FUNC
		965	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		966	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	967	}
927	}	968	}
928	OUTPUT:	969	OUTPUT:
929	RETVAL	970	RETVAL
930		971
931	void	972	void
		973	SDL_WM_SetCaption (const char title, const char icon)
		974
		975	void
932	SDL_GL_SwapBuffers ()	976	SDL_GL_SwapBuffers ()
933		977
934	char *	978	char *
935	SDL_GetKeyName (int sym)	979	SDL_GetKeyName (int sym)
936		980
…		…
938	SDL_GetAppState ()	982	SDL_GetAppState ()
939		983
940	int	984	int
941	SDL_GetModState ()	985	SDL_GetModState ()
942		986
		987	int
		988	SDL_WaitEvent ()
		989	C_ARGS: 0
		990
943	void	991	void
		992	SDL_PumpEvents ()
		993
		994	void
944	poll_events ()	995	peep_events ()
945	PPCODE:	996	PPCODE:
946	{	997	{
947	SDL_Event ev;	998	SDL_Event ev;
948		999
949	SDL_PumpEvents ();	1000	SDL_PumpEvents ();
…		…
1015		1066
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1067	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1068	}
1018	}	1069	}
1019		1070
		1071	char *
		1072	SDL_AudioDriverName ()
		1073	CODE:
		1074	{
		1075	char buf [256];
		1076	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1077	XSRETURN_UNDEF;
		1078
		1079	RETVAL = buf;
		1080	}
		1081	OUTPUT:
		1082	RETVAL
		1083
1020	int	1084	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1085	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1086	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1087	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1088	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1150	add_font (char *file)
1087	CODE:	1151	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1152	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1153	OUTPUT:
1090	RETVAL	1154	RETVAL
		1155
		1156	void
		1157	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1158
		1159	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1160	void
		1161	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1091		1162
1092	void	1163	void
1093	load_image_inline (SV *image_)	1164	load_image_inline (SV *image_)
1094	ALIAS:	1165	ALIAS:
1095	load_image_file = 1	1166	load_image_file = 1
…		…
1658	glDisable (GL_ALPHA_TEST);	1729	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1730	glDisable (GL_BLEND);
1660	}	1731	}
1661	}	1732	}
1662		1733
		1734	void
		1735	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)
		1736	PROTOTYPE: @
		1737	CODE:
		1738	{
		1739	glEnable (GL_BLEND);
		1740	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1741	glEnable (GL_TEXTURE_2D);
		1742	glBindTexture (GL_TEXTURE_2D, name1);
		1743
		1744	glColor3f (intensity, intensity, intensity);
		1745	glPushMatrix ();
		1746	glScalef (1./3, 1./3, 1.);
		1747
		1748	if (blend > 0.f)
		1749	{
		1750	float dx3 = dx * -3.f / w;
		1751	float dy3 = dy * -3.f / h;
		1752	GLfloat env_color[4] = { 0., 0., 0., blend };
		1753
		1754	/* interpolate the two shadow textures */
		1755	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1757
		1758	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1759	gl.ActiveTexture (GL_TEXTURE1);
		1760	glEnable (GL_TEXTURE_2D);
		1761	glBindTexture (GL_TEXTURE_2D, name2);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1763
		1764	/* rgb == rgb(glcolor) */
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1768
		1769	/* alpha = interpolate t0, t1 by env_alpha */
		1770	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1774	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1775
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1778
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1781
		1782	glBegin (GL_QUADS);
		1783	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1784	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1785	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1787	glEnd ();
		1788
		1789	glDisable (GL_TEXTURE_2D);
		1790	gl.ActiveTexture (GL_TEXTURE0);
		1791	}
		1792	else
		1793	{
		1794	/* simple blending of one texture, also opengl <1.3 path */
		1795	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1796
		1797	glBegin (GL_QUADS);
		1798	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1799	glTexCoord2f (0, t); glVertex2f (0, h);
		1800	glTexCoord2f (s, t); glVertex2f (w, h);
		1801	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1802	glEnd ();
		1803	}
		1804
		1805	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1806	{
		1807	int x, y;
		1808	int dx3 = dx * 3;
		1809	int dy3 = dy * 3;
		1810
		1811	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1812	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1813	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1814	glTranslatef (-1., -1., 0);
		1815	glBegin (GL_QUADS);
		1816
		1817	for (y = 1; y < h; y += 3)
		1818	{
		1819	int y1 = y - dy3;
		1820	int y1valid = y1 >= 0 && y1 < h;
		1821
		1822	for (x = 1; x < w; x += 3)
		1823	{
		1824	int x1 = x - dx3;
		1825	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1826	uint8_t h2;
		1827
		1828	if (y1valid && x1 >= 0 && x1 < w)
		1829	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1830	else
		1831	h2 = 1; /* out of range == invisible */
		1832
		1833	if (h1 \|\| h2)
		1834	{
		1835	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1836	glColor4f (1., 1., 1., alpha);
		1837
		1838	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1839	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1840	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1841	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1842	}
		1843	}
		1844	}
		1845	}
		1846
		1847	glEnd ();
		1848
		1849	glPopMatrix ();
		1850
		1851	glDisable (GL_TEXTURE_2D);
		1852	glDisable (GL_BLEND);
		1853	}
		1854
1663	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1855	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664	CODE:	1856	CODE:
1665	{	1857	{
1666	GLint width;	1858	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1859	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1881	{	2073	{
1882	ext = *data++;	2074	ext = *data++;
1883	cmd = ext & 0x7f;	2075	cmd = ext & 0x7f;
1884		2076
1885	if (cmd < 4)	2077	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;	2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1887	else if (cmd == 5) // health	2079	else if (cmd == 5) // health
1888	{	2080	{
1889	cell->stat_width = 1;	2081	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1891	}	2083	}
…		…
1966	? self->row + y	2158	? self->row + y
1967	: 0;	2159	: 0;
1968		2160
1969	for (x = x0; x < x1; x++)	2161	for (x = x0; x < x1; x++)
1970	{	2162	{
1971	int r = 32, g = 32, b = 32, a = 192;	2163	unsigned int r = 32, g = 32, b = 32, a = 192;
1972		2164
1973	if (row && row->c0 <= x && x < row->c1)	2165	if (row && row->c0 <= x && x < row->c1)
1974	{	2166	{
1975	mapcell *cell = row->col + (x - row->c0);	2167	mapcell *cell = row->col + (x - row->c0);
1976		2168
…		…
1978	{	2170	{
1979	maptex tex = self->tex [cell->tile [z]];	2171	maptex tex = self->tex [cell->tile [z]];
1980	int a0 = 255 - tex.a;	2172	int a0 = 255 - tex.a;
1981	int a1 = tex.a;	2173	int a1 = tex.a;
1982		2174
1983	r = (r * a0 + tex.r * a1) / 255;	2175	r = div255 (r * a0 + tex.r * a1);
1984	g = (g * a0 + tex.g * a1) / 255;	2176	g = div255 (g * a0 + tex.g * a1);
1985	b = (b * a0 + tex.b * a1) / 255;	2177	b = div255 (b * a0 + tex.b * a1);
1986	a = (a * a0 + tex.a * a1) / 255;	2178	a = div255 (a * a0 + tex.a * a1);
1987	}	2179	}
1988	}	2180	}
1989		2181
1990	*map++ = (r )	2182	*map++ = (r )
1991	\| (g << 8)	2183	\| (g << 8)
…		…
1998	}	2190	}
1999	OUTPUT:	2191	OUTPUT:
2000	RETVAL	2192	RETVAL
2001		2193
2002	void	2194	void
2003	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2195	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)
2004	CODE:	2196	CODE:
2005	{	2197	{
2006	int x, y, z;	2198	int x, y, z;
2007		2199
2008	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2200	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2012	int pl_x, pl_y;	2204	int pl_x, pl_y;
2013	maptex pl_tex;	2205	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2206	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2207	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2208	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2209	rc_array_t *arr;
2018		2210
2019	pl_tex.name = 0;	2211	pl_tex.name = 0;
2020		2212
2021	// that's current max. sorry.	2213	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2214	if (sw > 255) sw = 255;
…		…
2059	}	2251	}
2060		2252
2061	glEnable (GL_BLEND);	2253	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2254	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2255	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065	key.texname = self->tex [TEXID_HIDDEN].name;
2066	arr_hidden = rc_array (rc_ov, &key);
2067		2256
2068	for (z = 0; z <= 2; z++)	2257	for (z = 0; z <= 2; z++)
2069	{	2258	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2259	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2260	key.texname = -1;
…		…
2095		2284
2096	key.texname = tex.name;	2285	key.texname = tex.name;
2097	arr = rc_array (rc, &key);	2286	arr = rc_array (rc, &key);
2098	}	2287	}
2099		2288
2100	px = (x + 1) * T - tex.w;	2289	px = (x + 1) * Th - tex.w;
2101	py = (y + 1) * T - tex.h;	2290	py = (y + 1) * Tw - tex.h;
2102		2291
2103	if (expect_false (cell->player == player) && expect_false (z == 2))	2292	if (expect_false (cell->player == player) && expect_false (z == 2))
2104	{	2293	{
2105	pl_x = px;	2294	pl_x = px;
2106	pl_y = py;	2295	pl_y = py;
…		…
2151	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2340	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2152	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2341	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153	}	2342	}
2154	}	2343	}
2155		2344
2156	if (expect_false (z == 2))	2345	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2346	{
2158	/* draw question marks on top of hidden spaces */	2347	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2348	if (cell->flags & 1)
2160	{	2349	{
2161	maptex tex = self->tex [TEXID_HIDDEN];
2162	int px = (x + 1) * T - tex.w;
2163	int py = (y + 1) * T - tex.h;
2164
2165	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169	}
2170
2171	if (expect_false (cell->flags))
2172	{
2173	// overlays such as the speech bubble, probably more to come
2174	if (cell->flags & 1)
2175	{
2176	rc_key_t key_ov = key;	2350	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2351	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2352	rc_array_t *arr;
2179	int px = x * T + T * 2 / 32;	2353	int px = x * Tw + Tw * 2 / 32;
2180	int py = y * T - T * 6 / 32;	2354	int py = y * Th - Th * 6 / 32;
2181		2355
2182	key_ov.texname = tex.name;	2356	key_ov.texname = tex.name;
2183	arr = rc_array (rc_ov, &key_ov);	2357	arr = rc_array (rc_ov, &key_ov);
2184		2358
2185	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2359	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2360	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2187	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2361	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2188	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2362	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2189	}
2190	}	2363	}
2191	}	2364	}
2192	}	2365	}
2193	}	2366	}
2194		2367
…		…
2221	if (!(bits & 0x1000)	2394	if (!(bits & 0x1000)
2222	&& skey->level == level	2395	&& skey->level == level
2223	&& level > smooth_max [skey->x][skey->y])	2396	&& level > smooth_max [skey->x][skey->y])
2224	{	2397	{
2225	maptex tex = self->tex [skey->tile];	2398	maptex tex = self->tex [skey->tile];
2226	int px = (((int)skey->x) - 1) * T;	2399	int px = (((int)skey->x) - 1) * Tw;
2227	int py = (((int)skey->y) - 1) * T;	2400	int py = (((int)skey->y) - 1) * Th;
2228	int border = bits & 15;	2401	int border = bits & 15;
2229	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2402	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230	float dx = tex.s * .0625f; // 16 images/row	2403	float dx = tex.s * .0625f; // 16 images/row
2231	float dy = tex.t * .5f ; // 2 images/column	2404	float dy = tex.t * .5f ; // 2 images/column
2232		2405
…		…
2245		2418
2246	if (border)	2419	if (border)
2247	{	2420	{
2248	float ox = border * dx;	2421	float ox = border * dx;
2249		2422
2250	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2423	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2424	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2425	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2426	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254	}	2427	}
2255		2428
2256	if (corner)	2429	if (corner)
2257	{	2430	{
2258	float ox = corner * dx;	2431	float ox = corner * dx;
2259		2432
2260	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2433	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2434	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2435	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2436	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264	}	2437	}
2265	}	2438	}
2266	}	2439	}
2267	}	2440	}
2268	}	2441	}
…		…
2309	for (x = 0; x < sw; x++)	2482	for (x = 0; x < sw; x++)
2310	if (row->c0 <= x + mx && x + mx < row->c1)	2483	if (row->c0 <= x + mx && x + mx < row->c1)
2311	{	2484	{
2312	mapcell *cell = row->col + (x + mx - row->c0);	2485	mapcell *cell = row->col + (x + mx - row->c0);
2313		2486
2314	int px = x * T;	2487	int px = x * Tw;
2315	int py = y * T;	2488	int py = y * Th;
2316		2489
2317	if (expect_false (cell->player == player))	2490	if (expect_false (cell->player == player))
2318	{	2491	{
2319	px += sdx;	2492	px += sdx;
2320	py += sdy;	2493	py += sdy;
2321	}	2494	}
2322		2495
2323	if (cell->stat_hp)	2496	if (cell->stat_hp)
2324	{	2497	{
2325	int width = cell->stat_width * T;	2498	int width = cell->stat_width * Tw;
2326	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2499	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327		2500
2328	glColor3ub (0, 0, 0);	2501	glColor3ub (0, 0, 0);
2329	glRectf (px + 1, py - thick - 2,	2502	glRectf (px + 1, py - thick - 2,
2330	px + width - 1, py);	2503	px + width - 1, py);
2331		2504
…		…
2337	}	2510	}
2338	}	2511	}
2339	}	2512	}
2340		2513
2341	void	2514	void
2342	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2515	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2343	CODE:	2516	CODE:
2344	{	2517	{
2345	static float color[16][3] = {	2518	static float color[16][3] = {
2346	{ 0.00F, 0.00F, 0.00F },	2519	{ 0.00f, 0.00f, 0.00f },
2347	{ 1.00F, 1.00F, 1.00F },	2520	{ 1.00f, 1.00f, 1.00f },
2348	{ 0.00F, 0.00F, 0.55F },	2521	{ 0.00f, 0.00f, 0.55f },
2349	{ 1.00F, 0.00F, 0.00F },	2522	{ 1.00f, 0.00f, 0.00f },
2350		2523
2351	{ 1.00F, 0.54F, 0.00F },	2524	{ 1.00f, 0.54f, 0.00f },
2352	{ 0.11F, 0.56F, 1.00F },	2525	{ 0.11f, 0.56f, 1.00f },
2353	{ 0.93F, 0.46F, 0.00F },	2526	{ 0.93f, 0.46f, 0.00f },
2354	{ 0.18F, 0.54F, 0.34F },	2527	{ 0.18f, 0.54f, 0.34f },
2355		2528
2356	{ 0.56F, 0.73F, 0.56F },	2529	{ 0.56f, 0.73f, 0.56f },
2357	{ 0.80F, 0.80F, 0.80F },	2530	{ 0.80f, 0.80f, 0.80f },
2358	{ 0.55F, 0.41F, 0.13F },	2531	{ 0.55f, 0.41f, 0.13f },
2359	{ 0.99F, 0.77F, 0.26F },	2532	{ 0.99f, 0.77f, 0.26f },
2360		2533
2361	{ 0.74F, 0.65F, 0.41F },	2534	{ 0.74f, 0.65f, 0.41f },
2362		2535
2363	{ 0.00F, 1.00F, 1.00F },	2536	{ 0.00f, 1.00f, 1.00f },
2364	{ 1.00F, 0.00F, 1.00F },	2537	{ 1.00f, 0.00f, 1.00f },
2365	{ 1.00F, 1.00F, 0.00F },	2538	{ 1.00f, 1.00f, 0.00f },
2366	};	2539	};
2367		2540
2368	int x, y;	2541	int x, y;
2369		2542
2370	glEnable (GL_TEXTURE_2D);	2543	glEnable (GL_TEXTURE_2D);
2371	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2544	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372	* but the nvidia driver (185.18.14) mishandles alpha textures	2545	* but the nvidia driver (185.18.14) mishandles alpha textures
2373	* ansd takes the colour from god knows where instead of using	2546	* and takes the colour from god knows where instead of using
2374	* Cp. MODULATE results in the same colour, but slightly different	2547	* Cp. MODULATE results in the same colour, but slightly different
2375	* alpha, but atcually gives us the correct colour with nvidia.	2548	* alpha, but atcually gives us the correct colour with nvidia.
2376	*/	2549	*/
2377	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2550	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378	glEnable (GL_BLEND);	2551	glEnable (GL_BLEND);
…		…
2386		2559
2387	if (m)	2560	if (m)
2388	{	2561	{
2389	float *c = color [m & 15];	2562	float *c = color [m & 15];
2390		2563
2391	float tx1 = m & 0x40 ? 0.5 : 0.;	2564	float tx1 = m & 0x40 ? 0.5f : 0.f;
2392	float tx2 = tx1 + 0.5;	2565	float tx2 = tx1 + 0.5f;
2393		2566
2394	glColor4f (c[0], c[1], c[2], 1);	2567	glColor4f (c[0], c[1], c[2], 1);
2395	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2568	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2569	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2570	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2407	void	2580	void
2408	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2581	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2409	PPCODE:	2582	PPCODE:
2410	{	2583	{
2411	int x, y;	2584	int x, y;
2412	int sw1 = sw + 2;	2585	int sw1 = sw + 2;
2413	int sh1 = sh + 2;	2586	int sh1 = sh + 2;
2414	int sh3 = sh * 3;	2587	int sh3 = sh * 3;
2415	int sw34 = (sw * 3 + 3) & ~3;	2588	int sw3 = sw * 3;
		2589	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2590	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2416	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2591	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2417	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2592	memset (darkness1, 0, sw1*sh1);
2418	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2419		2593
2420	SvPOK_only (darkness3_sv);	2594	SvPOK_only (darkness3_sv);
2421	SvCUR_set (darkness3_sv, sw34 * sh3);	2595	SvCUR_set (darkness3_sv, sw3 * sh3);
2422		2596
2423	mx += self->x - 1;	2597	mx += self->x - 1;
2424	my += self->y - 1;	2598	my += self->y - 1;
2425
2426	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427		2599
2428	for (y = 0; y < sh1; y++)	2600	for (y = 0; y < sh1; y++)
2429	if (0 <= y + my && y + my < self->rows)	2601	if (0 <= y + my && y + my < self->rows)
2430	{	2602	{
2431	maprow *row = self->row + (y + my);	2603	maprow *row = self->row + (y + my);
…		…
2434	if (row->c0 <= x + mx && x + mx < row->c1)	2606	if (row->c0 <= x + mx && x + mx < row->c1)
2435	{	2607	{
2436	mapcell *cell = row->col + (x + mx - row->c0);	2608	mapcell *cell = row->col + (x + mx - row->c0);
2437		2609
2438	darkness1 [y * sw1 + x] = cell->darkness	2610	darkness1 [y * sw1 + x] = cell->darkness
2439	? 255 - (cell->darkness - 1)	2611	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440	: 255 - FOW_DARKNESS;	2612	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441	}	2613	}
2442	}	2614	}
2443		2615
2444	for (y = 0; y < sh; ++y)	2616	for (y = 0; y < sh; ++y)
2445	for (x = 0; x < sw; ++x)	2617	for (x = 0; x < sw; ++x)
…		…
2464		2636
2465	uint8_t r13 = (d13 + d23 + d12) / 3;	2637	uint8_t r13 = (d13 + d23 + d12) / 3;
2466	uint8_t r23 = d23;	2638	uint8_t r23 = d23;
2467	uint8_t r33 = (d23 + d33 + d32) / 3;	2639	uint8_t r33 = (d23 + d33 + d32) / 3;
2468		2640
2469	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2642	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2643	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2645	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2474	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2646	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2648	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2649	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478	}	2650	}
2479		2651
2480	free (darkness1);	2652	free (darkness1);
2481		2653
2482	EXTEND (SP, 3);	2654	EXTEND (SP, 3);
2483	PUSHs (sv_2mortal (newSViv (sw34)));	2655	PUSHs (sv_2mortal (newSViv (sw3)));
2484	PUSHs (sv_2mortal (newSViv (sh3)));	2656	PUSHs (sv_2mortal (newSViv (sh3)));
2485	PUSHs (darkness3_sv);	2657	PUSHs (darkness3_sv);
2486	}	2658	}
2487		2659
2488	SV *	2660	SV *
…		…
2686	if (RETVAL < 0)	2858	if (RETVAL < 0)
2687	{	2859	{
2688	RETVAL = Mix_GroupOldest (-1);	2860	RETVAL = Mix_GroupOldest (-1);
2689		2861
2690	if (RETVAL < 0)	2862	if (RETVAL < 0)
		2863	{
		2864	// happens sometimes, maybe it just stopped playing(?)
		2865	RETVAL = Mix_GroupAvailable (-1);
		2866
		2867	if (RETVAL < 0)
2691	XSRETURN_UNDEF;	2868	XSRETURN_UNDEF;
2692		2869	}
		2870	else
2693	Mix_HaltChannel (RETVAL);	2871	Mix_HaltChannel (RETVAL);
2694	}	2872	}
2695		2873
2696	Mix_UnregisterAllEffects (RETVAL);	2874	Mix_UnregisterAllEffects (RETVAL);
2697	Mix_Volume (RETVAL, 128);	2875	Mix_Volume (RETVAL, 128);
2698	}	2876	}
…		…
2745	void	2923	void
2746	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2924	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747	CODE:	2925	CODE:
2748	{	2926	{
2749	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2927	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2928	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2751	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2929	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752	}	2930	}
2753		2931
2754	void	2932	void
2755	set_reverse_stereo (DC::Channel self, int flip)	2933	set_reverse_stereo (DC::Channel self, int flip)
…		…
2757	Mix_SetReverseStereo (self, flip);	2935	Mix_SetReverseStereo (self, flip);
2758		2936
2759	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2937	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760		2938
2761	PROTOTYPES: DISABLE	2939	PROTOTYPES: DISABLE
		2940
		2941	void
		2942	decoders ()
		2943	PPCODE:
		2944	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2945	int i, num = Mix_GetNumChunkDecoders ();
		2946	EXTEND (SP, num);
		2947	for (i = 0; i < num; ++i)
		2948	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2949	#else
		2950	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2951	#endif
2762		2952
2763	DC::MixChunk	2953	DC::MixChunk
2764	new (SV *class, DC::RW rwops)	2954	new (SV *class, DC::RW rwops)
2765	CODE:	2955	CODE:
2766	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2956	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2799	OUTPUT:	2989	OUTPUT:
2800	RETVAL	2990	RETVAL
2801		2991
2802	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2992	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803		2993
		2994	void
		2995	decoders ()
		2996	PPCODE:
		2997	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2998	int i, num = Mix_GetNumMusicDecoders ();
		2999	EXTEND (SP, num);
		3000	for (i = 0; i < num; ++i)
		3001	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3002	#else
		3003	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3004	#endif
		3005
2804	int	3006	int
2805	volume (int volume = -1)	3007	volume (int volume = -1)
2806	PROTOTYPE: ;$	3008	PROTOTYPE: ;$
2807	CODE:	3009	CODE:
2808	if (items > 0)	3010	if (items > 0)
…		…
2818		3020
2819	void	3021	void
2820	halt ()	3022	halt ()
2821	CODE:	3023	CODE:
2822	Mix_HaltMusic ();	3024	Mix_HaltMusic ();
		3025
		3026	int
		3027	playing ()
		3028	CODE:
		3029	RETVAL = Mix_PlayingMusic ();
		3030	OUTPUT:
		3031	RETVAL
2823		3032
2824	DC::MixMusic	3033	DC::MixMusic
2825	new (SV *class, DC::RW rwops)	3034	new (SV *class, DC::RW rwops)
2826	CODE:	3035	CODE:
2827	RETVAL = Mix_LoadMUS_RW (rwops);	3036	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2858	} *civ, const_iv[] = {	3067	} *civ, const_iv[] = {
2859	# define const_iv(name) { # name, (IV)name }	3068	# define const_iv(name) { # name, (IV)name }
2860	const_iv (GL_VENDOR),	3069	const_iv (GL_VENDOR),
2861	const_iv (GL_VERSION),	3070	const_iv (GL_VERSION),
2862	const_iv (GL_EXTENSIONS),	3071	const_iv (GL_EXTENSIONS),
		3072	const_iv (GL_MAX_TEXTURE_UNITS),
2863	const_iv (GL_COLOR_MATERIAL),	3073	const_iv (GL_COLOR_MATERIAL),
2864	const_iv (GL_SMOOTH),	3074	const_iv (GL_SMOOTH),
2865	const_iv (GL_FLAT),	3075	const_iv (GL_FLAT),
2866	const_iv (GL_DITHER),	3076	const_iv (GL_DITHER),
2867	const_iv (GL_BLEND),	3077	const_iv (GL_BLEND),
…		…
2879	const_iv (GL_ZERO),	3089	const_iv (GL_ZERO),
2880	const_iv (GL_SRC_ALPHA),	3090	const_iv (GL_SRC_ALPHA),
2881	const_iv (GL_DST_ALPHA),	3091	const_iv (GL_DST_ALPHA),
2882	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3092	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883	const_iv (GL_ONE_MINUS_DST_ALPHA),	3093	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3094	const_iv (GL_SRC_COLOR),
		3095	const_iv (GL_DST_COLOR),
		3096	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3097	const_iv (GL_ONE_MINUS_DST_COLOR),
2884	const_iv (GL_SRC_ALPHA_SATURATE),	3098	const_iv (GL_SRC_ALPHA_SATURATE),
2885	const_iv (GL_RGB),	3099	const_iv (GL_RGB),
2886	const_iv (GL_RGBA),	3100	const_iv (GL_RGBA),
2887	const_iv (GL_RGBA4),	3101	const_iv (GL_RGBA4),
2888	const_iv (GL_RGBA8),	3102	const_iv (GL_RGBA8),
…		…
2962	const_iv (GL_FUNC_SUBTRACT),	3176	const_iv (GL_FUNC_SUBTRACT),
2963	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3177	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2964	# undef const_iv	3178	# undef const_iv
2965	};	3179	};
2966		3180
2967	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3181	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2968	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3182	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2969		3183
2970	texture_av = newAV ();	3184	texture_av = newAV ();
2971	AvREAL_off (texture_av);	3185	AvREAL_off (texture_av);
2972	}	3186	}
2973		3187
…		…
3016	RETVAL	3230	RETVAL
3017		3231
3018	int glGetError ()	3232	int glGetError ()
3019		3233
3020	void glFinish ()	3234	void glFinish ()
		3235
		3236	void glFlush ()
3021		3237
3022	void glClear (int mask)	3238	void glClear (int mask)
3023		3239
3024	void glClearColor (float r, float g, float b, float a = 1.0)	3240	void glClearColor (float r, float g, float b, float a = 1.0)
3025	PROTOTYPE: @	3241	PROTOTYPE: @
…		…
3196	void glNewList (int list, int mode = GL_COMPILE)	3412	void glNewList (int list, int mode = GL_COMPILE)
3197		3413
3198	void glEndList ()	3414	void glEndList ()
3199		3415
3200	void glCallList (int list)	3416	void glCallList (int list)
		3417
		3418	void c_init ()
		3419	CODE:
		3420	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3421	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3201		3422
3202	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3423	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203		3424
3204	PROTOTYPES: DISABLE	3425	PROTOTYPES: DISABLE
3205		3426

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs. Revision 1.314 by root, Wed Jan 18 15:31:51 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.314 by root, Wed Jan 18 15:31:51 2012 UTC