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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.249 by root, Fri Dec 28 15:40:07 2007 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 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
71	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
72		85
73	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
74		87
75	#if 0	88	/* mask out modifiers we are not interested in */
76	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
77	#else
78	# define PARACHUTE 0
79	#endif
80		90
81	static AV *texture_av;	91	static AV *texture_av;
82		92
83	static struct	93	static struct
84	{	94	{
…		…
178		188
179	static void	189	static void
180	layout_update_font (DC__Layout self)	190	layout_update_font (DC__Layout self)
181	{	191	{
182	/* 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
183	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
184	*/	194	*/
185	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
186		196
187	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
188	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
357	self->oy = 0;	367	self->oy = 0;
358	self->row = 0;	368	self->row = 0;
359	self->rows = 0;	369	self->rows = 0;
360	}	370	}
361		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
362	static void	382	static void
363	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)
364	{	384	{
365	int x, y;	385	int x, y;
366	maprow *row;	386	maprow *row;
…		…
380	if (x >= row->c1)	400	if (x >= row->c1)
381	break;	401	break;
382		402
383	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
384		404
385	cell->darkness = 0;	405	CELL_CLEAR (cell);
386	cell->stat_hp = 0;
387	cell->flags = 0;
388	cell->player = 0;
389	}	406	}
390	}	407	}
391	}	408	}
392		409
393	typedef struct {	410	typedef struct {
…		…
628	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
629	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
630	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
631		648
632	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)
633	# undef const_iv	679	# undef const_iv
634	};	680	};
635		681
636	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; )
637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
666	CODE:	712	CODE:
667	{	713	{
668	opengl_fontmap = pango_opengl_font_map_new ();	714	opengl_fontmap = pango_opengl_font_map_new ();
669	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);
670	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	716	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671	#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)
672	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	719	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673	pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);	720	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
674	#endif	721	#endif
675	}	722	}
676		723
677	char *
678	SDL_GetError ()	724	char *SDL_GetError ()
679		725
680	int	726	int SDL_Init (U32 flags)
681	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
682		727
683	void	728	int SDL_InitSubSystem (U32 flags)
		729
		730	void SDL_QuitSubSystem (U32 flags)
		731
684	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
685		742
686	void	743	void
687	SDL_ListModes (int rgb, int alpha)	744	SDL_ListModes (int rgb, int alpha)
688	PPCODE:	745	PPCODE:
689	{	746	{
…		…
701	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	758	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	759	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	760	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704		761
705	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	762	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706	#if SDL_VERSION_ATLEAST(1,2,10)
707	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	763	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709	#endif
710		764
711	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	765	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
712		766
713	if (m && m != (SDL_Rect **)-1)	767	if (m && m != (SDL_Rect **)-1)
714	while (*m)	768	while (*m)
715	{	769	{
716	if ((m)->w >= 800 && (m)->h >= 480)	770	if ((m)->w >= 400 && (m)->h >= 300)
717	{	771	{
718	AV *av = newAV ();	772	AV *av = newAV ();
719	av_push (av, newSViv ((*m)->w));	773	av_push (av, newSViv ((*m)->w));
720	av_push (av, newSViv ((*m)->h));	774	av_push (av, newSViv ((*m)->h));
721	av_push (av, newSViv (rgb));	775	av_push (av, newSViv (rgb));
…		…
763	SDL_GetKeyName (int sym)	817	SDL_GetKeyName (int sym)
764		818
765	int	819	int
766	SDL_GetAppState ()	820	SDL_GetAppState ()
767		821
		822	int
		823	SDL_GetModState ()
		824
768	void	825	void
769	poll_events ()	826	poll_events ()
770	PPCODE:	827	PPCODE:
771	{	828	{
772	SDL_Event ev;	829	SDL_Event ev;
…		…
781	{	838	{
782	case SDL_KEYDOWN:	839	case SDL_KEYDOWN:
783	case SDL_KEYUP:	840	case SDL_KEYUP:
784	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	841	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	842	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	843	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
787	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	844	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
788	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	845	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789	break;	846	break;
790		847
791	case SDL_ACTIVEEVENT:	848	case SDL_ACTIVEEVENT:
792	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	849	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
810	x = ev.motion.x;	867	x = ev.motion.x;
811	y = ev.motion.y;	868	y = ev.motion.y;
812	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	869	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813	}	870	}
814		871
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	872	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816	hv_store (hv, "state", 5, newSViv (state), 0);	873	hv_store (hv, "state", 5, newSViv (state), 0);
817	hv_store (hv, "x", 1, newSViv (x), 0);	874	hv_store (hv, "x", 1, newSViv (x), 0);
818	hv_store (hv, "y", 1, newSViv (y), 0);	875	hv_store (hv, "y", 1, newSViv (y), 0);
819	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	876	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	877	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821	}	878	}
822	break;	879	break;
823		880
824	case SDL_MOUSEBUTTONDOWN:	881	case SDL_MOUSEBUTTONDOWN:
825	case SDL_MOUSEBUTTONUP:	882	case SDL_MOUSEBUTTONUP:
826	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	883	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827		884
828	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	885	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	886	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	887	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	888	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
905	}	962	}
906	}	963	}
907	#endif	964	#endif
908	}	965	}
909		966
910	void	967	int
911	add_font (char *file)	968	add_font (char *file)
912	CODE:	969	CODE:
913	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	970	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		971	OUTPUT:
		972	RETVAL
914		973
915	void	974	void
916	load_image_inline (SV *image_)	975	load_image_inline (SV *image_)
917	ALIAS:	976	ALIAS:
918	load_image_file = 1	977	load_image_file = 1
…		…
1312		1371
1313	void	1372	void
1314	cursor_pos (DC::Layout self, int index)	1373	cursor_pos (DC::Layout self, int index)
1315	PPCODE:	1374	PPCODE:
1316	{	1375	{
1317	PangoRectangle strong_pos;	1376	PangoRectangle pos;
1318	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1377	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319		1378
1320	EXTEND (SP, 3);	1379	EXTEND (SP, 3);
1321	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1380	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1381	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1382	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324	}	1383	}
1325		1384
1326	void	1385	void
1327	index_to_line_x (DC::Layout self, int index, int trailing = 0)	1386	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328	PPCODE:	1387	PPCODE:
1329	{	1388	{
1330	int line, x;	1389	int line, x;
1331		1390
1332	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);
1333	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1392	#if !PANGO_VERSION_CHECK (1, 17, 3)
1334	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1393	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335	--line;	1394	--line;
1336	#endif	1395	#endif
1337	EXTEND (SP, 2);	1396	EXTEND (SP, 2);
1338	PUSHs (sv_2mortal (newSViv (line)));	1397	PUSHs (sv_2mortal (newSViv (line)));
…		…
1674	uint8_t ext, cmd;	1733	uint8_t ext, cmd;
1675		1734
1676	do	1735	do
1677	{	1736	{
1678	ext = *data++;	1737	ext = *data++;
1679	cmd = ext & 0x3f;	1738	cmd = ext & 0x7f;
1680		1739
1681	if (cmd < 4)	1740	if (cmd < 4)
1682	cell->darkness = 255 - ext * 64 + 1;	1741	cell->darkness = 255 - ext * 64 + 1;
1683	else if (cmd == 5) // health	1742	else if (cmd == 5) // health
1684	{	1743	{
…		…
1687	}	1746	}
1688	else if (cmd == 6) // monster width	1747	else if (cmd == 6) // monster width
1689	cell->stat_width = *data++ + 1;	1748	cell->stat_width = *data++ + 1;
1690	else if (cmd == 0x47)	1749	else if (cmd == 0x47)
1691	{	1750	{
1692	if (*data == 4)	1751	if (*data == 1) cell->player = data [1];
1693	; // 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);
1694		1755
1695	data += *data + 1;	1756	data += *data + 1;
1696	}	1757	}
1697	else if (cmd == 8) // cell flags	1758	else if (cmd == 8) // cell flags
1698	cell->flags = *data++;	1759	cell->flags = *data++;
…		…
1728	}	1789	}
1729	}	1790	}
1730	}	1791	}
1731	}	1792	}
1732	else	1793	else
1733	cell->darkness = 0;	1794	CELL_CLEAR (cell);
1734	}	1795	}
1735	}	1796	}
1736	OUTPUT:	1797	OUTPUT:
1737	RETVAL	1798	RETVAL
1738		1799
…		…
1790	}	1851	}
1791	OUTPUT:	1852	OUTPUT:
1792	RETVAL	1853	RETVAL
1793		1854
1794	void	1855	void
1795	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)
1796	CODE:	1857	CODE:
1797	{	1858	{
1798	int x, y, z;	1859	int x, y, z;
1799		1860
1800	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1861	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1801	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
1802	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)
1803	smooth_key skey;	1864	smooth_key skey;
1804		1865	int pl_x, pl_y;
		1866	maptex pl_tex;
1805	rc_t *rc = rc_alloc ();	1867	rc_t *rc = rc_alloc ();
1806	rc_key_t key;	1868	rc_key_t key;
1807	rc_array_t *arr;	1869	rc_array_t *arr;
		1870
		1871	pl_tex.name = 0;
1808		1872
1809	// thats current max. sorry.	1873	// thats current max. sorry.
1810	if (sw > 255) sw = 255;	1874	if (sw > 255) sw = 255;
1811	if (sh > 255) sh = 255;	1875	if (sh > 255) sh = 255;
1812		1876
…		…
1867	tileid tile = cell->tile [z];	1931	tileid tile = cell->tile [z];
1868		1932
1869	if (tile)	1933	if (tile)
1870	{	1934	{
1871	maptex tex = self->tex [tile];	1935	maptex tex = self->tex [tile];
1872	int px, py;	1936	int px = (x + 1) * T - tex.w;
		1937	int py = (y + 1) * T - tex.h;
1873		1938
1874	if (key.texname != tex.name)	1939	if (key.texname != tex.name)
1875	{	1940	{
1876	if (!tex.name)	1941	if (!tex.name)
1877	tex = self->tex [2]; /* missing, replace by noface */	1942	tex = self->tex [2]; /* missing, replace by noface */
1878		1943
1879	key.texname = tex.name;	1944	key.texname = tex.name;
1880	arr = rc_array (rc, &key);	1945	arr = rc_array (rc, &key);
1881	}	1946	}
1882		1947
1883	px = (x + 1) * T - tex.w;	1948	if (expect_false (cell->player == player) && expect_false (z == 2))
1884	py = (y + 1) * T - tex.h;	1949	{
		1950	pl_x = px;
		1951	pl_y = py;
		1952	pl_tex = tex;
		1953	continue;
		1954	}
1885		1955
1886	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1956	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887	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);
1888	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);
1889	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);
1890		1960
1891	if (cell->flags && z == 2)	1961	if (expect_false (cell->flags) && expect_false (z == 2))
1892	{	1962	{
1893	// overlays such as the speech bubble, probably more to come	1963	// overlays such as the speech bubble, probably more to come
1894	if (cell->flags & 1)	1964	if (cell->flags & 1)
1895	{	1965	{
1896	maptex tex = self->tex [1];	1966	maptex tex = self->tex [1];
…		…
2035	}	2105	}
2036		2106
2037	hv_clear (smooth);	2107	hv_clear (smooth);
2038	}	2108	}
2039		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
2040	glDisable (GL_BLEND);	2127	glDisable (GL_BLEND);
2041	rc_free (rc);	2128	rc_free (rc);
2042		2129
2043	// top layer: overlays such as the health bar	2130	// top layer: overlays such as the health bar
2044	for (y = 0; y < sh; y++)	2131	for (y = 0; y < sh; y++)
…		…
2149	SvCUR_set (darkness3_sv, sw34 * sh3);	2236	SvCUR_set (darkness3_sv, sw34 * sh3);
2150		2237
2151	mx += self->x - 1;	2238	mx += self->x - 1;
2152	my += self->y - 1;	2239	my += self->y - 1;
2153		2240
2154	memset (darkness1, 255, sw1 * sh1);	2241	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2155		2242
2156	for (y = 0; y < sh1; y++)	2243	for (y = 0; y < sh1; y++)
2157	if (0 <= y + my && y + my < self->rows)	2244	if (0 <= y + my && y + my < self->rows)
2158	{	2245	{
2159	maprow *row = self->row + (y + my);	2246	maprow *row = self->row + (y + my);
…		…
2279	else	2366	else
2280	*data++ = 0;	2367	*data++ = 0;
2281	}	2368	}
2282	}	2369	}
2283		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	{
2284	SvPOK_only (data_sv);	2374	SvPOK_only (data_sv);
2285	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2375	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2376	}
		2377
2286	RETVAL = data_sv;	2378	RETVAL = data_sv;
2287	}	2379	}
2288	OUTPUT:	2380	OUTPUT:
2289	RETVAL	2381	RETVAL
2290		2382
2291	void	2383	void
2292	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)
2293	PPCODE:	2385	PPCODE:
2294	{	2386	{
2295	int x, y, z;	2387	int x, y, z;
2296	int w, h;	2388	int w, h;
2297	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;
2298		2400
2299	if (*data++ != 0)	2401	if (*data++ != 0)
2300	XSRETURN_EMPTY; /* version mismatch */	2402	XSRETURN_EMPTY; /* version mismatch */
2301		2403
2302	w = data++ << 8; w \|= data++;	2404	w = data++ << 8; w \|= data++;
…		…
2317	{	2419	{
2318	maprow *row = map_get_row (self, y);	2420	maprow *row = map_get_row (self, y);
2319		2421
2320	for (x = x0; x < x1; x++)	2422	for (x = x0; x < x1; x++)
2321	{	2423	{
		2424	uint8_t flags;
		2425
		2426	if (data + 7 >= end)
		2427	XSRETURN_EMPTY;
		2428
2322	uint8_t flags = *data++;	2429	flags = *data++;
2323		2430
2324	if (flags)	2431	if (flags)
2325	{	2432	{
2326	mapcell *cell = row_get_cell (row, x);	2433	mapcell *cell = row_get_cell (row, x);
2327	tileid tile[3] = { 0, 0, 0 };	2434	tileid tile[3] = { 0, 0, 0 };
…		…
2330	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2437	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2331	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2438	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2332		2439
2333	if (cell->darkness == 0)	2440	if (cell->darkness == 0)
2334	{	2441	{
2335	cell->darkness = 0;	2442	/cell->darkness = 0;/
		2443	EXTEND (SP, 3);
2336		2444
2337	for (z = 0; z <= 2; z++)	2445	for (z = 0; z <= 2; z++)
2338	{	2446	{
2339	tileid t = tile [z];	2447	tileid t = tile [z];
2340		2448
2341	if (t >= self->texs \|\| (t && !self->tex [t].name))	2449	if (t >= self->texs \|\| (t && !self->tex [t].name))
2342	{	2450	{
2343	XPUSHs (sv_2mortal (newSViv (t)));	2451	PUSHs (sv_2mortal (newSViv (t)));
2344	need_texid (self, t);	2452	need_texid (self, t);
2345	}	2453	}
2346		2454
2347	cell->tile [z] = t;	2455	cell->tile [z] = t;
2348	}	2456	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.249 by root, Fri Dec 28 15:40:07 2007 UTC vs. Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.249 by root, Fri Dec 28 15:40:07 2007 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC