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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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));
…		…
350	self->oy = 0;	367	self->oy = 0;
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	(cell)->darkness = 0; \
		375	(cell)->stat_hp = 0; \
		376	(cell)->flags = 0; \
		377	(cell)->player = 0; \
		378	} while (0)
		379
355	static void	380	static void
356	map_blank (DC__Map self, int x0, int y0, int w, int h)	381	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	382	{
358	int x, y;	383	int x, y;
359	maprow *row;	384	maprow *row;
…		…
373	if (x >= row->c1)	398	if (x >= row->c1)
374	break;	399	break;
375		400
376	cell = row->col + x - row->c0;	401	cell = row->col + x - row->c0;
377		402
378	cell->darkness = 0;	403	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	404	}
383	}	405	}
384	}	406	}
385		407
386	typedef struct {	408	typedef struct {
…		…
621	const_iv (KMOD_NUM),	643	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	644	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	645	const_iv (KMOD_MODE),
624		646
625	const_iv (MIX_DEFAULT_FORMAT),	647	const_iv (MIX_DEFAULT_FORMAT),
		648
		649	const_iv (SDL_INIT_TIMER),
		650	const_iv (SDL_INIT_AUDIO),
		651	const_iv (SDL_INIT_VIDEO),
		652	const_iv (SDL_INIT_CDROM),
		653	const_iv (SDL_INIT_JOYSTICK),
		654	const_iv (SDL_INIT_EVERYTHING),
		655	const_iv (SDL_INIT_NOPARACHUTE),
		656	const_iv (SDL_INIT_EVENTTHREAD),
		657
		658	const_iv (SDL_GL_RED_SIZE),
		659	const_iv (SDL_GL_GREEN_SIZE),
		660	const_iv (SDL_GL_BLUE_SIZE),
		661	const_iv (SDL_GL_ALPHA_SIZE),
		662	const_iv (SDL_GL_DOUBLEBUFFER),
		663	const_iv (SDL_GL_BUFFER_SIZE),
		664	const_iv (SDL_GL_DEPTH_SIZE),
		665	const_iv (SDL_GL_STENCIL_SIZE),
		666	const_iv (SDL_GL_ACCUM_RED_SIZE),
		667	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		668	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		669	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		670	const_iv (SDL_GL_STEREO),
		671	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		672	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		673	const_iv (SDL_GL_ACCELERATED_VISUAL),
		674	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	675	# undef const_iv
627	};	676	};
628		677
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	678	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	679	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	708	CODE:
660	{	709	{
661	opengl_fontmap = pango_opengl_font_map_new ();	710	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	711	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);	712	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		713	/pango_context_set_font_description (opengl_context, default_font);/
		714	#if PANGO_VERSION_CHECK (1, 15, 2)
		715	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		716	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		717	#endif
664	}	718	}
665		719
666	char *
667	SDL_GetError ()	720	char *SDL_GetError ()
668		721
669	int	722	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		723
672	void	724	int SDL_InitSubSystem (U32 flags)
		725
		726	void SDL_QuitSubSystem (U32 flags)
		727
673	SDL_Quit ()	728	void SDL_Quit ()
		729
		730	int SDL_GL_SetAttribute (int attr, int value)
		731
		732	int SDL_GL_GetAttribute (int attr)
		733	CODE:
		734	if (SDL_GL_GetAttribute (attr, &RETVAL))
		735	XSRETURN_UNDEF;
		736	OUTPUT:
		737	RETVAL
674		738
675	void	739	void
676	SDL_ListModes (int rgb, int alpha)	740	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	741	PPCODE:
678	{	742	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	754	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	755	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	756	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		757
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	758	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);	759	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		760
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	761	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		762
702	if (m && m != (SDL_Rect **)-1)	763	if (m && m != (SDL_Rect **)-1)
703	while (*m)	764	while (*m)
704	{	765	{
705	if ((m)->w >= 800 && (m)->h >= 480)	766	if ((m)->w >= 400 && (m)->h >= 300)
706	{	767	{
707	AV *av = newAV ();	768	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	769	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	770	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	771	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	813	SDL_GetKeyName (int sym)
753		814
754	int	815	int
755	SDL_GetAppState ()	816	SDL_GetAppState ()
756		817
		818	int
		819	SDL_GetModState ()
		820
757	void	821	void
758	poll_events ()	822	poll_events ()
759	PPCODE:	823	PPCODE:
760	{	824	{
761	SDL_Event ev;	825	SDL_Event ev;
…		…
770	{	834	{
771	case SDL_KEYDOWN:	835	case SDL_KEYDOWN:
772	case SDL_KEYUP:	836	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	837	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	838	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	839	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 */	840	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);	841	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	842	break;
779		843
780	case SDL_ACTIVEEVENT:	844	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	845	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	863	x = ev.motion.x;
800	y = ev.motion.y;	864	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	865	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	866	}
803		867
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	868	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	869	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	870	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	871	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	872	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	873	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	874	}
811	break;	875	break;
812		876
813	case SDL_MOUSEBUTTONDOWN:	877	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	878	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	879	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		880
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	881	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	882	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	883	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	884	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
894	}	958	}
895	}	959	}
896	#endif	960	#endif
897	}	961	}
898		962
899	void	963	int
900	add_font (char *file)	964	add_font (char *file)
901	CODE:	965	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	966	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		967	OUTPUT:
		968	RETVAL
903		969
904	void	970	void
905	load_image_inline (SV *image_)	971	load_image_inline (SV *image_)
906	ALIAS:	972	ALIAS:
907	load_image_file = 1	973	load_image_file = 1
…		…
1165	{	1231	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1232	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1233
1168	do	1234	do
1169	{	1235	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1236	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1237
1172	if (run && shape_attr_p (run))	1238	if (run && shape_attr_p (run))
1173	{	1239	{
1174	PangoRectangle extents;	1240	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1241	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1279	int	1345	int
1280	descent (DC::Layout self)	1346	descent (DC::Layout self)
1281	CODE:	1347	CODE:
1282	{	1348	{
1283	PangoRectangle rect;	1349	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1350	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1351	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1352	RETVAL = PANGO_DESCENT (rect);
1287	}	1353	}
1288	OUTPUT:	1354	OUTPUT:
1289	RETVAL	1355	RETVAL
…		…
1301		1367
1302	void	1368	void
1303	cursor_pos (DC::Layout self, int index)	1369	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1370	PPCODE:
1305	{	1371	{
1306	PangoRectangle strong_pos;	1372	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1373	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1374
1309	EXTEND (SP, 3);	1375	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1376	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1377	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1378	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1379	}
1314		1380
1315	void	1381	void
1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)	1382	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1383	PPCODE:
1318	{	1384	{
1319	int line, x;	1385	int line, x;
1320		1386
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1387	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322
1323	#if !PANGO_VERSION_CHECK (1, 17. 3)	1388	#if !PANGO_VERSION_CHECK (1, 17, 3)
1324	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1389	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325	--line;	1390	--line;
1326	#endif	1391	#endif
1327
1328	EXTEND (SP, 2);	1392	EXTEND (SP, 2);
1329	PUSHs (sv_2mortal (newSViv (line)));	1393	PUSHs (sv_2mortal (newSViv (line)));
1330	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1394	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331	}	1395	}
1332		1396
…		…
1338	int index, trailing;	1402	int index, trailing;
1339		1403
1340	if (line < 0)	1404	if (line < 0)
1341	XSRETURN_EMPTY;	1405	XSRETURN_EMPTY;
1342		1406
1343	if (!(lp = pango_layout_get_line (self->pl, line)))	1407	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1344	XSRETURN_EMPTY; /* do better */	1408	XSRETURN_EMPTY; /* do better */
1345		1409
1346	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1410	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347		1411
1348	EXTEND (SP, 2);	1412	EXTEND (SP, 2);
…		…
1665	uint8_t ext, cmd;	1729	uint8_t ext, cmd;
1666		1730
1667	do	1731	do
1668	{	1732	{
1669	ext = *data++;	1733	ext = *data++;
1670	cmd = ext & 0x3f;	1734	cmd = ext & 0x7f;
1671		1735
1672	if (cmd < 4)	1736	if (cmd < 4)
1673	cell->darkness = 255 - ext * 64 + 1;	1737	cell->darkness = 255 - ext * 64 + 1;
1674	else if (cmd == 5) // health	1738	else if (cmd == 5) // health
1675	{	1739	{
…		…
1678	}	1742	}
1679	else if (cmd == 6) // monster width	1743	else if (cmd == 6) // monster width
1680	cell->stat_width = *data++ + 1;	1744	cell->stat_width = *data++ + 1;
1681	else if (cmd == 0x47)	1745	else if (cmd == 0x47)
1682	{	1746	{
1683	if (*data == 4)	1747	if (*data == 1) cell->player = data [1];
1684	; // decode player count	1748	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1749	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1750	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1685		1751
1686	data += *data + 1;	1752	data += *data + 1;
1687	}	1753	}
1688	else if (cmd == 8) // cell flags	1754	else if (cmd == 8) // cell flags
1689	cell->flags = *data++;	1755	cell->flags = *data++;
…		…
1719	}	1785	}
1720	}	1786	}
1721	}	1787	}
1722	}	1788	}
1723	else	1789	else
1724	cell->darkness = 0;	1790	CELL_CLEAR (cell);
1725	}	1791	}
1726	}	1792	}
1727	OUTPUT:	1793	OUTPUT:
1728	RETVAL	1794	RETVAL
1729		1795
…		…
1781	}	1847	}
1782	OUTPUT:	1848	OUTPUT:
1783	RETVAL	1849	RETVAL
1784		1850
1785	void	1851	void
1786	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1852	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1787	CODE:	1853	CODE:
1788	{	1854	{
1789	int x, y, z;	1855	int x, y, z;
1790		1856
1791	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1857	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1792	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1858	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1793	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1859	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1794	smooth_key skey;	1860	smooth_key skey;
1795		1861	int pl_x, pl_y;
		1862	maptex pl_tex;
1796	rc_t *rc = rc_alloc ();	1863	rc_t *rc = rc_alloc ();
1797	rc_key_t key;	1864	rc_key_t key;
1798	rc_array_t *arr;	1865	rc_array_t *arr;
		1866
		1867	pl_tex.name = 0;
1799		1868
1800	// thats current max. sorry.	1869	// thats current max. sorry.
1801	if (sw > 255) sw = 255;	1870	if (sw > 255) sw = 255;
1802	if (sh > 255) sh = 255;	1871	if (sh > 255) sh = 255;
1803		1872
…		…
1858	tileid tile = cell->tile [z];	1927	tileid tile = cell->tile [z];
1859		1928
1860	if (tile)	1929	if (tile)
1861	{	1930	{
1862	maptex tex = self->tex [tile];	1931	maptex tex = self->tex [tile];
1863	int px, py;	1932	int px = (x + 1) * T - tex.w;
		1933	int py = (y + 1) * T - tex.h;
1864		1934
1865	if (key.texname != tex.name)	1935	if (key.texname != tex.name)
1866	{	1936	{
1867	if (!tex.name)	1937	if (!tex.name)
1868	tex = self->tex [2]; /* missing, replace by noface */	1938	tex = self->tex [2]; /* missing, replace by noface */
1869		1939
1870	key.texname = tex.name;	1940	key.texname = tex.name;
1871	arr = rc_array (rc, &key);	1941	arr = rc_array (rc, &key);
1872	}	1942	}
1873		1943
1874	px = (x + 1) * T - tex.w;	1944	if (expect_false (cell->player == player) && expect_false (z == 2))
1875	py = (y + 1) * T - tex.h;	1945	{
		1946	pl_x = px;
		1947	pl_y = py;
		1948	pl_tex = tex;
		1949	continue;
		1950	}
1876		1951
1877	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1952	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1953	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1879	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1954	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1880	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1955	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1881		1956
1882	if (cell->flags && z == 2)	1957	if (expect_false (cell->flags) && expect_false (z == 2))
1883	{	1958	{
1884	// overlays such as the speech bubble, probably more to come	1959	// overlays such as the speech bubble, probably more to come
1885	if (cell->flags & 1)	1960	if (cell->flags & 1)
1886	{	1961	{
1887	maptex tex = self->tex [1];	1962	maptex tex = self->tex [1];
…		…
2024	glDisable (GL_TEXTURE_2D);	2099	glDisable (GL_TEXTURE_2D);
2025	key.texname = -1;	2100	key.texname = -1;
2026	}	2101	}
2027		2102
2028	hv_clear (smooth);	2103	hv_clear (smooth);
		2104	}
		2105
		2106	if (pl_tex.name)
		2107	{
		2108	maptex tex = pl_tex;
		2109	int px = pl_x + sdx;
		2110	int py = pl_y + sdy;
		2111
		2112	key.texname = tex.name;
		2113	arr = rc_array (rc, &key);
		2114
		2115	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2116	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2117	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2118	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2119
		2120	rc_draw (rc);
2029	}	2121	}
2030		2122
2031	glDisable (GL_BLEND);	2123	glDisable (GL_BLEND);
2032	rc_free (rc);	2124	rc_free (rc);
2033		2125
…		…
2270	else	2362	else
2271	*data++ = 0;	2363	*data++ = 0;
2272	}	2364	}
2273	}	2365	}
2274		2366
		2367	/* if size is wh + 5 then no data has been found /
		2368	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2369	{
2275	SvPOK_only (data_sv);	2370	SvPOK_only (data_sv);
2276	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2371	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2372	}
		2373
2277	RETVAL = data_sv;	2374	RETVAL = data_sv;
2278	}	2375	}
2279	OUTPUT:	2376	OUTPUT:
2280	RETVAL	2377	RETVAL
2281		2378
2282	void	2379	void
2283	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2380	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2284	PPCODE:	2381	PPCODE:
2285	{	2382	{
2286	int x, y, z;	2383	int x, y, z;
2287	int w, h;	2384	int w, h;
2288	int x1, y1;	2385	int x1, y1;
		2386	STRLEN len;
		2387	uint8_t data, end;
		2388
		2389	len = SvLEN (data_sv);
		2390	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2391	data = SvPVbyte_nolen (data_sv);
		2392	end = data + len + 8;
		2393
		2394	if (len < 5)
		2395	XSRETURN_EMPTY;
2289		2396
2290	if (*data++ != 0)	2397	if (*data++ != 0)
2291	XSRETURN_EMPTY; /* version mismatch */	2398	XSRETURN_EMPTY; /* version mismatch */
2292		2399
2293	w = data++ << 8; w \|= data++;	2400	w = data++ << 8; w \|= data++;
…		…
2308	{	2415	{
2309	maprow *row = map_get_row (self, y);	2416	maprow *row = map_get_row (self, y);
2310		2417
2311	for (x = x0; x < x1; x++)	2418	for (x = x0; x < x1; x++)
2312	{	2419	{
		2420	uint8_t flags;
		2421
		2422	if (data + 7 >= end)
		2423	XSRETURN_EMPTY;
		2424
2313	uint8_t flags = *data++;	2425	flags = *data++;
2314		2426
2315	if (flags)	2427	if (flags)
2316	{	2428	{
2317	mapcell *cell = row_get_cell (row, x);	2429	mapcell *cell = row_get_cell (row, x);
2318	tileid tile[3] = { 0, 0, 0 };	2430	tileid tile[3] = { 0, 0, 0 };
…		…
2321	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2433	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2322	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2434	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2323		2435
2324	if (cell->darkness == 0)	2436	if (cell->darkness == 0)
2325	{	2437	{
2326	cell->darkness = 0;	2438	/cell->darkness = 0;/
		2439	EXTEND (SP, 3);
2327		2440
2328	for (z = 0; z <= 2; z++)	2441	for (z = 0; z <= 2; z++)
2329	{	2442	{
2330	tileid t = tile [z];	2443	tileid t = tile [z];
2331		2444
2332	if (t >= self->texs \|\| (t && !self->tex [t].name))	2445	if (t >= self->texs \|\| (t && !self->tex [t].name))
2333	{	2446	{
2334	XPUSHs (sv_2mortal (newSViv (t)));	2447	PUSHs (sv_2mortal (newSViv (t)));
2335	need_texid (self, t);	2448	need_texid (self, t);
2336	}	2449	}
2337		2450
2338	cell->tile [z] = t;	2451	cell->tile [z] = t;
2339	}	2452	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC vs. Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC