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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.280 by root, Wed Nov 26 23:08:34 2008 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>
…		…
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
52	#include <glib/gmacros.h>	53	#include <glib.h>
53		54
54	#include <pango/pango.h>	55	#include <pango/pango.h>
55		56
56	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
57	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
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 32	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
92		96
93	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
		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	}
97		123
98	static AV *texture_av;	124	static AV *texture_av;
99		125
100	static struct	126	static struct
101	{	127	{
…		…
158	{	184	{
159	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
160		186
161	while (attrs)	187	while (attrs)
162	{	188	{
163	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
164		190
165	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
166	return 1;	192	return 1;
167		193
168	attrs = attrs->next;	194	attrs = attrs->next;
…		…
456		482
457	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
458	}	484	}
459		485
460	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
461	minpot (unsigned int n)	493	minpot (unsigned int n)
462	{	494	{
463	if (!n)	495	if (!n)
464	return 0;	496	return 0;
465		497
…		…
545		577
546	return mod;	578	return mod;
547	}	579	}
548		580
549	static void	581	static void
550	deliantra_main ()	582	deliantra_main (SV *real_main)
551	{	583	{
552	char *argv[] = { 0 };	584	dSP;
553	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
554	}	588	}
555		589
556	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
557	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
558	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
559	* 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,
560	* 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,
561	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
562	*/	598	*/
563	extern C_LINKAGE int	599	extern C_LINKAGE int
564	main (int argc, char *argv[])	600	main (int argc, char *argv[])
565	{	601	{
566	deliantra_main ();	602	deliantra_main (real_main);
567	}	603	}
568		604
569	#undef main	605	#undef main
570		606
571	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
572		608
573	static void	609	static void
574	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
575	{	611	{
		612	real_main = real_main_;
		613
576	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
577	(main) (1, argv);	615	(main) (1, argv);
578	}	616	}
579	#else	617	#else
580	static void	618	static void
581	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
582	{	620	{
583	deliantra_main ();	621	deliantra_main (real_main);
584	}	622	}
585	#endif	623	#endif
586		624
587	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
588		626
…		…
789		827
790	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
791	# undef const_iv	829	# undef const_iv
792	};	830	};
793		831
794	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--)
795	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796		834
797	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799	}	837	}
800		838
…		…
816	NV ceil (NV x)	854	NV ceil (NV x)
817		855
818	IV minpot (UV n)	856	IV minpot (UV n)
819		857
820	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
821		865
822	void	866	void
823	pango_init ()	867	pango_init ()
824	CODE:	868	CODE:
825	{	869	{
…		…
833	#endif	877	#endif
834	}	878	}
835		879
836	char *SDL_GetError ()	880	char *SDL_GetError ()
837		881
838	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
839		884
840	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
841		886
842	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
843		888
844	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
845		890
846	void SDL_Quit ()	891	void SDL_Quit ()
847		892
848	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
849		895
850	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
851	CODE:	897	CODE:
852	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
854	OUTPUT:	900	OUTPUT:
855	RETVAL	901	RETVAL
856		902
857	void	903	void
…		…
912	);	958	);
913		959
914	if (RETVAL)	960	if (RETVAL)
915	{	961	{
916	av_clear (texture_av);	962	av_clear (texture_av);
917
918	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919	#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);
920	#include "glfunc.h"	964	#include "glfunc.h"
921	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922	}	968	}
923	}	969	}
924	OUTPUT:	970	OUTPUT:
925	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
926		975
927	void	976	void
928	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
929		978
930	char *	979	char *
931	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
932		982
933	int	983	int
934	SDL_GetAppState ()	984	SDL_GetAppState ()
935		985
936	int	986	int
937	SDL_GetModState ()	987	SDL_GetModState ()
938		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
939	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
940	poll_events ()	997	peep_events ()
941	PPCODE:	998	PPCODE:
942	{	999	{
943	SDL_Event ev;	1000	SDL_Event ev;
944		1001
945	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1011		1068
1012	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))));
1013	}	1070	}
1014	}	1071	}
1015		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
		1085
1016	int	1086	int
1017	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)
1018	POSTCALL:	1088	POSTCALL:
1019	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1020	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1082	add_font (char *file)	1152	add_font (char *file)
1083	CODE:	1153	CODE:
1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085	OUTPUT:	1155	OUTPUT:
1086	RETVAL	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)
1087		1164
1088	void	1165	void
1089	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1090	ALIAS:	1167	ALIAS:
1091	load_image_file = 1	1168	load_image_file = 1
…		…
1137		1214
1138	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1139	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1140	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1141	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1142	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1143	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)));
1144	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1147		1224
…		…
1219	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1220		1297
1221	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1222		1299
1223	DC::Font	1300	DC::Font
1224	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1225	CODE:	1302	CODE:
1226	{	1303	{
1227	int count;	1304	int count;
1228	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1229	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1258	PROTOTYPE:	1335	PROTOTYPE:
1259	CODE:	1336	CODE:
1260	tc_restore ();	1337	tc_restore ();
1261		1338
1262	DC::Layout	1339	DC::Layout
1263	new (SV *class)	1340	new (SV *klass)
1264	CODE:	1341	CODE:
1265	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1266		1343
1267	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1268	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1417		1494
1418	void	1495	void
1419	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1420	CODE:	1497	CODE:
1421	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1422	{	1499	{
1423	self->base_height = base_height;	1500	self->base_height = base_height;
1424	layout_update_font (self);	1501	layout_update_font (self);
1425	}	1502	}
1426		1503
1427	void	1504	void
…		…
1654	glDisable (GL_ALPHA_TEST);	1731	glDisable (GL_ALPHA_TEST);
1655	glDisable (GL_BLEND);	1732	glDisable (GL_BLEND);
1656	}	1733	}
1657	}	1734	}
1658		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
1659	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)
1660	CODE:	1858	CODE:
1661	{	1859	{
1662	GLint width;	1860	GLint width;
1663	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);
…		…
1670	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1671		1869
1672	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1673		1871
1674	DC::Map	1872	DC::Map
1675	new (SV *class)	1873	new (SV *klass)
1676	CODE:	1874	CODE:
1677	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1678	RETVAL->x = 0;	1876	RETVAL->x = 0;
1679	RETVAL->y = 0;	1877	RETVAL->y = 0;
1680	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1780	if (tex->name)	1978	if (tex->name)
1781	{	1979	{
1782	if (tex->unused)	1980	if (tex->unused)
1783	{	1981	{
1784	tex->name = 0;	1982	tex->name = 0;
1785	tex->unused = 0,	1983	tex->unused = 0;
1786	XPUSHs (sv_2mortal (newSViv (texid)));	1984	XPUSHs (sv_2mortal (newSViv (texid)));
1787	}	1985	}
1788	else	1986	else
1789	tex->unused = 1;	1987	tex->unused = 1;
1790	}	1988	}
…		…
1836	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1837	}	2035	}
1838	}	2036	}
1839		2037
1840	SV *	2038	SV *
1841	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1842	CODE:	2040	CODE:
1843	{	2041	{
1844	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1845	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1846	mapcell *cell;	2044	mapcell *cell;
…		…
1867		2065
1868	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
1869		2067
1870	if (flags & 8)	2068	if (flags & 8)
1871	{	2069	{
		2070	uint8_t ext, cmd;
		2071
1872	if (extmap)	2072	do
1873	{	2073	{
1874	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
1875		2076
1876	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
1877	{	2080	{
1878	ext = *data++;
1879	cmd = ext & 0x7f;
1880
1881	if (cmd < 4)
1882	cell->darkness = 255 - ext * 64 + 1;
1883	else if (cmd == 5) // health
1884	{
1885	cell->stat_width = 1;	2081	cell->stat_width = 1;
1886	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1887	}
1888	else if (cmd == 6) // monster width
1889	cell->stat_width = *data++ + 1;
1890	else if (cmd == 0x47)
1891	{
1892	if (*data == 1) cell->player = data [1];
1893	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897	data += *data + 1;
1898	}
1899	else if (cmd == 8) // cell flags
1900	cell->flags = *data++;
1901	else if (ext & 0x40) // unknown, multibyte => skip
1902	data += *data + 1;
1903	else
1904	data++;
1905	}	2083	}
1906	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++;
1907	}	2101	}
1908	else	2102	while (ext & 0x80);
1909	cell->darkness = *data++ + 1;
1910	}	2103	}
1911		2104
1912	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
1913	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
1914	{	2107	{
…		…
1962	? self->row + y	2155	? self->row + y
1963	: 0;	2156	: 0;
1964		2157
1965	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
1966	{	2159	{
1967	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
1968		2161
1969	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
1970	{	2163	{
1971	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
1972		2165
…		…
1974	{	2167	{
1975	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
1976	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
1977	int a1 = tex.a;	2170	int a1 = tex.a;
1978		2171
1979	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
1980	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
1981	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
1982	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
1983	}	2176	}
1984	}	2177	}
1985		2178
1986	*map++ = (r )	2179	*map++ = (r )
1987	\| (g << 8)	2180	\| (g << 8)
…		…
1994	}	2187	}
1995	OUTPUT:	2188	OUTPUT:
1996	RETVAL	2189	RETVAL
1997		2190
1998	void	2191	void
1999	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	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)
2000	CODE:	2193	CODE:
2001	{	2194	{
2002	int x, y, z;	2195	int x, y, z;
2003		2196
2004	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2005	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
2006	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)
2007	smooth_key skey;	2200	smooth_key skey;
2008	int pl_x, pl_y;	2201	int pl_x, pl_y;
2009	maptex pl_tex;	2202	maptex pl_tex;
2010	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
		2204	rc_t *rc_ov = rc_alloc ();
2011	rc_key_t key;	2205	rc_key_t key;
2012	rc_array_t *arr;	2206	rc_array_t *arr;
2013		2207
2014	pl_tex.name = 0;	2208	pl_tex.name = 0;
2015		2209
2016	// thats current max. sorry.	2210	// that's current max. sorry.
2017	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
2018	if (sh > 255) sh = 255;	2212	if (sh > 255) sh = 255;
2019		2213
2020	// clear key, in case of extra padding	2214	// clear key, in case of extra padding
2021	memset (&skey, 0, sizeof (skey));	2215	memset (&skey, 0, sizeof (skey));
…		…
2025	key.g = 255;	2219	key.g = 255;
2026	key.b = 255;	2220	key.b = 255;
2027	key.a = 255;	2221	key.a = 255;
2028	key.mode = GL_QUADS;	2222	key.mode = GL_QUADS;
2029	key.format = GL_T2F_V3F;	2223	key.format = GL_T2F_V3F;
2030	key.texname = -1;
2031		2224
2032	mx += self->x;	2225	mx += self->x;
2033	my += self->y;	2226	my += self->y;
2034		2227
2035	// first pass: determine smooth_max	2228	// first pass: determine smooth_max
…		…
2059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060		2253
2061	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
2062	{	2255	{
2063	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
		2257	key.texname = -1;
2064		2258
2065	for (y = 0; y < sh; y++)	2259	for (y = 0; y < sh; y++)
2066	if (0 <= y + my && y + my < self->rows)	2260	if (0 <= y + my && y + my < self->rows)
2067	{	2261	{
2068	maprow *row = self->row + (y + my);	2262	maprow *row = self->row + (y + my);
…		…
2074	tileid tile = cell->tile [z];	2268	tileid tile = cell->tile [z];
2075		2269
2076	if (tile)	2270	if (tile)
2077	{	2271	{
2078	maptex tex = self->tex [tile];	2272	maptex tex = self->tex [tile];
2079	int px = (x + 1) * T - tex.w;	2273	int px, py;
2080	int py = (y + 1) * T - tex.h;
2081		2274
2082	if (key.texname != tex.name)	2275	if (key.texname != tex.name)
2083	{	2276	{
2084	self->tex [tile].unused = 0;	2277	self->tex [tile].unused = 0;
2085		2278
2086	if (!tex.name)	2279	if (!tex.name)
2087	tex = self->tex [2]; /* missing, replace by noface */	2280	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088		2281
2089	key.texname = tex.name;	2282	key.texname = tex.name;
2090	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2091	}	2284	}
		2285
		2286	px = (x + 1) * Th - tex.w;
		2287	py = (y + 1) * Tw - tex.h;
2092		2288
2093	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2094	{	2290	{
2095	pl_x = px;	2291	pl_x = px;
2096	pl_y = py;	2292	pl_y = py;
…		…
2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2297	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102	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);
2103	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);
2104	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);
2105		2301
2106	if (expect_false (cell->flags) && expect_false (z == 2))
2107	{
2108	// overlays such as the speech bubble, probably more to come
2109	if (cell->flags & 1)
2110	{
2111	maptex tex = self->tex [1];
2112	int px = x * T + T * 2 / 32;
2113	int py = y * T - T * 6 / 32;
2114
2115	if (tex.name)
2116	{
2117	if (key.texname != tex.name)
2118	{
2119	key.texname = tex.name;
2120	arr = rc_array (rc, &key);
2121	}
2122
2123	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127	}
2128	}
2129	}
2130
2131	// update smooth hash	2302	// update smooth hash
2132	if (tex.smoothtile)	2303	if (tex.smoothtile)
2133	{	2304	{
2134	skey.tile = tex.smoothtile;	2305	skey.tile = tex.smoothtile;
2135	skey.level = tex.smoothlevel;	2306	skey.level = tex.smoothlevel;
…		…
2163	// corners	2334	// corners
2164	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);
2165	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);
2166	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);
2167	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);
2168	}	2360	}
2169	}	2361	}
2170	}	2362	}
2171	}	2363	}
2172		2364
…		…
2199	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2200	&& skey->level == level	2392	&& skey->level == level
2201	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2202	{	2394	{
2203	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2204	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2205	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2206	int border = bits & 15;	2398	int border = bits & 15;
2207	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2209	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2210		2402
…		…
2223		2415
2224	if (border)	2416	if (border)
2225	{	2417	{
2226	float ox = border * dx;	2418	float ox = border * dx;
2227		2419
2228	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232	}	2424	}
2233		2425
2234	if (corner)	2426	if (corner)
2235	{	2427	{
2236	float ox = corner * dx;	2428	float ox = corner * dx;
2237		2429
2238	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242	}	2434	}
2243	}	2435	}
2244	}	2436	}
2245	}	2437	}
2246	}	2438	}
…		…
2269	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2461	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270		2462
2271	rc_draw (rc);	2463	rc_draw (rc);
2272	}	2464	}
2273		2465
		2466	rc_draw (rc_ov);
		2467	rc_clear (rc_ov);
		2468
2274	glDisable (GL_BLEND);	2469	glDisable (GL_BLEND);
2275	rc_free (rc);	2470	rc_free (rc);
		2471	rc_free (rc_ov);
2276		2472
2277	// top layer: overlays such as the health bar	2473	// top layer: overlays such as the health bar
2278	for (y = 0; y < sh; y++)	2474	for (y = 0; y < sh; y++)
2279	if (0 <= y + my && y + my < self->rows)	2475	if (0 <= y + my && y + my < self->rows)
2280	{	2476	{
…		…
2283	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2284	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2285	{	2481	{
2286	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2287		2483
2288	int px = x * T;	2484	int px = x * Tw;
2289	int py = y * T;	2485	int py = y * Th;
2290		2486
2291	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2292	{	2488	{
2293	px += sdx;	2489	px += sdx;
2294	py += sdy;	2490	py += sdy;
2295	}	2491	}
2296		2492
2297	if (cell->stat_hp)	2493	if (cell->stat_hp)
2298	{	2494	{
2299	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301		2497
2302	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2303	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2304	px + width - 1, py);	2500	px + width - 1, py);
2305		2501
…		…
2311	}	2507	}
2312	}	2508	}
2313	}	2509	}
2314		2510
2315	void	2511	void
2316	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)
2317	CODE:	2513	CODE:
2318	{	2514	{
2319	static float color[16][3] = {	2515	static float color[16][3] = {
2320	{ 0.00F, 0.00F, 0.00F },	2516	{ 0.00f, 0.00f, 0.00f },
2321	{ 1.00F, 1.00F, 1.00F },	2517	{ 1.00f, 1.00f, 1.00f },
2322	{ 0.00F, 0.00F, 0.55F },	2518	{ 0.00f, 0.00f, 0.55f },
2323	{ 1.00F, 0.00F, 0.00F },	2519	{ 1.00f, 0.00f, 0.00f },
2324		2520
2325	{ 1.00F, 0.54F, 0.00F },	2521	{ 1.00f, 0.54f, 0.00f },
2326	{ 0.11F, 0.56F, 1.00F },	2522	{ 0.11f, 0.56f, 1.00f },
2327	{ 0.93F, 0.46F, 0.00F },	2523	{ 0.93f, 0.46f, 0.00f },
2328	{ 0.18F, 0.54F, 0.34F },	2524	{ 0.18f, 0.54f, 0.34f },
2329		2525
2330	{ 0.56F, 0.73F, 0.56F },	2526	{ 0.56f, 0.73f, 0.56f },
2331	{ 0.80F, 0.80F, 0.80F },	2527	{ 0.80f, 0.80f, 0.80f },
2332	{ 0.55F, 0.41F, 0.13F },	2528	{ 0.55f, 0.41f, 0.13f },
2333	{ 0.99F, 0.77F, 0.26F },	2529	{ 0.99f, 0.77f, 0.26f },
2334		2530
2335	{ 0.74F, 0.65F, 0.41F },	2531	{ 0.74f, 0.65f, 0.41f },
2336		2532
2337	{ 0.00F, 1.00F, 1.00F },	2533	{ 0.00f, 1.00f, 1.00f },
2338	{ 1.00F, 0.00F, 1.00F },	2534	{ 1.00f, 0.00f, 1.00f },
2339	{ 1.00F, 1.00F, 0.00F },	2535	{ 1.00f, 1.00f, 0.00f },
2340	};	2536	};
2341		2537
2342	int x, y;	2538	int x, y;
2343		2539
2344	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	*/
2345	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2547	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346	glEnable (GL_BLEND);	2548	glEnable (GL_BLEND);
2347	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2549	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348	glBegin (GL_QUADS);	2550	glBegin (GL_QUADS);
2349		2551
2350	for (y = 0; y < h; y++)	2552	for (y = 0; y < h; y++)
…		…
2354		2556
2355	if (m)	2557	if (m)
2356	{	2558	{
2357	float *c = color [m & 15];	2559	float *c = color [m & 15];
2358		2560
2359	float tx1 = m & 0x40 ? 0.5 : 0.;	2561	float tx1 = m & 0x40 ? 0.5f : 0.f;
2360	float tx2 = tx1 + 0.5;	2562	float tx2 = tx1 + 0.5f;
2361		2563
2362	glColor4f (c[0], c[1], c[2], 0.75);	2564	glColor4f (c[0], c[1], c[2], 1);
2363	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2565	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2566	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2567	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2568	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367	}	2569	}
…		…
2375	void	2577	void
2376	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)
2377	PPCODE:	2579	PPCODE:
2378	{	2580	{
2379	int x, y;	2581	int x, y;
2380	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2381	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2382	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2383	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);
2384	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2385	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2589	memset (darkness1, 0, sw1*sh1);
2386	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2387		2590
2388	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2389	SvCUR_set (darkness3_sv, sw34 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2390		2593
2391	mx += self->x - 1;	2594	mx += self->x - 1;
2392	my += self->y - 1;	2595	my += self->y - 1;
2393
2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395		2596
2396	for (y = 0; y < sh1; y++)	2597	for (y = 0; y < sh1; y++)
2397	if (0 <= y + my && y + my < self->rows)	2598	if (0 <= y + my && y + my < self->rows)
2398	{	2599	{
2399	maprow *row = self->row + (y + my);	2600	maprow *row = self->row + (y + my);
…		…
2402	if (row->c0 <= x + mx && x + mx < row->c1)	2603	if (row->c0 <= x + mx && x + mx < row->c1)
2403	{	2604	{
2404	mapcell *cell = row->col + (x + mx - row->c0);	2605	mapcell *cell = row->col + (x + mx - row->c0);
2405		2606
2406	darkness1 [y * sw1 + x] = cell->darkness	2607	darkness1 [y * sw1 + x] = cell->darkness
2407	? 255 - (cell->darkness - 1)	2608	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408	: 255 - FOW_DARKNESS;	2609	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409	}	2610	}
2410	}	2611	}
2411		2612
2412	for (y = 0; y < sh; ++y)	2613	for (y = 0; y < sh; ++y)
2413	for (x = 0; x < sw; ++x)	2614	for (x = 0; x < sw; ++x)
…		…
2432		2633
2433	uint8_t r13 = (d13 + d23 + d12) / 3;	2634	uint8_t r13 = (d13 + d23 + d12) / 3;
2434	uint8_t r23 = d23;	2635	uint8_t r23 = d23;
2435	uint8_t r33 = (d23 + d33 + d32) / 3;	2636	uint8_t r33 = (d23 + d33 + d32) / 3;
2436		2637
2437	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441	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 */
2442	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446	}	2647	}
2447		2648
2448	free (darkness1);	2649	free (darkness1);
2449		2650
2450	EXTEND (SP, 3);	2651	EXTEND (SP, 3);
2451	PUSHs (sv_2mortal (newSViv (sw34)));	2652	PUSHs (sv_2mortal (newSViv (sw3)));
2452	PUSHs (sv_2mortal (newSViv (sh3)));	2653	PUSHs (sv_2mortal (newSViv (sh3)));
2453	PUSHs (darkness3_sv);	2654	PUSHs (darkness3_sv);
2454	}	2655	}
2455		2656
2456	SV *	2657	SV *
…		…
2543	STRLEN len;	2744	STRLEN len;
2544	uint8_t data, end;	2745	uint8_t data, end;
2545		2746
2546	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2547	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549	end = data + len + 8;	2750	end = data + len + 8;
2550		2751
2551	if (len < 5)	2752	if (len < 5)
2552	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2553		2754
…		…
2614	}	2815	}
2615		2816
2616	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2617		2818
2618	DC::RW	2819	DC::RW
2619	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2620	CODE:	2821	CODE:
2621	{	2822	{
2622	STRLEN datalen;	2823	STRLEN datalen;
2623	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2624		2825
…		…
2626	}	2827	}
2627	OUTPUT:	2828	OUTPUT:
2628	RETVAL	2829	RETVAL
2629		2830
2630	DC::RW	2831	DC::RW
2631	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")
2632	CODE:	2833	CODE:
2633	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2634	OUTPUT:	2835	OUTPUT:
2635	RETVAL	2836	RETVAL
2636		2837
…		…
2654	if (RETVAL < 0)	2855	if (RETVAL < 0)
2655	{	2856	{
2656	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2657		2858
2658	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)
2659	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2660		2866	}
		2867	else
2661	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2662	}	2869	}
2663		2870
2664	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2665	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2666	}	2873	}
…		…
2713	void	2920	void
2714	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)
2715	CODE:	2922	CODE:
2716	{	2923	{
2717	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));
2718	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;
2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2926	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720	}	2927	}
2721		2928
2722	void	2929	void
2723	set_reverse_stereo (DC::Channel self, int flip)	2930	set_reverse_stereo (DC::Channel self, int flip)
…		…
2726		2933
2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728		2935
2729	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2730		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
2731	DC::MixChunk	2950	DC::MixChunk
2732	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2733	CODE:	2952	CODE:
2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735	OUTPUT:	2954	OUTPUT:
2736	RETVAL	2955	RETVAL
2737		2956
…		…
2767	OUTPUT:	2986	OUTPUT:
2768	RETVAL	2987	RETVAL
2769		2988
2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771		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
2772	int	3003	int
2773	volume (int volume = -1)	3004	volume (int volume = -1)
2774	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2775	CODE:	3006	CODE:
2776	if (items > 0)	3007	if (items > 0)
…		…
2787	void	3018	void
2788	halt ()	3019	halt ()
2789	CODE:	3020	CODE:
2790	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2791		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2792	DC::MixMusic	3030	DC::MixMusic
2793	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2794	CODE:	3032	CODE:
2795	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2796	OUTPUT:	3034	OUTPUT:
2797	RETVAL	3035	RETVAL
2798		3036
…		…
2826	} *civ, const_iv[] = {	3064	} *civ, const_iv[] = {
2827	# define const_iv(name) { # name, (IV)name }	3065	# define const_iv(name) { # name, (IV)name }
2828	const_iv (GL_VENDOR),	3066	const_iv (GL_VENDOR),
2829	const_iv (GL_VERSION),	3067	const_iv (GL_VERSION),
2830	const_iv (GL_EXTENSIONS),	3068	const_iv (GL_EXTENSIONS),
		3069	const_iv (GL_MAX_TEXTURE_UNITS),
2831	const_iv (GL_COLOR_MATERIAL),	3070	const_iv (GL_COLOR_MATERIAL),
2832	const_iv (GL_SMOOTH),	3071	const_iv (GL_SMOOTH),
2833	const_iv (GL_FLAT),	3072	const_iv (GL_FLAT),
2834	const_iv (GL_DITHER),	3073	const_iv (GL_DITHER),
2835	const_iv (GL_BLEND),	3074	const_iv (GL_BLEND),
…		…
2847	const_iv (GL_ZERO),	3086	const_iv (GL_ZERO),
2848	const_iv (GL_SRC_ALPHA),	3087	const_iv (GL_SRC_ALPHA),
2849	const_iv (GL_DST_ALPHA),	3088	const_iv (GL_DST_ALPHA),
2850	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3089	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851	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),
2852	const_iv (GL_SRC_ALPHA_SATURATE),	3095	const_iv (GL_SRC_ALPHA_SATURATE),
2853	const_iv (GL_RGB),	3096	const_iv (GL_RGB),
2854	const_iv (GL_RGBA),	3097	const_iv (GL_RGBA),
2855	const_iv (GL_RGBA4),	3098	const_iv (GL_RGBA4),
2856	const_iv (GL_RGBA8),	3099	const_iv (GL_RGBA8),
…		…
2924	const_iv (GL_NICEST),	3167	const_iv (GL_NICEST),
2925	const_iv (GL_V2F),	3168	const_iv (GL_V2F),
2926	const_iv (GL_V3F),	3169	const_iv (GL_V3F),
2927	const_iv (GL_T2F_V3F),	3170	const_iv (GL_T2F_V3F),
2928	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),
2929	# undef const_iv	3175	# undef const_iv
2930	};	3176	};
2931		3177
2932	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--)
2933	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934		3180
2935	texture_av = newAV ();	3181	texture_av = newAV ();
2936	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
2937	}	3183	}
2938		3184
…		…
2940	disable_GL_EXT_blend_func_separate ()	3186	disable_GL_EXT_blend_func_separate ()
2941	CODE:	3187	CODE:
2942	gl.BlendFuncSeparate = 0;	3188	gl.BlendFuncSeparate = 0;
2943	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
2944		3190
2945	char *	3191	void
		3192	apple_nvidia_bug (int enable)
		3193
		3194	const char *
2946	gl_vendor ()	3195	gl_vendor ()
2947	CODE:	3196	CODE:
2948	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
2949	OUTPUT:	3198	OUTPUT:
2950	RETVAL	3199	RETVAL
2951		3200
2952	char *	3201	const char *
2953	gl_version ()	3202	gl_version ()
2954	CODE:	3203	CODE:
2955	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
2956	OUTPUT:	3205	OUTPUT:
2957	RETVAL	3206	RETVAL
2958		3207
2959	char *	3208	const char *
2960	gl_extensions ()	3209	gl_extensions ()
2961	CODE:	3210	CODE:
2962	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963	OUTPUT:	3212	OUTPUT:
2964	RETVAL	3213	RETVAL
2965		3214
2966	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
2967		3220
2968	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
2969	CODE:	3222	CODE:
2970	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
2971	OUTPUT:	3224	OUTPUT:
…		…
2979		3232
2980	int glGetError ()	3233	int glGetError ()
2981		3234
2982	void glFinish ()	3235	void glFinish ()
2983		3236
		3237	void glFlush ()
		3238
2984	void glClear (int mask)	3239	void glClear (int mask)
2985		3240
2986	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)
2987	PROTOTYPE: @	3242	PROTOTYPE: @
2988		3243
…		…
2997	void glBlendFunc (int sfactor, int dfactor)	3252	void glBlendFunc (int sfactor, int dfactor)
2998		3253
2999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3254	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000	CODE:	3255	CODE:
3001	gl_BlendFuncSeparate (sa, da, saa, daa);	3256	gl_BlendFuncSeparate (sa, da, saa, daa);
		3257
		3258	# void glBlendEquation (int se)
3002		3259
3003	void glDepthMask (int flag)	3260	void glDepthMask (int flag)
3004		3261
3005	void glLogicOp (int opcode)	3262	void glLogicOp (int opcode)
3006		3263
…		…
3156	void glNewList (int list, int mode = GL_COMPILE)	3413	void glNewList (int list, int mode = GL_COMPILE)
3157		3414
3158	void glEndList ()	3415	void glEndList ()
3159		3416
3160	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);
3161		3423
3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3424	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163		3425
3164	PROTOTYPES: DISABLE	3426	PROTOTYPES: DISABLE
3165		3427

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.280 by root, Wed Nov 26 23:08:34 2008 UTC vs. Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.280 by root, Wed Nov 26 23:08:34 2008 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC