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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		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
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
171		188
172	static void	189	static void
173	layout_update_font (DC__Layout self)	190	layout_update_font (DC__Layout self)
174	{	191	{
175	/* 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
176	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
177	*/	194	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
179		196
180	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
621	const_iv (KMOD_NUM),	638	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	639	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	640	const_iv (KMOD_MODE),
624		641
625	const_iv (MIX_DEFAULT_FORMAT),	642	const_iv (MIX_DEFAULT_FORMAT),
		643
		644	const_iv (SDL_INIT_TIMER),
		645	const_iv (SDL_INIT_AUDIO),
		646	const_iv (SDL_INIT_VIDEO),
		647	const_iv (SDL_INIT_CDROM),
		648	const_iv (SDL_INIT_JOYSTICK),
		649	const_iv (SDL_INIT_EVERYTHING),
		650	const_iv (SDL_INIT_NOPARACHUTE),
		651	const_iv (SDL_INIT_EVENTTHREAD),
		652
		653	const_iv (SDL_GL_RED_SIZE),
		654	const_iv (SDL_GL_GREEN_SIZE),
		655	const_iv (SDL_GL_BLUE_SIZE),
		656	const_iv (SDL_GL_ALPHA_SIZE),
		657	const_iv (SDL_GL_DOUBLEBUFFER),
		658	const_iv (SDL_GL_BUFFER_SIZE),
		659	const_iv (SDL_GL_DEPTH_SIZE),
		660	const_iv (SDL_GL_STENCIL_SIZE),
		661	const_iv (SDL_GL_ACCUM_RED_SIZE),
		662	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		663	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		665	const_iv (SDL_GL_STEREO),
		666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		667	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		668	const_iv (SDL_GL_ACCELERATED_VISUAL),
		669	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	670	# undef const_iv
627	};	671	};
628		672
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	673	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	703	CODE:
660	{	704	{
661	opengl_fontmap = pango_opengl_font_map_new ();	705	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	706	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	707	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		708	/pango_context_set_font_description (opengl_context, default_font);/
		709	#if PANGO_VERSION_CHECK (1, 15, 2)
		710	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		711	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		712	#endif
664	}	713	}
665		714
666	char *
667	SDL_GetError ()	715	char *SDL_GetError ()
668		716
669	int	717	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		718
672	void	719	int SDL_InitSubSystem (U32 flags)
		720
		721	void SDL_QuitSubSystem (U32 flags)
		722
673	SDL_Quit ()	723	void SDL_Quit ()
		724
		725	int SDL_GL_SetAttribute (int attr, int value)
		726
		727	int SDL_GL_GetAttribute (int attr)
		728	CODE:
		729	if (SDL_GL_GetAttribute (attr, &RETVAL))
		730	XSRETURN_UNDEF;
		731	OUTPUT:
		732	RETVAL
674		733
675	void	734	void
676	SDL_ListModes (int rgb, int alpha)	735	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	736	PPCODE:
678	{	737	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	749	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	750	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	751	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		752
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	753	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	754	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		755
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	756	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		757
702	if (m && m != (SDL_Rect **)-1)	758	if (m && m != (SDL_Rect **)-1)
703	while (*m)	759	while (*m)
704	{	760	{
705	if ((m)->w >= 800 && (m)->h >= 480)
706	{
707	AV *av = newAV ();	761	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	762	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	763	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	764	av_push (av, newSViv (rgb));
711	av_push (av, newSViv (alpha));	765	av_push (av, newSViv (alpha));
712	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713	}
714		767
715	++m;	768	++m;
716	}	769	}
717	}	770	}
718		771
…		…
751	char *	804	char *
752	SDL_GetKeyName (int sym)	805	SDL_GetKeyName (int sym)
753		806
754	int	807	int
755	SDL_GetAppState ()	808	SDL_GetAppState ()
		809
		810	int
		811	SDL_GetModState ()
756		812
757	void	813	void
758	poll_events ()	814	poll_events ()
759	PPCODE:	815	PPCODE:
760	{	816	{
…		…
770	{	826	{
771	case SDL_KEYDOWN:	827	case SDL_KEYDOWN:
772	case SDL_KEYUP:	828	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	829	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	830	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	831	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	832	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	833	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	834	break;
779		835
780	case SDL_ACTIVEEVENT:	836	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	837	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	855	x = ev.motion.x;
800	y = ev.motion.y;	856	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	857	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	858	}
803		859
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	860	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	861	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	862	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	863	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	864	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	865	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	866	}
811	break;	867	break;
812		868
813	case SDL_MOUSEBUTTONDOWN:	869	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	870	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	871	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		872
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	873	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	874	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	875	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	876	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
894	}	950	}
895	}	951	}
896	#endif	952	#endif
897	}	953	}
898		954
899	void	955	int
900	add_font (char *file)	956	add_font (char *file)
901	CODE:	957	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	958	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		959	OUTPUT:
		960	RETVAL
903		961
904	void	962	void
905	load_image_inline (SV *image_)	963	load_image_inline (SV *image_)
906	ALIAS:	964	ALIAS:
907	load_image_file = 1	965	load_image_file = 1
…		…
1165	{	1223	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1224	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1225
1168	do	1226	do
1169	{	1227	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1228	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1229
1172	if (run && shape_attr_p (run))	1230	if (run && shape_attr_p (run))
1173	{	1231	{
1174	PangoRectangle extents;	1232	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1233	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1279	int	1337	int
1280	descent (DC::Layout self)	1338	descent (DC::Layout self)
1281	CODE:	1339	CODE:
1282	{	1340	{
1283	PangoRectangle rect;	1341	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1342	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1343	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1344	RETVAL = PANGO_DESCENT (rect);
1287	}	1345	}
1288	OUTPUT:	1346	OUTPUT:
1289	RETVAL	1347	RETVAL
…		…
1301		1359
1302	void	1360	void
1303	cursor_pos (DC::Layout self, int index)	1361	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1362	PPCODE:
1305	{	1363	{
1306	PangoRectangle strong_pos;	1364	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1365	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1366
1309	EXTEND (SP, 3);	1367	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1368	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1369	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1370	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1371	}
1314		1372
1315	void	1373	void
1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)	1374	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1375	PPCODE:
1318	{	1376	{
1319	int line, x;	1377	int line, x;
1320		1378
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1379	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1380	#if !PANGO_VERSION_CHECK (1, 17, 3)
1323	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1381	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324	--line;	1382	--line;
1325	#endif	1383	#endif
1326	EXTEND (SP, 2);	1384	EXTEND (SP, 2);
1327	PUSHs (sv_2mortal (newSViv (line)));	1385	PUSHs (sv_2mortal (newSViv (line)));
…		…
1336	int index, trailing;	1394	int index, trailing;
1337		1395
1338	if (line < 0)	1396	if (line < 0)
1339	XSRETURN_EMPTY;	1397	XSRETURN_EMPTY;
1340		1398
1341	if (!(lp = pango_layout_get_line (self->pl, line)))	1399	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342	XSRETURN_EMPTY; /* do better */	1400	XSRETURN_EMPTY; /* do better */
1343		1401
1344	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1402	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345		1403
1346	EXTEND (SP, 2);	1404	EXTEND (SP, 2);
…		…
1663	uint8_t ext, cmd;	1721	uint8_t ext, cmd;
1664		1722
1665	do	1723	do
1666	{	1724	{
1667	ext = *data++;	1725	ext = *data++;
1668	cmd = ext & 0x3f;	1726	cmd = ext & 0x7f;
1669		1727
1670	if (cmd < 4)	1728	if (cmd < 4)
1671	cell->darkness = 255 - ext * 64 + 1;	1729	cell->darkness = 255 - ext * 64 + 1;
1672	else if (cmd == 5) // health	1730	else if (cmd == 5) // health
1673	{	1731	{
…		…
1676	}	1734	}
1677	else if (cmd == 6) // monster width	1735	else if (cmd == 6) // monster width
1678	cell->stat_width = *data++ + 1;	1736	cell->stat_width = *data++ + 1;
1679	else if (cmd == 0x47)	1737	else if (cmd == 0x47)
1680	{	1738	{
1681	if (*data == 4)	1739	if (*data == 1) cell->player = data [1];
1682	; // decode player count	1740	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1741	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1742	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683		1743
1684	data += *data + 1;	1744	data += *data + 1;
1685	}	1745	}
1686	else if (cmd == 8) // cell flags	1746	else if (cmd == 8) // cell flags
1687	cell->flags = *data++;	1747	cell->flags = *data++;
…		…
1779	}	1839	}
1780	OUTPUT:	1840	OUTPUT:
1781	RETVAL	1841	RETVAL
1782		1842
1783	void	1843	void
1784	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1844	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1785	CODE:	1845	CODE:
1786	{	1846	{
1787	int x, y, z;	1847	int x, y, z;
1788		1848
1789	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1849	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1790	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1850	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1791	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1851	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792	smooth_key skey;	1852	smooth_key skey;
1793		1853	int pl_x, pl_y;
		1854	maptex pl_tex;
1794	rc_t *rc = rc_alloc ();	1855	rc_t *rc = rc_alloc ();
1795	rc_key_t key;	1856	rc_key_t key;
1796	rc_array_t *arr;	1857	rc_array_t *arr;
		1858
		1859	pl_tex.name = 0;
1797		1860
1798	// thats current max. sorry.	1861	// thats current max. sorry.
1799	if (sw > 255) sw = 255;	1862	if (sw > 255) sw = 255;
1800	if (sh > 255) sh = 255;	1863	if (sh > 255) sh = 255;
1801		1864
…		…
1856	tileid tile = cell->tile [z];	1919	tileid tile = cell->tile [z];
1857		1920
1858	if (tile)	1921	if (tile)
1859	{	1922	{
1860	maptex tex = self->tex [tile];	1923	maptex tex = self->tex [tile];
1861	int px, py;	1924	int px = (x + 1) * T - tex.w;
		1925	int py = (y + 1) * T - tex.h;
1862		1926
1863	if (key.texname != tex.name)	1927	if (key.texname != tex.name)
1864	{	1928	{
1865	if (!tex.name)	1929	if (!tex.name)
1866	tex = self->tex [2]; /* missing, replace by noface */	1930	tex = self->tex [2]; /* missing, replace by noface */
1867		1931
1868	key.texname = tex.name;	1932	key.texname = tex.name;
1869	arr = rc_array (rc, &key);	1933	arr = rc_array (rc, &key);
1870	}	1934	}
1871		1935
1872	px = (x + 1) * T - tex.w;	1936	if (expect_false (cell->player == player) && expect_false (z == 2))
1873	py = (y + 1) * T - tex.h;	1937	{
		1938	pl_x = px;
		1939	pl_y = py;
		1940	pl_tex = tex;
		1941	continue;
		1942	}
1874		1943
1875	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1944	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1945	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1877	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1946	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1878	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1947	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879		1948
1880	if (cell->flags && z == 2)	1949	if (expect_false (cell->flags) && expect_false (z == 2))
1881	{	1950	{
1882	// overlays such as the speech bubble, probably more to come	1951	// overlays such as the speech bubble, probably more to come
1883	if (cell->flags & 1)	1952	if (cell->flags & 1)
1884	{	1953	{
1885	maptex tex = self->tex [1];	1954	maptex tex = self->tex [1];
…		…
2022	glDisable (GL_TEXTURE_2D);	2091	glDisable (GL_TEXTURE_2D);
2023	key.texname = -1;	2092	key.texname = -1;
2024	}	2093	}
2025		2094
2026	hv_clear (smooth);	2095	hv_clear (smooth);
		2096	}
		2097
		2098	if (pl_tex.name)
		2099	{
		2100	maptex tex = pl_tex;
		2101	int px = pl_x + pdx;
		2102	int py = pl_y + pdy;
		2103
		2104	key.texname = tex.name;
		2105	arr = rc_array (rc, &key);
		2106
		2107	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2108	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2109	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2110	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2111
		2112	rc_draw (rc);
2027	}	2113	}
2028		2114
2029	glDisable (GL_BLEND);	2115	glDisable (GL_BLEND);
2030	rc_free (rc);	2116	rc_free (rc);
2031		2117
…		…
2268	else	2354	else
2269	*data++ = 0;	2355	*data++ = 0;
2270	}	2356	}
2271	}	2357	}
2272		2358
		2359	/* if size is wh + 5 then no data has been found /
		2360	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2361	{
2273	SvPOK_only (data_sv);	2362	SvPOK_only (data_sv);
2274	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2363	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2364	}
		2365
2275	RETVAL = data_sv;	2366	RETVAL = data_sv;
2276	}	2367	}
2277	OUTPUT:	2368	OUTPUT:
2278	RETVAL	2369	RETVAL
2279		2370
2280	void	2371	void
2281	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2372	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282	PPCODE:	2373	PPCODE:
2283	{	2374	{
2284	int x, y, z;	2375	int x, y, z;
2285	int w, h;	2376	int w, h;
2286	int x1, y1;	2377	int x1, y1;
		2378	STRLEN len;
		2379	uint8_t data, end;
		2380
		2381	len = SvLEN (data_sv);
		2382	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2383	data = SvPVbyte_nolen (data_sv);
		2384	end = data + len + 8;
		2385
		2386	if (len < 5)
		2387	XSRETURN_EMPTY;
2287		2388
2288	if (*data++ != 0)	2389	if (*data++ != 0)
2289	XSRETURN_EMPTY; /* version mismatch */	2390	XSRETURN_EMPTY; /* version mismatch */
2290		2391
2291	w = data++ << 8; w \|= data++;	2392	w = data++ << 8; w \|= data++;
…		…
2306	{	2407	{
2307	maprow *row = map_get_row (self, y);	2408	maprow *row = map_get_row (self, y);
2308		2409
2309	for (x = x0; x < x1; x++)	2410	for (x = x0; x < x1; x++)
2310	{	2411	{
		2412	uint8_t flags;
		2413
		2414	if (data + 7 >= end)
		2415	XSRETURN_EMPTY;
		2416
2311	uint8_t flags = *data++;	2417	flags = *data++;
2312		2418
2313	if (flags)	2419	if (flags)
2314	{	2420	{
2315	mapcell *cell = row_get_cell (row, x);	2421	mapcell *cell = row_get_cell (row, x);
2316	tileid tile[3] = { 0, 0, 0 };	2422	tileid tile[3] = { 0, 0, 0 };
…		…
2319	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2425	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2320	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2426	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2321		2427
2322	if (cell->darkness == 0)	2428	if (cell->darkness == 0)
2323	{	2429	{
2324	cell->darkness = 0;	2430	/cell->darkness = 0;/
		2431	EXTEND (SP, 3);
2325		2432
2326	for (z = 0; z <= 2; z++)	2433	for (z = 0; z <= 2; z++)
2327	{	2434	{
2328	tileid t = tile [z];	2435	tileid t = tile [z];
2329		2436
2330	if (t >= self->texs \|\| (t && !self->tex [t].name))	2437	if (t >= self->texs \|\| (t && !self->tex [t].name))
2331	{	2438	{
2332	XPUSHs (sv_2mortal (newSViv (t)));	2439	PUSHs (sv_2mortal (newSViv (t)));
2333	need_texid (self, t);	2440	need_texid (self, t);
2334	}	2441	}
2335		2442
2336	cell->tile [z] = t;	2443	cell->tile [z] = t;
2337	}	2444	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC vs. Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC