[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.273 by root, Wed Aug 20 13:30:02 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	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		537	dSP;
		538	}
		539
		540	#ifdef __MACOSX__
		541	/* to due surprising braindamage on the side of SDL design, we
		542	* do some mind-boggling hack here: SDL requires a custom main()
		543	* on OS X, so... we provide one and call the original main(), which,
		544	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		545	* and which calls our main (== SDL_main) back.
		546	*/
		547	extern C_LINKAGE int
		548	main (int argc, char *argv[])
		549	{
		550	deliantra_main ();
		551	}
		552
		553	#undef main
		554
		555	extern C_LINKAGE int main (int argc, char *argv[]);
		556
		557	static void
		558	SDL_braino (void)
		559	{
		560	char *argv[] = { "deliantra client", 0 };
		561	(main) (1, argv);
		562	}
		563	#else
		564	static void
		565	SDL_braino (void)
		566	{
		567	deliantra_main ();
		568	}
		569	#endif
512		570
513	MODULE = Deliantra::Client PACKAGE = DC	571	MODULE = Deliantra::Client PACKAGE = DC
514		572
515	PROTOTYPES: ENABLE	573	PROTOTYPES: ENABLE
516		574
…		…
631	const_iv (KMOD_NUM),	689	const_iv (KMOD_NUM),
632	const_iv (KMOD_CAPS),	690	const_iv (KMOD_CAPS),
633	const_iv (KMOD_MODE),	691	const_iv (KMOD_MODE),
634		692
635	const_iv (MIX_DEFAULT_FORMAT),	693	const_iv (MIX_DEFAULT_FORMAT),
		694
		695	const_iv (SDL_INIT_TIMER),
		696	const_iv (SDL_INIT_AUDIO),
		697	const_iv (SDL_INIT_VIDEO),
		698	const_iv (SDL_INIT_CDROM),
		699	const_iv (SDL_INIT_JOYSTICK),
		700	const_iv (SDL_INIT_EVERYTHING),
		701	const_iv (SDL_INIT_NOPARACHUTE),
		702	const_iv (SDL_INIT_EVENTTHREAD),
		703
		704	const_iv (SDL_GL_RED_SIZE),
		705	const_iv (SDL_GL_GREEN_SIZE),
		706	const_iv (SDL_GL_BLUE_SIZE),
		707	const_iv (SDL_GL_ALPHA_SIZE),
		708	const_iv (SDL_GL_DOUBLEBUFFER),
		709	const_iv (SDL_GL_BUFFER_SIZE),
		710	const_iv (SDL_GL_DEPTH_SIZE),
		711	const_iv (SDL_GL_STENCIL_SIZE),
		712	const_iv (SDL_GL_ACCUM_RED_SIZE),
		713	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		714	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		715	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		716	const_iv (SDL_GL_STEREO),
		717	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		718	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		719	const_iv (SDL_GL_ACCELERATED_VISUAL),
		720	const_iv (SDL_GL_SWAP_CONTROL),
		721
		722	const_iv (FOW_DARKNESS)
636	# undef const_iv	723	# undef const_iv
637	};	724	};
638		725
639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	726	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	727	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
669	CODE:	756	CODE:
670	{	757	{
671	opengl_fontmap = pango_opengl_font_map_new ();	758	opengl_fontmap = pango_opengl_font_map_new ();
672	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	759	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);	760	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)	761	/pango_context_set_font_description (opengl_context, default_font);/
		762	#if PANGO_VERSION_CHECK (1, 15, 2)
675	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	763	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	764	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
677	#endif	765	#endif
678	}	766	}
679		767
680	char *
681	SDL_GetError ()	768	char *SDL_GetError ()
682		769
683	int	770	void SDL_braino ()
684	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
685		771
686	void	772	int SDL_Init (U32 flags)
		773
		774	int SDL_InitSubSystem (U32 flags)
		775
		776	void SDL_QuitSubSystem (U32 flags)
		777
687	SDL_Quit ()	778	void SDL_Quit ()
		779
		780	int SDL_GL_SetAttribute (int attr, int value)
		781
		782	int SDL_GL_GetAttribute (int attr)
		783	CODE:
		784	if (SDL_GL_GetAttribute (attr, &RETVAL))
		785	XSRETURN_UNDEF;
		786	OUTPUT:
		787	RETVAL
688		788
689	void	789	void
690	SDL_ListModes (int rgb, int alpha)	790	SDL_ListModes (int rgb, int alpha)
691	PPCODE:	791	PPCODE:
692	{	792	{
…		…
704	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	804	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	805	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	806	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707		807
708	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	808	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);	809	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712	#endif
713		810
714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	811	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
715		812
716	if (m && m != (SDL_Rect **)-1)	813	if (m && m != (SDL_Rect **)-1)
717	while (*m)	814	while (*m)
718	{	815	{
719	if ((m)->w >= 800 && (m)->h >= 480)	816	if ((m)->w >= 400 && (m)->h >= 300)
720	{	817	{
721	AV *av = newAV ();	818	AV *av = newAV ();
722	av_push (av, newSViv ((*m)->w));	819	av_push (av, newSViv ((*m)->w));
723	av_push (av, newSViv ((*m)->h));	820	av_push (av, newSViv ((*m)->h));
724	av_push (av, newSViv (rgb));	821	av_push (av, newSViv (rgb));
…		…
765	char *	862	char *
766	SDL_GetKeyName (int sym)	863	SDL_GetKeyName (int sym)
767		864
768	int	865	int
769	SDL_GetAppState ()	866	SDL_GetAppState ()
		867
		868	int
		869	SDL_GetModState ()
770		870
771	void	871	void
772	poll_events ()	872	poll_events ()
773	PPCODE:	873	PPCODE:
774	{	874	{
…		…
908	}	1008	}
909	}	1009	}
910	#endif	1010	#endif
911	}	1011	}
912		1012
913	void	1013	int
914	add_font (char *file)	1014	add_font (char *file)
915	CODE:	1015	CODE:
916	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1016	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1017	OUTPUT:
		1018	RETVAL
917		1019
918	void	1020	void
919	load_image_inline (SV *image_)	1021	load_image_inline (SV *image_)
920	ALIAS:	1022	ALIAS:
921	load_image_file = 1	1023	load_image_file = 1
…		…
1331	PPCODE:	1433	PPCODE:
1332	{	1434	{
1333	int line, x;	1435	int line, x;
1334		1436
1335	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1437	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1438	#if !PANGO_VERSION_CHECK (1, 17, 3)
1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1439	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338	--line;	1440	--line;
1339	#endif	1441	#endif
1340	EXTEND (SP, 2);	1442	EXTEND (SP, 2);
1341	PUSHs (sv_2mortal (newSViv (line)));	1443	PUSHs (sv_2mortal (newSViv (line)));
…		…
1677	uint8_t ext, cmd;	1779	uint8_t ext, cmd;
1678		1780
1679	do	1781	do
1680	{	1782	{
1681	ext = *data++;	1783	ext = *data++;
1682	cmd = ext & 0x3f;	1784	cmd = ext & 0x7f;
1683		1785
1684	if (cmd < 4)	1786	if (cmd < 4)
1685	cell->darkness = 255 - ext * 64 + 1;	1787	cell->darkness = 255 - ext * 64 + 1;
1686	else if (cmd == 5) // health	1788	else if (cmd == 5) // health
1687	{	1789	{
…		…
1690	}	1792	}
1691	else if (cmd == 6) // monster width	1793	else if (cmd == 6) // monster width
1692	cell->stat_width = *data++ + 1;	1794	cell->stat_width = *data++ + 1;
1693	else if (cmd == 0x47)	1795	else if (cmd == 0x47)
1694	{	1796	{
1695	if (*data == 4)	1797	if (*data == 1) cell->player = data [1];
1696	; // decode player count	1798	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1799	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1800	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697		1801
1698	data += *data + 1;	1802	data += *data + 1;
1699	}	1803	}
1700	else if (cmd == 8) // cell flags	1804	else if (cmd == 8) // cell flags
1701	cell->flags = *data++;	1805	cell->flags = *data++;
…		…
1731	}	1835	}
1732	}	1836	}
1733	}	1837	}
1734	}	1838	}
1735	else	1839	else
1736	cell->darkness = 0;	1840	CELL_CLEAR (cell);
1737	}	1841	}
1738	}	1842	}
1739	OUTPUT:	1843	OUTPUT:
1740	RETVAL	1844	RETVAL
1741		1845
…		…
1793	}	1897	}
1794	OUTPUT:	1898	OUTPUT:
1795	RETVAL	1899	RETVAL
1796		1900
1797	void	1901	void
1798	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1902	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:	1903	CODE:
1800	{	1904	{
1801	int x, y, z;	1905	int x, y, z;
1802		1906
1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1907	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1804	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1908	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)	1909	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806	smooth_key skey;	1910	smooth_key skey;
1807		1911	int pl_x, pl_y;
		1912	maptex pl_tex;
1808	rc_t *rc = rc_alloc ();	1913	rc_t *rc = rc_alloc ();
1809	rc_key_t key;	1914	rc_key_t key;
1810	rc_array_t *arr;	1915	rc_array_t *arr;
		1916
		1917	pl_tex.name = 0;
1811		1918
1812	// thats current max. sorry.	1919	// thats current max. sorry.
1813	if (sw > 255) sw = 255;	1920	if (sw > 255) sw = 255;
1814	if (sh > 255) sh = 255;	1921	if (sh > 255) sh = 255;
1815		1922
…		…
1870	tileid tile = cell->tile [z];	1977	tileid tile = cell->tile [z];
1871		1978
1872	if (tile)	1979	if (tile)
1873	{	1980	{
1874	maptex tex = self->tex [tile];	1981	maptex tex = self->tex [tile];
1875	int px, py;	1982	int px = (x + 1) * T - tex.w;
		1983	int py = (y + 1) * T - tex.h;
1876		1984
1877	if (key.texname != tex.name)	1985	if (key.texname != tex.name)
1878	{	1986	{
1879	if (!tex.name)	1987	if (!tex.name)
1880	tex = self->tex [2]; /* missing, replace by noface */	1988	tex = self->tex [2]; /* missing, replace by noface */
1881		1989
1882	key.texname = tex.name;	1990	key.texname = tex.name;
1883	arr = rc_array (rc, &key);	1991	arr = rc_array (rc, &key);
1884	}	1992	}
1885		1993
1886	px = (x + 1) * T - tex.w;	1994	if (expect_false (cell->player == player) && expect_false (z == 2))
1887	py = (y + 1) * T - tex.h;	1995	{
		1996	pl_x = px;
		1997	pl_y = py;
		1998	pl_tex = tex;
		1999	continue;
		2000	}
1888		2001
1889	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2002	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2003	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);	2004	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);	2005	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893		2006
1894	if (cell->flags && z == 2)	2007	if (expect_false (cell->flags) && expect_false (z == 2))
1895	{	2008	{
1896	// overlays such as the speech bubble, probably more to come	2009	// overlays such as the speech bubble, probably more to come
1897	if (cell->flags & 1)	2010	if (cell->flags & 1)
1898	{	2011	{
1899	maptex tex = self->tex [1];	2012	maptex tex = self->tex [1];
…		…
2038	}	2151	}
2039		2152
2040	hv_clear (smooth);	2153	hv_clear (smooth);
2041	}	2154	}
2042		2155
		2156	if (pl_tex.name)
		2157	{
		2158	maptex tex = pl_tex;
		2159	int px = pl_x + sdx;
		2160	int py = pl_y + sdy;
		2161
		2162	key.texname = tex.name;
		2163	arr = rc_array (rc, &key);
		2164
		2165	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2166	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2167	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2168	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2169
		2170	rc_draw (rc);
		2171	}
		2172
2043	glDisable (GL_BLEND);	2173	glDisable (GL_BLEND);
2044	rc_free (rc);	2174	rc_free (rc);
2045		2175
2046	// top layer: overlays such as the health bar	2176	// top layer: overlays such as the health bar
2047	for (y = 0; y < sh; y++)	2177	for (y = 0; y < sh; y++)
…		…
2152	SvCUR_set (darkness3_sv, sw34 * sh3);	2282	SvCUR_set (darkness3_sv, sw34 * sh3);
2153		2283
2154	mx += self->x - 1;	2284	mx += self->x - 1;
2155	my += self->y - 1;	2285	my += self->y - 1;
2156		2286
2157	memset (darkness1, 255, sw1 * sh1);	2287	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158		2288
2159	for (y = 0; y < sh1; y++)	2289	for (y = 0; y < sh1; y++)
2160	if (0 <= y + my && y + my < self->rows)	2290	if (0 <= y + my && y + my < self->rows)
2161	{	2291	{
2162	maprow *row = self->row + (y + my);	2292	maprow *row = self->row + (y + my);
…		…
2282	else	2412	else
2283	*data++ = 0;	2413	*data++ = 0;
2284	}	2414	}
2285	}	2415	}
2286		2416
		2417	/* if size is wh + 5 then no data has been found /
		2418	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2419	{
2287	SvPOK_only (data_sv);	2420	SvPOK_only (data_sv);
2288	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2421	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2422	}
		2423
2289	RETVAL = data_sv;	2424	RETVAL = data_sv;
2290	}	2425	}
2291	OUTPUT:	2426	OUTPUT:
2292	RETVAL	2427	RETVAL
2293		2428
2294	void	2429	void
2295	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2430	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296	PPCODE:	2431	PPCODE:
2297	{	2432	{
2298	int x, y, z;	2433	int x, y, z;
2299	int w, h;	2434	int w, h;
2300	int x1, y1;	2435	int x1, y1;
		2436	STRLEN len;
		2437	uint8_t data, end;
		2438
		2439	len = SvLEN (data_sv);
		2440	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2441	data = SvPVbyte_nolen (data_sv);
		2442	end = data + len + 8;
		2443
		2444	if (len < 5)
		2445	XSRETURN_EMPTY;
2301		2446
2302	if (*data++ != 0)	2447	if (*data++ != 0)
2303	XSRETURN_EMPTY; /* version mismatch */	2448	XSRETURN_EMPTY; /* version mismatch */
2304		2449
2305	w = data++ << 8; w \|= data++;	2450	w = data++ << 8; w \|= data++;
…		…
2320	{	2465	{
2321	maprow *row = map_get_row (self, y);	2466	maprow *row = map_get_row (self, y);
2322		2467
2323	for (x = x0; x < x1; x++)	2468	for (x = x0; x < x1; x++)
2324	{	2469	{
		2470	uint8_t flags;
		2471
		2472	if (data + 7 >= end)
		2473	XSRETURN_EMPTY;
		2474
2325	uint8_t flags = *data++;	2475	flags = *data++;
2326		2476
2327	if (flags)	2477	if (flags)
2328	{	2478	{
2329	mapcell *cell = row_get_cell (row, x);	2479	mapcell *cell = row_get_cell (row, x);
2330	tileid tile[3] = { 0, 0, 0 };	2480	tileid tile[3] = { 0, 0, 0 };
…		…
2333	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2483	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2334	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2484	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2335		2485
2336	if (cell->darkness == 0)	2486	if (cell->darkness == 0)
2337	{	2487	{
2338	cell->darkness = 0;	2488	/cell->darkness = 0;/
		2489	EXTEND (SP, 3);
2339		2490
2340	for (z = 0; z <= 2; z++)	2491	for (z = 0; z <= 2; z++)
2341	{	2492	{
2342	tileid t = tile [z];	2493	tileid t = tile [z];
2343		2494
2344	if (t >= self->texs \|\| (t && !self->tex [t].name))	2495	if (t >= self->texs \|\| (t && !self->tex [t].name))
2345	{	2496	{
2346	XPUSHs (sv_2mortal (newSViv (t)));	2497	PUSHs (sv_2mortal (newSViv (t)));
2347	need_texid (self, t);	2498	need_texid (self, t);
2348	}	2499	}
2349		2500
2350	cell->tile [z] = t;	2501	cell->tile [z] = t;
2351	}	2502	}

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.273 by root, Wed Aug 20 13:30:02 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.273 by root, Wed Aug 20 13:30:02 2008 UTC