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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 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
…		…
65	# include <netinet/in.h>	70	# include <netinet/in.h>
66	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
67	# include <inttypes.h>	72	# include <inttypes.h>
68	#endif	73	#endif
69		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
70	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71		85
72	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
73		87
74	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
…		…
76		90
77	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
78		92
79	/* mask out modifiers we are not interested in */	93	/* mask out modifiers we are not interested in */
80	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
81
82	#if 0
83	# define PARACHUTE SDL_INIT_NOPARACHUTE
84	#else
85	# define PARACHUTE 0
86	#endif
87		95
88	static AV *texture_av;	96	static AV *texture_av;
89		97
90	static struct	98	static struct
91	{	99	{
…		…
185		193
186	static void	194	static void
187	layout_update_font (DC__Layout self)	195	layout_update_font (DC__Layout self)
188	{	196	{
189	/* 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
190	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
191	*/	199	*/
192	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
193		201
194	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
195	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
364	self->oy = 0;	372	self->oy = 0;
365	self->row = 0;	373	self->row = 0;
366	self->rows = 0;	374	self->rows = 0;
367	}	375	}
368		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
369	static void	387	static void
370	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)
371	{	389	{
372	int x, y;	390	int x, y;
373	maprow *row;	391	maprow *row;
…		…
387	if (x >= row->c1)	405	if (x >= row->c1)
388	break;	406	break;
389		407
390	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
391		409
392	cell->darkness = 0;	410	CELL_CLEAR (cell);
393	cell->stat_hp = 0;
394	cell->flags = 0;
395	cell->player = 0;
396	}	411	}
397	}	412	}
398	}	413	}
399		414
400	typedef struct {	415	typedef struct {
…		…
511	if (!svp \|\| !SvTRUE (*svp))	526	if (!svp \|\| !SvTRUE (*svp))
512	return 0;	527	return 0;
513		528
514	return 1;	529	return 1;
515	}	530	}
		531
		532	static void
		533	deliantra_main ()
		534	{
		535	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		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
516		569
517	MODULE = Deliantra::Client PACKAGE = DC	570	MODULE = Deliantra::Client PACKAGE = DC
518		571
519	PROTOTYPES: ENABLE	572	PROTOTYPES: ENABLE
520		573
…		…
549	const_iv (SDL_USEREVENT),	602	const_iv (SDL_USEREVENT),
550		603
551	const_iv (SDL_APPINPUTFOCUS),	604	const_iv (SDL_APPINPUTFOCUS),
552	const_iv (SDL_APPMOUSEFOCUS),	605	const_iv (SDL_APPMOUSEFOCUS),
553	const_iv (SDL_APPACTIVE),	606	const_iv (SDL_APPACTIVE),
		607
		608
		609	const_iv (SDLK_UNKNOWN),
		610	const_iv (SDLK_FIRST),
		611	const_iv (SDLK_BACKSPACE),
		612	const_iv (SDLK_TAB),
		613	const_iv (SDLK_CLEAR),
		614	const_iv (SDLK_RETURN),
		615	const_iv (SDLK_PAUSE),
		616	const_iv (SDLK_ESCAPE),
		617	const_iv (SDLK_SPACE),
		618	const_iv (SDLK_EXCLAIM),
		619	const_iv (SDLK_QUOTEDBL),
		620	const_iv (SDLK_HASH),
		621	const_iv (SDLK_DOLLAR),
		622	const_iv (SDLK_AMPERSAND),
		623	const_iv (SDLK_QUOTE),
		624	const_iv (SDLK_LEFTPAREN),
		625	const_iv (SDLK_RIGHTPAREN),
		626	const_iv (SDLK_ASTERISK),
		627	const_iv (SDLK_PLUS),
		628	const_iv (SDLK_COMMA),
		629	const_iv (SDLK_MINUS),
		630	const_iv (SDLK_PERIOD),
		631	const_iv (SDLK_SLASH),
		632	const_iv (SDLK_0),
		633	const_iv (SDLK_1),
		634	const_iv (SDLK_2),
		635	const_iv (SDLK_3),
		636	const_iv (SDLK_4),
		637	const_iv (SDLK_5),
		638	const_iv (SDLK_6),
		639	const_iv (SDLK_7),
		640	const_iv (SDLK_8),
		641	const_iv (SDLK_9),
		642	const_iv (SDLK_COLON),
		643	const_iv (SDLK_SEMICOLON),
		644	const_iv (SDLK_LESS),
		645	const_iv (SDLK_EQUALS),
		646	const_iv (SDLK_GREATER),
		647	const_iv (SDLK_QUESTION),
		648	const_iv (SDLK_AT),
		649
		650	const_iv (SDLK_LEFTBRACKET),
		651	const_iv (SDLK_BACKSLASH),
		652	const_iv (SDLK_RIGHTBRACKET),
		653	const_iv (SDLK_CARET),
		654	const_iv (SDLK_UNDERSCORE),
		655	const_iv (SDLK_BACKQUOTE),
		656	const_iv (SDLK_DELETE),
554		657
555	const_iv (SDLK_FIRST),	658	const_iv (SDLK_FIRST),
556	const_iv (SDLK_LAST),	659	const_iv (SDLK_LAST),
557	const_iv (SDLK_KP0),	660	const_iv (SDLK_KP0),
558	const_iv (SDLK_KP1),	661	const_iv (SDLK_KP1),
…		…
635	const_iv (KMOD_NUM),	738	const_iv (KMOD_NUM),
636	const_iv (KMOD_CAPS),	739	const_iv (KMOD_CAPS),
637	const_iv (KMOD_MODE),	740	const_iv (KMOD_MODE),
638		741
639	const_iv (MIX_DEFAULT_FORMAT),	742	const_iv (MIX_DEFAULT_FORMAT),
		743
		744	const_iv (SDL_INIT_TIMER),
		745	const_iv (SDL_INIT_AUDIO),
		746	const_iv (SDL_INIT_VIDEO),
		747	const_iv (SDL_INIT_CDROM),
		748	const_iv (SDL_INIT_JOYSTICK),
		749	const_iv (SDL_INIT_EVERYTHING),
		750	const_iv (SDL_INIT_NOPARACHUTE),
		751	const_iv (SDL_INIT_EVENTTHREAD),
		752
		753	const_iv (SDL_GL_RED_SIZE),
		754	const_iv (SDL_GL_GREEN_SIZE),
		755	const_iv (SDL_GL_BLUE_SIZE),
		756	const_iv (SDL_GL_ALPHA_SIZE),
		757	const_iv (SDL_GL_DOUBLEBUFFER),
		758	const_iv (SDL_GL_BUFFER_SIZE),
		759	const_iv (SDL_GL_DEPTH_SIZE),
		760	const_iv (SDL_GL_STENCIL_SIZE),
		761	const_iv (SDL_GL_ACCUM_RED_SIZE),
		762	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		763	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		764	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		765	const_iv (SDL_GL_STEREO),
		766	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		767	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		768	const_iv (SDL_GL_ACCELERATED_VISUAL),
		769	const_iv (SDL_GL_SWAP_CONTROL),
		770
		771	const_iv (FOW_DARKNESS)
640	# undef const_iv	772	# undef const_iv
641	};	773	};
642		774
643	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	775	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	776	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
673	CODE:	805	CODE:
674	{	806	{
675	opengl_fontmap = pango_opengl_font_map_new ();	807	opengl_fontmap = pango_opengl_font_map_new ();
676	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	808	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	809	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		810	/pango_context_set_font_description (opengl_context, default_font);/
678	#if PANGO_VERSION_CHECK (1, 15, 2)	811	#if PANGO_VERSION_CHECK (1, 15, 2)
679	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	812	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	813	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
681	#endif	814	#endif
682	}	815	}
683		816
684	char *
685	SDL_GetError ()	817	char *SDL_GetError ()
686		818
687	int	819	void SDL_braino ()
688	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
689		820
690	void	821	int SDL_Init (U32 flags)
		822
		823	int SDL_InitSubSystem (U32 flags)
		824
		825	void SDL_QuitSubSystem (U32 flags)
		826
691	SDL_Quit ()	827	void SDL_Quit ()
		828
		829	int SDL_GL_SetAttribute (int attr, int value)
		830
		831	int SDL_GL_GetAttribute (int attr)
		832	CODE:
		833	if (SDL_GL_GetAttribute (attr, &RETVAL))
		834	XSRETURN_UNDEF;
		835	OUTPUT:
		836	RETVAL
692		837
693	void	838	void
694	SDL_ListModes (int rgb, int alpha)	839	SDL_ListModes (int rgb, int alpha)
695	PPCODE:	840	PPCODE:
696	{	841	{
…		…
708	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	853	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	854	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	855	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711		856
712	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	857	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713	#if SDL_VERSION_ATLEAST(1,2,10)
714	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	858	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716	#endif
717		859
718	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	860	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
719		861
720	if (m && m != (SDL_Rect **)-1)	862	if (m && m != (SDL_Rect **)-1)
721	while (*m)	863	while (*m)
722	{	864	{
723	if ((m)->w >= 800 && (m)->h >= 480)	865	if ((m)->w >= 400 && (m)->h >= 300)
724	{	866	{
725	AV *av = newAV ();	867	AV *av = newAV ();
726	av_push (av, newSViv ((*m)->w));	868	av_push (av, newSViv ((*m)->w));
727	av_push (av, newSViv ((*m)->h));	869	av_push (av, newSViv ((*m)->h));
728	av_push (av, newSViv (rgb));	870	av_push (av, newSViv (rgb));
…		…
915	}	1057	}
916	}	1058	}
917	#endif	1059	#endif
918	}	1060	}
919		1061
920	void	1062	int
921	add_font (char *file)	1063	add_font (char *file)
922	CODE:	1064	CODE:
923	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1065	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1066	OUTPUT:
		1067	RETVAL
924		1068
925	void	1069	void
926	load_image_inline (SV *image_)	1070	load_image_inline (SV *image_)
927	ALIAS:	1071	ALIAS:
928	load_image_file = 1	1072	load_image_file = 1
…		…
1684	uint8_t ext, cmd;	1828	uint8_t ext, cmd;
1685		1829
1686	do	1830	do
1687	{	1831	{
1688	ext = *data++;	1832	ext = *data++;
1689	cmd = ext & 0x3f;	1833	cmd = ext & 0x7f;
1690		1834
1691	if (cmd < 4)	1835	if (cmd < 4)
1692	cell->darkness = 255 - ext * 64 + 1;	1836	cell->darkness = 255 - ext * 64 + 1;
1693	else if (cmd == 5) // health	1837	else if (cmd == 5) // health
1694	{	1838	{
…		…
1697	}	1841	}
1698	else if (cmd == 6) // monster width	1842	else if (cmd == 6) // monster width
1699	cell->stat_width = *data++ + 1;	1843	cell->stat_width = *data++ + 1;
1700	else if (cmd == 0x47)	1844	else if (cmd == 0x47)
1701	{	1845	{
1702	if (*data == 4)	1846	if (*data == 1) cell->player = data [1];
1703	; // decode player count	1847	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1848	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1849	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1704		1850
1705	data += *data + 1;	1851	data += *data + 1;
1706	}	1852	}
1707	else if (cmd == 8) // cell flags	1853	else if (cmd == 8) // cell flags
1708	cell->flags = *data++;	1854	cell->flags = *data++;
…		…
1738	}	1884	}
1739	}	1885	}
1740	}	1886	}
1741	}	1887	}
1742	else	1888	else
1743	cell->darkness = 0;	1889	CELL_CLEAR (cell);
1744	}	1890	}
1745	}	1891	}
1746	OUTPUT:	1892	OUTPUT:
1747	RETVAL	1893	RETVAL
1748		1894
…		…
1800	}	1946	}
1801	OUTPUT:	1947	OUTPUT:
1802	RETVAL	1948	RETVAL
1803		1949
1804	void	1950	void
1805	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1951	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806	CODE:	1952	CODE:
1807	{	1953	{
1808	int x, y, z;	1954	int x, y, z;
1809		1955
1810	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1956	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1811	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1957	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1958	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813	smooth_key skey;	1959	smooth_key skey;
1814		1960	int pl_x, pl_y;
		1961	maptex pl_tex;
1815	rc_t *rc = rc_alloc ();	1962	rc_t *rc = rc_alloc ();
1816	rc_key_t key;	1963	rc_key_t key;
1817	rc_array_t *arr;	1964	rc_array_t *arr;
		1965
		1966	pl_tex.name = 0;
1818		1967
1819	// thats current max. sorry.	1968	// thats current max. sorry.
1820	if (sw > 255) sw = 255;	1969	if (sw > 255) sw = 255;
1821	if (sh > 255) sh = 255;	1970	if (sh > 255) sh = 255;
1822		1971
…		…
1877	tileid tile = cell->tile [z];	2026	tileid tile = cell->tile [z];
1878		2027
1879	if (tile)	2028	if (tile)
1880	{	2029	{
1881	maptex tex = self->tex [tile];	2030	maptex tex = self->tex [tile];
1882	int px, py;	2031	int px = (x + 1) * T - tex.w;
		2032	int py = (y + 1) * T - tex.h;
1883		2033
1884	if (key.texname != tex.name)	2034	if (key.texname != tex.name)
1885	{	2035	{
1886	if (!tex.name)	2036	if (!tex.name)
1887	tex = self->tex [2]; /* missing, replace by noface */	2037	tex = self->tex [2]; /* missing, replace by noface */
1888		2038
1889	key.texname = tex.name;	2039	key.texname = tex.name;
1890	arr = rc_array (rc, &key);	2040	arr = rc_array (rc, &key);
1891	}	2041	}
1892		2042
1893	px = (x + 1) * T - tex.w;	2043	if (expect_false (cell->player == player) && expect_false (z == 2))
1894	py = (y + 1) * T - tex.h;	2044	{
		2045	pl_x = px;
		2046	pl_y = py;
		2047	pl_tex = tex;
		2048	continue;
		2049	}
1895		2050
1896	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2051	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2052	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2053	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2054	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900		2055
1901	if (cell->flags && z == 2)	2056	if (expect_false (cell->flags) && expect_false (z == 2))
1902	{	2057	{
1903	// overlays such as the speech bubble, probably more to come	2058	// overlays such as the speech bubble, probably more to come
1904	if (cell->flags & 1)	2059	if (cell->flags & 1)
1905	{	2060	{
1906	maptex tex = self->tex [1];	2061	maptex tex = self->tex [1];
…		…
2045	}	2200	}
2046		2201
2047	hv_clear (smooth);	2202	hv_clear (smooth);
2048	}	2203	}
2049		2204
		2205	if (pl_tex.name)
		2206	{
		2207	maptex tex = pl_tex;
		2208	int px = pl_x + sdx;
		2209	int py = pl_y + sdy;
		2210
		2211	key.texname = tex.name;
		2212	arr = rc_array (rc, &key);
		2213
		2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2216	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2217	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2218
		2219	rc_draw (rc);
		2220	}
		2221
2050	glDisable (GL_BLEND);	2222	glDisable (GL_BLEND);
2051	rc_free (rc);	2223	rc_free (rc);
2052		2224
2053	// top layer: overlays such as the health bar	2225	// top layer: overlays such as the health bar
2054	for (y = 0; y < sh; y++)	2226	for (y = 0; y < sh; y++)
…		…
2159	SvCUR_set (darkness3_sv, sw34 * sh3);	2331	SvCUR_set (darkness3_sv, sw34 * sh3);
2160		2332
2161	mx += self->x - 1;	2333	mx += self->x - 1;
2162	my += self->y - 1;	2334	my += self->y - 1;
2163		2335
2164	memset (darkness1, 255, sw1 * sh1);	2336	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2165		2337
2166	for (y = 0; y < sh1; y++)	2338	for (y = 0; y < sh1; y++)
2167	if (0 <= y + my && y + my < self->rows)	2339	if (0 <= y + my && y + my < self->rows)
2168	{	2340	{
2169	maprow *row = self->row + (y + my);	2341	maprow *row = self->row + (y + my);
…		…
2289	else	2461	else
2290	*data++ = 0;	2462	*data++ = 0;
2291	}	2463	}
2292	}	2464	}
2293		2465
		2466	/* if size is wh + 5 then no data has been found /
		2467	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2468	{
2294	SvPOK_only (data_sv);	2469	SvPOK_only (data_sv);
2295	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2470	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2471	}
		2472
2296	RETVAL = data_sv;	2473	RETVAL = data_sv;
2297	}	2474	}
2298	OUTPUT:	2475	OUTPUT:
2299	RETVAL	2476	RETVAL
2300		2477
2301	void	2478	void
2302	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2479	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303	PPCODE:	2480	PPCODE:
2304	{	2481	{
2305	int x, y, z;	2482	int x, y, z;
2306	int w, h;	2483	int w, h;
2307	int x1, y1;	2484	int x1, y1;
		2485	STRLEN len;
		2486	uint8_t data, end;
		2487
		2488	len = SvLEN (data_sv);
		2489	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2490	data = SvPVbyte_nolen (data_sv);
		2491	end = data + len + 8;
		2492
		2493	if (len < 5)
		2494	XSRETURN_EMPTY;
2308		2495
2309	if (*data++ != 0)	2496	if (*data++ != 0)
2310	XSRETURN_EMPTY; /* version mismatch */	2497	XSRETURN_EMPTY; /* version mismatch */
2311		2498
2312	w = data++ << 8; w \|= data++;	2499	w = data++ << 8; w \|= data++;
…		…
2327	{	2514	{
2328	maprow *row = map_get_row (self, y);	2515	maprow *row = map_get_row (self, y);
2329		2516
2330	for (x = x0; x < x1; x++)	2517	for (x = x0; x < x1; x++)
2331	{	2518	{
		2519	uint8_t flags;
		2520
		2521	if (data + 7 >= end)
		2522	XSRETURN_EMPTY;
		2523
2332	uint8_t flags = *data++;	2524	flags = *data++;
2333		2525
2334	if (flags)	2526	if (flags)
2335	{	2527	{
2336	mapcell *cell = row_get_cell (row, x);	2528	mapcell *cell = row_get_cell (row, x);
2337	tileid tile[3] = { 0, 0, 0 };	2529	tileid tile[3] = { 0, 0, 0 };
…		…
2340	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2532	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2341	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2533	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2342		2534
2343	if (cell->darkness == 0)	2535	if (cell->darkness == 0)
2344	{	2536	{
2345	cell->darkness = 0;	2537	/cell->darkness = 0;/
		2538	EXTEND (SP, 3);
2346		2539
2347	for (z = 0; z <= 2; z++)	2540	for (z = 0; z <= 2; z++)
2348	{	2541	{
2349	tileid t = tile [z];	2542	tileid t = tile [z];
2350		2543
2351	if (t >= self->texs \|\| (t && !self->tex [t].name))	2544	if (t >= self->texs \|\| (t && !self->tex [t].name))
2352	{	2545	{
2353	XPUSHs (sv_2mortal (newSViv (t)));	2546	PUSHs (sv_2mortal (newSViv (t)));
2354	need_texid (self, t);	2547	need_texid (self, t);
2355	}	2548	}
2356		2549
2357	cell->tile [z] = t;	2550	cell->tile [z] = t;
2358	}	2551	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC vs. Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC