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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 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>
…		…
38	#include <SDL_thread.h>	37	#include <SDL_thread.h>
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
43		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib/gmacros.h>
…		…
76	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
77	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
78		84
79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80		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 */
81	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
82		91
83	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
84	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
85		94
86	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
87		96
88	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		99
		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	}
90		123
91	static AV *texture_av;	124	static AV *texture_av;
92		125
93	static struct	126	static struct
94	{	127	{
…		…
226	int w, h;	259	int w, h;
227	float s, t;	260	float s, t;
228	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
229	tileid smoothtile;	262	tileid smoothtile;
230	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
231	} maptex;	265	} maptex;
232		266
233	typedef struct {	267	typedef struct {
234	uint32_t player;	268	uint32_t player;
235	tileid tile[3];	269	tileid tile[3];
…		…
367	self->oy = 0;	401	self->oy = 0;
368	self->row = 0;	402	self->row = 0;
369	self->rows = 0;	403	self->rows = 0;
370	}	404	}
371		405
		406	#define CELL_CLEAR(cell) \
		407	do { \
		408	if ((cell)->player) \
		409	(cell)->tile [2] = 0; \
		410	(cell)->darkness = 0; \
		411	(cell)->stat_hp = 0; \
		412	(cell)->flags = 0; \
		413	(cell)->player = 0; \
		414	} while (0)
		415
372	static void	416	static void
373	map_blank (DC__Map self, int x0, int y0, int w, int h)	417	map_blank (DC__Map self, int x0, int y0, int w, int h)
374	{	418	{
375	int x, y;	419	int x, y;
376	maprow *row;	420	maprow *row;
…		…
390	if (x >= row->c1)	434	if (x >= row->c1)
391	break;	435	break;
392		436
393	cell = row->col + x - row->c0;	437	cell = row->col + x - row->c0;
394		438
395	cell->darkness = 0;	439	CELL_CLEAR (cell);
396	cell->stat_hp = 0;
397	cell->flags = 0;
398	cell->player = 0;
399	}	440	}
400	}	441	}
401	}	442	}
402		443
403	typedef struct {	444	typedef struct {
…		…
438	ev.code = 1;	479	ev.code = 1;
439	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
440	ev.data2 = 0;	481	ev.data2 = 0;
441		482
442	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
443	}	490	}
444		491
445	static unsigned int	492	static unsigned int
446	minpot (unsigned int n)	493	minpot (unsigned int n)
447	{	494	{
…		…
514	if (!svp \|\| !SvTRUE (*svp))	561	if (!svp \|\| !SvTRUE (*svp))
515	return 0;	562	return 0;
516		563
517	return 1;	564	return 1;
518	}	565	}
		566
		567	/******************************************************************************/
		568
		569	/* process keyboard modifiers */
		570	static int
		571	mod_munge (int mod)
		572	{
		573	mod &= MOD_MASK;
		574
		575	if (mod & (KMOD_META \| KMOD_ALT))
		576	mod \|= KMOD_LRAM;
		577
		578	return mod;
		579	}
		580
		581	static void
		582	deliantra_main ()
		583	{
		584	char *argv[] = { 0 };
		585	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		586	}
		587
		588	#ifdef __MACOSX__
		589	/* to due surprising braindamage on the side of SDL design, we
		590	* do some mind-boggling hack here: SDL requires a custom main()
		591	* on OS X, so... we provide one and call the original main(), which,
		592	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		593	* and which calls our main (== SDL_main) back.
		594	*/
		595	extern C_LINKAGE int
		596	main (int argc, char *argv[])
		597	{
		598	deliantra_main ();
		599	}
		600
		601	#undef main
		602
		603	extern C_LINKAGE int main (int argc, char *argv[]);
		604
		605	static void
		606	SDL_braino (void)
		607	{
		608	char *argv[] = { "deliantra client", 0 };
		609	(main) (1, argv);
		610	}
		611	#else
		612	static void
		613	SDL_braino (void)
		614	{
		615	deliantra_main ();
		616	}
		617	#endif
519		618
520	MODULE = Deliantra::Client PACKAGE = DC	619	MODULE = Deliantra::Client PACKAGE = DC
521		620
522	PROTOTYPES: ENABLE	621	PROTOTYPES: ENABLE
523		622
…		…
552	const_iv (SDL_USEREVENT),	651	const_iv (SDL_USEREVENT),
553		652
554	const_iv (SDL_APPINPUTFOCUS),	653	const_iv (SDL_APPINPUTFOCUS),
555	const_iv (SDL_APPMOUSEFOCUS),	654	const_iv (SDL_APPMOUSEFOCUS),
556	const_iv (SDL_APPACTIVE),	655	const_iv (SDL_APPACTIVE),
		656
		657
		658	const_iv (SDLK_UNKNOWN),
		659	const_iv (SDLK_FIRST),
		660	const_iv (SDLK_BACKSPACE),
		661	const_iv (SDLK_TAB),
		662	const_iv (SDLK_CLEAR),
		663	const_iv (SDLK_RETURN),
		664	const_iv (SDLK_PAUSE),
		665	const_iv (SDLK_ESCAPE),
		666	const_iv (SDLK_SPACE),
		667	const_iv (SDLK_EXCLAIM),
		668	const_iv (SDLK_QUOTEDBL),
		669	const_iv (SDLK_HASH),
		670	const_iv (SDLK_DOLLAR),
		671	const_iv (SDLK_AMPERSAND),
		672	const_iv (SDLK_QUOTE),
		673	const_iv (SDLK_LEFTPAREN),
		674	const_iv (SDLK_RIGHTPAREN),
		675	const_iv (SDLK_ASTERISK),
		676	const_iv (SDLK_PLUS),
		677	const_iv (SDLK_COMMA),
		678	const_iv (SDLK_MINUS),
		679	const_iv (SDLK_PERIOD),
		680	const_iv (SDLK_SLASH),
		681	const_iv (SDLK_0),
		682	const_iv (SDLK_1),
		683	const_iv (SDLK_2),
		684	const_iv (SDLK_3),
		685	const_iv (SDLK_4),
		686	const_iv (SDLK_5),
		687	const_iv (SDLK_6),
		688	const_iv (SDLK_7),
		689	const_iv (SDLK_8),
		690	const_iv (SDLK_9),
		691	const_iv (SDLK_COLON),
		692	const_iv (SDLK_SEMICOLON),
		693	const_iv (SDLK_LESS),
		694	const_iv (SDLK_EQUALS),
		695	const_iv (SDLK_GREATER),
		696	const_iv (SDLK_QUESTION),
		697	const_iv (SDLK_AT),
		698
		699	const_iv (SDLK_LEFTBRACKET),
		700	const_iv (SDLK_BACKSLASH),
		701	const_iv (SDLK_RIGHTBRACKET),
		702	const_iv (SDLK_CARET),
		703	const_iv (SDLK_UNDERSCORE),
		704	const_iv (SDLK_BACKQUOTE),
		705	const_iv (SDLK_DELETE),
557		706
558	const_iv (SDLK_FIRST),	707	const_iv (SDLK_FIRST),
559	const_iv (SDLK_LAST),	708	const_iv (SDLK_LAST),
560	const_iv (SDLK_KP0),	709	const_iv (SDLK_KP0),
561	const_iv (SDLK_KP1),	710	const_iv (SDLK_KP1),
…		…
637	const_iv (KMOD_RMETA),	786	const_iv (KMOD_RMETA),
638	const_iv (KMOD_NUM),	787	const_iv (KMOD_NUM),
639	const_iv (KMOD_CAPS),	788	const_iv (KMOD_CAPS),
640	const_iv (KMOD_MODE),	789	const_iv (KMOD_MODE),
641		790
		791	const_iv (KMOD_LRAM),
		792
642	const_iv (MIX_DEFAULT_FORMAT),	793	const_iv (MIX_DEFAULT_FORMAT),
643		794
644	const_iv (SDL_INIT_TIMER),	795	const_iv (SDL_INIT_TIMER),
645	const_iv (SDL_INIT_AUDIO),	796	const_iv (SDL_INIT_AUDIO),
646	const_iv (SDL_INIT_VIDEO),	797	const_iv (SDL_INIT_VIDEO),
…		…
664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),	815	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665	const_iv (SDL_GL_STEREO),	816	const_iv (SDL_GL_STEREO),
666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),	817	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667	const_iv (SDL_GL_MULTISAMPLESAMPLES),	818	const_iv (SDL_GL_MULTISAMPLESAMPLES),
668	const_iv (SDL_GL_ACCELERATED_VISUAL),	819	const_iv (SDL_GL_ACCELERATED_VISUAL),
669	const_iv (SDL_GL_SWAP_CONTROL)	820	const_iv (SDL_GL_SWAP_CONTROL),
		821
		822	const_iv (FOW_DARKNESS)
670	# undef const_iv	823	# undef const_iv
671	};	824	};
672		825
673	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--)
674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675		828
676	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678	}	831	}
679		832
…		…
695	NV ceil (NV x)	848	NV ceil (NV x)
696		849
697	IV minpot (UV n)	850	IV minpot (UV n)
698		851
699	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
700		859
701	void	860	void
702	pango_init ()	861	pango_init ()
703	CODE:	862	CODE:
704	{	863	{
…		…
711	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	870	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
712	#endif	871	#endif
713	}	872	}
714		873
715	char *SDL_GetError ()	874	char *SDL_GetError ()
		875
		876	void SDL_braino ()
716		877
717	int SDL_Init (U32 flags)	878	int SDL_Init (U32 flags)
718		879
719	int SDL_InitSubSystem (U32 flags)	880	int SDL_InitSubSystem (U32 flags)
720		881
…		…
794		955
795	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796	#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);
797	#include "glfunc.h"	958	#include "glfunc.h"
798	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799	}	963	}
800	}	964	}
801	OUTPUT:	965	OUTPUT:
802	RETVAL	966	RETVAL
803		967
…		…
829	{	993	{
830	case SDL_KEYDOWN:	994	case SDL_KEYDOWN:
831	case SDL_KEYUP:	995	case SDL_KEYUP:
832	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	996	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	997	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	998	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
835	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	999	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
836	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1000	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837	break;	1001	break;
838		1002
839	case SDL_ACTIVEEVENT:	1003	case SDL_ACTIVEEVENT:
840	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1004	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
858	x = ev.motion.x;	1022	x = ev.motion.x;
859	y = ev.motion.y;	1023	y = ev.motion.y;
860	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1024	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861	}	1025	}
862		1026
863	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1027	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864	hv_store (hv, "state", 5, newSViv (state), 0);	1028	hv_store (hv, "state", 5, newSViv (state), 0);
865	hv_store (hv, "x", 1, newSViv (x), 0);	1029	hv_store (hv, "x", 1, newSViv (x), 0);
866	hv_store (hv, "y", 1, newSViv (y), 0);	1030	hv_store (hv, "y", 1, newSViv (y), 0);
867	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1031	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1032	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
888		1052
889	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
890	}	1054	}
891	}	1055	}
892		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
893	int	1070	int
894	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
895	POSTCALL:	1072	POSTCALL:
896	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
897	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
959	add_font (char *file)	1136	add_font (char *file)
960	CODE:	1137	CODE:
961	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962	OUTPUT:	1139	OUTPUT:
963	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
964		1144
965	void	1145	void
966	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
967	ALIAS:	1147	ALIAS:
968	load_image_file = 1	1148	load_image_file = 1
…		…
1084	#if DEBUG	1264	#if DEBUG
1085	VALGRIND_DO_LEAK_CHECK;	1265	VALGRIND_DO_LEAK_CHECK;
1086	#endif	1266	#endif
1087	}	1267	}
1088		1268
		1269	int
		1270	SvREFCNT (SV *sv)
		1271	CODE:
		1272	RETVAL = SvREFCNT (sv);
		1273	OUTPUT:
		1274	RETVAL
		1275
1089	MODULE = Deliantra::Client PACKAGE = DC::Font	1276	MODULE = Deliantra::Client PACKAGE = DC::Font
1090		1277
1091	PROTOTYPES: DISABLE	1278	PROTOTYPES: DISABLE
1092		1279
1093	DC::Font	1280	DC::Font
…		…
1522	if (ix)	1709	if (ix)
1523	{	1710	{
1524	glDisable (GL_ALPHA_TEST);	1711	glDisable (GL_ALPHA_TEST);
1525	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1526	}	1713	}
		1714	}
		1715
		1716	void
		1717	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)
		1718	PROTOTYPE: @
		1719	CODE:
		1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1723	glEnable (GL_TEXTURE_2D);
		1724	glBindTexture (GL_TEXTURE_2D, name1);
		1725
		1726	glColor3f (intensity, intensity, intensity);
		1727	glPushMatrix ();
		1728	glScalef (1./3, 1./3, 1.);
		1729
		1730	if (blend > 0.f)
		1731	{
		1732	float dx3 = dx * -3.f / w;
		1733	float dy3 = dy * -3.f / h;
		1734	GLfloat env_color[4] = { 0., 0., 0., blend };
		1735
		1736	/* interpolate the two shadow textures */
		1737	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1738	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1739
		1740	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1741	gl.ActiveTexture (GL_TEXTURE1);
		1742	glEnable (GL_TEXTURE_2D);
		1743	glBindTexture (GL_TEXTURE_2D, name2);
		1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1745
		1746	/* rgb == rgb(glcolor) */
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1750
		1751	/* alpha = interpolate t0, t1 by env_alpha */
		1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1753
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1757
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glBegin (GL_QUADS);
		1765	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1766	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1767	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1769	glEnd ();
		1770
		1771	glDisable (GL_TEXTURE_2D);
		1772	gl.ActiveTexture (GL_TEXTURE0);
		1773	}
		1774	else
		1775	{
		1776	/* simple blending of one texture, also opengl <1.3 path */
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1778
		1779	glBegin (GL_QUADS);
		1780	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1781	glTexCoord2f (0, t); glVertex2f (0, h);
		1782	glTexCoord2f (s, t); glVertex2f (w, h);
		1783	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1784	glEnd ();
		1785	}
		1786
		1787	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1788	{
		1789	int x, y;
		1790	int dx3 = dx * 3;
		1791	int dy3 = dy * 3;
		1792
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1794	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1795	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1796	glTranslatef (-1., -1., 0);
		1797	glBegin (GL_QUADS);
		1798
		1799	for (y = 1; y < h; y += 3)
		1800	{
		1801	int y1 = y - dy3;
		1802	int y1valid = y1 >= 0 && y1 < h;
		1803
		1804	for (x = 1; x < w; x += 3)
		1805	{
		1806	int x1 = x - dx3;
		1807	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1808	uint8_t h2;
		1809
		1810	if (y1valid && x1 >= 0 && x1 < w)
		1811	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1812	else
		1813	h2 = 1; /* out of range == invisible */
		1814
		1815	if (h1 \|\| h2)
		1816	{
		1817	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1818	glColor4f (1., 1., 1., alpha);
		1819
		1820	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1821	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1822	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1823	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1824	}
		1825	}
		1826	}
		1827	}
		1828
		1829	glEnd ();
		1830
		1831	glPopMatrix ();
		1832
		1833	glDisable (GL_TEXTURE_2D);
		1834	glDisable (GL_BLEND);
1527	}	1835	}
1528		1836
1529	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1837	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530	CODE:	1838	CODE:
1531	{	1839	{
…		…
1637	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1945	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638	// use uglier nearest interpolation because linear suffers	1946	// use uglier nearest interpolation because linear suffers
1639	// from transparent color bleeding and ugly wrapping effects.	1947	// from transparent color bleeding and ugly wrapping effects.
1640	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1948	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641	}	1949	}
		1950
		1951	void
		1952	expire_textures (DC::Map self, int texid, int count)
		1953	PPCODE:
		1954	for (; texid < self->texs && count; ++texid, --count)
		1955	{
		1956	maptex *tex = self->tex + texid;
		1957
		1958	if (tex->name)
		1959	{
		1960	if (tex->unused)
		1961	{
		1962	tex->name = 0;
		1963	tex->unused = 0;
		1964	XPUSHs (sv_2mortal (newSViv (texid)));
		1965	}
		1966	else
		1967	tex->unused = 1;
		1968	}
		1969	}
1642		1970
1643	int	1971	int
1644	ox (DC::Map self)	1972	ox (DC::Map self)
1645	ALIAS:	1973	ALIAS:
1646	oy = 1	1974	oy = 1
…		…
1727	{	2055	{
1728	ext = *data++;	2056	ext = *data++;
1729	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1730		2058
1731	if (cmd < 4)	2059	if (cmd < 4)
1732	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1733	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1734	{	2062	{
1735	cell->stat_width = 1;	2063	cell->stat_width = 1;
1736	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1737	}	2065	}
…		…
1767	cell->tile [z] = self->face2tile [face];	2095	cell->tile [z] = self->face2tile [face];
1768		2096
1769	if (cell->tile [z])	2097	if (cell->tile [z])
1770	{	2098	{
1771	maptex *tex = self->tex + cell->tile [z];	2099	maptex *tex = self->tex + cell->tile [z];
		2100	tex->unused = 0;
1772	if (!tex->name)	2101	if (!tex->name)
1773	av_push (missing, newSViv (cell->tile [z]));	2102	av_push (missing, newSViv (cell->tile [z]));
1774		2103
1775	if (tex->smoothtile)	2104	if (tex->smoothtile)
1776	{	2105	{
1777	maptex *smooth = self->tex + tex->smoothtile;	2106	maptex *smooth = self->tex + tex->smoothtile;
		2107	smooth->unused = 0;
1778	if (!smooth->name)	2108	if (!smooth->name)
1779	av_push (missing, newSViv (tex->smoothtile));	2109	av_push (missing, newSViv (tex->smoothtile));
1780	}	2110	}
1781	}	2111	}
1782	}	2112	}
1783	}	2113	}
1784	else	2114	else
1785	cell->darkness = 0;	2115	CELL_CLEAR (cell);
1786	}	2116	}
1787	}	2117	}
1788	OUTPUT:	2118	OUTPUT:
1789	RETVAL	2119	RETVAL
1790		2120
…		…
1810	? self->row + y	2140	? self->row + y
1811	: 0;	2141	: 0;
1812		2142
1813	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1814	{	2144	{
1815	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
1816		2146
1817	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
1818	{	2148	{
1819	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
1820		2150
…		…
1822	{	2152	{
1823	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
1824	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
1825	int a1 = tex.a;	2155	int a1 = tex.a;
1826		2156
1827	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
1828	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
1829	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
1830	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
1831	}	2161	}
1832	}	2162	}
1833		2163
1834	*map++ = (r )	2164	*map++ = (r )
1835	\| (g << 8)	2165	\| (g << 8)
…		…
1842	}	2172	}
1843	OUTPUT:	2173	OUTPUT:
1844	RETVAL	2174	RETVAL
1845		2175
1846	void	2176	void
1847	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)	2177	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)
1848	CODE:	2178	CODE:
1849	{	2179	{
1850	int x, y, z;	2180	int x, y, z;
1851		2181
1852	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1853	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2183	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1854	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2184	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1855	smooth_key skey;	2185	smooth_key skey;
1856	int pl_x, pl_y;	2186	int pl_x, pl_y;
1857	maptex pl_tex;	2187	maptex pl_tex;
1858	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
		2189	rc_t *rc_ov = rc_alloc ();
1859	rc_key_t key;	2190	rc_key_t key;
1860	rc_array_t *arr;	2191	rc_array_t *arr;
1861		2192
1862	pl_tex.name = 0;	2193	pl_tex.name = 0;
1863		2194
1864	// thats current max. sorry.	2195	// that's current max. sorry.
1865	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
1866	if (sh > 255) sh = 255;	2197	if (sh > 255) sh = 255;
1867		2198
1868	// clear key, in case of extra padding	2199	// clear key, in case of extra padding
1869	memset (&skey, 0, sizeof (skey));	2200	memset (&skey, 0, sizeof (skey));
…		…
1873	key.g = 255;	2204	key.g = 255;
1874	key.b = 255;	2205	key.b = 255;
1875	key.a = 255;	2206	key.a = 255;
1876	key.mode = GL_QUADS;	2207	key.mode = GL_QUADS;
1877	key.format = GL_T2F_V3F;	2208	key.format = GL_T2F_V3F;
1878	key.texname = -1;
1879		2209
1880	mx += self->x;	2210	mx += self->x;
1881	my += self->y;	2211	my += self->y;
1882		2212
1883	// first pass: determine smooth_max	2213	// first pass: determine smooth_max
…		…
1907	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908		2238
1909	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
1910	{	2240	{
1911	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
		2242	key.texname = -1;
1912		2243
1913	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
1914	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
1915	{	2246	{
1916	maprow *row = self->row + (y + my);	2247	maprow *row = self->row + (y + my);
…		…
1922	tileid tile = cell->tile [z];	2253	tileid tile = cell->tile [z];
1923		2254
1924	if (tile)	2255	if (tile)
1925	{	2256	{
1926	maptex tex = self->tex [tile];	2257	maptex tex = self->tex [tile];
1927	int px = (x + 1) * T - tex.w;	2258	int px, py;
1928	int py = (y + 1) * T - tex.h;
1929		2259
1930	if (key.texname != tex.name)	2260	if (key.texname != tex.name)
1931	{	2261	{
		2262	self->tex [tile].unused = 0;
		2263
1932	if (!tex.name)	2264	if (!tex.name)
1933	tex = self->tex [2]; /* missing, replace by noface */	2265	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934		2266
1935	key.texname = tex.name;	2267	key.texname = tex.name;
1936	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
1937	}	2269	}
		2270
		2271	px = (x + 1) * Th - tex.w;
		2272	py = (y + 1) * Tw - tex.h;
1938		2273
1939	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
1940	{	2275	{
1941	pl_x = px;	2276	pl_x = px;
1942	pl_y = py;	2277	pl_y = py;
…		…
1947	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2282	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2283	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1949	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2284	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1950	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2285	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951		2286
1952	if (expect_false (cell->flags) && expect_false (z == 2))
1953	{
1954	// overlays such as the speech bubble, probably more to come
1955	if (cell->flags & 1)
1956	{
1957	maptex tex = self->tex [1];
1958	int px = x * T + T * 2 / 32;
1959	int py = y * T - T * 6 / 32;
1960
1961	if (tex.name)
1962	{
1963	if (key.texname != tex.name)
1964	{
1965	key.texname = tex.name;
1966	arr = rc_array (rc, &key);
1967	}
1968
1969	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973	}
1974	}
1975	}
1976
1977	// update smooth hash	2287	// update smooth hash
1978	if (tex.smoothtile)	2288	if (tex.smoothtile)
1979	{	2289	{
1980	skey.tile = tex.smoothtile;	2290	skey.tile = tex.smoothtile;
1981	skey.level = tex.smoothlevel;	2291	skey.level = tex.smoothlevel;
…		…
2009	// corners	2319	// corners
2010	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2320	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2011	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2321	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2012	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2322	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2013	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2323	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2324	}
		2325	}
		2326
		2327	if (expect_false (z == 2) && expect_false (cell->flags))
		2328	{
		2329	// overlays such as the speech bubble, probably more to come
		2330	if (cell->flags & 1)
		2331	{
		2332	rc_key_t key_ov = key;
		2333	maptex tex = self->tex [TEXID_SPEECH];
		2334	rc_array_t *arr;
		2335	int px = x * Tw + Tw * 2 / 32;
		2336	int py = y * Th - Th * 6 / 32;
		2337
		2338	key_ov.texname = tex.name;
		2339	arr = rc_array (rc_ov, &key_ov);
		2340
		2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2342	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2343	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2014	}	2345	}
2015	}	2346	}
2016	}	2347	}
2017	}	2348	}
2018		2349
…		…
2045	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2046	&& skey->level == level	2377	&& skey->level == level
2047	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2048	{	2379	{
2049	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2050	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2051	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2052	int border = bits & 15;	2383	int border = bits & 15;
2053	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2054	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2055	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2056		2387
…		…
2058	{	2389	{
2059	// this time avoiding texture state changes	2390	// this time avoiding texture state changes
2060	// save gobs of state changes.	2391	// save gobs of state changes.
2061	if (key.texname != tex.name)	2392	if (key.texname != tex.name)
2062	{	2393	{
		2394	self->tex [skey->tile].unused = 0;
		2395
2063	glEnd ();	2396	glEnd ();
2064	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2397	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065	glBegin (GL_QUADS);	2398	glBegin (GL_QUADS);
2066	}	2399	}
2067		2400
2068	if (border)	2401	if (border)
2069	{	2402	{
2070	float ox = border * dx;	2403	float ox = border * dx;
2071		2404
2072	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2073	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2074	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2075	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2076	}	2409	}
2077		2410
2078	if (corner)	2411	if (corner)
2079	{	2412	{
2080	float ox = corner * dx;	2413	float ox = corner * dx;
2081		2414
2082	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2083	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2084	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2085	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2086	}	2419	}
2087	}	2420	}
2088	}	2421	}
2089	}	2422	}
2090	}	2423	}
…		…
2099	}	2432	}
2100		2433
2101	if (pl_tex.name)	2434	if (pl_tex.name)
2102	{	2435	{
2103	maptex tex = pl_tex;	2436	maptex tex = pl_tex;
2104	int px = pl_x + pdx;	2437	int px = pl_x + sdx;
2105	int py = pl_y + pdy;	2438	int py = pl_y + sdy;
2106		2439
2107	key.texname = tex.name;	2440	key.texname = tex.name;
2108	arr = rc_array (rc, &key);	2441	arr = rc_array (rc, &key);
2109		2442
2110	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2443	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
…		…
2113	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2446	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114		2447
2115	rc_draw (rc);	2448	rc_draw (rc);
2116	}	2449	}
2117		2450
		2451	rc_draw (rc_ov);
		2452	rc_clear (rc_ov);
		2453
2118	glDisable (GL_BLEND);	2454	glDisable (GL_BLEND);
2119	rc_free (rc);	2455	rc_free (rc);
		2456	rc_free (rc_ov);
2120		2457
2121	// top layer: overlays such as the health bar	2458	// top layer: overlays such as the health bar
2122	for (y = 0; y < sh; y++)	2459	for (y = 0; y < sh; y++)
2123	if (0 <= y + my && y + my < self->rows)	2460	if (0 <= y + my && y + my < self->rows)
2124	{	2461	{
…		…
2127	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2128	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2129	{	2466	{
2130	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2131		2468
2132	int px = x * T;	2469	int px = x * Tw;
2133	int py = y * T;	2470	int py = y * Th;
		2471
		2472	if (expect_false (cell->player == player))
		2473	{
		2474	px += sdx;
		2475	py += sdy;
		2476	}
2134		2477
2135	if (cell->stat_hp)	2478	if (cell->stat_hp)
2136	{	2479	{
2137	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2138	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2139		2482
2140	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2141	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2142	px + width - 1, py);	2485	px + width - 1, py);
2143		2486
…		…
2149	}	2492	}
2150	}	2493	}
2151	}	2494	}
2152		2495
2153	void	2496	void
2154	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2497	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2155	CODE:	2498	CODE:
2156	{	2499	{
2157	static float color[16][3] = {	2500	static float color[16][3] = {
2158	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2159	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2160	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2161	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2162		2505
2163	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2164	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2165	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2166	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2167		2510
2168	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2169	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2170	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2171	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2172		2515
2173	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2174		2517
2175	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2176	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2177	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2178	};	2521	};
2179		2522
2180	int x, y;	2523	int x, y;
2181		2524
2182	glEnable (GL_TEXTURE_2D);	2525	glEnable (GL_TEXTURE_2D);
		2526	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2527	* but the nvidia driver (185.18.14) mishandles alpha textures
		2528	* and takes the colour from god knows where instead of using
		2529	* Cp. MODULATE results in the same colour, but slightly different
		2530	* alpha, but atcually gives us the correct colour with nvidia.
		2531	*/
2183	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
2185	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186	glBegin (GL_QUADS);	2535	glBegin (GL_QUADS);
2187		2536
2188	for (y = 0; y < h; y++)	2537	for (y = 0; y < h; y++)
…		…
2192		2541
2193	if (m)	2542	if (m)
2194	{	2543	{
2195	float *c = color [m & 15];	2544	float *c = color [m & 15];
2196		2545
2197	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2198	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2199		2548
2200	glColor4f (c[0], c[1], c[2], 0.75);	2549	glColor4f (c[0], c[1], c[2], 1);
2201	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205	}	2554	}
…		…
2213	void	2562	void
2214	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2563	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2215	PPCODE:	2564	PPCODE:
2216	{	2565	{
2217	int x, y;	2566	int x, y;
2218	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2219	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2220	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2221	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
		2571	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2572	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2222	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2573	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2223	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2574	memset (darkness1, 0, sw1*sh1);
2224	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2225		2575
2226	SvPOK_only (darkness3_sv);	2576	SvPOK_only (darkness3_sv);
2227	SvCUR_set (darkness3_sv, sw34 * sh3);	2577	SvCUR_set (darkness3_sv, sw3 * sh3);
2228		2578
2229	mx += self->x - 1;	2579	mx += self->x - 1;
2230	my += self->y - 1;	2580	my += self->y - 1;
2231
2232	memset (darkness1, 255, sw1 * sh1);
2233		2581
2234	for (y = 0; y < sh1; y++)	2582	for (y = 0; y < sh1; y++)
2235	if (0 <= y + my && y + my < self->rows)	2583	if (0 <= y + my && y + my < self->rows)
2236	{	2584	{
2237	maprow *row = self->row + (y + my);	2585	maprow *row = self->row + (y + my);
…		…
2240	if (row->c0 <= x + mx && x + mx < row->c1)	2588	if (row->c0 <= x + mx && x + mx < row->c1)
2241	{	2589	{
2242	mapcell *cell = row->col + (x + mx - row->c0);	2590	mapcell *cell = row->col + (x + mx - row->c0);
2243		2591
2244	darkness1 [y * sw1 + x] = cell->darkness	2592	darkness1 [y * sw1 + x] = cell->darkness
2245	? 255 - (cell->darkness - 1)	2593	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246	: 255 - FOW_DARKNESS;	2594	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247	}	2595	}
2248	}	2596	}
2249		2597
2250	for (y = 0; y < sh; ++y)	2598	for (y = 0; y < sh; ++y)
2251	for (x = 0; x < sw; ++x)	2599	for (x = 0; x < sw; ++x)
…		…
2270		2618
2271	uint8_t r13 = (d13 + d23 + d12) / 3;	2619	uint8_t r13 = (d13 + d23 + d12) / 3;
2272	uint8_t r23 = d23;	2620	uint8_t r23 = d23;
2273	uint8_t r33 = (d23 + d33 + d32) / 3;	2621	uint8_t r33 = (d23 + d33 + d32) / 3;
2274		2622
2275	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2625	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2626	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2280	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2628	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2631	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284	}	2632	}
2285		2633
2286	free (darkness1);	2634	free (darkness1);
2287		2635
2288	EXTEND (SP, 3);	2636	EXTEND (SP, 3);
2289	PUSHs (sv_2mortal (newSViv (sw34)));	2637	PUSHs (sv_2mortal (newSViv (sw3)));
2290	PUSHs (sv_2mortal (newSViv (sh3)));	2638	PUSHs (sv_2mortal (newSViv (sh3)));
2291	PUSHs (darkness3_sv);	2639	PUSHs (darkness3_sv);
2292	}	2640	}
2293		2641
2294	SV *	2642	SV *
…		…
2492	if (RETVAL < 0)	2840	if (RETVAL < 0)
2493	{	2841	{
2494	RETVAL = Mix_GroupOldest (-1);	2842	RETVAL = Mix_GroupOldest (-1);
2495		2843
2496	if (RETVAL < 0)	2844	if (RETVAL < 0)
		2845	{
		2846	// happens sometimes, maybe it just stopped playing(?)
		2847	RETVAL = Mix_GroupAvailable (-1);
		2848
		2849	if (RETVAL < 0)
2497	XSRETURN_UNDEF;	2850	XSRETURN_UNDEF;
2498		2851	}
		2852	else
2499	Mix_HaltChannel (RETVAL);	2853	Mix_HaltChannel (RETVAL);
2500	}	2854	}
2501		2855
2502	Mix_UnregisterAllEffects (RETVAL);	2856	Mix_UnregisterAllEffects (RETVAL);
2503	Mix_Volume (RETVAL, 128);	2857	Mix_Volume (RETVAL, 128);
2504	}	2858	}
…		…
2551	void	2905	void
2552	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2906	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553	CODE:	2907	CODE:
2554	{	2908	{
2555	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2909	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2556	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2910	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2911	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558	}	2912	}
2559		2913
2560	void	2914	void
2561	set_reverse_stereo (DC::Channel self, int flip)	2915	set_reverse_stereo (DC::Channel self, int flip)
…		…
2563	Mix_SetReverseStereo (self, flip);	2917	Mix_SetReverseStereo (self, flip);
2564		2918
2565	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2919	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566		2920
2567	PROTOTYPES: DISABLE	2921	PROTOTYPES: DISABLE
		2922
		2923	void
		2924	decoders ()
		2925	PPCODE:
		2926	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2927	int i, num = Mix_GetNumChunkDecoders ();
		2928	EXTEND (SP, num);
		2929	for (i = 0; i < num; ++i)
		2930	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2931	#else
		2932	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2933	#endif
2568		2934
2569	DC::MixChunk	2935	DC::MixChunk
2570	new (SV *class, DC::RW rwops)	2936	new (SV *class, DC::RW rwops)
2571	CODE:	2937	CODE:
2572	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2938	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2605	OUTPUT:	2971	OUTPUT:
2606	RETVAL	2972	RETVAL
2607		2973
2608	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2974	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609		2975
		2976	void
		2977	decoders ()
		2978	PPCODE:
		2979	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2980	int i, num = Mix_GetNumMusicDecoders ();
		2981	EXTEND (SP, num);
		2982	for (i = 0; i < num; ++i)
		2983	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2984	#else
		2985	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2986	#endif
		2987
2610	int	2988	int
2611	volume (int volume = -1)	2989	volume (int volume = -1)
2612	PROTOTYPE: ;$	2990	PROTOTYPE: ;$
2613	CODE:	2991	CODE:
2614	if (items > 0)	2992	if (items > 0)
…		…
2624		3002
2625	void	3003	void
2626	halt ()	3004	halt ()
2627	CODE:	3005	CODE:
2628	Mix_HaltMusic ();	3006	Mix_HaltMusic ();
		3007
		3008	int
		3009	playing ()
		3010	CODE:
		3011	RETVAL = Mix_PlayingMusic ();
		3012	OUTPUT:
		3013	RETVAL
2629		3014
2630	DC::MixMusic	3015	DC::MixMusic
2631	new (SV *class, DC::RW rwops)	3016	new (SV *class, DC::RW rwops)
2632	CODE:	3017	CODE:
2633	RETVAL = Mix_LoadMUS_RW (rwops);	3018	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2664	} *civ, const_iv[] = {	3049	} *civ, const_iv[] = {
2665	# define const_iv(name) { # name, (IV)name }	3050	# define const_iv(name) { # name, (IV)name }
2666	const_iv (GL_VENDOR),	3051	const_iv (GL_VENDOR),
2667	const_iv (GL_VERSION),	3052	const_iv (GL_VERSION),
2668	const_iv (GL_EXTENSIONS),	3053	const_iv (GL_EXTENSIONS),
		3054	const_iv (GL_MAX_TEXTURE_UNITS),
2669	const_iv (GL_COLOR_MATERIAL),	3055	const_iv (GL_COLOR_MATERIAL),
2670	const_iv (GL_SMOOTH),	3056	const_iv (GL_SMOOTH),
2671	const_iv (GL_FLAT),	3057	const_iv (GL_FLAT),
2672	const_iv (GL_DITHER),	3058	const_iv (GL_DITHER),
2673	const_iv (GL_BLEND),	3059	const_iv (GL_BLEND),
…		…
2685	const_iv (GL_ZERO),	3071	const_iv (GL_ZERO),
2686	const_iv (GL_SRC_ALPHA),	3072	const_iv (GL_SRC_ALPHA),
2687	const_iv (GL_DST_ALPHA),	3073	const_iv (GL_DST_ALPHA),
2688	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3074	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689	const_iv (GL_ONE_MINUS_DST_ALPHA),	3075	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3076	const_iv (GL_SRC_COLOR),
		3077	const_iv (GL_DST_COLOR),
		3078	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3079	const_iv (GL_ONE_MINUS_DST_COLOR),
2690	const_iv (GL_SRC_ALPHA_SATURATE),	3080	const_iv (GL_SRC_ALPHA_SATURATE),
2691	const_iv (GL_RGB),	3081	const_iv (GL_RGB),
2692	const_iv (GL_RGBA),	3082	const_iv (GL_RGBA),
2693	const_iv (GL_RGBA4),	3083	const_iv (GL_RGBA4),
2694	const_iv (GL_RGBA8),	3084	const_iv (GL_RGBA8),
…		…
2762	const_iv (GL_NICEST),	3152	const_iv (GL_NICEST),
2763	const_iv (GL_V2F),	3153	const_iv (GL_V2F),
2764	const_iv (GL_V3F),	3154	const_iv (GL_V3F),
2765	const_iv (GL_T2F_V3F),	3155	const_iv (GL_T2F_V3F),
2766	const_iv (GL_T2F_N3F_V3F),	3156	const_iv (GL_T2F_N3F_V3F),
		3157	const_iv (GL_FUNC_ADD),
		3158	const_iv (GL_FUNC_SUBTRACT),
		3159	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767	# undef const_iv	3160	# undef const_iv
2768	};	3161	};
2769		3162
2770	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3163	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2771	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3164	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2772		3165
2773	texture_av = newAV ();	3166	texture_av = newAV ();
2774	AvREAL_off (texture_av);	3167	AvREAL_off (texture_av);
2775	}	3168	}
2776		3169
2777	void	3170	void
2778	disable_GL_EXT_blend_func_separate ()	3171	disable_GL_EXT_blend_func_separate ()
2779	CODE:	3172	CODE:
2780	gl.BlendFuncSeparate = 0;	3173	gl.BlendFuncSeparate = 0;
2781	gl.BlendFuncSeparateEXT = 0;	3174	gl.BlendFuncSeparateEXT = 0;
		3175
		3176	void
		3177	apple_nvidia_bug (int enable)
2782		3178
2783	char *	3179	char *
2784	gl_vendor ()	3180	gl_vendor ()
2785	CODE:	3181	CODE:
2786	RETVAL = (char *)glGetString (GL_VENDOR);	3182	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2817		3213
2818	int glGetError ()	3214	int glGetError ()
2819		3215
2820	void glFinish ()	3216	void glFinish ()
2821		3217
		3218	void glFlush ()
		3219
2822	void glClear (int mask)	3220	void glClear (int mask)
2823		3221
2824	void glClearColor (float r, float g, float b, float a = 1.0)	3222	void glClearColor (float r, float g, float b, float a = 1.0)
2825	PROTOTYPE: @	3223	PROTOTYPE: @
2826		3224
…		…
2835	void glBlendFunc (int sfactor, int dfactor)	3233	void glBlendFunc (int sfactor, int dfactor)
2836		3234
2837	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3235	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838	CODE:	3236	CODE:
2839	gl_BlendFuncSeparate (sa, da, saa, daa);	3237	gl_BlendFuncSeparate (sa, da, saa, daa);
		3238
		3239	# void glBlendEquation (int se)
2840		3240
2841	void glDepthMask (int flag)	3241	void glDepthMask (int flag)
2842		3242
2843	void glLogicOp (int opcode)	3243	void glLogicOp (int opcode)
2844		3244
…		…
2879	void glRotate (float angle, float x, float y, float z)	3279	void glRotate (float angle, float x, float y, float z)
2880	CODE:	3280	CODE:
2881	glRotatef (angle, x, y, z);	3281	glRotatef (angle, x, y, z);
2882		3282
2883	void glColor (float r, float g, float b, float a = 1.0)	3283	void glColor (float r, float g, float b, float a = 1.0)
		3284	PROTOTYPE: @
2884	ALIAS:	3285	ALIAS:
2885	glColor_premultiply = 1	3286	glColor_premultiply = 1
2886	CODE:	3287	CODE:
2887	if (ix)	3288	if (ix)
2888	{	3289	{
…		…
2993	void glNewList (int list, int mode = GL_COMPILE)	3394	void glNewList (int list, int mode = GL_COMPILE)
2994		3395
2995	void glEndList ()	3396	void glEndList ()
2996		3397
2997	void glCallList (int list)	3398	void glCallList (int list)
		3399
		3400	void c_init ()
		3401	CODE:
		3402	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3403	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2998		3404
2999	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3405	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000		3406
3001	PROTOTYPES: DISABLE	3407	PROTOTYPES: DISABLE
3002		3408

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC vs. Revision 1.308 by root, Fri Jul 29 08:35:35 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 2011 UTC