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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 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
…		…
552		580
553	static void	581	static void
554	deliantra_main ()	582	deliantra_main ()
555	{	583	{
556	char *argv[] = { 0 };	584	char *argv[] = { 0 };
557	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);
558	}	586	}
559		587
560	#ifdef __MACOSX__	588	#ifdef __MACOSX__
561	/* to due surprising braindamage on the side of SDL design, we	589	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	590	* 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,	591	* 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,	592	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	593	* and which calls our main (== SDL_main) back.
566	*/	594	*/
567	extern C_LINKAGE int	595	extern C_LINKAGE int
568	main (int argc, char *argv[])	596	main (int argc, char *argv[])
569	{	597	{
…		…
793		821
794	const_iv (FOW_DARKNESS)	822	const_iv (FOW_DARKNESS)
795	# undef const_iv	823	# undef const_iv
796	};	824	};
797		825
798	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	826	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		828
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	831	}
804		832
…		…
820	NV ceil (NV x)	848	NV ceil (NV x)
821		849
822	IV minpot (UV n)	850	IV minpot (UV n)
823		851
824	IV popcount (UV n)	852	IV popcount (UV n)
		853
		854	NV distance (NV dx, NV dy)
		855	CODE:
		856	RETVAL = pow (dx * dx + dy * dy, 0.5);
		857	OUTPUT:
		858	RETVAL
825		859
826	void	860	void
827	pango_init ()	861	pango_init ()
828	CODE:	862	CODE:
829	{	863	{
…		…
921		955
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924	#include "glfunc.h"	958	#include "glfunc.h"
925	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	963	}
927	}	964	}
928	OUTPUT:	965	OUTPUT:
929	RETVAL	966	RETVAL
930		967
…		…
938	SDL_GetAppState ()	975	SDL_GetAppState ()
939		976
940	int	977	int
941	SDL_GetModState ()	978	SDL_GetModState ()
942		979
		980	int
		981	SDL_WaitEvent ()
		982	C_ARGS: 0
		983
943	void	984	void
		985	SDL_PumpEvents ()
		986
		987	void
944	poll_events ()	988	peep_events ()
945	PPCODE:	989	PPCODE:
946	{	990	{
947	SDL_Event ev;	991	SDL_Event ev;
948		992
949	SDL_PumpEvents ();	993	SDL_PumpEvents ();
…		…
1015		1059
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1060	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1061	}
1018	}	1062	}
1019		1063
		1064	char *
		1065	SDL_AudioDriverName ()
		1066	CODE:
		1067	{
		1068	char buf [256];
		1069	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1070	XSRETURN_UNDEF;
		1071
		1072	RETVAL = buf;
		1073	}
		1074	OUTPUT:
		1075	RETVAL
		1076
1020	int	1077	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1078	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1079	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1080	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1081	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1143	add_font (char *file)
1087	CODE:	1144	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1145	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1146	OUTPUT:
1090	RETVAL	1147	RETVAL
		1148
		1149	void
		1150	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1151
		1152	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1153	void
		1154	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1091		1155
1092	void	1156	void
1093	load_image_inline (SV *image_)	1157	load_image_inline (SV *image_)
1094	ALIAS:	1158	ALIAS:
1095	load_image_file = 1	1159	load_image_file = 1
…		…
1659	glDisable (GL_BLEND);	1723	glDisable (GL_BLEND);
1660	}	1724	}
1661	}	1725	}
1662		1726
1663	void	1727	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	1728	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)
1665	PROTOTYPE: @	1729	PROTOTYPE: @
1666	CODE:	1730	CODE:
1667	{	1731	{
		1732	glEnable (GL_BLEND);
		1733	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668	glEnable (GL_TEXTURE_2D);	1734	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1735	glBindTexture (GL_TEXTURE_2D, name1);
1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672		1736
1673	glColor4f (intensity, intensity, intensity, 0.9);	1737	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1738	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1739	glScalef (1./3, 1./3, 1.);
1676		1740
		1741	if (blend > 0.f)
		1742	{
		1743	float dx3 = dx * -3.f / w;
		1744	float dy3 = dy * -3.f / h;
		1745	GLfloat env_color[4] = { 0., 0., 0., blend };
		1746
		1747	/* interpolate the two shadow textures */
		1748	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1752	gl.ActiveTexture (GL_TEXTURE1);
		1753	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1754	glBindTexture (GL_TEXTURE_2D, name2);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1756
		1757	/* rgb == rgb(glcolor) */
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1760	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1761
		1762	/* alpha = interpolate t0, t1 by env_alpha */
		1763	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1768
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1774
		1775	glBegin (GL_QUADS);
		1776	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1777	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1778	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1779	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1780	glEnd ();
		1781
		1782	glDisable (GL_TEXTURE_2D);
		1783	gl.ActiveTexture (GL_TEXTURE0);
		1784	}
		1785	else
		1786	{
		1787	/* simple blending of one texture, also opengl <1.3 path */
		1788	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1789
		1790	glBegin (GL_QUADS);
		1791	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1792	glTexCoord2f (0, t); glVertex2f (0, h);
		1793	glTexCoord2f (s, t); glVertex2f (w, h);
		1794	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1795	glEnd ();
		1796	}
		1797
		1798	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1799	{
		1800	int x, y;
		1801	int dx3 = dx * 3;
		1802	int dy3 = dy * 3;
		1803
		1804	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1805	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1806	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1807	glTranslatef (-1., -1., 0);
1679	glBegin (GL_QUADS);	1808	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1809
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1810	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1811	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1812	int y1 = y - dy3;
		1813	int y1valid = y1 >= 0 && y1 < h;
		1814
		1815	for (x = 1; x < w; x += 3)
		1816	{
		1817	int x1 = x - dx3;
		1818	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1819	uint8_t h2;
		1820
		1821	if (y1valid && x1 >= 0 && x1 < w)
		1822	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1823	else
		1824	h2 = 1; /* out of range == invisible */
		1825
		1826	if (h1 \|\| h2)
		1827	{
		1828	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1829	glColor4f (1., 1., 1., alpha);
		1830
		1831	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1832	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1833	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1834	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1835	}
		1836	}
		1837	}
		1838	}
		1839
1684	glEnd ();	1840	glEnd ();
1685		1841
1686	glPopMatrix ();	1842	glPopMatrix ();
1687		1843
1688	glDisable (GL_TEXTURE_2D);	1844	glDisable (GL_TEXTURE_2D);
…		…
1910	{	2066	{
1911	ext = *data++;	2067	ext = *data++;
1912	cmd = ext & 0x7f;	2068	cmd = ext & 0x7f;
1913		2069
1914	if (cmd < 4)	2070	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;	2071	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916	else if (cmd == 5) // health	2072	else if (cmd == 5) // health
1917	{	2073	{
1918	cell->stat_width = 1;	2074	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2075	cell->stat_hp = *data++;
1920	}	2076	}
…		…
1995	? self->row + y	2151	? self->row + y
1996	: 0;	2152	: 0;
1997		2153
1998	for (x = x0; x < x1; x++)	2154	for (x = x0; x < x1; x++)
1999	{	2155	{
2000	int r = 32, g = 32, b = 32, a = 192;	2156	unsigned int r = 32, g = 32, b = 32, a = 192;
2001		2157
2002	if (row && row->c0 <= x && x < row->c1)	2158	if (row && row->c0 <= x && x < row->c1)
2003	{	2159	{
2004	mapcell *cell = row->col + (x - row->c0);	2160	mapcell *cell = row->col + (x - row->c0);
2005		2161
…		…
2007	{	2163	{
2008	maptex tex = self->tex [cell->tile [z]];	2164	maptex tex = self->tex [cell->tile [z]];
2009	int a0 = 255 - tex.a;	2165	int a0 = 255 - tex.a;
2010	int a1 = tex.a;	2166	int a1 = tex.a;
2011		2167
2012	r = (r * a0 + tex.r * a1) / 255;	2168	r = div255 (r * a0 + tex.r * a1);
2013	g = (g * a0 + tex.g * a1) / 255;	2169	g = div255 (g * a0 + tex.g * a1);
2014	b = (b * a0 + tex.b * a1) / 255;	2170	b = div255 (b * a0 + tex.b * a1);
2015	a = (a * a0 + tex.a * a1) / 255;	2171	a = div255 (a * a0 + tex.a * a1);
2016	}	2172	}
2017	}	2173	}
2018		2174
2019	*map++ = (r )	2175	*map++ = (r )
2020	\| (g << 8)	2176	\| (g << 8)
…		…
2027	}	2183	}
2028	OUTPUT:	2184	OUTPUT:
2029	RETVAL	2185	RETVAL
2030		2186
2031	void	2187	void
2032	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2188	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)
2033	CODE:	2189	CODE:
2034	{	2190	{
2035	int x, y, z;	2191	int x, y, z;
2036		2192
2037	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2193	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2041	int pl_x, pl_y;	2197	int pl_x, pl_y;
2042	maptex pl_tex;	2198	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2199	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2200	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2201	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2202	rc_array_t *arr;
2047		2203
2048	pl_tex.name = 0;	2204	pl_tex.name = 0;
2049		2205
2050	// that's current max. sorry.	2206	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2207	if (sw > 255) sw = 255;
…		…
2088	}	2244	}
2089		2245
2090	glEnable (GL_BLEND);	2246	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2247	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2248	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094	key.texname = self->tex [TEXID_HIDDEN].name;
2095	arr_hidden = rc_array (rc_ov, &key);
2096		2249
2097	for (z = 0; z <= 2; z++)	2250	for (z = 0; z <= 2; z++)
2098	{	2251	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2252	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2253	key.texname = -1;
…		…
2124		2277
2125	key.texname = tex.name;	2278	key.texname = tex.name;
2126	arr = rc_array (rc, &key);	2279	arr = rc_array (rc, &key);
2127	}	2280	}
2128		2281
2129	px = (x + 1) * T - tex.w;	2282	px = (x + 1) * Th - tex.w;
2130	py = (y + 1) * T - tex.h;	2283	py = (y + 1) * Tw - tex.h;
2131		2284
2132	if (expect_false (cell->player == player) && expect_false (z == 2))	2285	if (expect_false (cell->player == player) && expect_false (z == 2))
2133	{	2286	{
2134	pl_x = px;	2287	pl_x = px;
2135	pl_y = py;	2288	pl_y = py;
…		…
2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2333	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2181	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2334	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182	}	2335	}
2183	}	2336	}
2184		2337
2185	if (expect_false (z == 2))	2338	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2339	{
2187	/* draw question marks on top of hidden spaces */	2340	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2341	if (cell->flags & 1)
2189	{	2342	{
2190	maptex tex = self->tex [TEXID_HIDDEN];
2191	int px = (x + 1) * T - tex.w;
2192	int py = (y + 1) * T - tex.h;
2193
2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198	}
2199
2200	if (expect_false (cell->flags))
2201	{
2202	// overlays such as the speech bubble, probably more to come
2203	if (cell->flags & 1)
2204	{
2205	rc_key_t key_ov = key;	2343	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2344	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2345	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2346	int px = x * Tw + Tw * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2347	int py = y * Th - Th * 6 / 32;
2210		2348
2211	key_ov.texname = tex.name;	2349	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2350	arr = rc_array (rc_ov, &key_ov);
2213		2351
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2352	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2353	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2354	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2355	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218	}
2219	}	2356	}
2220	}	2357	}
2221	}	2358	}
2222	}	2359	}
2223		2360
…		…
2250	if (!(bits & 0x1000)	2387	if (!(bits & 0x1000)
2251	&& skey->level == level	2388	&& skey->level == level
2252	&& level > smooth_max [skey->x][skey->y])	2389	&& level > smooth_max [skey->x][skey->y])
2253	{	2390	{
2254	maptex tex = self->tex [skey->tile];	2391	maptex tex = self->tex [skey->tile];
2255	int px = (((int)skey->x) - 1) * T;	2392	int px = (((int)skey->x) - 1) * Tw;
2256	int py = (((int)skey->y) - 1) * T;	2393	int py = (((int)skey->y) - 1) * Th;
2257	int border = bits & 15;	2394	int border = bits & 15;
2258	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2395	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259	float dx = tex.s * .0625f; // 16 images/row	2396	float dx = tex.s * .0625f; // 16 images/row
2260	float dy = tex.t * .5f ; // 2 images/column	2397	float dy = tex.t * .5f ; // 2 images/column
2261		2398
…		…
2274		2411
2275	if (border)	2412	if (border)
2276	{	2413	{
2277	float ox = border * dx;	2414	float ox = border * dx;
2278		2415
2279	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2416	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2417	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2419	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283	}	2420	}
2284		2421
2285	if (corner)	2422	if (corner)
2286	{	2423	{
2287	float ox = corner * dx;	2424	float ox = corner * dx;
2288		2425
2289	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2426	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2427	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2428	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2429	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293	}	2430	}
2294	}	2431	}
2295	}	2432	}
2296	}	2433	}
2297	}	2434	}
…		…
2338	for (x = 0; x < sw; x++)	2475	for (x = 0; x < sw; x++)
2339	if (row->c0 <= x + mx && x + mx < row->c1)	2476	if (row->c0 <= x + mx && x + mx < row->c1)
2340	{	2477	{
2341	mapcell *cell = row->col + (x + mx - row->c0);	2478	mapcell *cell = row->col + (x + mx - row->c0);
2342		2479
2343	int px = x * T;	2480	int px = x * Tw;
2344	int py = y * T;	2481	int py = y * Th;
2345		2482
2346	if (expect_false (cell->player == player))	2483	if (expect_false (cell->player == player))
2347	{	2484	{
2348	px += sdx;	2485	px += sdx;
2349	py += sdy;	2486	py += sdy;
2350	}	2487	}
2351		2488
2352	if (cell->stat_hp)	2489	if (cell->stat_hp)
2353	{	2490	{
2354	int width = cell->stat_width * T;	2491	int width = cell->stat_width * Tw;
2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2492	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356		2493
2357	glColor3ub (0, 0, 0);	2494	glColor3ub (0, 0, 0);
2358	glRectf (px + 1, py - thick - 2,	2495	glRectf (px + 1, py - thick - 2,
2359	px + width - 1, py);	2496	px + width - 1, py);
2360		2497
…		…
2366	}	2503	}
2367	}	2504	}
2368	}	2505	}
2369		2506
2370	void	2507	void
2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2508	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372	CODE:	2509	CODE:
2373	{	2510	{
2374	static float color[16][3] = {	2511	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2512	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2513	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2514	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2515	{ 1.00f, 0.00f, 0.00f },
2379		2516
2380	{ 1.00F, 0.54F, 0.00F },	2517	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2518	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2519	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2520	{ 0.18f, 0.54f, 0.34f },
2384		2521
2385	{ 0.56F, 0.73F, 0.56F },	2522	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2523	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2524	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2525	{ 0.99f, 0.77f, 0.26f },
2389		2526
2390	{ 0.74F, 0.65F, 0.41F },	2527	{ 0.74f, 0.65f, 0.41f },
2391		2528
2392	{ 0.00F, 1.00F, 1.00F },	2529	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2530	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2531	{ 1.00f, 1.00f, 0.00f },
2395	};	2532	};
2396		2533
2397	int x, y;	2534	int x, y;
2398		2535
2399	glEnable (GL_TEXTURE_2D);	2536	glEnable (GL_TEXTURE_2D);
2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2537	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2538	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2539	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2540	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2541	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2542	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2543	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2544	glEnable (GL_BLEND);
…		…
2415		2552
2416	if (m)	2553	if (m)
2417	{	2554	{
2418	float *c = color [m & 15];	2555	float *c = color [m & 15];
2419		2556
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2557	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2558	float tx2 = tx1 + 0.5f;
2422		2559
2423	glColor4f (c[0], c[1], c[2], 1);	2560	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2561	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2562	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2563	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2573	void
2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2574	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438	PPCODE:	2575	PPCODE:
2439	{	2576	{
2440	int x, y;	2577	int x, y;
2441	int sw1 = sw + 2;	2578	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2579	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2580	int sh3 = sh * 3;
2444	int sw34 = (sw * 3 + 3) & ~3;	2581	int sw3 = sw * 3;
		2582	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2583	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2584	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2585	memset (darkness1, 0, sw1*sh1);
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2586
2449	SvPOK_only (darkness3_sv);	2587	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2588	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2589
2452	mx += self->x - 1;	2590	mx += self->x - 1;
2453	my += self->y - 1;	2591	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2592
2457	for (y = 0; y < sh1; y++)	2593	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2594	if (0 <= y + my && y + my < self->rows)
2459	{	2595	{
2460	maprow *row = self->row + (y + my);	2596	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2599	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2600	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2601	mapcell *cell = row->col + (x + mx - row->c0);
2466		2602
2467	darkness1 [y * sw1 + x] = cell->darkness	2603	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2604	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2605	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2606	}
2471	}	2607	}
2472		2608
2473	for (y = 0; y < sh; ++y)	2609	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2610	for (x = 0; x < sw; ++x)
…		…
2493		2629
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2630	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2631	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2632	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2633
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2634	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2635	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2636	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2637	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2638	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2503	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2639	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2640	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2641	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2642	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2643	}
2508		2644
2509	free (darkness1);	2645	free (darkness1);
2510		2646
2511	EXTEND (SP, 3);	2647	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2648	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2649	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2650	PUSHs (darkness3_sv);
2515	}	2651	}
2516		2652
2517	SV *	2653	SV *
…		…
2715	if (RETVAL < 0)	2851	if (RETVAL < 0)
2716	{	2852	{
2717	RETVAL = Mix_GroupOldest (-1);	2853	RETVAL = Mix_GroupOldest (-1);
2718		2854
2719	if (RETVAL < 0)	2855	if (RETVAL < 0)
		2856	{
		2857	// happens sometimes, maybe it just stopped playing(?)
		2858	RETVAL = Mix_GroupAvailable (-1);
		2859
		2860	if (RETVAL < 0)
2720	XSRETURN_UNDEF;	2861	XSRETURN_UNDEF;
2721		2862	}
		2863	else
2722	Mix_HaltChannel (RETVAL);	2864	Mix_HaltChannel (RETVAL);
2723	}	2865	}
2724		2866
2725	Mix_UnregisterAllEffects (RETVAL);	2867	Mix_UnregisterAllEffects (RETVAL);
2726	Mix_Volume (RETVAL, 128);	2868	Mix_Volume (RETVAL, 128);
2727	}	2869	}
…		…
2774	void	2916	void
2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2917	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776	CODE:	2918	CODE:
2777	{	2919	{
2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2920	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2921	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2922	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2923	}
2782		2924
2783	void	2925	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2926	set_reverse_stereo (DC::Channel self, int flip)
…		…
2786	Mix_SetReverseStereo (self, flip);	2928	Mix_SetReverseStereo (self, flip);
2787		2929
2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2930	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789		2931
2790	PROTOTYPES: DISABLE	2932	PROTOTYPES: DISABLE
		2933
		2934	void
		2935	decoders ()
		2936	PPCODE:
		2937	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2938	int i, num = Mix_GetNumChunkDecoders ();
		2939	EXTEND (SP, num);
		2940	for (i = 0; i < num; ++i)
		2941	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2942	#else
		2943	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2944	#endif
2791		2945
2792	DC::MixChunk	2946	DC::MixChunk
2793	new (SV *class, DC::RW rwops)	2947	new (SV *class, DC::RW rwops)
2794	CODE:	2948	CODE:
2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2949	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2828	OUTPUT:	2982	OUTPUT:
2829	RETVAL	2983	RETVAL
2830		2984
2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2985	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832		2986
		2987	void
		2988	decoders ()
		2989	PPCODE:
		2990	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2991	int i, num = Mix_GetNumMusicDecoders ();
		2992	EXTEND (SP, num);
		2993	for (i = 0; i < num; ++i)
		2994	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2995	#else
		2996	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2997	#endif
		2998
2833	int	2999	int
2834	volume (int volume = -1)	3000	volume (int volume = -1)
2835	PROTOTYPE: ;$	3001	PROTOTYPE: ;$
2836	CODE:	3002	CODE:
2837	if (items > 0)	3003	if (items > 0)
…		…
2847		3013
2848	void	3014	void
2849	halt ()	3015	halt ()
2850	CODE:	3016	CODE:
2851	Mix_HaltMusic ();	3017	Mix_HaltMusic ();
		3018
		3019	int
		3020	playing ()
		3021	CODE:
		3022	RETVAL = Mix_PlayingMusic ();
		3023	OUTPUT:
		3024	RETVAL
2852		3025
2853	DC::MixMusic	3026	DC::MixMusic
2854	new (SV *class, DC::RW rwops)	3027	new (SV *class, DC::RW rwops)
2855	CODE:	3028	CODE:
2856	RETVAL = Mix_LoadMUS_RW (rwops);	3029	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2996	const_iv (GL_FUNC_SUBTRACT),	3169	const_iv (GL_FUNC_SUBTRACT),
2997	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3170	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998	# undef const_iv	3171	# undef const_iv
2999	};	3172	};
3000		3173
3001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3174	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3175	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003		3176
3004	texture_av = newAV ();	3177	texture_av = newAV ();
3005	AvREAL_off (texture_av);	3178	AvREAL_off (texture_av);
3006	}	3179	}
3007		3180
…		…
3050	RETVAL	3223	RETVAL
3051		3224
3052	int glGetError ()	3225	int glGetError ()
3053		3226
3054	void glFinish ()	3227	void glFinish ()
		3228
		3229	void glFlush ()
3055		3230
3056	void glClear (int mask)	3231	void glClear (int mask)
3057		3232
3058	void glClearColor (float r, float g, float b, float a = 1.0)	3233	void glClearColor (float r, float g, float b, float a = 1.0)
3059	PROTOTYPE: @	3234	PROTOTYPE: @
…		…
3230	void glNewList (int list, int mode = GL_COMPILE)	3405	void glNewList (int list, int mode = GL_COMPILE)
3231		3406
3232	void glEndList ()	3407	void glEndList ()
3233		3408
3234	void glCallList (int list)	3409	void glCallList (int list)
		3410
		3411	void c_init ()
		3412	CODE:
		3413	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3414	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3235		3415
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3416	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3417
3238	PROTOTYPES: DISABLE	3418	PROTOTYPES: DISABLE
3239		3419

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs. Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC