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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.254 by root, Sun Jan 6 18:12:20 2008 UTC vs.
Revision 1.277 by root, Mon Sep 1 06:18:09 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
…		…
51	#ifndef PANGO_VERSION_CHECK	56	#ifndef PANGO_VERSION_CHECK
52	# define PANGO_VERSION_CHECK(a,b,c) 0	57	# define PANGO_VERSION_CHECK(a,b,c) 0
53	#endif	58	#endif
54		59
55	#if !PANGO_VERSION_CHECK (1, 15, 2)	60	#if !PANGO_VERSION_CHECK (1, 15, 2)
56	# define pango_layout_get_line_readonly pango_layout_get_line_readonly	61	# define pango_layout_get_line_readonly pango_layout_get_line
57	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly	62	# define pango_layout_get_lines_readonly pango_layout_get_lines
58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly	63	# 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_readonly	64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60	#endif	65	#endif
61		66
62	#ifndef _WIN32	67	#ifndef _WIN32
63	# include <sys/types.h>	68	# include <sys/types.h>
64	# include <sys/socket.h>	69	# include <sys/socket.h>
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
…		…
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		95
82	#if 0	96	#define KMOD_LRAM 0x10000 // our extension
83	# define PARACHUTE SDL_INIT_NOPARACHUTE
84	#else
85	# define PARACHUTE 0
86	#endif
87		97
88	static AV *texture_av;	98	static AV *texture_av;
89		99
90	static struct	100	static struct
91	{	101	{
…		…
185		195
186	static void	196	static void
187	layout_update_font (DC__Layout self)	197	layout_update_font (DC__Layout self)
188	{	198	{
189	/* use a random scale factor to account for unknown descenders, 0.8 works	199	/* use a random scale factor to account for unknown descenders, 0.8 works
190	* reasonably well with bitstream vera	200	* reasonably well with dejavu/bistream fonts
191	*/	201	*/
192	PangoFontDescription *font = self->font ? self->font : default_font;	202	PangoFontDescription *font = self->font ? self->font : default_font;
193		203
194	pango_font_description_set_absolute_size (font,	204	pango_font_description_set_absolute_size (font,
195	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	205	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
364	self->oy = 0;	374	self->oy = 0;
365	self->row = 0;	375	self->row = 0;
366	self->rows = 0;	376	self->rows = 0;
367	}	377	}
368		378
		379	#define CELL_CLEAR(cell) \
		380	do { \
		381	if ((cell)->player) \
		382	(cell)->tile [2] = 0; \
		383	(cell)->darkness = 0; \
		384	(cell)->stat_hp = 0; \
		385	(cell)->flags = 0; \
		386	(cell)->player = 0; \
		387	} while (0)
		388
369	static void	389	static void
370	map_blank (DC__Map self, int x0, int y0, int w, int h)	390	map_blank (DC__Map self, int x0, int y0, int w, int h)
371	{	391	{
372	int x, y;	392	int x, y;
373	maprow *row;	393	maprow *row;
…		…
387	if (x >= row->c1)	407	if (x >= row->c1)
388	break;	408	break;
389		409
390	cell = row->col + x - row->c0;	410	cell = row->col + x - row->c0;
391		411
392	cell->darkness = 0;	412	CELL_CLEAR (cell);
393	cell->stat_hp = 0;
394	cell->flags = 0;
395	cell->player = 0;
396	}	413	}
397	}	414	}
398	}	415	}
399		416
400	typedef struct {	417	typedef struct {
…		…
511	if (!svp \|\| !SvTRUE (*svp))	528	if (!svp \|\| !SvTRUE (*svp))
512	return 0;	529	return 0;
513		530
514	return 1;	531	return 1;
515	}	532	}
		533
		534	/******************************************************************************/
		535
		536	/* process keyboard modifiers */
		537	static int
		538	mod_munge (int mod)
		539	{
		540	mod &= MOD_MASK;
		541
		542	if (mod & (KMOD_META \| KMOD_ALT))
		543	mod \|= KMOD_LRAM;
		544
		545	return mod;
		546	}
		547
		548	static void
		549	deliantra_main ()
		550	{
		551	char *argv[] = { 0 };
		552	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		553	}
		554
		555	#ifdef __MACOSX__
		556	/* to due surprising braindamage on the side of SDL design, we
		557	* do some mind-boggling hack here: SDL requires a custom main()
		558	* on OS X, so... we provide one and call the original main(), which,
		559	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		560	* and which calls our main (== SDL_main) back.
		561	*/
		562	extern C_LINKAGE int
		563	main (int argc, char *argv[])
		564	{
		565	deliantra_main ();
		566	}
		567
		568	#undef main
		569
		570	extern C_LINKAGE int main (int argc, char *argv[]);
		571
		572	static void
		573	SDL_braino (void)
		574	{
		575	char *argv[] = { "deliantra client", 0 };
		576	(main) (1, argv);
		577	}
		578	#else
		579	static void
		580	SDL_braino (void)
		581	{
		582	deliantra_main ();
		583	}
		584	#endif
516		585
517	MODULE = Deliantra::Client PACKAGE = DC	586	MODULE = Deliantra::Client PACKAGE = DC
518		587
519	PROTOTYPES: ENABLE	588	PROTOTYPES: ENABLE
520		589
…		…
549	const_iv (SDL_USEREVENT),	618	const_iv (SDL_USEREVENT),
550		619
551	const_iv (SDL_APPINPUTFOCUS),	620	const_iv (SDL_APPINPUTFOCUS),
552	const_iv (SDL_APPMOUSEFOCUS),	621	const_iv (SDL_APPMOUSEFOCUS),
553	const_iv (SDL_APPACTIVE),	622	const_iv (SDL_APPACTIVE),
		623
		624
		625	const_iv (SDLK_UNKNOWN),
		626	const_iv (SDLK_FIRST),
		627	const_iv (SDLK_BACKSPACE),
		628	const_iv (SDLK_TAB),
		629	const_iv (SDLK_CLEAR),
		630	const_iv (SDLK_RETURN),
		631	const_iv (SDLK_PAUSE),
		632	const_iv (SDLK_ESCAPE),
		633	const_iv (SDLK_SPACE),
		634	const_iv (SDLK_EXCLAIM),
		635	const_iv (SDLK_QUOTEDBL),
		636	const_iv (SDLK_HASH),
		637	const_iv (SDLK_DOLLAR),
		638	const_iv (SDLK_AMPERSAND),
		639	const_iv (SDLK_QUOTE),
		640	const_iv (SDLK_LEFTPAREN),
		641	const_iv (SDLK_RIGHTPAREN),
		642	const_iv (SDLK_ASTERISK),
		643	const_iv (SDLK_PLUS),
		644	const_iv (SDLK_COMMA),
		645	const_iv (SDLK_MINUS),
		646	const_iv (SDLK_PERIOD),
		647	const_iv (SDLK_SLASH),
		648	const_iv (SDLK_0),
		649	const_iv (SDLK_1),
		650	const_iv (SDLK_2),
		651	const_iv (SDLK_3),
		652	const_iv (SDLK_4),
		653	const_iv (SDLK_5),
		654	const_iv (SDLK_6),
		655	const_iv (SDLK_7),
		656	const_iv (SDLK_8),
		657	const_iv (SDLK_9),
		658	const_iv (SDLK_COLON),
		659	const_iv (SDLK_SEMICOLON),
		660	const_iv (SDLK_LESS),
		661	const_iv (SDLK_EQUALS),
		662	const_iv (SDLK_GREATER),
		663	const_iv (SDLK_QUESTION),
		664	const_iv (SDLK_AT),
		665
		666	const_iv (SDLK_LEFTBRACKET),
		667	const_iv (SDLK_BACKSLASH),
		668	const_iv (SDLK_RIGHTBRACKET),
		669	const_iv (SDLK_CARET),
		670	const_iv (SDLK_UNDERSCORE),
		671	const_iv (SDLK_BACKQUOTE),
		672	const_iv (SDLK_DELETE),
554		673
555	const_iv (SDLK_FIRST),	674	const_iv (SDLK_FIRST),
556	const_iv (SDLK_LAST),	675	const_iv (SDLK_LAST),
557	const_iv (SDLK_KP0),	676	const_iv (SDLK_KP0),
558	const_iv (SDLK_KP1),	677	const_iv (SDLK_KP1),
…		…
634	const_iv (KMOD_RMETA),	753	const_iv (KMOD_RMETA),
635	const_iv (KMOD_NUM),	754	const_iv (KMOD_NUM),
636	const_iv (KMOD_CAPS),	755	const_iv (KMOD_CAPS),
637	const_iv (KMOD_MODE),	756	const_iv (KMOD_MODE),
638		757
		758	const_iv (KMOD_LRAM),
		759
639	const_iv (MIX_DEFAULT_FORMAT),	760	const_iv (MIX_DEFAULT_FORMAT),
		761
		762	const_iv (SDL_INIT_TIMER),
		763	const_iv (SDL_INIT_AUDIO),
		764	const_iv (SDL_INIT_VIDEO),
		765	const_iv (SDL_INIT_CDROM),
		766	const_iv (SDL_INIT_JOYSTICK),
		767	const_iv (SDL_INIT_EVERYTHING),
		768	const_iv (SDL_INIT_NOPARACHUTE),
		769	const_iv (SDL_INIT_EVENTTHREAD),
		770
		771	const_iv (SDL_GL_RED_SIZE),
		772	const_iv (SDL_GL_GREEN_SIZE),
		773	const_iv (SDL_GL_BLUE_SIZE),
		774	const_iv (SDL_GL_ALPHA_SIZE),
		775	const_iv (SDL_GL_DOUBLEBUFFER),
		776	const_iv (SDL_GL_BUFFER_SIZE),
		777	const_iv (SDL_GL_DEPTH_SIZE),
		778	const_iv (SDL_GL_STENCIL_SIZE),
		779	const_iv (SDL_GL_ACCUM_RED_SIZE),
		780	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		781	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		782	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		783	const_iv (SDL_GL_STEREO),
		784	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		785	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		786	const_iv (SDL_GL_ACCELERATED_VISUAL),
		787	const_iv (SDL_GL_SWAP_CONTROL),
		788
		789	const_iv (FOW_DARKNESS)
640	# undef const_iv	790	# undef const_iv
641	};	791	};
642		792
643	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	793	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	794	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
673	CODE:	823	CODE:
674	{	824	{
675	opengl_fontmap = pango_opengl_font_map_new ();	825	opengl_fontmap = pango_opengl_font_map_new ();
676	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	826	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);	827	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		828	/pango_context_set_font_description (opengl_context, default_font);/
678	#if PANGO_VERSION_CHECK (1, 15, 2)	829	#if PANGO_VERSION_CHECK (1, 15, 2)
679	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	830	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	831	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
681	#endif	832	#endif
682	}	833	}
683		834
684	char *
685	SDL_GetError ()	835	char *SDL_GetError ()
686		836
687	int	837	void SDL_braino ()
688	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
689		838
690	void	839	int SDL_Init (U32 flags)
		840
		841	int SDL_InitSubSystem (U32 flags)
		842
		843	void SDL_QuitSubSystem (U32 flags)
		844
691	SDL_Quit ()	845	void SDL_Quit ()
		846
		847	int SDL_GL_SetAttribute (int attr, int value)
		848
		849	int SDL_GL_GetAttribute (int attr)
		850	CODE:
		851	if (SDL_GL_GetAttribute (attr, &RETVAL))
		852	XSRETURN_UNDEF;
		853	OUTPUT:
		854	RETVAL
692		855
693	void	856	void
694	SDL_ListModes (int rgb, int alpha)	857	SDL_ListModes (int rgb, int alpha)
695	PPCODE:	858	PPCODE:
696	{	859	{
…		…
708	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	871	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711		874
712	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	875	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);	876	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716	#endif
717		877
718	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	878	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
719		879
720	if (m && m != (SDL_Rect **)-1)	880	if (m && m != (SDL_Rect **)-1)
721	while (*m)	881	while (*m)
722	{	882	{
723	if ((m)->w >= 800 && (m)->h >= 480)	883	if ((m)->w >= 400 && (m)->h >= 300)
724	{	884	{
725	AV *av = newAV ();	885	AV *av = newAV ();
726	av_push (av, newSViv ((*m)->w));	886	av_push (av, newSViv ((*m)->w));
727	av_push (av, newSViv ((*m)->h));	887	av_push (av, newSViv ((*m)->h));
728	av_push (av, newSViv (rgb));	888	av_push (av, newSViv (rgb));
…		…
770	SDL_GetKeyName (int sym)	930	SDL_GetKeyName (int sym)
771		931
772	int	932	int
773	SDL_GetAppState ()	933	SDL_GetAppState ()
774		934
		935	int
		936	SDL_GetModState ()
		937
775	void	938	void
776	poll_events ()	939	poll_events ()
777	PPCODE:	940	PPCODE:
778	{	941	{
779	SDL_Event ev;	942	SDL_Event ev;
…		…
788	{	951	{
789	case SDL_KEYDOWN:	952	case SDL_KEYDOWN:
790	case SDL_KEYUP:	953	case SDL_KEYUP:
791	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	954	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	955	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	956	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
794	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	957	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
795	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	958	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796	break;	959	break;
797		960
798	case SDL_ACTIVEEVENT:	961	case SDL_ACTIVEEVENT:
799	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	962	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
817	x = ev.motion.x;	980	x = ev.motion.x;
818	y = ev.motion.y;	981	y = ev.motion.y;
819	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	982	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820	}	983	}
821		984
822	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	985	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823	hv_store (hv, "state", 5, newSViv (state), 0);	986	hv_store (hv, "state", 5, newSViv (state), 0);
824	hv_store (hv, "x", 1, newSViv (x), 0);	987	hv_store (hv, "x", 1, newSViv (x), 0);
825	hv_store (hv, "y", 1, newSViv (y), 0);	988	hv_store (hv, "y", 1, newSViv (y), 0);
826	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	989	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	990	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
912	}	1075	}
913	}	1076	}
914	#endif	1077	#endif
915	}	1078	}
916		1079
917	void	1080	int
918	add_font (char *file)	1081	add_font (char *file)
919	CODE:	1082	CODE:
920	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1084	OUTPUT:
		1085	RETVAL
921		1086
922	void	1087	void
923	load_image_inline (SV *image_)	1088	load_image_inline (SV *image_)
924	ALIAS:	1089	ALIAS:
925	load_image_file = 1	1090	load_image_file = 1
…		…
1681	uint8_t ext, cmd;	1846	uint8_t ext, cmd;
1682		1847
1683	do	1848	do
1684	{	1849	{
1685	ext = *data++;	1850	ext = *data++;
1686	cmd = ext & 0x3f;	1851	cmd = ext & 0x7f;
1687		1852
1688	if (cmd < 4)	1853	if (cmd < 4)
1689	cell->darkness = 255 - ext * 64 + 1;	1854	cell->darkness = 255 - ext * 64 + 1;
1690	else if (cmd == 5) // health	1855	else if (cmd == 5) // health
1691	{	1856	{
…		…
1694	}	1859	}
1695	else if (cmd == 6) // monster width	1860	else if (cmd == 6) // monster width
1696	cell->stat_width = *data++ + 1;	1861	cell->stat_width = *data++ + 1;
1697	else if (cmd == 0x47)	1862	else if (cmd == 0x47)
1698	{	1863	{
1699	if (*data == 4)	1864	if (*data == 1) cell->player = data [1];
1700	; // decode player count	1865	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1866	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1867	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701		1868
1702	data += *data + 1;	1869	data += *data + 1;
1703	}	1870	}
1704	else if (cmd == 8) // cell flags	1871	else if (cmd == 8) // cell flags
1705	cell->flags = *data++;	1872	cell->flags = *data++;
…		…
1735	}	1902	}
1736	}	1903	}
1737	}	1904	}
1738	}	1905	}
1739	else	1906	else
1740	cell->darkness = 0;	1907	CELL_CLEAR (cell);
1741	}	1908	}
1742	}	1909	}
1743	OUTPUT:	1910	OUTPUT:
1744	RETVAL	1911	RETVAL
1745		1912
…		…
1797	}	1964	}
1798	OUTPUT:	1965	OUTPUT:
1799	RETVAL	1966	RETVAL
1800		1967
1801	void	1968	void
1802	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1969	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803	CODE:	1970	CODE:
1804	{	1971	{
1805	int x, y, z;	1972	int x, y, z;
1806		1973
1807	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1974	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1808	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810	smooth_key skey;	1977	smooth_key skey;
1811		1978	int pl_x, pl_y;
		1979	maptex pl_tex;
1812	rc_t *rc = rc_alloc ();	1980	rc_t *rc = rc_alloc ();
1813	rc_key_t key;	1981	rc_key_t key;
1814	rc_array_t *arr;	1982	rc_array_t *arr;
		1983
		1984	pl_tex.name = 0;
1815		1985
1816	// thats current max. sorry.	1986	// thats current max. sorry.
1817	if (sw > 255) sw = 255;	1987	if (sw > 255) sw = 255;
1818	if (sh > 255) sh = 255;	1988	if (sh > 255) sh = 255;
1819		1989
…		…
1874	tileid tile = cell->tile [z];	2044	tileid tile = cell->tile [z];
1875		2045
1876	if (tile)	2046	if (tile)
1877	{	2047	{
1878	maptex tex = self->tex [tile];	2048	maptex tex = self->tex [tile];
1879	int px, py;	2049	int px = (x + 1) * T - tex.w;
		2050	int py = (y + 1) * T - tex.h;
1880		2051
1881	if (key.texname != tex.name)	2052	if (key.texname != tex.name)
1882	{	2053	{
1883	if (!tex.name)	2054	if (!tex.name)
1884	tex = self->tex [2]; /* missing, replace by noface */	2055	tex = self->tex [2]; /* missing, replace by noface */
1885		2056
1886	key.texname = tex.name;	2057	key.texname = tex.name;
1887	arr = rc_array (rc, &key);	2058	arr = rc_array (rc, &key);
1888	}	2059	}
1889		2060
1890	px = (x + 1) * T - tex.w;	2061	if (expect_false (cell->player == player) && expect_false (z == 2))
1891	py = (y + 1) * T - tex.h;	2062	{
		2063	pl_x = px;
		2064	pl_y = py;
		2065	pl_tex = tex;
		2066	continue;
		2067	}
1892		2068
1893	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897		2073
1898	if (cell->flags && z == 2)	2074	if (expect_false (cell->flags) && expect_false (z == 2))
1899	{	2075	{
1900	// overlays such as the speech bubble, probably more to come	2076	// overlays such as the speech bubble, probably more to come
1901	if (cell->flags & 1)	2077	if (cell->flags & 1)
1902	{	2078	{
1903	maptex tex = self->tex [1];	2079	maptex tex = self->tex [1];
…		…
2042	}	2218	}
2043		2219
2044	hv_clear (smooth);	2220	hv_clear (smooth);
2045	}	2221	}
2046		2222
		2223	if (pl_tex.name)
		2224	{
		2225	maptex tex = pl_tex;
		2226	int px = pl_x + sdx;
		2227	int py = pl_y + sdy;
		2228
		2229	key.texname = tex.name;
		2230	arr = rc_array (rc, &key);
		2231
		2232	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2233	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2234	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2236
		2237	rc_draw (rc);
		2238	}
		2239
2047	glDisable (GL_BLEND);	2240	glDisable (GL_BLEND);
2048	rc_free (rc);	2241	rc_free (rc);
2049		2242
2050	// top layer: overlays such as the health bar	2243	// top layer: overlays such as the health bar
2051	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
…		…
2156	SvCUR_set (darkness3_sv, sw34 * sh3);	2349	SvCUR_set (darkness3_sv, sw34 * sh3);
2157		2350
2158	mx += self->x - 1;	2351	mx += self->x - 1;
2159	my += self->y - 1;	2352	my += self->y - 1;
2160		2353
2161	memset (darkness1, 255, sw1 * sh1);	2354	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2162		2355
2163	for (y = 0; y < sh1; y++)	2356	for (y = 0; y < sh1; y++)
2164	if (0 <= y + my && y + my < self->rows)	2357	if (0 <= y + my && y + my < self->rows)
2165	{	2358	{
2166	maprow *row = self->row + (y + my);	2359	maprow *row = self->row + (y + my);
…		…
2286	else	2479	else
2287	*data++ = 0;	2480	*data++ = 0;
2288	}	2481	}
2289	}	2482	}
2290		2483
		2484	/* if size is wh + 5 then no data has been found /
		2485	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2486	{
2291	SvPOK_only (data_sv);	2487	SvPOK_only (data_sv);
2292	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2488	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2489	}
		2490
2293	RETVAL = data_sv;	2491	RETVAL = data_sv;
2294	}	2492	}
2295	OUTPUT:	2493	OUTPUT:
2296	RETVAL	2494	RETVAL
2297		2495
2298	void	2496	void
2299	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2497	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300	PPCODE:	2498	PPCODE:
2301	{	2499	{
2302	int x, y, z;	2500	int x, y, z;
2303	int w, h;	2501	int w, h;
2304	int x1, y1;	2502	int x1, y1;
		2503	STRLEN len;
		2504	uint8_t data, end;
		2505
		2506	len = SvLEN (data_sv);
		2507	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2508	data = SvPVbyte_nolen (data_sv);
		2509	end = data + len + 8;
		2510
		2511	if (len < 5)
		2512	XSRETURN_EMPTY;
2305		2513
2306	if (*data++ != 0)	2514	if (*data++ != 0)
2307	XSRETURN_EMPTY; /* version mismatch */	2515	XSRETURN_EMPTY; /* version mismatch */
2308		2516
2309	w = data++ << 8; w \|= data++;	2517	w = data++ << 8; w \|= data++;
…		…
2324	{	2532	{
2325	maprow *row = map_get_row (self, y);	2533	maprow *row = map_get_row (self, y);
2326		2534
2327	for (x = x0; x < x1; x++)	2535	for (x = x0; x < x1; x++)
2328	{	2536	{
		2537	uint8_t flags;
		2538
		2539	if (data + 7 >= end)
		2540	XSRETURN_EMPTY;
		2541
2329	uint8_t flags = *data++;	2542	flags = *data++;
2330		2543
2331	if (flags)	2544	if (flags)
2332	{	2545	{
2333	mapcell *cell = row_get_cell (row, x);	2546	mapcell *cell = row_get_cell (row, x);
2334	tileid tile[3] = { 0, 0, 0 };	2547	tileid tile[3] = { 0, 0, 0 };
…		…
2337	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2550	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2338	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2551	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2339		2552
2340	if (cell->darkness == 0)	2553	if (cell->darkness == 0)
2341	{	2554	{
2342	cell->darkness = 0;	2555	/cell->darkness = 0;/
		2556	EXTEND (SP, 3);
2343		2557
2344	for (z = 0; z <= 2; z++)	2558	for (z = 0; z <= 2; z++)
2345	{	2559	{
2346	tileid t = tile [z];	2560	tileid t = tile [z];
2347		2561
2348	if (t >= self->texs \|\| (t && !self->tex [t].name))	2562	if (t >= self->texs \|\| (t && !self->tex [t].name))
2349	{	2563	{
2350	XPUSHs (sv_2mortal (newSViv (t)));	2564	PUSHs (sv_2mortal (newSViv (t)));
2351	need_texid (self, t);	2565	need_texid (self, t);
2352	}	2566	}
2353		2567
2354	cell->tile [z] = t;	2568	cell->tile [z] = t;
2355	}	2569	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.254 by root, Sun Jan 6 18:12:20 2008 UTC vs. Revision 1.277 by root, Mon Sep 1 06:18:09 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.254 by root, Sun Jan 6 18:12:20 2008 UTC vs.
Revision 1.277 by root, Mon Sep 1 06:18:09 2008 UTC