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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.272 by root, Tue Aug 19 17:38:29 2008 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
49	#include <pango/pango.h>	54	#include <pango/pango.h>
50		55
51	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))	56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly	61	# define pango_layout_get_line_readonly pango_layout_get_line
53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly	62	# define pango_layout_get_lines_readonly pango_layout_get_lines
54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly	63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly	64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56	#endif	65	#endif
57		66
58	#ifndef _WIN32	67	#ifndef _WIN32
59	# include <sys/types.h>	68	# include <sys/types.h>
60	# include <sys/socket.h>	69	# include <sys/socket.h>
61	# include <netinet/in.h>	70	# include <netinet/in.h>
62	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
63	# include <inttypes.h>	72	# include <inttypes.h>
64	#endif	73	#endif
65		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
66	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67		85
68	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
69		87
70	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
…		…
72		90
73	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
74		92
75	/* mask out modifiers we are not interested in */	93	/* mask out modifiers we are not interested in */
76	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
77
78	#if 0
79	# define PARACHUTE SDL_INIT_NOPARACHUTE
80	#else
81	# define PARACHUTE 0
82	#endif
83		95
84	static AV *texture_av;	96	static AV *texture_av;
85		97
86	static struct	98	static struct
87	{	99	{
…		…
181		193
182	static void	194	static void
183	layout_update_font (DC__Layout self)	195	layout_update_font (DC__Layout self)
184	{	196	{
185	/* use a random scale factor to account for unknown descenders, 0.8 works	197	/* use a random scale factor to account for unknown descenders, 0.8 works
186	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
187	*/	199	*/
188	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
189		201
190	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
191	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
360	self->oy = 0;	372	self->oy = 0;
361	self->row = 0;	373	self->row = 0;
362	self->rows = 0;	374	self->rows = 0;
363	}	375	}
364		376
		377	#define CELL_CLEAR(cell) \
		378	do { \
		379	if ((cell)->player) \
		380	(cell)->tile [2] = 0; \
		381	(cell)->darkness = 0; \
		382	(cell)->stat_hp = 0; \
		383	(cell)->flags = 0; \
		384	(cell)->player = 0; \
		385	} while (0)
		386
365	static void	387	static void
366	map_blank (DC__Map self, int x0, int y0, int w, int h)	388	map_blank (DC__Map self, int x0, int y0, int w, int h)
367	{	389	{
368	int x, y;	390	int x, y;
369	maprow *row;	391	maprow *row;
…		…
383	if (x >= row->c1)	405	if (x >= row->c1)
384	break;	406	break;
385		407
386	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
387		409
388	cell->darkness = 0;	410	CELL_CLEAR (cell);
389	cell->stat_hp = 0;
390	cell->flags = 0;
391	cell->player = 0;
392	}	411	}
393	}	412	}
394	}	413	}
395		414
396	typedef struct {	415	typedef struct {
…		…
507	if (!svp \|\| !SvTRUE (*svp))	526	if (!svp \|\| !SvTRUE (*svp))
508	return 0;	527	return 0;
509		528
510	return 1;	529	return 1;
511	}	530	}
		531
		532	static void
		533	deliantra_main ()
		534	{
		535	call_argv ("::main", G_DISCARD \| G_VOID, 0);
		536	dSP;
		537	}
		538
		539	#ifdef __MACOSX__
		540	/* to due surprising braindamage on the side of SDL design, we
		541	* do some mind-boggling hack here: SDL requires a custom main()
		542	* on OS X, so... we provide one and call the original main(), which,
		543	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		544	* and which calls our main (== SDL_main) back.
		545	*/
		546	extern C_LINKAGE int
		547	main (int argc, char *argv[])
		548	{
		549	deliantra_main ();
		550	}
		551
		552	#undef main
		553
		554	extern C_LINKAGE int main (int argc, char *argv[]);
		555
		556	static void
		557	SDL_braino (void)
		558	{
		559	char *argv[] = { "deliantra client", 0 };
		560	(main) (1, argv);
		561	}
		562	#else
		563	static void
		564	SDL_braino (void)
		565	{
		566	deliantra_main ();
		567	}
		568	#endif
512		569
513	MODULE = Deliantra::Client PACKAGE = DC	570	MODULE = Deliantra::Client PACKAGE = DC
514		571
515	PROTOTYPES: ENABLE	572	PROTOTYPES: ENABLE
516		573
…		…
631	const_iv (KMOD_NUM),	688	const_iv (KMOD_NUM),
632	const_iv (KMOD_CAPS),	689	const_iv (KMOD_CAPS),
633	const_iv (KMOD_MODE),	690	const_iv (KMOD_MODE),
634		691
635	const_iv (MIX_DEFAULT_FORMAT),	692	const_iv (MIX_DEFAULT_FORMAT),
		693
		694	const_iv (SDL_INIT_TIMER),
		695	const_iv (SDL_INIT_AUDIO),
		696	const_iv (SDL_INIT_VIDEO),
		697	const_iv (SDL_INIT_CDROM),
		698	const_iv (SDL_INIT_JOYSTICK),
		699	const_iv (SDL_INIT_EVERYTHING),
		700	const_iv (SDL_INIT_NOPARACHUTE),
		701	const_iv (SDL_INIT_EVENTTHREAD),
		702
		703	const_iv (SDL_GL_RED_SIZE),
		704	const_iv (SDL_GL_GREEN_SIZE),
		705	const_iv (SDL_GL_BLUE_SIZE),
		706	const_iv (SDL_GL_ALPHA_SIZE),
		707	const_iv (SDL_GL_DOUBLEBUFFER),
		708	const_iv (SDL_GL_BUFFER_SIZE),
		709	const_iv (SDL_GL_DEPTH_SIZE),
		710	const_iv (SDL_GL_STENCIL_SIZE),
		711	const_iv (SDL_GL_ACCUM_RED_SIZE),
		712	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		713	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		714	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		715	const_iv (SDL_GL_STEREO),
		716	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		717	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		718	const_iv (SDL_GL_ACCELERATED_VISUAL),
		719	const_iv (SDL_GL_SWAP_CONTROL),
		720
		721	const_iv (FOW_DARKNESS)
636	# undef const_iv	722	# undef const_iv
637	};	723	};
638		724
639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	725	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	726	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
669	CODE:	755	CODE:
670	{	756	{
671	opengl_fontmap = pango_opengl_font_map_new ();	757	opengl_fontmap = pango_opengl_font_map_new ();
672	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	758	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	759	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)	760	/pango_context_set_font_description (opengl_context, default_font);/
		761	#if PANGO_VERSION_CHECK (1, 15, 2)
675	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	762	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	763	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
677	#endif	764	#endif
678	}	765	}
679		766
680	char *
681	SDL_GetError ()	767	char *SDL_GetError ()
682		768
683	int	769	void SDL_braino ()
684	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
685		770
686	void	771	int SDL_Init (U32 flags)
		772
		773	int SDL_InitSubSystem (U32 flags)
		774
		775	void SDL_QuitSubSystem (U32 flags)
		776
687	SDL_Quit ()	777	void SDL_Quit ()
		778
		779	int SDL_GL_SetAttribute (int attr, int value)
		780
		781	int SDL_GL_GetAttribute (int attr)
		782	CODE:
		783	if (SDL_GL_GetAttribute (attr, &RETVAL))
		784	XSRETURN_UNDEF;
		785	OUTPUT:
		786	RETVAL
688		787
689	void	788	void
690	SDL_ListModes (int rgb, int alpha)	789	SDL_ListModes (int rgb, int alpha)
691	PPCODE:	790	PPCODE:
692	{	791	{
…		…
704	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	803	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	804	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	805	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707		806
708	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	807	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709	#if SDL_VERSION_ATLEAST(1,2,10)
710	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	808	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712	#endif
713		809
714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	810	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
715		811
716	if (m && m != (SDL_Rect **)-1)	812	if (m && m != (SDL_Rect **)-1)
717	while (*m)	813	while (*m)
718	{	814	{
719	if ((m)->w >= 800 && (m)->h >= 480)	815	if ((m)->w >= 400 && (m)->h >= 300)
720	{	816	{
721	AV *av = newAV ();	817	AV *av = newAV ();
722	av_push (av, newSViv ((*m)->w));	818	av_push (av, newSViv ((*m)->w));
723	av_push (av, newSViv ((*m)->h));	819	av_push (av, newSViv ((*m)->h));
724	av_push (av, newSViv (rgb));	820	av_push (av, newSViv (rgb));
…		…
765	char *	861	char *
766	SDL_GetKeyName (int sym)	862	SDL_GetKeyName (int sym)
767		863
768	int	864	int
769	SDL_GetAppState ()	865	SDL_GetAppState ()
		866
		867	int
		868	SDL_GetModState ()
770		869
771	void	870	void
772	poll_events ()	871	poll_events ()
773	PPCODE:	872	PPCODE:
774	{	873	{
…		…
908	}	1007	}
909	}	1008	}
910	#endif	1009	#endif
911	}	1010	}
912		1011
913	void	1012	int
914	add_font (char *file)	1013	add_font (char *file)
915	CODE:	1014	CODE:
916	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1015	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1016	OUTPUT:
		1017	RETVAL
917		1018
918	void	1019	void
919	load_image_inline (SV *image_)	1020	load_image_inline (SV *image_)
920	ALIAS:	1021	ALIAS:
921	load_image_file = 1	1022	load_image_file = 1
…		…
1331	PPCODE:	1432	PPCODE:
1332	{	1433	{
1333	int line, x;	1434	int line, x;
1334		1435
1335	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1436	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1437	#if !PANGO_VERSION_CHECK (1, 17, 3)
1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1438	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338	--line;	1439	--line;
1339	#endif	1440	#endif
1340	EXTEND (SP, 2);	1441	EXTEND (SP, 2);
1341	PUSHs (sv_2mortal (newSViv (line)));	1442	PUSHs (sv_2mortal (newSViv (line)));
…		…
1677	uint8_t ext, cmd;	1778	uint8_t ext, cmd;
1678		1779
1679	do	1780	do
1680	{	1781	{
1681	ext = *data++;	1782	ext = *data++;
1682	cmd = ext & 0x3f;	1783	cmd = ext & 0x7f;
1683		1784
1684	if (cmd < 4)	1785	if (cmd < 4)
1685	cell->darkness = 255 - ext * 64 + 1;	1786	cell->darkness = 255 - ext * 64 + 1;
1686	else if (cmd == 5) // health	1787	else if (cmd == 5) // health
1687	{	1788	{
…		…
1690	}	1791	}
1691	else if (cmd == 6) // monster width	1792	else if (cmd == 6) // monster width
1692	cell->stat_width = *data++ + 1;	1793	cell->stat_width = *data++ + 1;
1693	else if (cmd == 0x47)	1794	else if (cmd == 0x47)
1694	{	1795	{
1695	if (*data == 4)	1796	if (*data == 1) cell->player = data [1];
1696	; // decode player count	1797	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1798	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1799	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697		1800
1698	data += *data + 1;	1801	data += *data + 1;
1699	}	1802	}
1700	else if (cmd == 8) // cell flags	1803	else if (cmd == 8) // cell flags
1701	cell->flags = *data++;	1804	cell->flags = *data++;
…		…
1731	}	1834	}
1732	}	1835	}
1733	}	1836	}
1734	}	1837	}
1735	else	1838	else
1736	cell->darkness = 0;	1839	CELL_CLEAR (cell);
1737	}	1840	}
1738	}	1841	}
1739	OUTPUT:	1842	OUTPUT:
1740	RETVAL	1843	RETVAL
1741		1844
…		…
1793	}	1896	}
1794	OUTPUT:	1897	OUTPUT:
1795	RETVAL	1898	RETVAL
1796		1899
1797	void	1900	void
1798	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1901	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799	CODE:	1902	CODE:
1800	{	1903	{
1801	int x, y, z;	1904	int x, y, z;
1802		1905
1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1906	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1804	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1907	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1908	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806	smooth_key skey;	1909	smooth_key skey;
1807		1910	int pl_x, pl_y;
		1911	maptex pl_tex;
1808	rc_t *rc = rc_alloc ();	1912	rc_t *rc = rc_alloc ();
1809	rc_key_t key;	1913	rc_key_t key;
1810	rc_array_t *arr;	1914	rc_array_t *arr;
		1915
		1916	pl_tex.name = 0;
1811		1917
1812	// thats current max. sorry.	1918	// thats current max. sorry.
1813	if (sw > 255) sw = 255;	1919	if (sw > 255) sw = 255;
1814	if (sh > 255) sh = 255;	1920	if (sh > 255) sh = 255;
1815		1921
…		…
1870	tileid tile = cell->tile [z];	1976	tileid tile = cell->tile [z];
1871		1977
1872	if (tile)	1978	if (tile)
1873	{	1979	{
1874	maptex tex = self->tex [tile];	1980	maptex tex = self->tex [tile];
1875	int px, py;	1981	int px = (x + 1) * T - tex.w;
		1982	int py = (y + 1) * T - tex.h;
1876		1983
1877	if (key.texname != tex.name)	1984	if (key.texname != tex.name)
1878	{	1985	{
1879	if (!tex.name)	1986	if (!tex.name)
1880	tex = self->tex [2]; /* missing, replace by noface */	1987	tex = self->tex [2]; /* missing, replace by noface */
1881		1988
1882	key.texname = tex.name;	1989	key.texname = tex.name;
1883	arr = rc_array (rc, &key);	1990	arr = rc_array (rc, &key);
1884	}	1991	}
1885		1992
1886	px = (x + 1) * T - tex.w;	1993	if (expect_false (cell->player == player) && expect_false (z == 2))
1887	py = (y + 1) * T - tex.h;	1994	{
		1995	pl_x = px;
		1996	pl_y = py;
		1997	pl_tex = tex;
		1998	continue;
		1999	}
1888		2000
1889	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2001	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2002	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2003	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2004	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893		2005
1894	if (cell->flags && z == 2)	2006	if (expect_false (cell->flags) && expect_false (z == 2))
1895	{	2007	{
1896	// overlays such as the speech bubble, probably more to come	2008	// overlays such as the speech bubble, probably more to come
1897	if (cell->flags & 1)	2009	if (cell->flags & 1)
1898	{	2010	{
1899	maptex tex = self->tex [1];	2011	maptex tex = self->tex [1];
…		…
2038	}	2150	}
2039		2151
2040	hv_clear (smooth);	2152	hv_clear (smooth);
2041	}	2153	}
2042		2154
		2155	if (pl_tex.name)
		2156	{
		2157	maptex tex = pl_tex;
		2158	int px = pl_x + sdx;
		2159	int py = pl_y + sdy;
		2160
		2161	key.texname = tex.name;
		2162	arr = rc_array (rc, &key);
		2163
		2164	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2165	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2166	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2167	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2168
		2169	rc_draw (rc);
		2170	}
		2171
2043	glDisable (GL_BLEND);	2172	glDisable (GL_BLEND);
2044	rc_free (rc);	2173	rc_free (rc);
2045		2174
2046	// top layer: overlays such as the health bar	2175	// top layer: overlays such as the health bar
2047	for (y = 0; y < sh; y++)	2176	for (y = 0; y < sh; y++)
…		…
2152	SvCUR_set (darkness3_sv, sw34 * sh3);	2281	SvCUR_set (darkness3_sv, sw34 * sh3);
2153		2282
2154	mx += self->x - 1;	2283	mx += self->x - 1;
2155	my += self->y - 1;	2284	my += self->y - 1;
2156		2285
2157	memset (darkness1, 255, sw1 * sh1);	2286	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158		2287
2159	for (y = 0; y < sh1; y++)	2288	for (y = 0; y < sh1; y++)
2160	if (0 <= y + my && y + my < self->rows)	2289	if (0 <= y + my && y + my < self->rows)
2161	{	2290	{
2162	maprow *row = self->row + (y + my);	2291	maprow *row = self->row + (y + my);
…		…
2282	else	2411	else
2283	*data++ = 0;	2412	*data++ = 0;
2284	}	2413	}
2285	}	2414	}
2286		2415
		2416	/* if size is wh + 5 then no data has been found /
		2417	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2418	{
2287	SvPOK_only (data_sv);	2419	SvPOK_only (data_sv);
2288	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2420	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2421	}
		2422
2289	RETVAL = data_sv;	2423	RETVAL = data_sv;
2290	}	2424	}
2291	OUTPUT:	2425	OUTPUT:
2292	RETVAL	2426	RETVAL
2293		2427
2294	void	2428	void
2295	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2429	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296	PPCODE:	2430	PPCODE:
2297	{	2431	{
2298	int x, y, z;	2432	int x, y, z;
2299	int w, h;	2433	int w, h;
2300	int x1, y1;	2434	int x1, y1;
		2435	STRLEN len;
		2436	uint8_t data, end;
		2437
		2438	len = SvLEN (data_sv);
		2439	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2440	data = SvPVbyte_nolen (data_sv);
		2441	end = data + len + 8;
		2442
		2443	if (len < 5)
		2444	XSRETURN_EMPTY;
2301		2445
2302	if (*data++ != 0)	2446	if (*data++ != 0)
2303	XSRETURN_EMPTY; /* version mismatch */	2447	XSRETURN_EMPTY; /* version mismatch */
2304		2448
2305	w = data++ << 8; w \|= data++;	2449	w = data++ << 8; w \|= data++;
…		…
2320	{	2464	{
2321	maprow *row = map_get_row (self, y);	2465	maprow *row = map_get_row (self, y);
2322		2466
2323	for (x = x0; x < x1; x++)	2467	for (x = x0; x < x1; x++)
2324	{	2468	{
		2469	uint8_t flags;
		2470
		2471	if (data + 7 >= end)
		2472	XSRETURN_EMPTY;
		2473
2325	uint8_t flags = *data++;	2474	flags = *data++;
2326		2475
2327	if (flags)	2476	if (flags)
2328	{	2477	{
2329	mapcell *cell = row_get_cell (row, x);	2478	mapcell *cell = row_get_cell (row, x);
2330	tileid tile[3] = { 0, 0, 0 };	2479	tileid tile[3] = { 0, 0, 0 };
…		…
2333	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2482	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2334	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2483	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2335		2484
2336	if (cell->darkness == 0)	2485	if (cell->darkness == 0)
2337	{	2486	{
2338	cell->darkness = 0;	2487	/cell->darkness = 0;/
		2488	EXTEND (SP, 3);
2339		2489
2340	for (z = 0; z <= 2; z++)	2490	for (z = 0; z <= 2; z++)
2341	{	2491	{
2342	tileid t = tile [z];	2492	tileid t = tile [z];
2343		2493
2344	if (t >= self->texs \|\| (t && !self->tex [t].name))	2494	if (t >= self->texs \|\| (t && !self->tex [t].name))
2345	{	2495	{
2346	XPUSHs (sv_2mortal (newSViv (t)));	2496	PUSHs (sv_2mortal (newSViv (t)));
2347	need_texid (self, t);	2497	need_texid (self, t);
2348	}	2498	}
2349		2499
2350	cell->tile [z] = t;	2500	cell->tile [z] = t;
2351	}	2501	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs. Revision 1.272 by root, Tue Aug 19 17:38:29 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.272 by root, Tue Aug 19 17:38:29 2008 UTC