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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.266 by root, Sun Jul 20 02:51:40 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 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 ("DC::Main::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 shared library 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
…		…
811	SDL_GetAppState ()	975	SDL_GetAppState ()
812		976
813	int	977	int
814	SDL_GetModState ()	978	SDL_GetModState ()
815		979
		980	int
		981	SDL_WaitEvent ()
		982	C_ARGS: 0
		983
816	void	984	void
		985	SDL_PumpEvents ()
		986
		987	void
817	poll_events ()	988	peep_events ()
818	PPCODE:	989	PPCODE:
819	{	990	{
820	SDL_Event ev;	991	SDL_Event ev;
821		992
822	SDL_PumpEvents ();	993	SDL_PumpEvents ();
…		…
829	{	1000	{
830	case SDL_KEYDOWN:	1001	case SDL_KEYDOWN:
831	case SDL_KEYUP:	1002	case SDL_KEYUP:
832	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	1003	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	1004	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);	1005	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 */	1006	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);	1007	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837	break;	1008	break;
838		1009
839	case SDL_ACTIVEEVENT:	1010	case SDL_ACTIVEEVENT:
840	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1011	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
858	x = ev.motion.x;	1029	x = ev.motion.x;
859	y = ev.motion.y;	1030	y = ev.motion.y;
860	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1031	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861	}	1032	}
862		1033
863	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1034	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864	hv_store (hv, "state", 5, newSViv (state), 0);	1035	hv_store (hv, "state", 5, newSViv (state), 0);
865	hv_store (hv, "x", 1, newSViv (x), 0);	1036	hv_store (hv, "x", 1, newSViv (x), 0);
866	hv_store (hv, "y", 1, newSViv (y), 0);	1037	hv_store (hv, "y", 1, newSViv (y), 0);
867	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1038	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1039	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
888		1059
889	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1060	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
890	}	1061	}
891	}	1062	}
892		1063
		1064	char *
		1065	SDL_AudioDriverName ()
		1066	CODE:
		1067	{
		1068	char buf [256];
		1069	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1070	XSRETURN_UNDEF;
		1071
		1072	RETVAL = buf;
		1073	}
		1074	OUTPUT:
		1075	RETVAL
		1076
893	int	1077	int
894	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1078	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
895	POSTCALL:	1079	POSTCALL:
896	Mix_HookMusicFinished (music_finished);	1080	Mix_HookMusicFinished (music_finished);
897	Mix_ChannelFinished (channel_finished);	1081	Mix_ChannelFinished (channel_finished);
…		…
959	add_font (char *file)	1143	add_font (char *file)
960	CODE:	1144	CODE:
961	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1145	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962	OUTPUT:	1146	OUTPUT:
963	RETVAL	1147	RETVAL
		1148
		1149	void
		1150	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1151
		1152	void
		1153	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)
964		1154
965	void	1155	void
966	load_image_inline (SV *image_)	1156	load_image_inline (SV *image_)
967	ALIAS:	1157	ALIAS:
968	load_image_file = 1	1158	load_image_file = 1
…		…
1084	#if DEBUG	1274	#if DEBUG
1085	VALGRIND_DO_LEAK_CHECK;	1275	VALGRIND_DO_LEAK_CHECK;
1086	#endif	1276	#endif
1087	}	1277	}
1088		1278
		1279	int
		1280	SvREFCNT (SV *sv)
		1281	CODE:
		1282	RETVAL = SvREFCNT (sv);
		1283	OUTPUT:
		1284	RETVAL
		1285
1089	MODULE = Deliantra::Client PACKAGE = DC::Font	1286	MODULE = Deliantra::Client PACKAGE = DC::Font
1090		1287
1091	PROTOTYPES: DISABLE	1288	PROTOTYPES: DISABLE
1092		1289
1093	DC::Font	1290	DC::Font
…		…
1522	if (ix)	1719	if (ix)
1523	{	1720	{
1524	glDisable (GL_ALPHA_TEST);	1721	glDisable (GL_ALPHA_TEST);
1525	glDisable (GL_BLEND);	1722	glDisable (GL_BLEND);
1526	}	1723	}
		1724	}
		1725
		1726	void
		1727	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)
		1728	PROTOTYPE: @
		1729	CODE:
		1730	{
		1731	glEnable (GL_BLEND);
		1732	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1733	glEnable (GL_TEXTURE_2D);
		1734	glBindTexture (GL_TEXTURE_2D, name1);
		1735
		1736	glColor3f (intensity, intensity, intensity);
		1737	glPushMatrix ();
		1738	glScalef (1./3, 1./3, 1.);
		1739
		1740	if (blend > 0.f)
		1741	{
		1742	float dx3 = dx * -3.f / w;
		1743	float dy3 = dy * -3.f / h;
		1744	GLfloat env_color[4] = { 0., 0., 0., blend };
		1745
		1746	/* interpolate the two shadow textures */
		1747	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1749
		1750	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1751	gl.ActiveTexture (GL_TEXTURE1);
		1752	glEnable (GL_TEXTURE_2D);
		1753	glBindTexture (GL_TEXTURE_2D, name2);
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1755
		1756	/* rgb == rgb(glcolor) */
		1757	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1760
		1761	/* alpha = interpolate t0, t1 by env_alpha */
		1762	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1763
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1767
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1770
		1771	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1773
		1774	glBegin (GL_QUADS);
		1775	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1776	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1777	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1778	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1779	glEnd ();
		1780
		1781	glDisable (GL_TEXTURE_2D);
		1782	gl.ActiveTexture (GL_TEXTURE0);
		1783	}
		1784	else
		1785	{
		1786	/* simple blending of one texture, also opengl <1.3 path */
		1787	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1788
		1789	glBegin (GL_QUADS);
		1790	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1791	glTexCoord2f (0, t); glVertex2f (0, h);
		1792	glTexCoord2f (s, t); glVertex2f (w, h);
		1793	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1794	glEnd ();
		1795	}
		1796
		1797	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1798	{
		1799	int x, y;
		1800	int dx3 = dx * 3;
		1801	int dy3 = dy * 3;
		1802
		1803	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1804	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1805	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1806	glTranslatef (-1., -1., 0);
		1807	glBegin (GL_QUADS);
		1808
		1809	for (y = 1; y < h; y += 3)
		1810	{
		1811	int y1 = y - dy3;
		1812	int y1valid = y1 >= 0 && y1 < h;
		1813
		1814	for (x = 1; x < w; x += 3)
		1815	{
		1816	int x1 = x - dx3;
		1817	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1818	uint8_t h2;
		1819
		1820	if (y1valid && x1 >= 0 && x1 < w)
		1821	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1822	else
		1823	h2 = 1; /* out of range == invisible */
		1824
		1825	if (h1 \|\| h2)
		1826	{
		1827	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1828	glColor4f (1., 1., 1., alpha);
		1829
		1830	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1831	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1832	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1833	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1834	}
		1835	}
		1836	}
		1837	}
		1838
		1839	glEnd ();
		1840
		1841	glPopMatrix ();
		1842
		1843	glDisable (GL_TEXTURE_2D);
		1844	glDisable (GL_BLEND);
1527	}	1845	}
1528		1846
1529	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1847	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530	CODE:	1848	CODE:
1531	{	1849	{
…		…
1637	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1955	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638	// use uglier nearest interpolation because linear suffers	1956	// use uglier nearest interpolation because linear suffers
1639	// from transparent color bleeding and ugly wrapping effects.	1957	// from transparent color bleeding and ugly wrapping effects.
1640	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1958	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641	}	1959	}
		1960
		1961	void
		1962	expire_textures (DC::Map self, int texid, int count)
		1963	PPCODE:
		1964	for (; texid < self->texs && count; ++texid, --count)
		1965	{
		1966	maptex *tex = self->tex + texid;
		1967
		1968	if (tex->name)
		1969	{
		1970	if (tex->unused)
		1971	{
		1972	tex->name = 0;
		1973	tex->unused = 0;
		1974	XPUSHs (sv_2mortal (newSViv (texid)));
		1975	}
		1976	else
		1977	tex->unused = 1;
		1978	}
		1979	}
1642		1980
1643	int	1981	int
1644	ox (DC::Map self)	1982	ox (DC::Map self)
1645	ALIAS:	1983	ALIAS:
1646	oy = 1	1984	oy = 1
…		…
1727	{	2065	{
1728	ext = *data++;	2066	ext = *data++;
1729	cmd = ext & 0x7f;	2067	cmd = ext & 0x7f;
1730		2068
1731	if (cmd < 4)	2069	if (cmd < 4)
1732	cell->darkness = 255 - ext * 64 + 1;	2070	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1733	else if (cmd == 5) // health	2071	else if (cmd == 5) // health
1734	{	2072	{
1735	cell->stat_width = 1;	2073	cell->stat_width = 1;
1736	cell->stat_hp = *data++;	2074	cell->stat_hp = *data++;
1737	}	2075	}
…		…
1767	cell->tile [z] = self->face2tile [face];	2105	cell->tile [z] = self->face2tile [face];
1768		2106
1769	if (cell->tile [z])	2107	if (cell->tile [z])
1770	{	2108	{
1771	maptex *tex = self->tex + cell->tile [z];	2109	maptex *tex = self->tex + cell->tile [z];
		2110	tex->unused = 0;
1772	if (!tex->name)	2111	if (!tex->name)
1773	av_push (missing, newSViv (cell->tile [z]));	2112	av_push (missing, newSViv (cell->tile [z]));
1774		2113
1775	if (tex->smoothtile)	2114	if (tex->smoothtile)
1776	{	2115	{
1777	maptex *smooth = self->tex + tex->smoothtile;	2116	maptex *smooth = self->tex + tex->smoothtile;
		2117	smooth->unused = 0;
1778	if (!smooth->name)	2118	if (!smooth->name)
1779	av_push (missing, newSViv (tex->smoothtile));	2119	av_push (missing, newSViv (tex->smoothtile));
1780	}	2120	}
1781	}	2121	}
1782	}	2122	}
1783	}	2123	}
1784	else	2124	else
1785	{	2125	CELL_CLEAR (cell);
1786	cell->darkness = 0;
1787	cell->stat_hp = 0;
1788	cell->flags = 0;
1789	cell->player = 0;
1790	}
1791	}	2126	}
1792	}	2127	}
1793	OUTPUT:	2128	OUTPUT:
1794	RETVAL	2129	RETVAL
1795		2130
…		…
1815	? self->row + y	2150	? self->row + y
1816	: 0;	2151	: 0;
1817		2152
1818	for (x = x0; x < x1; x++)	2153	for (x = x0; x < x1; x++)
1819	{	2154	{
1820	int r = 32, g = 32, b = 32, a = 192;	2155	unsigned int r = 32, g = 32, b = 32, a = 192;
1821		2156
1822	if (row && row->c0 <= x && x < row->c1)	2157	if (row && row->c0 <= x && x < row->c1)
1823	{	2158	{
1824	mapcell *cell = row->col + (x - row->c0);	2159	mapcell *cell = row->col + (x - row->c0);
1825		2160
…		…
1827	{	2162	{
1828	maptex tex = self->tex [cell->tile [z]];	2163	maptex tex = self->tex [cell->tile [z]];
1829	int a0 = 255 - tex.a;	2164	int a0 = 255 - tex.a;
1830	int a1 = tex.a;	2165	int a1 = tex.a;
1831		2166
1832	r = (r * a0 + tex.r * a1) / 255;	2167	r = div255 (r * a0 + tex.r * a1);
1833	g = (g * a0 + tex.g * a1) / 255;	2168	g = div255 (g * a0 + tex.g * a1);
1834	b = (b * a0 + tex.b * a1) / 255;	2169	b = div255 (b * a0 + tex.b * a1);
1835	a = (a * a0 + tex.a * a1) / 255;	2170	a = div255 (a * a0 + tex.a * a1);
1836	}	2171	}
1837	}	2172	}
1838		2173
1839	*map++ = (r )	2174	*map++ = (r )
1840	\| (g << 8)	2175	\| (g << 8)
…		…
1847	}	2182	}
1848	OUTPUT:	2183	OUTPUT:
1849	RETVAL	2184	RETVAL
1850		2185
1851	void	2186	void
1852	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2187	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)
1853	CODE:	2188	CODE:
1854	{	2189	{
1855	int x, y, z;	2190	int x, y, z;
1856		2191
1857	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2192	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1858	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2193	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2194	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1860	smooth_key skey;	2195	smooth_key skey;
1861	int pl_x, pl_y;	2196	int pl_x, pl_y;
1862	maptex pl_tex;	2197	maptex pl_tex;
1863	rc_t *rc = rc_alloc ();	2198	rc_t *rc = rc_alloc ();
		2199	rc_t *rc_ov = rc_alloc ();
1864	rc_key_t key;	2200	rc_key_t key;
1865	rc_array_t *arr;	2201	rc_array_t *arr;
1866		2202
1867	pl_tex.name = 0;	2203	pl_tex.name = 0;
1868		2204
1869	// thats current max. sorry.	2205	// that's current max. sorry.
1870	if (sw > 255) sw = 255;	2206	if (sw > 255) sw = 255;
1871	if (sh > 255) sh = 255;	2207	if (sh > 255) sh = 255;
1872		2208
1873	// clear key, in case of extra padding	2209	// clear key, in case of extra padding
1874	memset (&skey, 0, sizeof (skey));	2210	memset (&skey, 0, sizeof (skey));
…		…
1878	key.g = 255;	2214	key.g = 255;
1879	key.b = 255;	2215	key.b = 255;
1880	key.a = 255;	2216	key.a = 255;
1881	key.mode = GL_QUADS;	2217	key.mode = GL_QUADS;
1882	key.format = GL_T2F_V3F;	2218	key.format = GL_T2F_V3F;
1883	key.texname = -1;
1884		2219
1885	mx += self->x;	2220	mx += self->x;
1886	my += self->y;	2221	my += self->y;
1887		2222
1888	// first pass: determine smooth_max	2223	// first pass: determine smooth_max
…		…
1912	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2247	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913		2248
1914	for (z = 0; z <= 2; z++)	2249	for (z = 0; z <= 2; z++)
1915	{	2250	{
1916	memset (smooth_level, 0, sizeof (smooth_level));	2251	memset (smooth_level, 0, sizeof (smooth_level));
		2252	key.texname = -1;
1917		2253
1918	for (y = 0; y < sh; y++)	2254	for (y = 0; y < sh; y++)
1919	if (0 <= y + my && y + my < self->rows)	2255	if (0 <= y + my && y + my < self->rows)
1920	{	2256	{
1921	maprow *row = self->row + (y + my);	2257	maprow *row = self->row + (y + my);
…		…
1927	tileid tile = cell->tile [z];	2263	tileid tile = cell->tile [z];
1928		2264
1929	if (tile)	2265	if (tile)
1930	{	2266	{
1931	maptex tex = self->tex [tile];	2267	maptex tex = self->tex [tile];
1932	int px = (x + 1) * T - tex.w;	2268	int px, py;
1933	int py = (y + 1) * T - tex.h;
1934		2269
1935	if (key.texname != tex.name)	2270	if (key.texname != tex.name)
1936	{	2271	{
		2272	self->tex [tile].unused = 0;
		2273
1937	if (!tex.name)	2274	if (!tex.name)
1938	tex = self->tex [2]; /* missing, replace by noface */	2275	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939		2276
1940	key.texname = tex.name;	2277	key.texname = tex.name;
1941	arr = rc_array (rc, &key);	2278	arr = rc_array (rc, &key);
1942	}	2279	}
		2280
		2281	px = (x + 1) * Th - tex.w;
		2282	py = (y + 1) * Tw - tex.h;
1943		2283
1944	if (expect_false (cell->player == player) && expect_false (z == 2))	2284	if (expect_false (cell->player == player) && expect_false (z == 2))
1945	{	2285	{
1946	pl_x = px;	2286	pl_x = px;
1947	pl_y = py;	2287	pl_y = py;
…		…
1952	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2292	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2293	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2294	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2295	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956		2296
1957	if (expect_false (cell->flags) && expect_false (z == 2))
1958	{
1959	// overlays such as the speech bubble, probably more to come
1960	if (cell->flags & 1)
1961	{
1962	maptex tex = self->tex [1];
1963	int px = x * T + T * 2 / 32;
1964	int py = y * T - T * 6 / 32;
1965
1966	if (tex.name)
1967	{
1968	if (key.texname != tex.name)
1969	{
1970	key.texname = tex.name;
1971	arr = rc_array (rc, &key);
1972	}
1973
1974	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978	}
1979	}
1980	}
1981
1982	// update smooth hash	2297	// update smooth hash
1983	if (tex.smoothtile)	2298	if (tex.smoothtile)
1984	{	2299	{
1985	skey.tile = tex.smoothtile;	2300	skey.tile = tex.smoothtile;
1986	skey.level = tex.smoothlevel;	2301	skey.level = tex.smoothlevel;
…		…
2014	// corners	2329	// corners
2015	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2330	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2016	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2331	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2017	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2332	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2018	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2333	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2334	}
		2335	}
		2336
		2337	if (expect_false (z == 2) && expect_false (cell->flags))
		2338	{
		2339	// overlays such as the speech bubble, probably more to come
		2340	if (cell->flags & 1)
		2341	{
		2342	rc_key_t key_ov = key;
		2343	maptex tex = self->tex [TEXID_SPEECH];
		2344	rc_array_t *arr;
		2345	int px = x * Tw + Tw * 2 / 32;
		2346	int py = y * Th - Th * 6 / 32;
		2347
		2348	key_ov.texname = tex.name;
		2349	arr = rc_array (rc_ov, &key_ov);
		2350
		2351	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2352	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2353	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2354	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2019	}	2355	}
2020	}	2356	}
2021	}	2357	}
2022	}	2358	}
2023		2359
…		…
2050	if (!(bits & 0x1000)	2386	if (!(bits & 0x1000)
2051	&& skey->level == level	2387	&& skey->level == level
2052	&& level > smooth_max [skey->x][skey->y])	2388	&& level > smooth_max [skey->x][skey->y])
2053	{	2389	{
2054	maptex tex = self->tex [skey->tile];	2390	maptex tex = self->tex [skey->tile];
2055	int px = (((int)skey->x) - 1) * T;	2391	int px = (((int)skey->x) - 1) * Tw;
2056	int py = (((int)skey->y) - 1) * T;	2392	int py = (((int)skey->y) - 1) * Th;
2057	int border = bits & 15;	2393	int border = bits & 15;
2058	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2394	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059	float dx = tex.s * .0625f; // 16 images/row	2395	float dx = tex.s * .0625f; // 16 images/row
2060	float dy = tex.t * .5f ; // 2 images/column	2396	float dy = tex.t * .5f ; // 2 images/column
2061		2397
…		…
2063	{	2399	{
2064	// this time avoiding texture state changes	2400	// this time avoiding texture state changes
2065	// save gobs of state changes.	2401	// save gobs of state changes.
2066	if (key.texname != tex.name)	2402	if (key.texname != tex.name)
2067	{	2403	{
		2404	self->tex [skey->tile].unused = 0;
		2405
2068	glEnd ();	2406	glEnd ();
2069	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2407	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070	glBegin (GL_QUADS);	2408	glBegin (GL_QUADS);
2071	}	2409	}
2072		2410
2073	if (border)	2411	if (border)
2074	{	2412	{
2075	float ox = border * dx;	2413	float ox = border * dx;
2076		2414
2077	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2415	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081	}	2419	}
2082		2420
2083	if (corner)	2421	if (corner)
2084	{	2422	{
2085	float ox = corner * dx;	2423	float ox = corner * dx;
2086		2424
2087	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2425	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2426	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2427	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2428	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091	}	2429	}
2092	}	2430	}
2093	}	2431	}
2094	}	2432	}
2095	}	2433	}
…		…
2118	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2456	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119		2457
2120	rc_draw (rc);	2458	rc_draw (rc);
2121	}	2459	}
2122		2460
		2461	rc_draw (rc_ov);
		2462	rc_clear (rc_ov);
		2463
2123	glDisable (GL_BLEND);	2464	glDisable (GL_BLEND);
2124	rc_free (rc);	2465	rc_free (rc);
		2466	rc_free (rc_ov);
2125		2467
2126	// top layer: overlays such as the health bar	2468	// top layer: overlays such as the health bar
2127	for (y = 0; y < sh; y++)	2469	for (y = 0; y < sh; y++)
2128	if (0 <= y + my && y + my < self->rows)	2470	if (0 <= y + my && y + my < self->rows)
2129	{	2471	{
…		…
2132	for (x = 0; x < sw; x++)	2474	for (x = 0; x < sw; x++)
2133	if (row->c0 <= x + mx && x + mx < row->c1)	2475	if (row->c0 <= x + mx && x + mx < row->c1)
2134	{	2476	{
2135	mapcell *cell = row->col + (x + mx - row->c0);	2477	mapcell *cell = row->col + (x + mx - row->c0);
2136		2478
2137	int px = x * T;	2479	int px = x * Tw;
2138	int py = y * T;	2480	int py = y * Th;
		2481
		2482	if (expect_false (cell->player == player))
		2483	{
		2484	px += sdx;
		2485	py += sdy;
		2486	}
2139		2487
2140	if (cell->stat_hp)	2488	if (cell->stat_hp)
2141	{	2489	{
2142	int width = cell->stat_width * T;	2490	int width = cell->stat_width * Tw;
2143	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2491	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144		2492
2145	glColor3ub (0, 0, 0);	2493	glColor3ub (0, 0, 0);
2146	glRectf (px + 1, py - thick - 2,	2494	glRectf (px + 1, py - thick - 2,
2147	px + width - 1, py);	2495	px + width - 1, py);
2148		2496
…		…
2154	}	2502	}
2155	}	2503	}
2156	}	2504	}
2157		2505
2158	void	2506	void
2159	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2507	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2160	CODE:	2508	CODE:
2161	{	2509	{
2162	static float color[16][3] = {	2510	static float color[16][3] = {
2163	{ 0.00F, 0.00F, 0.00F },	2511	{ 0.00f, 0.00f, 0.00f },
2164	{ 1.00F, 1.00F, 1.00F },	2512	{ 1.00f, 1.00f, 1.00f },
2165	{ 0.00F, 0.00F, 0.55F },	2513	{ 0.00f, 0.00f, 0.55f },
2166	{ 1.00F, 0.00F, 0.00F },	2514	{ 1.00f, 0.00f, 0.00f },
2167		2515
2168	{ 1.00F, 0.54F, 0.00F },	2516	{ 1.00f, 0.54f, 0.00f },
2169	{ 0.11F, 0.56F, 1.00F },	2517	{ 0.11f, 0.56f, 1.00f },
2170	{ 0.93F, 0.46F, 0.00F },	2518	{ 0.93f, 0.46f, 0.00f },
2171	{ 0.18F, 0.54F, 0.34F },	2519	{ 0.18f, 0.54f, 0.34f },
2172		2520
2173	{ 0.56F, 0.73F, 0.56F },	2521	{ 0.56f, 0.73f, 0.56f },
2174	{ 0.80F, 0.80F, 0.80F },	2522	{ 0.80f, 0.80f, 0.80f },
2175	{ 0.55F, 0.41F, 0.13F },	2523	{ 0.55f, 0.41f, 0.13f },
2176	{ 0.99F, 0.77F, 0.26F },	2524	{ 0.99f, 0.77f, 0.26f },
2177		2525
2178	{ 0.74F, 0.65F, 0.41F },	2526	{ 0.74f, 0.65f, 0.41f },
2179		2527
2180	{ 0.00F, 1.00F, 1.00F },	2528	{ 0.00f, 1.00f, 1.00f },
2181	{ 1.00F, 0.00F, 1.00F },	2529	{ 1.00f, 0.00f, 1.00f },
2182	{ 1.00F, 1.00F, 0.00F },	2530	{ 1.00f, 1.00f, 0.00f },
2183	};	2531	};
2184		2532
2185	int x, y;	2533	int x, y;
2186		2534
2187	glEnable (GL_TEXTURE_2D);	2535	glEnable (GL_TEXTURE_2D);
		2536	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2537	* but the nvidia driver (185.18.14) mishandles alpha textures
		2538	* and takes the colour from god knows where instead of using
		2539	* Cp. MODULATE results in the same colour, but slightly different
		2540	* alpha, but atcually gives us the correct colour with nvidia.
		2541	*/
2188	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2542	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189	glEnable (GL_BLEND);	2543	glEnable (GL_BLEND);
2190	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2544	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191	glBegin (GL_QUADS);	2545	glBegin (GL_QUADS);
2192		2546
2193	for (y = 0; y < h; y++)	2547	for (y = 0; y < h; y++)
…		…
2197		2551
2198	if (m)	2552	if (m)
2199	{	2553	{
2200	float *c = color [m & 15];	2554	float *c = color [m & 15];
2201		2555
2202	float tx1 = m & 0x40 ? 0.5 : 0.;	2556	float tx1 = m & 0x40 ? 0.5f : 0.f;
2203	float tx2 = tx1 + 0.5;	2557	float tx2 = tx1 + 0.5f;
2204		2558
2205	glColor4f (c[0], c[1], c[2], 0.75);	2559	glColor4f (c[0], c[1], c[2], 1);
2206	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2560	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2561	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2562	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2563	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210	}	2564	}
…		…
2218	void	2572	void
2219	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2573	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2220	PPCODE:	2574	PPCODE:
2221	{	2575	{
2222	int x, y;	2576	int x, y;
2223	int sw1 = sw + 2;	2577	int sw1 = sw + 2;
2224	int sh1 = sh + 2;	2578	int sh1 = sh + 2;
2225	int sh3 = sh * 3;	2579	int sh3 = sh * 3;
2226	int sw34 = (sw * 3 + 3) & ~3;	2580	int sw3 = sw * 3;
		2581	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2582	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2227	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2583	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2228	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2584	memset (darkness1, 0, sw1*sh1);
2229	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2230		2585
2231	SvPOK_only (darkness3_sv);	2586	SvPOK_only (darkness3_sv);
2232	SvCUR_set (darkness3_sv, sw34 * sh3);	2587	SvCUR_set (darkness3_sv, sw3 * sh3);
2233		2588
2234	mx += self->x - 1;	2589	mx += self->x - 1;
2235	my += self->y - 1;	2590	my += self->y - 1;
2236
2237	memset (darkness1, 255, sw1 * sh1);
2238		2591
2239	for (y = 0; y < sh1; y++)	2592	for (y = 0; y < sh1; y++)
2240	if (0 <= y + my && y + my < self->rows)	2593	if (0 <= y + my && y + my < self->rows)
2241	{	2594	{
2242	maprow *row = self->row + (y + my);	2595	maprow *row = self->row + (y + my);
…		…
2245	if (row->c0 <= x + mx && x + mx < row->c1)	2598	if (row->c0 <= x + mx && x + mx < row->c1)
2246	{	2599	{
2247	mapcell *cell = row->col + (x + mx - row->c0);	2600	mapcell *cell = row->col + (x + mx - row->c0);
2248		2601
2249	darkness1 [y * sw1 + x] = cell->darkness	2602	darkness1 [y * sw1 + x] = cell->darkness
2250	? 255 - (cell->darkness - 1)	2603	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251	: 255 - FOW_DARKNESS;	2604	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252	}	2605	}
2253	}	2606	}
2254		2607
2255	for (y = 0; y < sh; ++y)	2608	for (y = 0; y < sh; ++y)
2256	for (x = 0; x < sw; ++x)	2609	for (x = 0; x < sw; ++x)
…		…
2275		2628
2276	uint8_t r13 = (d13 + d23 + d12) / 3;	2629	uint8_t r13 = (d13 + d23 + d12) / 3;
2277	uint8_t r23 = d23;	2630	uint8_t r23 = d23;
2278	uint8_t r33 = (d23 + d33 + d32) / 3;	2631	uint8_t r33 = (d23 + d33 + d32) / 3;
2279		2632
2280	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2633	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2634	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2635	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2636	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2637	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2285	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2638	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2639	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2640	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2641	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289	}	2642	}
2290		2643
2291	free (darkness1);	2644	free (darkness1);
2292		2645
2293	EXTEND (SP, 3);	2646	EXTEND (SP, 3);
2294	PUSHs (sv_2mortal (newSViv (sw34)));	2647	PUSHs (sv_2mortal (newSViv (sw3)));
2295	PUSHs (sv_2mortal (newSViv (sh3)));	2648	PUSHs (sv_2mortal (newSViv (sh3)));
2296	PUSHs (darkness3_sv);	2649	PUSHs (darkness3_sv);
2297	}	2650	}
2298		2651
2299	SV *	2652	SV *
…		…
2497	if (RETVAL < 0)	2850	if (RETVAL < 0)
2498	{	2851	{
2499	RETVAL = Mix_GroupOldest (-1);	2852	RETVAL = Mix_GroupOldest (-1);
2500		2853
2501	if (RETVAL < 0)	2854	if (RETVAL < 0)
		2855	{
		2856	// happens sometimes, maybe it just stopped playing(?)
		2857	RETVAL = Mix_GroupAvailable (-1);
		2858
		2859	if (RETVAL < 0)
2502	XSRETURN_UNDEF;	2860	XSRETURN_UNDEF;
2503		2861	}
		2862	else
2504	Mix_HaltChannel (RETVAL);	2863	Mix_HaltChannel (RETVAL);
2505	}	2864	}
2506		2865
2507	Mix_UnregisterAllEffects (RETVAL);	2866	Mix_UnregisterAllEffects (RETVAL);
2508	Mix_Volume (RETVAL, 128);	2867	Mix_Volume (RETVAL, 128);
2509	}	2868	}
…		…
2556	void	2915	void
2557	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2916	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558	CODE:	2917	CODE:
2559	{	2918	{
2560	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2919	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2920	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2562	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2921	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563	}	2922	}
2564		2923
2565	void	2924	void
2566	set_reverse_stereo (DC::Channel self, int flip)	2925	set_reverse_stereo (DC::Channel self, int flip)
…		…
2568	Mix_SetReverseStereo (self, flip);	2927	Mix_SetReverseStereo (self, flip);
2569		2928
2570	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2929	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571		2930
2572	PROTOTYPES: DISABLE	2931	PROTOTYPES: DISABLE
		2932
		2933	void
		2934	decoders ()
		2935	PPCODE:
		2936	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2937	int i, num = Mix_GetNumChunkDecoders ();
		2938	EXTEND (SP, num);
		2939	for (i = 0; i < num; ++i)
		2940	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2941	#else
		2942	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2943	#endif
2573		2944
2574	DC::MixChunk	2945	DC::MixChunk
2575	new (SV *class, DC::RW rwops)	2946	new (SV *class, DC::RW rwops)
2576	CODE:	2947	CODE:
2577	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2948	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2610	OUTPUT:	2981	OUTPUT:
2611	RETVAL	2982	RETVAL
2612		2983
2613	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2984	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614		2985
		2986	void
		2987	decoders ()
		2988	PPCODE:
		2989	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2990	int i, num = Mix_GetNumMusicDecoders ();
		2991	EXTEND (SP, num);
		2992	for (i = 0; i < num; ++i)
		2993	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2994	#else
		2995	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2996	#endif
		2997
2615	int	2998	int
2616	volume (int volume = -1)	2999	volume (int volume = -1)
2617	PROTOTYPE: ;$	3000	PROTOTYPE: ;$
2618	CODE:	3001	CODE:
2619	if (items > 0)	3002	if (items > 0)
…		…
2629		3012
2630	void	3013	void
2631	halt ()	3014	halt ()
2632	CODE:	3015	CODE:
2633	Mix_HaltMusic ();	3016	Mix_HaltMusic ();
		3017
		3018	int
		3019	playing ()
		3020	CODE:
		3021	RETVAL = Mix_PlayingMusic ();
		3022	OUTPUT:
		3023	RETVAL
2634		3024
2635	DC::MixMusic	3025	DC::MixMusic
2636	new (SV *class, DC::RW rwops)	3026	new (SV *class, DC::RW rwops)
2637	CODE:	3027	CODE:
2638	RETVAL = Mix_LoadMUS_RW (rwops);	3028	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2669	} *civ, const_iv[] = {	3059	} *civ, const_iv[] = {
2670	# define const_iv(name) { # name, (IV)name }	3060	# define const_iv(name) { # name, (IV)name }
2671	const_iv (GL_VENDOR),	3061	const_iv (GL_VENDOR),
2672	const_iv (GL_VERSION),	3062	const_iv (GL_VERSION),
2673	const_iv (GL_EXTENSIONS),	3063	const_iv (GL_EXTENSIONS),
		3064	const_iv (GL_MAX_TEXTURE_UNITS),
2674	const_iv (GL_COLOR_MATERIAL),	3065	const_iv (GL_COLOR_MATERIAL),
2675	const_iv (GL_SMOOTH),	3066	const_iv (GL_SMOOTH),
2676	const_iv (GL_FLAT),	3067	const_iv (GL_FLAT),
2677	const_iv (GL_DITHER),	3068	const_iv (GL_DITHER),
2678	const_iv (GL_BLEND),	3069	const_iv (GL_BLEND),
…		…
2690	const_iv (GL_ZERO),	3081	const_iv (GL_ZERO),
2691	const_iv (GL_SRC_ALPHA),	3082	const_iv (GL_SRC_ALPHA),
2692	const_iv (GL_DST_ALPHA),	3083	const_iv (GL_DST_ALPHA),
2693	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3084	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694	const_iv (GL_ONE_MINUS_DST_ALPHA),	3085	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3086	const_iv (GL_SRC_COLOR),
		3087	const_iv (GL_DST_COLOR),
		3088	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3089	const_iv (GL_ONE_MINUS_DST_COLOR),
2695	const_iv (GL_SRC_ALPHA_SATURATE),	3090	const_iv (GL_SRC_ALPHA_SATURATE),
2696	const_iv (GL_RGB),	3091	const_iv (GL_RGB),
2697	const_iv (GL_RGBA),	3092	const_iv (GL_RGBA),
2698	const_iv (GL_RGBA4),	3093	const_iv (GL_RGBA4),
2699	const_iv (GL_RGBA8),	3094	const_iv (GL_RGBA8),
…		…
2767	const_iv (GL_NICEST),	3162	const_iv (GL_NICEST),
2768	const_iv (GL_V2F),	3163	const_iv (GL_V2F),
2769	const_iv (GL_V3F),	3164	const_iv (GL_V3F),
2770	const_iv (GL_T2F_V3F),	3165	const_iv (GL_T2F_V3F),
2771	const_iv (GL_T2F_N3F_V3F),	3166	const_iv (GL_T2F_N3F_V3F),
		3167	const_iv (GL_FUNC_ADD),
		3168	const_iv (GL_FUNC_SUBTRACT),
		3169	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2772	# undef const_iv	3170	# undef const_iv
2773	};	3171	};
2774		3172
2775	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3173	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2776	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3174	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777		3175
2778	texture_av = newAV ();	3176	texture_av = newAV ();
2779	AvREAL_off (texture_av);	3177	AvREAL_off (texture_av);
2780	}	3178	}
2781		3179
2782	void	3180	void
2783	disable_GL_EXT_blend_func_separate ()	3181	disable_GL_EXT_blend_func_separate ()
2784	CODE:	3182	CODE:
2785	gl.BlendFuncSeparate = 0;	3183	gl.BlendFuncSeparate = 0;
2786	gl.BlendFuncSeparateEXT = 0;	3184	gl.BlendFuncSeparateEXT = 0;
		3185
		3186	void
		3187	apple_nvidia_bug (int enable)
2787		3188
2788	char *	3189	char *
2789	gl_vendor ()	3190	gl_vendor ()
2790	CODE:	3191	CODE:
2791	RETVAL = (char *)glGetString (GL_VENDOR);	3192	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2822		3223
2823	int glGetError ()	3224	int glGetError ()
2824		3225
2825	void glFinish ()	3226	void glFinish ()
2826		3227
		3228	void glFlush ()
		3229
2827	void glClear (int mask)	3230	void glClear (int mask)
2828		3231
2829	void glClearColor (float r, float g, float b, float a = 1.0)	3232	void glClearColor (float r, float g, float b, float a = 1.0)
2830	PROTOTYPE: @	3233	PROTOTYPE: @
2831		3234
…		…
2840	void glBlendFunc (int sfactor, int dfactor)	3243	void glBlendFunc (int sfactor, int dfactor)
2841		3244
2842	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3245	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843	CODE:	3246	CODE:
2844	gl_BlendFuncSeparate (sa, da, saa, daa);	3247	gl_BlendFuncSeparate (sa, da, saa, daa);
		3248
		3249	# void glBlendEquation (int se)
2845		3250
2846	void glDepthMask (int flag)	3251	void glDepthMask (int flag)
2847		3252
2848	void glLogicOp (int opcode)	3253	void glLogicOp (int opcode)
2849		3254
…		…
2884	void glRotate (float angle, float x, float y, float z)	3289	void glRotate (float angle, float x, float y, float z)
2885	CODE:	3290	CODE:
2886	glRotatef (angle, x, y, z);	3291	glRotatef (angle, x, y, z);
2887		3292
2888	void glColor (float r, float g, float b, float a = 1.0)	3293	void glColor (float r, float g, float b, float a = 1.0)
		3294	PROTOTYPE: @
2889	ALIAS:	3295	ALIAS:
2890	glColor_premultiply = 1	3296	glColor_premultiply = 1
2891	CODE:	3297	CODE:
2892	if (ix)	3298	if (ix)
2893	{	3299	{
…		…
2998	void glNewList (int list, int mode = GL_COMPILE)	3404	void glNewList (int list, int mode = GL_COMPILE)
2999		3405
3000	void glEndList ()	3406	void glEndList ()
3001		3407
3002	void glCallList (int list)	3408	void glCallList (int list)
		3409
		3410	void c_init ()
		3411	CODE:
		3412	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3413	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3003		3414
3004	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3415	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005		3416
3006	PROTOTYPES: DISABLE	3417	PROTOTYPES: DISABLE
3007		3418

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.266 by root, Sun Jul 20 02:51:40 2008 UTC vs. Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.266 by root, Sun Jul 20 02:51:40 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC