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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.300 by root, Thu Dec 24 10:47:45 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
935
936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938	}	968	}
939	}	969	}
940	OUTPUT:	970	OUTPUT:
941	RETVAL	971	RETVAL
942		972
943	void	973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
		975
		976	void
944	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
945		978
946	char *	979	char *
947	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
948		982
949	int	983	int
950	SDL_GetAppState ()	984	SDL_GetAppState ()
951		985
952	int	986	int
953	SDL_GetModState ()	987	SDL_GetModState ()
954		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
955	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
956	poll_events ()	997	peep_events ()
957	PPCODE:	998	PPCODE:
958	{	999	{
959	SDL_Event ev;	1000	SDL_Event ev;
960		1001
961	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1027		1068
1028	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))));
1029	}	1070	}
1030	}	1071	}
1031		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
1032	int	1086	int
1033	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)
1034	POSTCALL:	1088	POSTCALL:
1035	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1036	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1098	add_font (char *file)	1152	add_font (char *file)
1099	CODE:	1153	CODE:
1100	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101	OUTPUT:	1155	OUTPUT:
1102	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)
1103		1164
1104	void	1165	void
1105	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1106	ALIAS:	1167	ALIAS:
1107	load_image_file = 1	1168	load_image_file = 1
…		…
1153		1214
1154	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1155	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1156	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1157	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1158	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1159	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)));
1160	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1163		1224
…		…
1235	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1236		1297
1237	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1238		1299
1239	DC::Font	1300	DC::Font
1240	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1241	CODE:	1302	CODE:
1242	{	1303	{
1243	int count;	1304	int count;
1244	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1245	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1274	PROTOTYPE:	1335	PROTOTYPE:
1275	CODE:	1336	CODE:
1276	tc_restore ();	1337	tc_restore ();
1277		1338
1278	DC::Layout	1339	DC::Layout
1279	new (SV *class)	1340	new (SV *klass)
1280	CODE:	1341	CODE:
1281	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1282		1343
1283	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1284	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1433		1494
1434	void	1495	void
1435	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1436	CODE:	1497	CODE:
1437	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1438	{	1499	{
1439	self->base_height = base_height;	1500	self->base_height = base_height;
1440	layout_update_font (self);	1501	layout_update_font (self);
1441	}	1502	}
1442		1503
1443	void	1504	void
…		…
1807	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1808		1869
1809	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1810		1871
1811	DC::Map	1872	DC::Map
1812	new (SV *class)	1873	new (SV *klass)
1813	CODE:	1874	CODE:
1814	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1815	RETVAL->x = 0;	1876	RETVAL->x = 0;
1816	RETVAL->y = 0;	1877	RETVAL->y = 0;
1817	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1973	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1974	}	2035	}
1975	}	2036	}
1976		2037
1977	SV *	2038	SV *
1978	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1979	CODE:	2040	CODE:
1980	{	2041	{
1981	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1982	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1983	mapcell *cell;	2044	mapcell *cell;
…		…
2004		2065
2005	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
2006		2067
2007	if (flags & 8)	2068	if (flags & 8)
2008	{	2069	{
		2070	uint8_t ext, cmd;
		2071
2009	if (extmap)	2072	do
2010	{	2073	{
2011	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
2012		2076
2013	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
2014	{	2080	{
2015	ext = *data++;
2016	cmd = ext & 0x7f;
2017
2018	if (cmd < 4)
2019	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2020	else if (cmd == 5) // health
2021	{
2022	cell->stat_width = 1;	2081	cell->stat_width = 1;
2023	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
2024	}
2025	else if (cmd == 6) // monster width
2026	cell->stat_width = *data++ + 1;
2027	else if (cmd == 0x47)
2028	{
2029	if (*data == 1) cell->player = data [1];
2030	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2033
2034	data += *data + 1;
2035	}
2036	else if (cmd == 8) // cell flags
2037	cell->flags = *data++;
2038	else if (ext & 0x40) // unknown, multibyte => skip
2039	data += *data + 1;
2040	else
2041	data++;
2042	}	2083	}
2043	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++;
2044	}	2101	}
2045	else	2102	while (ext & 0x80);
2046	cell->darkness = *data++ + 1;
2047	}	2103	}
2048		2104
2049	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2050	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2051	{	2107	{
…		…
2099	? self->row + y	2155	? self->row + y
2100	: 0;	2156	: 0;
2101		2157
2102	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
2103	{	2159	{
2104	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2105		2161
2106	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2107	{	2163	{
2108	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2109		2165
…		…
2111	{	2167	{
2112	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2113	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2114	int a1 = tex.a;	2170	int a1 = tex.a;
2115		2171
2116	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2117	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2118	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2119	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2120	}	2176	}
2121	}	2177	}
2122		2178
2123	*map++ = (r )	2179	*map++ = (r )
2124	\| (g << 8)	2180	\| (g << 8)
…		…
2131	}	2187	}
2132	OUTPUT:	2188	OUTPUT:
2133	RETVAL	2189	RETVAL
2134		2190
2135	void	2191	void
2136	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)
2137	CODE:	2193	CODE:
2138	{	2194	{
2139	int x, y, z;	2195	int x, y, z;
2140		2196
2141	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2225		2281
2226	key.texname = tex.name;	2282	key.texname = tex.name;
2227	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2228	}	2284	}
2229		2285
2230	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2231	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2232		2288
2233	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2234	{	2290	{
2235	pl_x = px;	2291	pl_x = px;
2236	pl_y = py;	2292	pl_y = py;
…		…
2289	if (cell->flags & 1)	2345	if (cell->flags & 1)
2290	{	2346	{
2291	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2292	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2293	rc_array_t *arr;	2349	rc_array_t *arr;
2294	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2295	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2296		2352
2297	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2298	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2299		2355
2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2302	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);
2303	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2304	}	2360	}
2305	}	2361	}
2306	}	2362	}
2307	}	2363	}
2308		2364
…		…
2335	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2336	&& skey->level == level	2392	&& skey->level == level
2337	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2338	{	2394	{
2339	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2340	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2341	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2342	int border = bits & 15;	2398	int border = bits & 15;
2343	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2344	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2345	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2346		2402
…		…
2359		2415
2360	if (border)	2416	if (border)
2361	{	2417	{
2362	float ox = border * dx;	2418	float ox = border * dx;
2363		2419
2364	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368	}	2424	}
2369		2425
2370	if (corner)	2426	if (corner)
2371	{	2427	{
2372	float ox = corner * dx;	2428	float ox = corner * dx;
2373		2429
2374	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378	}	2434	}
2379	}	2435	}
2380	}	2436	}
2381	}	2437	}
2382	}	2438	}
…		…
2423	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2424	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2425	{	2481	{
2426	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2427		2483
2428	int px = x * T;	2484	int px = x * Tw;
2429	int py = y * T;	2485	int py = y * Th;
2430		2486
2431	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2432	{	2488	{
2433	px += sdx;	2489	px += sdx;
2434	py += sdy;	2490	py += sdy;
2435	}	2491	}
2436		2492
2437	if (cell->stat_hp)	2493	if (cell->stat_hp)
2438	{	2494	{
2439	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2440	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441		2497
2442	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2443	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2444	px + width - 1, py);	2500	px + width - 1, py);
2445		2501
…		…
2525	int x, y;	2581	int x, y;
2526	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2527	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2528	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2529	int sw3 = sw * 3;	2585	int sw3 = sw * 3;
2530	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2531	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2586	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2532	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);
2533		2590
2534	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2535	SvCUR_set (darkness3_sv, sw3 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2536		2593
2537	mx += self->x - 1;	2594	mx += self->x - 1;
…		…
2687	STRLEN len;	2744	STRLEN len;
2688	uint8_t data, end;	2745	uint8_t data, end;
2689		2746
2690	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2691	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693	end = data + len + 8;	2750	end = data + len + 8;
2694		2751
2695	if (len < 5)	2752	if (len < 5)
2696	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2697		2754
…		…
2758	}	2815	}
2759		2816
2760	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2761		2818
2762	DC::RW	2819	DC::RW
2763	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2764	CODE:	2821	CODE:
2765	{	2822	{
2766	STRLEN datalen;	2823	STRLEN datalen;
2767	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2768		2825
…		…
2770	}	2827	}
2771	OUTPUT:	2828	OUTPUT:
2772	RETVAL	2829	RETVAL
2773		2830
2774	DC::RW	2831	DC::RW
2775	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")
2776	CODE:	2833	CODE:
2777	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2778	OUTPUT:	2835	OUTPUT:
2779	RETVAL	2836	RETVAL
2780		2837
…		…
2798	if (RETVAL < 0)	2855	if (RETVAL < 0)
2799	{	2856	{
2800	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2801		2858
2802	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)
2803	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2804		2866	}
		2867	else
2805	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2806	}	2869	}
2807		2870
2808	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2809	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2810	}	2873	}
…		…
2870		2933
2871	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2872		2935
2873	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2874		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
2875	DC::MixChunk	2950	DC::MixChunk
2876	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2877	CODE:	2952	CODE:
2878	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2879	OUTPUT:	2954	OUTPUT:
2880	RETVAL	2955	RETVAL
2881		2956
…		…
2911	OUTPUT:	2986	OUTPUT:
2912	RETVAL	2987	RETVAL
2913		2988
2914	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2915		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
2916	int	3003	int
2917	volume (int volume = -1)	3004	volume (int volume = -1)
2918	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2919	CODE:	3006	CODE:
2920	if (items > 0)	3007	if (items > 0)
…		…
2931	void	3018	void
2932	halt ()	3019	halt ()
2933	CODE:	3020	CODE:
2934	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2935		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2936	DC::MixMusic	3030	DC::MixMusic
2937	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2938	CODE:	3032	CODE:
2939	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2940	OUTPUT:	3034	OUTPUT:
2941	RETVAL	3035	RETVAL
2942		3036
…		…
3079	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
3080	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3081	# undef const_iv	3175	# undef const_iv
3082	};	3176	};
3083		3177
3084	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--)
3085	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3086		3180
3087	texture_av = newAV ();	3181	texture_av = newAV ();
3088	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3089	}	3183	}
3090		3184
…		…
3095	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3096		3190
3097	void	3191	void
3098	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3099		3193
3100	char *	3194	const char *
3101	gl_vendor ()	3195	gl_vendor ()
3102	CODE:	3196	CODE:
3103	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3104	OUTPUT:	3198	OUTPUT:
3105	RETVAL	3199	RETVAL
3106		3200
3107	char *	3201	const char *
3108	gl_version ()	3202	gl_version ()
3109	CODE:	3203	CODE:
3110	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3111	OUTPUT:	3205	OUTPUT:
3112	RETVAL	3206	RETVAL
3113		3207
3114	char *	3208	const char *
3115	gl_extensions ()	3209	gl_extensions ()
3116	CODE:	3210	CODE:
3117	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3118	OUTPUT:	3212	OUTPUT:
3119	RETVAL	3213	RETVAL
3120		3214
3121	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3122		3220
3123	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3124	CODE:	3222	CODE:
3125	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3126	OUTPUT:	3224	OUTPUT:
…		…
3133	RETVAL	3231	RETVAL
3134		3232
3135	int glGetError ()	3233	int glGetError ()
3136		3234
3137	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3138		3238
3139	void glClear (int mask)	3239	void glClear (int mask)
3140		3240
3141	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)
3142	PROTOTYPE: @	3242	PROTOTYPE: @

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.300 by root, Thu Dec 24 10:47:45 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.300 by root, Thu Dec 24 10:47:45 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC