[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.271 by root, Sun Jul 20 15:09:29 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
51	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))	51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly	56	# define pango_layout_get_line_readonly pango_layout_get_line
53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly	57	# define pango_layout_get_lines_readonly pango_layout_get_lines
54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly	58	# 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	59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56	#endif	60	#endif
57		61
58	#ifndef _WIN32	62	#ifndef _WIN32
59	# include <sys/types.h>	63	# include <sys/types.h>
60	# include <sys/socket.h>	64	# include <sys/socket.h>
61	# include <netinet/in.h>	65	# include <netinet/in.h>
62	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
63	# include <inttypes.h>	67	# include <inttypes.h>
64	#endif	68	#endif
65		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
66	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67		80
68	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
69		82
70	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
…		…
72		85
73	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
74		87
75	/* mask out modifiers we are not interested in */	88	/* mask out modifiers we are not interested in */
76	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	89	#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		90
84	static AV *texture_av;	91	static AV *texture_av;
85		92
86	static struct	93	static struct
87	{	94	{
…		…
181		188
182	static void	189	static void
183	layout_update_font (DC__Layout self)	190	layout_update_font (DC__Layout self)
184	{	191	{
185	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
186	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
187	*/	194	*/
188	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
189		196
190	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
191	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
360	self->oy = 0;	367	self->oy = 0;
361	self->row = 0;	368	self->row = 0;
362	self->rows = 0;	369	self->rows = 0;
363	}	370	}
364		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	if ((cell)->player) \
		375	(cell)->tile [2] = 0; \
		376	(cell)->darkness = 0; \
		377	(cell)->stat_hp = 0; \
		378	(cell)->flags = 0; \
		379	(cell)->player = 0; \
		380	} while (0)
		381
365	static void	382	static void
366	map_blank (DC__Map self, int x0, int y0, int w, int h)	383	map_blank (DC__Map self, int x0, int y0, int w, int h)
367	{	384	{
368	int x, y;	385	int x, y;
369	maprow *row;	386	maprow *row;
…		…
383	if (x >= row->c1)	400	if (x >= row->c1)
384	break;	401	break;
385		402
386	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
387		404
388	cell->darkness = 0;	405	CELL_CLEAR (cell);
389	cell->stat_hp = 0;
390	cell->flags = 0;
391	cell->player = 0;
392	}	406	}
393	}	407	}
394	}	408	}
395		409
396	typedef struct {	410	typedef struct {
…		…
631	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
632	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
633	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
634		648
635	const_iv (MIX_DEFAULT_FORMAT),	649	const_iv (MIX_DEFAULT_FORMAT),
		650
		651	const_iv (SDL_INIT_TIMER),
		652	const_iv (SDL_INIT_AUDIO),
		653	const_iv (SDL_INIT_VIDEO),
		654	const_iv (SDL_INIT_CDROM),
		655	const_iv (SDL_INIT_JOYSTICK),
		656	const_iv (SDL_INIT_EVERYTHING),
		657	const_iv (SDL_INIT_NOPARACHUTE),
		658	const_iv (SDL_INIT_EVENTTHREAD),
		659
		660	const_iv (SDL_GL_RED_SIZE),
		661	const_iv (SDL_GL_GREEN_SIZE),
		662	const_iv (SDL_GL_BLUE_SIZE),
		663	const_iv (SDL_GL_ALPHA_SIZE),
		664	const_iv (SDL_GL_DOUBLEBUFFER),
		665	const_iv (SDL_GL_BUFFER_SIZE),
		666	const_iv (SDL_GL_DEPTH_SIZE),
		667	const_iv (SDL_GL_STENCIL_SIZE),
		668	const_iv (SDL_GL_ACCUM_RED_SIZE),
		669	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		670	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		671	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		672	const_iv (SDL_GL_STEREO),
		673	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		674	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		675	const_iv (SDL_GL_ACCELERATED_VISUAL),
		676	const_iv (SDL_GL_SWAP_CONTROL),
		677
		678	const_iv (FOW_DARKNESS)
636	# undef const_iv	679	# undef const_iv
637	};	680	};
638		681
639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	682	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
669	CODE:	712	CODE:
670	{	713	{
671	opengl_fontmap = pango_opengl_font_map_new ();	714	opengl_fontmap = pango_opengl_font_map_new ();
672	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	715	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);	716	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)	717	/pango_context_set_font_description (opengl_context, default_font);/
		718	#if PANGO_VERSION_CHECK (1, 15, 2)
675	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	719	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	720	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
677	#endif	721	#endif
678	}	722	}
679		723
680	char *
681	SDL_GetError ()	724	char *SDL_GetError ()
682		725
683	int	726	int SDL_Init (U32 flags)
684	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
685		727
686	void	728	int SDL_InitSubSystem (U32 flags)
		729
		730	void SDL_QuitSubSystem (U32 flags)
		731
687	SDL_Quit ()	732	void SDL_Quit ()
		733
		734	int SDL_GL_SetAttribute (int attr, int value)
		735
		736	int SDL_GL_GetAttribute (int attr)
		737	CODE:
		738	if (SDL_GL_GetAttribute (attr, &RETVAL))
		739	XSRETURN_UNDEF;
		740	OUTPUT:
		741	RETVAL
688		742
689	void	743	void
690	SDL_ListModes (int rgb, int alpha)	744	SDL_ListModes (int rgb, int alpha)
691	PPCODE:	745	PPCODE:
692	{	746	{
…		…
704	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	758	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	759	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	760	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707		761
708	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	762	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);	763	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712	#endif
713		764
714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	765	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
715		766
716	if (m && m != (SDL_Rect **)-1)	767	if (m && m != (SDL_Rect **)-1)
717	while (*m)	768	while (*m)
718	{	769	{
719	if ((m)->w >= 800 && (m)->h >= 480)	770	if ((m)->w >= 400 && (m)->h >= 300)
720	{	771	{
721	AV *av = newAV ();	772	AV *av = newAV ();
722	av_push (av, newSViv ((*m)->w));	773	av_push (av, newSViv ((*m)->w));
723	av_push (av, newSViv ((*m)->h));	774	av_push (av, newSViv ((*m)->h));
724	av_push (av, newSViv (rgb));	775	av_push (av, newSViv (rgb));
…		…
765	char *	816	char *
766	SDL_GetKeyName (int sym)	817	SDL_GetKeyName (int sym)
767		818
768	int	819	int
769	SDL_GetAppState ()	820	SDL_GetAppState ()
		821
		822	int
		823	SDL_GetModState ()
770		824
771	void	825	void
772	poll_events ()	826	poll_events ()
773	PPCODE:	827	PPCODE:
774	{	828	{
…		…
908	}	962	}
909	}	963	}
910	#endif	964	#endif
911	}	965	}
912		966
913	void	967	int
914	add_font (char *file)	968	add_font (char *file)
915	CODE:	969	CODE:
916	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	970	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		971	OUTPUT:
		972	RETVAL
917		973
918	void	974	void
919	load_image_inline (SV *image_)	975	load_image_inline (SV *image_)
920	ALIAS:	976	ALIAS:
921	load_image_file = 1	977	load_image_file = 1
…		…
1331	PPCODE:	1387	PPCODE:
1332	{	1388	{
1333	int line, x;	1389	int line, x;
1334		1390
1335	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1391	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1392	#if !PANGO_VERSION_CHECK (1, 17, 3)
1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1393	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338	--line;	1394	--line;
1339	#endif	1395	#endif
1340	EXTEND (SP, 2);	1396	EXTEND (SP, 2);
1341	PUSHs (sv_2mortal (newSViv (line)));	1397	PUSHs (sv_2mortal (newSViv (line)));
…		…
1677	uint8_t ext, cmd;	1733	uint8_t ext, cmd;
1678		1734
1679	do	1735	do
1680	{	1736	{
1681	ext = *data++;	1737	ext = *data++;
1682	cmd = ext & 0x3f;	1738	cmd = ext & 0x7f;
1683		1739
1684	if (cmd < 4)	1740	if (cmd < 4)
1685	cell->darkness = 255 - ext * 64 + 1;	1741	cell->darkness = 255 - ext * 64 + 1;
1686	else if (cmd == 5) // health	1742	else if (cmd == 5) // health
1687	{	1743	{
…		…
1690	}	1746	}
1691	else if (cmd == 6) // monster width	1747	else if (cmd == 6) // monster width
1692	cell->stat_width = *data++ + 1;	1748	cell->stat_width = *data++ + 1;
1693	else if (cmd == 0x47)	1749	else if (cmd == 0x47)
1694	{	1750	{
1695	if (*data == 4)	1751	if (*data == 1) cell->player = data [1];
1696	; // decode player count	1752	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1753	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1754	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697		1755
1698	data += *data + 1;	1756	data += *data + 1;
1699	}	1757	}
1700	else if (cmd == 8) // cell flags	1758	else if (cmd == 8) // cell flags
1701	cell->flags = *data++;	1759	cell->flags = *data++;
…		…
1731	}	1789	}
1732	}	1790	}
1733	}	1791	}
1734	}	1792	}
1735	else	1793	else
1736	cell->darkness = 0;	1794	CELL_CLEAR (cell);
1737	}	1795	}
1738	}	1796	}
1739	OUTPUT:	1797	OUTPUT:
1740	RETVAL	1798	RETVAL
1741		1799
…		…
1793	}	1851	}
1794	OUTPUT:	1852	OUTPUT:
1795	RETVAL	1853	RETVAL
1796		1854
1797	void	1855	void
1798	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1856	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:	1857	CODE:
1800	{	1858	{
1801	int x, y, z;	1859	int x, y, z;
1802		1860
1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1861	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1804	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1862	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)	1863	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806	smooth_key skey;	1864	smooth_key skey;
1807		1865	int pl_x, pl_y;
		1866	maptex pl_tex;
1808	rc_t *rc = rc_alloc ();	1867	rc_t *rc = rc_alloc ();
1809	rc_key_t key;	1868	rc_key_t key;
1810	rc_array_t *arr;	1869	rc_array_t *arr;
		1870
		1871	pl_tex.name = 0;
1811		1872
1812	// thats current max. sorry.	1873	// thats current max. sorry.
1813	if (sw > 255) sw = 255;	1874	if (sw > 255) sw = 255;
1814	if (sh > 255) sh = 255;	1875	if (sh > 255) sh = 255;
1815		1876
…		…
1870	tileid tile = cell->tile [z];	1931	tileid tile = cell->tile [z];
1871		1932
1872	if (tile)	1933	if (tile)
1873	{	1934	{
1874	maptex tex = self->tex [tile];	1935	maptex tex = self->tex [tile];
1875	int px, py;	1936	int px = (x + 1) * T - tex.w;
		1937	int py = (y + 1) * T - tex.h;
1876		1938
1877	if (key.texname != tex.name)	1939	if (key.texname != tex.name)
1878	{	1940	{
1879	if (!tex.name)	1941	if (!tex.name)
1880	tex = self->tex [2]; /* missing, replace by noface */	1942	tex = self->tex [2]; /* missing, replace by noface */
1881		1943
1882	key.texname = tex.name;	1944	key.texname = tex.name;
1883	arr = rc_array (rc, &key);	1945	arr = rc_array (rc, &key);
1884	}	1946	}
1885		1947
1886	px = (x + 1) * T - tex.w;	1948	if (expect_false (cell->player == player) && expect_false (z == 2))
1887	py = (y + 1) * T - tex.h;	1949	{
		1950	pl_x = px;
		1951	pl_y = py;
		1952	pl_tex = tex;
		1953	continue;
		1954	}
1888		1955
1889	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1956	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1957	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);	1958	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);	1959	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893		1960
1894	if (cell->flags && z == 2)	1961	if (expect_false (cell->flags) && expect_false (z == 2))
1895	{	1962	{
1896	// overlays such as the speech bubble, probably more to come	1963	// overlays such as the speech bubble, probably more to come
1897	if (cell->flags & 1)	1964	if (cell->flags & 1)
1898	{	1965	{
1899	maptex tex = self->tex [1];	1966	maptex tex = self->tex [1];
…		…
2038	}	2105	}
2039		2106
2040	hv_clear (smooth);	2107	hv_clear (smooth);
2041	}	2108	}
2042		2109
		2110	if (pl_tex.name)
		2111	{
		2112	maptex tex = pl_tex;
		2113	int px = pl_x + sdx;
		2114	int py = pl_y + sdy;
		2115
		2116	key.texname = tex.name;
		2117	arr = rc_array (rc, &key);
		2118
		2119	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2120	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2121	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2122	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2123
		2124	rc_draw (rc);
		2125	}
		2126
2043	glDisable (GL_BLEND);	2127	glDisable (GL_BLEND);
2044	rc_free (rc);	2128	rc_free (rc);
2045		2129
2046	// top layer: overlays such as the health bar	2130	// top layer: overlays such as the health bar
2047	for (y = 0; y < sh; y++)	2131	for (y = 0; y < sh; y++)
…		…
2152	SvCUR_set (darkness3_sv, sw34 * sh3);	2236	SvCUR_set (darkness3_sv, sw34 * sh3);
2153		2237
2154	mx += self->x - 1;	2238	mx += self->x - 1;
2155	my += self->y - 1;	2239	my += self->y - 1;
2156		2240
2157	memset (darkness1, 255, sw1 * sh1);	2241	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158		2242
2159	for (y = 0; y < sh1; y++)	2243	for (y = 0; y < sh1; y++)
2160	if (0 <= y + my && y + my < self->rows)	2244	if (0 <= y + my && y + my < self->rows)
2161	{	2245	{
2162	maprow *row = self->row + (y + my);	2246	maprow *row = self->row + (y + my);
…		…
2282	else	2366	else
2283	*data++ = 0;	2367	*data++ = 0;
2284	}	2368	}
2285	}	2369	}
2286		2370
		2371	/* if size is wh + 5 then no data has been found /
		2372	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2373	{
2287	SvPOK_only (data_sv);	2374	SvPOK_only (data_sv);
2288	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2375	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2376	}
		2377
2289	RETVAL = data_sv;	2378	RETVAL = data_sv;
2290	}	2379	}
2291	OUTPUT:	2380	OUTPUT:
2292	RETVAL	2381	RETVAL
2293		2382
2294	void	2383	void
2295	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2384	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296	PPCODE:	2385	PPCODE:
2297	{	2386	{
2298	int x, y, z;	2387	int x, y, z;
2299	int w, h;	2388	int w, h;
2300	int x1, y1;	2389	int x1, y1;
		2390	STRLEN len;
		2391	uint8_t data, end;
		2392
		2393	len = SvLEN (data_sv);
		2394	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2395	data = SvPVbyte_nolen (data_sv);
		2396	end = data + len + 8;
		2397
		2398	if (len < 5)
		2399	XSRETURN_EMPTY;
2301		2400
2302	if (*data++ != 0)	2401	if (*data++ != 0)
2303	XSRETURN_EMPTY; /* version mismatch */	2402	XSRETURN_EMPTY; /* version mismatch */
2304		2403
2305	w = data++ << 8; w \|= data++;	2404	w = data++ << 8; w \|= data++;
…		…
2320	{	2419	{
2321	maprow *row = map_get_row (self, y);	2420	maprow *row = map_get_row (self, y);
2322		2421
2323	for (x = x0; x < x1; x++)	2422	for (x = x0; x < x1; x++)
2324	{	2423	{
		2424	uint8_t flags;
		2425
		2426	if (data + 7 >= end)
		2427	XSRETURN_EMPTY;
		2428
2325	uint8_t flags = *data++;	2429	flags = *data++;
2326		2430
2327	if (flags)	2431	if (flags)
2328	{	2432	{
2329	mapcell *cell = row_get_cell (row, x);	2433	mapcell *cell = row_get_cell (row, x);
2330	tileid tile[3] = { 0, 0, 0 };	2434	tileid tile[3] = { 0, 0, 0 };
…		…
2333	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2437	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2334	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2438	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2335		2439
2336	if (cell->darkness == 0)	2440	if (cell->darkness == 0)
2337	{	2441	{
2338	cell->darkness = 0;	2442	/cell->darkness = 0;/
		2443	EXTEND (SP, 3);
2339		2444
2340	for (z = 0; z <= 2; z++)	2445	for (z = 0; z <= 2; z++)
2341	{	2446	{
2342	tileid t = tile [z];	2447	tileid t = tile [z];
2343		2448
2344	if (t >= self->texs \|\| (t && !self->tex [t].name))	2449	if (t >= self->texs \|\| (t && !self->tex [t].name))
2345	{	2450	{
2346	XPUSHs (sv_2mortal (newSViv (t)));	2451	PUSHs (sv_2mortal (newSViv (t)));
2347	need_texid (self, t);	2452	need_texid (self, t);
2348	}	2453	}
2349		2454
2350	cell->tile [z] = t;	2455	cell->tile [z] = t;
2351	}	2456	}

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.271 by root, Sun Jul 20 15:09: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.271 by root, Sun Jul 20 15:09:29 2008 UTC