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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

…		…
48	#endif	48	#endif
49		49
50	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
52		52
53	#include <glib/gmacros.h>	53	#include <glib.h>
54		54
55	#include <pango/pango.h>	55	#include <pango/pango.h>
56		56
57	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
100	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
101		101
102	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
104		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	}
		123
105	static AV *texture_av;	124	static AV *texture_av;
106		125
107	static struct	126	static struct
108	{	127	{
109	#define GL_FUNC(ptr,name) ptr name;	128	#define GL_FUNC(ptr,name) ptr name;
…		…
165	{	184	{
166	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
167		186
168	while (attrs)	187	while (attrs)
169	{	188	{
170	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
171		190
172	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
173	return 1;	192	return 1;
174		193
175	attrs = attrs->next;	194	attrs = attrs->next;
…		…
193	static void	212	static void
194	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
195	{	214	{
196	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
197	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
198	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199	#endif	218	#endif
200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201	}	220	}
202		221
203	static void	222	static void
…		…
463		482
464	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
465	}	484	}
466		485
467	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
468	minpot (unsigned int n)	493	minpot (unsigned int n)
469	{	494	{
470	if (!n)	495	if (!n)
471	return 0;	496	return 0;
472		497
…		…
552		577
553	return mod;	578	return mod;
554	}	579	}
555		580
556	static void	581	static void
557	deliantra_main ()	582	deliantra_main (SV *real_main)
558	{	583	{
559	char *argv[] = { 0 };	584	dSP;
560	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
561	}	588	}
562		589
563	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
564	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
565	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
566	* on OS X, so... we provide one and call the original main(), which,	595	* on OS X, so... we provide one and call the original main(), which,
567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
568	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
569	*/	598	*/
570	extern C_LINKAGE int	599	extern C_LINKAGE int
571	main (int argc, char *argv[])	600	main (int argc, char *argv[])
572	{	601	{
573	deliantra_main ();	602	deliantra_main (real_main);
574	}	603	}
575		604
576	#undef main	605	#undef main
577		606
578	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
579		608
580	static void	609	static void
581	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
582	{	611	{
		612	real_main = real_main_;
		613
583	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
584	(main) (1, argv);	615	(main) (1, argv);
585	}	616	}
586	#else	617	#else
587	static void	618	static void
588	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
589	{	620	{
590	deliantra_main ();	621	deliantra_main (real_main);
591	}	622	}
592	#endif	623	#endif
593		624
594	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
595		626
…		…
796		827
797	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
798	# undef const_iv	829	# undef const_iv
799	};	830	};
800		831
801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	832	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803		834
804	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806	}	837	}
807		838
…		…
846	#endif	877	#endif
847	}	878	}
848		879
849	char *SDL_GetError ()	880	char *SDL_GetError ()
850		881
851	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
852		884
853	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
854		886
855	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
856		888
857	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
858		890
859	void SDL_Quit ()	891	void SDL_Quit ()
860		892
861	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
862		895
863	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
864	CODE:	897	CODE:
865	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
867	OUTPUT:	900	OUTPUT:
868	RETVAL	901	RETVAL
869		902
870	void	903	void
…		…
925	);	958	);
926		959
927	if (RETVAL)	960	if (RETVAL)
928	{	961	{
929	av_clear (texture_av);	962	av_clear (texture_av);
930
931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	963	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933	#include "glfunc.h"	964	#include "glfunc.h"
934	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
935	}	968	}
936	}	969	}
937	OUTPUT:	970	OUTPUT:
938	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
939		975
940	void	976	void
941	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
942		978
943	char *	979	char *
944	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
945		982
946	int	983	int
947	SDL_GetAppState ()	984	SDL_GetAppState ()
948		985
949	int	986	int
950	SDL_GetModState ()	987	SDL_GetModState ()
951		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
952	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
953	poll_events ()	997	peep_events ()
954	PPCODE:	998	PPCODE:
955	{	999	{
956	SDL_Event ev;	1000	SDL_Event ev;
957		1001
958	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1024		1068
1025	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1069	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1026	}	1070	}
1027	}	1071	}
1028		1072
		1073	char *
		1074	SDL_AudioDriverName ()
		1075	CODE:
		1076	{
		1077	char buf [256];
		1078	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1079	XSRETURN_UNDEF;
		1080
		1081	RETVAL = buf;
		1082	}
		1083	OUTPUT:
		1084	RETVAL
		1085
1029	int	1086	int
1030	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1087	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1031	POSTCALL:	1088	POSTCALL:
1032	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1033	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1095	add_font (char *file)	1152	add_font (char *file)
1096	CODE:	1153	CODE:
1097	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098	OUTPUT:	1155	OUTPUT:
1099	RETVAL	1156	RETVAL
		1157
		1158	void
		1159	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1160
		1161	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1162	void
		1163	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1100		1164
1101	void	1165	void
1102	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1103	ALIAS:	1167	ALIAS:
1104	load_image_file = 1	1168	load_image_file = 1
…		…
1150		1214
1151	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1152	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1153	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1154	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1155	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1156	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1220	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1157	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1158	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1159	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1160		1224
…		…
1232	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1233		1297
1234	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1235		1299
1236	DC::Font	1300	DC::Font
1237	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1238	CODE:	1302	CODE:
1239	{	1303	{
1240	int count;	1304	int count;
1241	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1242	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1271	PROTOTYPE:	1335	PROTOTYPE:
1272	CODE:	1336	CODE:
1273	tc_restore ();	1337	tc_restore ();
1274		1338
1275	DC::Layout	1339	DC::Layout
1276	new (SV *class)	1340	new (SV *klass)
1277	CODE:	1341	CODE:
1278	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1279		1343
1280	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1281	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1430		1494
1431	void	1495	void
1432	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1433	CODE:	1497	CODE:
1434	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1435	{	1499	{
1436	self->base_height = base_height;	1500	self->base_height = base_height;
1437	layout_update_font (self);	1501	layout_update_font (self);
1438	}	1502	}
1439		1503
1440	void	1504	void
…		…
1672	void	1736	void
1673	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)	1737	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
1674	PROTOTYPE: @	1738	PROTOTYPE: @
1675	CODE:	1739	CODE:
1676	{	1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677	glEnable (GL_TEXTURE_2D);	1743	glEnable (GL_TEXTURE_2D);
1678	glEnable (GL_BLEND);
1679	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680	glBindTexture (GL_TEXTURE_2D, name1);	1744	glBindTexture (GL_TEXTURE_2D, name1);
1681		1745
1682	glColor3f (intensity, intensity, intensity);	1746	glColor3f (intensity, intensity, intensity);
1683	glPushMatrix ();	1747	glPushMatrix ();
1684	glScalef (1./3, 1./3, 1.);	1748	glScalef (1./3, 1./3, 1.);
…		…
1699	glBindTexture (GL_TEXTURE_2D, name2);	1763	glBindTexture (GL_TEXTURE_2D, name2);
1700	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701		1765
1702	/* rgb == rgb(glcolor) */	1766	/* rgb == rgb(glcolor) */
1703	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1705	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706		1770
1707	/* alpha = interpolate t0, t1 by env_alpha */	1771	/* alpha = interpolate t0, t1 by env_alpha */
1708	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709		1773
…		…
1804	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1805		1869
1806	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1807		1871
1808	DC::Map	1872	DC::Map
1809	new (SV *class)	1873	new (SV *klass)
1810	CODE:	1874	CODE:
1811	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1812	RETVAL->x = 0;	1876	RETVAL->x = 0;
1813	RETVAL->y = 0;	1877	RETVAL->y = 0;
1814	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1970	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1971	}	2035	}
1972	}	2036	}
1973		2037
1974	SV *	2038	SV *
1975	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1976	CODE:	2040	CODE:
1977	{	2041	{
1978	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1979	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1980	mapcell *cell;	2044	mapcell *cell;
…		…
2001		2065
2002	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
2003		2067
2004	if (flags & 8)	2068	if (flags & 8)
2005	{	2069	{
		2070	uint8_t ext, cmd;
		2071
2006	if (extmap)	2072	do
2007	{	2073	{
2008	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
2009		2076
2010	do	2077	if (cmd < 4)
		2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2079	else if (cmd == 5) // health
2011	{	2080	{
2012	ext = *data++;
2013	cmd = ext & 0x7f;
2014
2015	if (cmd < 4)
2016	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2017	else if (cmd == 5) // health
2018	{
2019	cell->stat_width = 1;	2081	cell->stat_width = 1;
2020	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
2021	}
2022	else if (cmd == 6) // monster width
2023	cell->stat_width = *data++ + 1;
2024	else if (cmd == 0x47)
2025	{
2026	if (*data == 1) cell->player = data [1];
2027	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2030
2031	data += *data + 1;
2032	}
2033	else if (cmd == 8) // cell flags
2034	cell->flags = *data++;
2035	else if (ext & 0x40) // unknown, multibyte => skip
2036	data += *data + 1;
2037	else
2038	data++;
2039	}	2083	}
2040	while (ext & 0x80);	2084	else if (cmd == 6) // monster width
		2085	cell->stat_width = *data++ + 1;
		2086	else if (cmd == 0x47)
		2087	{
		2088	if (*data == 1) cell->player = data [1];
		2089	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2090	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2091	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2092
		2093	data += *data + 1;
		2094	}
		2095	else if (cmd == 8) // cell flags
		2096	cell->flags = *data++;
		2097	else if (ext & 0x40) // unknown, multibyte => skip
		2098	data += *data + 1;
		2099	else
		2100	data++;
2041	}	2101	}
2042	else	2102	while (ext & 0x80);
2043	cell->darkness = *data++ + 1;
2044	}	2103	}
2045		2104
2046	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2047	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2048	{	2107	{
…		…
2096	? self->row + y	2155	? self->row + y
2097	: 0;	2156	: 0;
2098		2157
2099	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
2100	{	2159	{
2101	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2102		2161
2103	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2104	{	2163	{
2105	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2106		2165
…		…
2108	{	2167	{
2109	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2110	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2111	int a1 = tex.a;	2170	int a1 = tex.a;
2112		2171
2113	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2114	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2115	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2116	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2117	}	2176	}
2118	}	2177	}
2119		2178
2120	*map++ = (r )	2179	*map++ = (r )
2121	\| (g << 8)	2180	\| (g << 8)
…		…
2128	}	2187	}
2129	OUTPUT:	2188	OUTPUT:
2130	RETVAL	2189	RETVAL
2131		2190
2132	void	2191	void
2133	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2192	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2134	CODE:	2193	CODE:
2135	{	2194	{
2136	int x, y, z;	2195	int x, y, z;
2137		2196
2138	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2222		2281
2223	key.texname = tex.name;	2282	key.texname = tex.name;
2224	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2225	}	2284	}
2226		2285
2227	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2228	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2229		2288
2230	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2231	{	2290	{
2232	pl_x = px;	2291	pl_x = px;
2233	pl_y = py;	2292	pl_y = py;
…		…
2286	if (cell->flags & 1)	2345	if (cell->flags & 1)
2287	{	2346	{
2288	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2289	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2290	rc_array_t *arr;	2349	rc_array_t *arr;
2291	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2292	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2293		2352
2294	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2295	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2296		2355
2297	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2299	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2358	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2300	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2301	}	2360	}
2302	}	2361	}
2303	}	2362	}
2304	}	2363	}
2305		2364
…		…
2332	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2333	&& skey->level == level	2392	&& skey->level == level
2334	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2335	{	2394	{
2336	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2337	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2338	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2339	int border = bits & 15;	2398	int border = bits & 15;
2340	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2341	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2342	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2343		2402
…		…
2356		2415
2357	if (border)	2416	if (border)
2358	{	2417	{
2359	float ox = border * dx;	2418	float ox = border * dx;
2360		2419
2361	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2362	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2363	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2364	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2365	}	2424	}
2366		2425
2367	if (corner)	2426	if (corner)
2368	{	2427	{
2369	float ox = corner * dx;	2428	float ox = corner * dx;
2370		2429
2371	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2372	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2373	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2374	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2375	}	2434	}
2376	}	2435	}
2377	}	2436	}
2378	}	2437	}
2379	}	2438	}
…		…
2420	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2421	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2422	{	2481	{
2423	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2424		2483
2425	int px = x * T;	2484	int px = x * Tw;
2426	int py = y * T;	2485	int py = y * Th;
2427		2486
2428	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2429	{	2488	{
2430	px += sdx;	2489	px += sdx;
2431	py += sdy;	2490	py += sdy;
2432	}	2491	}
2433		2492
2434	if (cell->stat_hp)	2493	if (cell->stat_hp)
2435	{	2494	{
2436	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2437	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2438		2497
2439	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2440	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2441	px + width - 1, py);	2500	px + width - 1, py);
2442		2501
…		…
2522	int x, y;	2581	int x, y;
2523	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2524	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2525	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2526	int sw3 = sw * 3;	2585	int sw3 = sw * 3;
2527	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2528	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2586	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2529	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2587	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2589	memset (darkness1, 0, sw1*sh1);
2530		2590
2531	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2532	SvCUR_set (darkness3_sv, sw3 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2533		2593
2534	mx += self->x - 1;	2594	mx += self->x - 1;
…		…
2684	STRLEN len;	2744	STRLEN len;
2685	uint8_t data, end;	2745	uint8_t data, end;
2686		2746
2687	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2688	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2690	end = data + len + 8;	2750	end = data + len + 8;
2691		2751
2692	if (len < 5)	2752	if (len < 5)
2693	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2694		2754
…		…
2755	}	2815	}
2756		2816
2757	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2758		2818
2759	DC::RW	2819	DC::RW
2760	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2761	CODE:	2821	CODE:
2762	{	2822	{
2763	STRLEN datalen;	2823	STRLEN datalen;
2764	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2765		2825
…		…
2767	}	2827	}
2768	OUTPUT:	2828	OUTPUT:
2769	RETVAL	2829	RETVAL
2770		2830
2771	DC::RW	2831	DC::RW
2772	new_from_file (SV class, const char path, const char *mode = "rb")	2832	new_from_file (SV klass, const char path, const char *mode = "rb")
2773	CODE:	2833	CODE:
2774	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2775	OUTPUT:	2835	OUTPUT:
2776	RETVAL	2836	RETVAL
2777		2837
…		…
2795	if (RETVAL < 0)	2855	if (RETVAL < 0)
2796	{	2856	{
2797	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2798		2858
2799	if (RETVAL < 0)	2859	if (RETVAL < 0)
		2860	{
		2861	// happens sometimes, maybe it just stopped playing(?)
		2862	RETVAL = Mix_GroupAvailable (-1);
		2863
		2864	if (RETVAL < 0)
2800	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2801		2866	}
		2867	else
2802	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2803	}	2869	}
2804		2870
2805	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2806	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2807	}	2873	}
…		…
2867		2933
2868	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869		2935
2870	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2871		2937
		2938	void
		2939	decoders ()
		2940	PPCODE:
		2941	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2942	int i, num = Mix_GetNumChunkDecoders ();
		2943	EXTEND (SP, num);
		2944	for (i = 0; i < num; ++i)
		2945	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2946	#else
		2947	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2948	#endif
		2949
2872	DC::MixChunk	2950	DC::MixChunk
2873	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2874	CODE:	2952	CODE:
2875	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2876	OUTPUT:	2954	OUTPUT:
2877	RETVAL	2955	RETVAL
2878		2956
…		…
2908	OUTPUT:	2986	OUTPUT:
2909	RETVAL	2987	RETVAL
2910		2988
2911	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2912		2990
		2991	void
		2992	decoders ()
		2993	PPCODE:
		2994	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2995	int i, num = Mix_GetNumMusicDecoders ();
		2996	EXTEND (SP, num);
		2997	for (i = 0; i < num; ++i)
		2998	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2999	#else
		3000	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3001	#endif
		3002
2913	int	3003	int
2914	volume (int volume = -1)	3004	volume (int volume = -1)
2915	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2916	CODE:	3006	CODE:
2917	if (items > 0)	3007	if (items > 0)
…		…
2928	void	3018	void
2929	halt ()	3019	halt ()
2930	CODE:	3020	CODE:
2931	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2932		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2933	DC::MixMusic	3030	DC::MixMusic
2934	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2935	CODE:	3032	CODE:
2936	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2937	OUTPUT:	3034	OUTPUT:
2938	RETVAL	3035	RETVAL
2939		3036
…		…
3076	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
3077	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3078	# undef const_iv	3175	# undef const_iv
3079	};	3176	};
3080		3177
3081	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3178	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3082	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3083		3180
3084	texture_av = newAV ();	3181	texture_av = newAV ();
3085	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3086	}	3183	}
3087		3184
…		…
3092	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3093		3190
3094	void	3191	void
3095	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3096		3193
3097	char *	3194	const char *
3098	gl_vendor ()	3195	gl_vendor ()
3099	CODE:	3196	CODE:
3100	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3101	OUTPUT:	3198	OUTPUT:
3102	RETVAL	3199	RETVAL
3103		3200
3104	char *	3201	const char *
3105	gl_version ()	3202	gl_version ()
3106	CODE:	3203	CODE:
3107	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3108	OUTPUT:	3205	OUTPUT:
3109	RETVAL	3206	RETVAL
3110		3207
3111	char *	3208	const char *
3112	gl_extensions ()	3209	gl_extensions ()
3113	CODE:	3210	CODE:
3114	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3115	OUTPUT:	3212	OUTPUT:
3116	RETVAL	3213	RETVAL
3117		3214
3118	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3119		3220
3120	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3121	CODE:	3222	CODE:
3122	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3123	OUTPUT:	3224	OUTPUT:
…		…
3130	RETVAL	3231	RETVAL
3131		3232
3132	int glGetError ()	3233	int glGetError ()
3133		3234
3134	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3135		3238
3136	void glClear (int mask)	3239	void glClear (int mask)
3137		3240
3138	void glClearColor (float r, float g, float b, float a = 1.0)	3241	void glClearColor (float r, float g, float b, float a = 1.0)
3139	PROTOTYPE: @	3242	PROTOTYPE: @

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs. Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC