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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 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
		88	/* mask out modifiers we are not interested in */
		89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		90
68	#if 0	91	#if 1
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	92	# define PARACHUTE SDL_INIT_NOPARACHUTE
70	#else	93	#else
71	# define PARACHUTE 0	94	# define PARACHUTE 0
72	#endif	95	#endif
73		96
…		…
120		143
121	#include "pango-font.c"	144	#include "pango-font.c"
122	#include "pango-fontmap.c"	145	#include "pango-fontmap.c"
123	#include "pango-render.c"	146	#include "pango-render.c"
124		147
125	typedef IV CFPlus__Channel;	148	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	149	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	150	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	151	typedef Mix_Music *DC__MixMusic;
129		152
130	typedef PangoFontDescription *CFPlus__Font;	153	typedef PangoFontDescription *DC__Font;
131		154
132	static int	155	static int
133	shape_attr_p (PangoLayoutRun *run)	156	shape_attr_p (PangoLayoutRun *run)
134	{	157	{
135	GSList *attrs = run->item->analysis.extra_attrs;	158	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		172
150	typedef struct cf_layout {	173	typedef struct cf_layout {
151	PangoLayout *pl;	174	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	175	float r, g, b, a; // default color for rgba mode
153	int base_height;	176	int base_height;
154	CFPlus__Font font;	177	DC__Font font;
155	rc_t *rc;	178	rc_t *rc;
156	} *CFPlus__Layout;	179	} *DC__Layout;
157		180
158	static CFPlus__Font default_font;	181	static DC__Font default_font;
159	static PangoContext *opengl_context;	182	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	183	static PangoFontMap *opengl_fontmap;
161		184
162	static void	185	static void
163	substitute_func (FcPattern *pattern, gpointer data)	186	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	191	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	192	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	193	}
171		194
172	static void	195	static void
173	layout_update_font (CFPlus__Layout self)	196	layout_update_font (DC__Layout self)
174	{	197	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	198	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	199	* reasonably well with dejavu/bistream fonts
177	*/	200	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	201	PangoFontDescription *font = self->font ? self->font : default_font;
179		202
180	pango_font_description_set_absolute_size (font,	203	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	204	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		205
183	pango_layout_set_font_description (self->pl, font);	206	pango_layout_set_font_description (self->pl, font);
184	}	207	}
185		208
186	static void	209	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	210	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	211	{
189	PangoRectangle rect;	212	PangoRectangle rect;
190		213
191	// get_pixel_* wrongly rounds down	214	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	215	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	254	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	255	int texs; maptex *tex; // [tileid]
233		256
234	int32_t rows;	257	int32_t rows;
235	maprow *row;	258	maprow *row;
236	} *CFPlus__Map;	259	} *DC__Map;
237		260
238	static char *	261	static char *
239	prepend (char *ptr, int sze, int inc)	262	prepend (char *ptr, int sze, int inc)
240	{	263	{
241	char *p;	264	char *p;
…		…
279	self->texs *= 2;	302	self->texs *= 2;
280	}	303	}
281	}	304	}
282		305
283	static maprow *	306	static maprow *
284	map_get_row (CFPlus__Map self, int y)	307	map_get_row (DC__Map self, int y)
285	{	308	{
286	if (0 > y)	309	if (0 > y)
287	{	310	{
288	int extend = - y + MAP_EXTEND_Y;	311	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	312	Prepend (maprow, self->row, self->rows, extend);
…		…
327		350
328	return row->col + (x - row->c0);	351	return row->col + (x - row->c0);
329	}	352	}
330		353
331	static mapcell *	354	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	355	map_get_cell (DC__Map self, int x, int y)
333	{	356	{
334	return row_get_cell (map_get_row (self, y), x);	357	return row_get_cell (map_get_row (self, y), x);
335	}	358	}
336		359
337	static void	360	static void
338	map_clear (CFPlus__Map self)	361	map_clear (DC__Map self)
339	{	362	{
340	int r;	363	int r;
341		364
342	for (r = 0; r < self->rows; r++)	365	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	366	Safefree (self->row[r].col);
…		…
351	self->row = 0;	374	self->row = 0;
352	self->rows = 0;	375	self->rows = 0;
353	}	376	}
354		377
355	static void	378	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	379	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	380	{
358	int x, y;	381	int x, y;
359	maprow *row;	382	maprow *row;
360	mapcell *cell;	383	mapcell *cell;
361		384
…		…
498	return 0;	521	return 0;
499		522
500	return 1;	523	return 1;
501	}	524	}
502		525
503	MODULE = CFPlus PACKAGE = CFPlus	526	MODULE = Deliantra::Client PACKAGE = DC
504		527
505	PROTOTYPES: ENABLE	528	PROTOTYPES: ENABLE
506		529
507	BOOT:	530	BOOT:
508	{	531	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	532	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	533	static const struct {
511	const char *name;	534	const char *name;
512	IV iv;	535	IV iv;
513	} *civ, const_iv[] = {	536	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	537	# define const_iv(name) { # name, (IV)name }
…		…
619	const_iv (KMOD_LMETA),	642	const_iv (KMOD_LMETA),
620	const_iv (KMOD_RMETA),	643	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	644	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	645	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	646	const_iv (KMOD_MODE),
		647
		648	const_iv (MIX_DEFAULT_FORMAT),
624	# undef const_iv	649	# undef const_iv
625	};	650	};
626		651
627	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	652	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	653	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
657	CODE:	682	CODE:
658	{	683	{
659	opengl_fontmap = pango_opengl_font_map_new ();	684	opengl_fontmap = pango_opengl_font_map_new ();
660	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	685	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	686	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		687	/pango_context_set_font_description (opengl_context, default_font);/
		688	#if PANGO_VERSION_CHECK (1, 15, 2)
		689	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		690	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		691	#endif
662	}	692	}
663		693
664	char *	694	char *
665	SDL_GetError ()	695	SDL_GetError ()
666		696
…		…
698	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	728	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
699		729
700	if (m && m != (SDL_Rect **)-1)	730	if (m && m != (SDL_Rect **)-1)
701	while (*m)	731	while (*m)
702	{	732	{
703	if ((m)->w >= 640 && (m)->h >= 480)	733	if ((m)->w >= 800 && (m)->h >= 480)
704	{	734	{
705	AV *av = newAV ();	735	AV *av = newAV ();
706	av_push (av, newSViv ((*m)->w));	736	av_push (av, newSViv ((*m)->w));
707	av_push (av, newSViv ((*m)->h));	737	av_push (av, newSViv ((*m)->h));
708	av_push (av, newSViv (rgb));	738	av_push (av, newSViv (rgb));
…		…
732		762
733	if (RETVAL)	763	if (RETVAL)
734	{	764	{
735	av_clear (texture_av);	765	av_clear (texture_av);
736		766
737	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	767	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	768	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739	#include "glfunc.h"	769	#include "glfunc.h"
740	#undef GL_FUNC	770	#undef GL_FUNC
741	}	771	}
742	}	772	}
…		…
749	char *	779	char *
750	SDL_GetKeyName (int sym)	780	SDL_GetKeyName (int sym)
751		781
752	int	782	int
753	SDL_GetAppState ()	783	SDL_GetAppState ()
		784
		785	int
		786	SDL_GetModState ()
754		787
755	void	788	void
756	poll_events ()	789	poll_events ()
757	PPCODE:	790	PPCODE:
758	{	791	{
…		…
768	{	801	{
769	case SDL_KEYDOWN:	802	case SDL_KEYDOWN:
770	case SDL_KEYUP:	803	case SDL_KEYUP:
771	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	804	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	805	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	806	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
774	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	807	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
775	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	808	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776	break;	809	break;
777		810
778	case SDL_ACTIVEEVENT:	811	case SDL_ACTIVEEVENT:
779	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	812	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
797	x = ev.motion.x;	830	x = ev.motion.x;
798	y = ev.motion.y;	831	y = ev.motion.y;
799	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	832	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800	}	833	}
801		834
802	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	835	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803	hv_store (hv, "state", 5, newSViv (state), 0);	836	hv_store (hv, "state", 5, newSViv (state), 0);
804	hv_store (hv, "x", 1, newSViv (x), 0);	837	hv_store (hv, "x", 1, newSViv (x), 0);
805	hv_store (hv, "y", 1, newSViv (y), 0);	838	hv_store (hv, "y", 1, newSViv (y), 0);
806	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	839	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	840	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808	}	841	}
809	break;	842	break;
810		843
811	case SDL_MOUSEBUTTONDOWN:	844	case SDL_MOUSEBUTTONDOWN:
812	case SDL_MOUSEBUTTONUP:	845	case SDL_MOUSEBUTTONUP:
813	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	846	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814		847
815	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	848	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	849	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	850	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	851	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
823	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	856	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	857	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825	break;	858	break;
826	}	859	}
827		860
828	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	861	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829	}	862	}
830	}	863	}
831		864
832	int	865	int
833	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	866	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834	POSTCALL:	867	POSTCALL:
835	Mix_HookMusicFinished (music_finished);	868	Mix_HookMusicFinished (music_finished);
836	Mix_ChannelFinished (channel_finished);	869	Mix_ChannelFinished (channel_finished);
		870
		871	void
		872	Mix_QuerySpec ()
		873	PPCODE:
		874	{
		875	int freq, channels;
		876	Uint16 format;
		877
		878	if (Mix_QuerySpec (&freq, &format, &channels))
		879	{
		880	EXTEND (SP, 3);
		881	PUSHs (sv_2mortal (newSViv (freq)));
		882	PUSHs (sv_2mortal (newSViv (format)));
		883	PUSHs (sv_2mortal (newSViv (channels)));
		884	}
		885	}
837		886
838	void	887	void
839	Mix_CloseAudio ()	888	Mix_CloseAudio ()
840		889
841	int	890	int
…		…
876	}	925	}
877	}	926	}
878	#endif	927	#endif
879	}	928	}
880		929
881	void	930	int
882	add_font (char *file)	931	add_font (char *file)
883	CODE:	932	CODE:
884	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	933	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		934	OUTPUT:
		935	RETVAL
885		936
886	void	937	void
887	load_image_inline (SV *image_)	938	load_image_inline (SV *image_)
888	ALIAS:	939	ALIAS:
889	load_image_file = 1	940	load_image_file = 1
…		…
975	void	1026	void
976	error (char *message)	1027	error (char *message)
977	CODE:	1028	CODE:
978	fprintf (stderr, "ERROR: %s\n", message);	1029	fprintf (stderr, "ERROR: %s\n", message);
979	#ifdef _WIN32	1030	#ifdef _WIN32
980	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1031	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
981	#endif	1032	#endif
982		1033
983	void	1034	void
984	fatal (char *message)	1035	fatal (char *message)
985	CODE:	1036	CODE:
986	fprintf (stderr, "FATAL: %s\n", message);	1037	fprintf (stderr, "FATAL: %s\n", message);
987	#ifdef _WIN32	1038	#ifdef _WIN32
988	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1039	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
989	#endif	1040	#endif
990	_exit (1);	1041	_exit (1);
991		1042
992	void	1043	void
993	_exit (int retval = 0)	1044	_exit (int retval = 0)
…		…
1005	#if DEBUG	1056	#if DEBUG
1006	VALGRIND_DO_LEAK_CHECK;	1057	VALGRIND_DO_LEAK_CHECK;
1007	#endif	1058	#endif
1008	}	1059	}
1009		1060
1010	MODULE = CFPlus PACKAGE = CFPlus::Font	1061	MODULE = Deliantra::Client PACKAGE = DC::Font
1011		1062
1012	PROTOTYPES: DISABLE	1063	PROTOTYPES: DISABLE
1013		1064
1014	CFPlus::Font	1065	DC::Font
1015	new_from_file (SV class, char path, int id = 0)	1066	new_from_file (SV class, char path, int id = 0)
1016	CODE:	1067	CODE:
1017	{	1068	{
1018	int count;	1069	int count;
1019	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1070	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1022	}	1073	}
1023	OUTPUT:	1074	OUTPUT:
1024	RETVAL	1075	RETVAL
1025		1076
1026	void	1077	void
1027	DESTROY (CFPlus::Font self)	1078	DESTROY (DC::Font self)
1028	CODE:	1079	CODE:
1029	pango_font_description_free (self);	1080	pango_font_description_free (self);
1030		1081
1031	void	1082	void
1032	make_default (CFPlus::Font self)	1083	make_default (DC::Font self)
1033	PROTOTYPE: $	1084	PROTOTYPE: $
1034	CODE:	1085	CODE:
1035	default_font = self;	1086	default_font = self;
1036		1087
1037	MODULE = CFPlus PACKAGE = CFPlus::Layout	1088	MODULE = Deliantra::Client PACKAGE = DC::Layout
1038		1089
1039	PROTOTYPES: DISABLE	1090	PROTOTYPES: DISABLE
1040		1091
1041	void	1092	void
1042	reset_glyph_cache ()	1093	glyph_cache_backup ()
1043	PROTOTYPE:	1094	PROTOTYPE:
1044	CODE:	1095	CODE:
		1096	tc_backup ();
		1097
		1098	void
		1099	glyph_cache_restore ()
		1100	PROTOTYPE:
		1101	CODE:
1045	tc_clear ();	1102	tc_restore ();
1046		1103
1047	CFPlus::Layout	1104	DC::Layout
1048	new (SV *class)	1105	new (SV *class)
1049	CODE:	1106	CODE:
1050	New (0, RETVAL, 1, struct cf_layout);	1107	New (0, RETVAL, 1, struct cf_layout);
1051		1108
1052	RETVAL->pl = pango_layout_new (opengl_context);	1109	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1062	layout_update_font (RETVAL);	1119	layout_update_font (RETVAL);
1063	OUTPUT:	1120	OUTPUT:
1064	RETVAL	1121	RETVAL
1065		1122
1066	void	1123	void
1067	DESTROY (CFPlus::Layout self)	1124	DESTROY (DC::Layout self)
1068	CODE:	1125	CODE:
1069	g_object_unref (self->pl);	1126	g_object_unref (self->pl);
1070	rc_free (self->rc);	1127	rc_free (self->rc);
1071	Safefree (self);	1128	Safefree (self);
1072		1129
1073	void	1130	void
1074	set_text (CFPlus::Layout self, SV *text_)	1131	set_text (DC::Layout self, SV *text_)
1075	CODE:	1132	CODE:
1076	{	1133	{
1077	STRLEN textlen;	1134	STRLEN textlen;
1078	char *text = SvPVutf8 (text_, textlen);	1135	char *text = SvPVutf8 (text_, textlen);
1079		1136
1080	pango_layout_set_text (self->pl, text, textlen);	1137	pango_layout_set_text (self->pl, text, textlen);
1081	}	1138	}
1082		1139
1083	void	1140	void
1084	set_markup (CFPlus::Layout self, SV *text_)	1141	set_markup (DC::Layout self, SV *text_)
1085	CODE:	1142	CODE:
1086	{	1143	{
1087	STRLEN textlen;	1144	STRLEN textlen;
1088	char *text = SvPVutf8 (text_, textlen);	1145	char *text = SvPVutf8 (text_, textlen);
1089		1146
1090	pango_layout_set_markup (self->pl, text, textlen);	1147	pango_layout_set_markup (self->pl, text, textlen);
1091	}	1148	}
1092		1149
1093	void	1150	void
1094	set_shapes (CFPlus::Layout self, ...)	1151	set_shapes (DC::Layout self, ...)
1095	CODE:	1152	CODE:
1096	{	1153	{
1097	PangoAttrList *attrs = 0;	1154	PangoAttrList *attrs = 0;
1098	const char *text = pango_layout_get_text (self->pl);	1155	const char *text = pango_layout_get_text (self->pl);
1099	const char *pos = text;	1156	const char *pos = text;
…		…
1134	if (attrs)	1191	if (attrs)
1135	pango_layout_set_attributes (self->pl, attrs);	1192	pango_layout_set_attributes (self->pl, attrs);
1136	}	1193	}
1137		1194
1138	void	1195	void
1139	get_shapes (CFPlus::Layout self)	1196	get_shapes (DC::Layout self)
1140	PPCODE:	1197	PPCODE:
1141	{	1198	{
1142	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1199	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143		1200
1144	do	1201	do
1145	{	1202	{
1146	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1203	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147		1204
1148	if (run && shape_attr_p (run))	1205	if (run && shape_attr_p (run))
1149	{	1206	{
1150	PangoRectangle extents;	1207	PangoRectangle extents;
1151	pango_layout_iter_get_run_extents (iter, 0, &extents);	1208	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1159		1216
1160	pango_layout_iter_free (iter);	1217	pango_layout_iter_free (iter);
1161	}	1218	}
1162		1219
1163	int	1220	int
1164	has_wrapped (CFPlus::Layout self)	1221	has_wrapped (DC::Layout self)
1165	CODE:	1222	CODE:
1166	{	1223	{
1167	int lines = 1;	1224	int lines = 1;
1168	const char *text = pango_layout_get_text (self->pl);	1225	const char *text = pango_layout_get_text (self->pl);
1169		1226
…		…
1174	}	1231	}
1175	OUTPUT:	1232	OUTPUT:
1176	RETVAL	1233	RETVAL
1177		1234
1178	SV *	1235	SV *
1179	get_text (CFPlus::Layout self)	1236	get_text (DC::Layout self)
1180	CODE:	1237	CODE:
1181	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1238	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182	sv_utf8_decode (RETVAL);	1239	sv_utf8_decode (RETVAL);
1183	OUTPUT:	1240	OUTPUT:
1184	RETVAL	1241	RETVAL
1185		1242
1186	void	1243	void
1187	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1244	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188	CODE:	1245	CODE:
1189	self->r = r;	1246	self->r = r;
1190	self->g = g;	1247	self->g = g;
1191	self->b = b;	1248	self->b = b;
1192	self->a = a;	1249	self->a = a;
1193		1250
1194	void	1251	void
1195	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1252	set_font (DC::Layout self, DC::Font font = 0)
1196	CODE:	1253	CODE:
1197	if (self->font != font)	1254	if (self->font != font)
1198	{	1255	{
1199	self->font = font;	1256	self->font = font;
1200	layout_update_font (self);	1257	layout_update_font (self);
1201	}	1258	}
1202		1259
1203	void	1260	void
1204	set_height (CFPlus::Layout self, int base_height)	1261	set_height (DC::Layout self, int base_height)
1205	CODE:	1262	CODE:
1206	if (self->base_height != base_height)	1263	if (self->base_height != base_height)
1207	{	1264	{
1208	self->base_height = base_height;	1265	self->base_height = base_height;
1209	layout_update_font (self);	1266	layout_update_font (self);
1210	}	1267	}
1211		1268
1212	void	1269	void
1213	set_width (CFPlus::Layout self, int max_width = -1)	1270	set_width (DC::Layout self, int max_width = -1)
1214	CODE:	1271	CODE:
1215	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1272	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216		1273
1217	void	1274	void
1218	set_indent (CFPlus::Layout self, int indent)	1275	set_indent (DC::Layout self, int indent)
1219	CODE:	1276	CODE:
1220	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1277	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221		1278
1222	void	1279	void
1223	set_spacing (CFPlus::Layout self, int spacing)	1280	set_spacing (DC::Layout self, int spacing)
1224	CODE:	1281	CODE:
1225	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1282	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226		1283
1227	void	1284	void
1228	set_ellipsise (CFPlus::Layout self, int ellipsise)	1285	set_ellipsise (DC::Layout self, int ellipsise)
1229	CODE:	1286	CODE:
1230	pango_layout_set_ellipsize (self->pl,	1287	pango_layout_set_ellipsize (self->pl,
1231	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1288	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1289	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1290	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234	: PANGO_ELLIPSIZE_NONE	1291	: PANGO_ELLIPSIZE_NONE
1235	);	1292	);
1236		1293
1237	void	1294	void
1238	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1295	set_single_paragraph_mode (DC::Layout self, int spm)
1239	CODE:	1296	CODE:
1240	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1297	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241		1298
1242	void	1299	void
1243	size (CFPlus::Layout self)	1300	size (DC::Layout self)
1244	PPCODE:	1301	PPCODE:
1245	{	1302	{
1246	int w, h;	1303	int w, h;
1247		1304
1248	layout_get_pixel_size (self, &w, &h);	1305	layout_get_pixel_size (self, &w, &h);
…		…
1251	PUSHs (sv_2mortal (newSViv (w)));	1308	PUSHs (sv_2mortal (newSViv (w)));
1252	PUSHs (sv_2mortal (newSViv (h)));	1309	PUSHs (sv_2mortal (newSViv (h)));
1253	}	1310	}
1254		1311
1255	int	1312	int
1256	descent (CFPlus::Layout self)	1313	descent (DC::Layout self)
1257	CODE:	1314	CODE:
1258	{	1315	{
1259	PangoRectangle rect;	1316	PangoRectangle rect;
1260	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1317	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261	pango_layout_line_get_pixel_extents (line, 0, &rect);	1318	pango_layout_line_get_pixel_extents (line, 0, &rect);
1262	RETVAL = PANGO_DESCENT (rect);	1319	RETVAL = PANGO_DESCENT (rect);
1263	}	1320	}
1264	OUTPUT:	1321	OUTPUT:
1265	RETVAL	1322	RETVAL
1266		1323
1267	int	1324	int
1268	xy_to_index (CFPlus::Layout self, int x, int y)	1325	xy_to_index (DC::Layout self, int x, int y)
1269	CODE:	1326	CODE:
1270	{	1327	{
1271	int index, trailing;	1328	int index, trailing;
1272	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1329	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273	RETVAL = index + trailing;	1330	RETVAL = index + trailing;
1274	}	1331	}
1275	OUTPUT:	1332	OUTPUT:
1276	RETVAL	1333	RETVAL
1277		1334
1278	void	1335	void
1279	cursor_pos (CFPlus::Layout self, int index)	1336	cursor_pos (DC::Layout self, int index)
1280	PPCODE:	1337	PPCODE:
1281	{	1338	{
1282	PangoRectangle strong_pos;	1339	PangoRectangle pos;
1283	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1340	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284		1341
1285	EXTEND (SP, 3);	1342	EXTEND (SP, 3);
1286	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1343	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289	}	1346	}
1290		1347
1291	void	1348	void
1292	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1349	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293	PPCODE:	1350	PPCODE:
1294	{	1351	{
1295	int line, x;	1352	int line, x;
1296		1353
1297	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1354	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1355	#if !PANGO_VERSION_CHECK (1, 17, 3)
1298	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1356	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299		1357	--line;
		1358	#endif
1300	EXTEND (SP, 2);	1359	EXTEND (SP, 2);
1301	PUSHs (sv_2mortal (newSViv (line - 1)));	1360	PUSHs (sv_2mortal (newSViv (line)));
1302	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1361	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303	}	1362	}
1304		1363
1305	void	1364	void
1306	line_x_to_index (CFPlus::Layout self, int line, int x)	1365	line_x_to_index (DC::Layout self, int line, int x)
1307	PPCODE:	1366	PPCODE:
1308	{	1367	{
1309	PangoLayoutLine *lp;	1368	PangoLayoutLine *lp;
1310	int index, trailing;	1369	int index, trailing;
1311		1370
1312	if (line < 0)	1371	if (line < 0)
1313	XSRETURN_EMPTY;	1372	XSRETURN_EMPTY;
1314		1373
1315	if (!(lp = pango_layout_get_line (self->pl, line)))	1374	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316	XSRETURN_EMPTY; /* do better */	1375	XSRETURN_EMPTY; /* do better */
1317		1376
1318	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1377	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319		1378
1320	EXTEND (SP, 2);	1379	EXTEND (SP, 2);
…		…
1326	PUSHs (sv_2mortal (newSViv (trailing)));	1385	PUSHs (sv_2mortal (newSViv (trailing)));
1327	}	1386	}
1328	}	1387	}
1329		1388
1330	void	1389	void
1331	render (CFPlus::Layout self, float x, float y, int flags = 0)	1390	render (DC::Layout self, float x, float y, int flags = 0)
1332	CODE:	1391	CODE:
1333	rc_clear (self->rc);	1392	rc_clear (self->rc);
1334	pango_opengl_render_layout_subpixel (	1393	pango_opengl_render_layout_subpixel (
1335	self->pl,	1394	self->pl,
1336	self->rc,	1395	self->rc,
…		…
1341	// we assume that context_change actually clears/frees stuff	1400	// we assume that context_change actually clears/frees stuff
1342	// and does not do any recomputation...	1401	// and does not do any recomputation...
1343	pango_layout_context_changed (self->pl);	1402	pango_layout_context_changed (self->pl);
1344		1403
1345	void	1404	void
1346	draw (CFPlus::Layout self)	1405	draw (DC::Layout self)
1347	CODE:	1406	CODE:
1348	{	1407	{
1349	glEnable (GL_TEXTURE_2D);	1408	glEnable (GL_TEXTURE_2D);
1350	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1409	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351	glEnable (GL_BLEND);	1410	glEnable (GL_BLEND);
…		…
1359	glDisable (GL_ALPHA_TEST);	1418	glDisable (GL_ALPHA_TEST);
1360	glDisable (GL_BLEND);	1419	glDisable (GL_BLEND);
1361	glDisable (GL_TEXTURE_2D);	1420	glDisable (GL_TEXTURE_2D);
1362	}	1421	}
1363		1422
1364	MODULE = CFPlus PACKAGE = CFPlus::Texture	1423	MODULE = Deliantra::Client PACKAGE = DC::Texture
1365		1424
1366	PROTOTYPES: ENABLE	1425	PROTOTYPES: ENABLE
1367		1426
1368	void	1427	void
1369	pad (SV *data_, int ow, int oh, int nw, int nh)	1428	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1448	RETVAL = width > 0;	1507	RETVAL = width > 0;
1449	}	1508	}
1450	OUTPUT:	1509	OUTPUT:
1451	RETVAL	1510	RETVAL
1452		1511
1453	MODULE = CFPlus PACKAGE = CFPlus::Map	1512	MODULE = Deliantra::Client PACKAGE = DC::Map
1454		1513
1455	PROTOTYPES: DISABLE	1514	PROTOTYPES: DISABLE
1456		1515
1457	CFPlus::Map	1516	DC::Map
1458	new (SV *class)	1517	new (SV *class)
1459	CODE:	1518	CODE:
1460	New (0, RETVAL, 1, struct map);	1519	New (0, RETVAL, 1, struct map);
1461	RETVAL->x = 0;	1520	RETVAL->x = 0;
1462	RETVAL->y = 0;	1521	RETVAL->y = 0;
…		…
1470	RETVAL->row = 0;	1529	RETVAL->row = 0;
1471	OUTPUT:	1530	OUTPUT:
1472	RETVAL	1531	RETVAL
1473		1532
1474	void	1533	void
1475	DESTROY (CFPlus::Map self)	1534	DESTROY (DC::Map self)
1476	CODE:	1535	CODE:
1477	{	1536	{
1478	map_clear (self);	1537	map_clear (self);
1479	Safefree (self->face2tile);	1538	Safefree (self->face2tile);
1480	Safefree (self->tex);	1539	Safefree (self->tex);
1481	Safefree (self);	1540	Safefree (self);
1482	}	1541	}
1483		1542
1484	void	1543	void
1485	resize (CFPlus::Map self, int map_width, int map_height)	1544	resize (DC::Map self, int map_width, int map_height)
1486	CODE:	1545	CODE:
1487	self->w = map_width;	1546	self->w = map_width;
1488	self->h = map_height;	1547	self->h = map_height;
1489		1548
1490	void	1549	void
1491	clear (CFPlus::Map self)	1550	clear (DC::Map self)
1492	CODE:	1551	CODE:
1493	map_clear (self);	1552	map_clear (self);
1494		1553
1495	void	1554	void
1496	set_tileid (CFPlus::Map self, int face, int tile)	1555	set_tileid (DC::Map self, int face, int tile)
1497	CODE:	1556	CODE:
1498	{	1557	{
1499	need_facenum (self, face); self->face2tile [face] = tile;	1558	need_facenum (self, face); self->face2tile [face] = tile;
1500	need_texid (self, tile);	1559	need_texid (self, tile);
1501	}	1560	}
1502		1561
1503	void	1562	void
1504	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1563	set_smooth (DC::Map self, int face, int smooth, int level)
1505	CODE:	1564	CODE:
1506	{	1565	{
1507	tileid texid;	1566	tileid texid;
1508	maptex *tex;	1567	maptex *tex;
1509		1568
…		…
1522	tex->smoothtile = self->face2tile [smooth];	1581	tex->smoothtile = self->face2tile [smooth];
1523	tex->smoothlevel = level;	1582	tex->smoothlevel = level;
1524	}	1583	}
1525		1584
1526	void	1585	void
1527	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1586	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528	CODE:	1587	CODE:
1529	{	1588	{
1530	need_texid (self, texid);	1589	need_texid (self, texid);
1531		1590
1532	{	1591	{
…		…
1552	// from transparent color bleeding and ugly wrapping effects.	1611	// from transparent color bleeding and ugly wrapping effects.
1553	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554	}	1613	}
1555		1614
1556	int	1615	int
1557	ox (CFPlus::Map self)	1616	ox (DC::Map self)
1558	ALIAS:	1617	ALIAS:
1559	oy = 1	1618	oy = 1
1560	x = 2	1619	x = 2
1561	y = 3	1620	y = 3
1562	w = 4	1621	w = 4
…		…
1573	}	1632	}
1574	OUTPUT:	1633	OUTPUT:
1575	RETVAL	1634	RETVAL
1576		1635
1577	void	1636	void
1578	scroll (CFPlus::Map self, int dx, int dy)	1637	scroll (DC::Map self, int dx, int dy)
1579	CODE:	1638	CODE:
1580	{	1639	{
1581	if (dx > 0)	1640	if (dx > 0)
1582	map_blank (self, self->x, self->y, dx, self->h);	1641	map_blank (self, self->x, self->y, dx, self->h);
1583	else if (dx < 0)	1642	else if (dx < 0)
…		…
1599	self->y += MAP_EXTEND_Y;	1658	self->y += MAP_EXTEND_Y;
1600	}	1659	}
1601	}	1660	}
1602		1661
1603	SV *	1662	SV *
1604	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1663	map1a_update (DC::Map self, SV *data_, int extmap)
1605	CODE:	1664	CODE:
1606	{	1665	{
1607	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1666	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1608	uint8_t data_end = (uint8_t )SvEND (data_);	1667	uint8_t data_end = (uint8_t )SvEND (data_);
1609	mapcell *cell;	1668	mapcell *cell;
…		…
1637	uint8_t ext, cmd;	1696	uint8_t ext, cmd;
1638		1697
1639	do	1698	do
1640	{	1699	{
1641	ext = *data++;	1700	ext = *data++;
1642	cmd = ext & 0x3f;	1701	cmd = ext & 0x7f;
1643		1702
1644	if (cmd < 4)	1703	if (cmd < 4)
1645	cell->darkness = 255 - ext * 64 + 1;	1704	cell->darkness = 255 - ext * 64 + 1;
1646	else if (cmd == 5) // health	1705	else if (cmd == 5) // health
1647	{	1706	{
…		…
1650	}	1709	}
1651	else if (cmd == 6) // monster width	1710	else if (cmd == 6) // monster width
1652	cell->stat_width = *data++ + 1;	1711	cell->stat_width = *data++ + 1;
1653	else if (cmd == 0x47)	1712	else if (cmd == 0x47)
1654	{	1713	{
1655	if (*data == 4)	1714	if (*data == 1) cell->player = data [1];
1656	; // decode player count	1715	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1716	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1717	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657		1718
1658	data += *data + 1;	1719	data += *data + 1;
1659	}	1720	}
1660	else if (cmd == 8) // cell flags	1721	else if (cmd == 8) // cell flags
1661	cell->flags = *data++;	1722	cell->flags = *data++;
…		…
1698	}	1759	}
1699	OUTPUT:	1760	OUTPUT:
1700	RETVAL	1761	RETVAL
1701		1762
1702	SV *	1763	SV *
1703	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1764	mapmap (DC::Map self, int x0, int y0, int w, int h)
1704	CODE:	1765	CODE:
1705	{	1766	{
1706	int x1, x;	1767	int x1, x;
1707	int y1, y;	1768	int y1, y;
1708	int z;	1769	int z;
…		…
1753	}	1814	}
1754	OUTPUT:	1815	OUTPUT:
1755	RETVAL	1816	RETVAL
1756		1817
1757	void	1818	void
1758	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1819	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1759	CODE:	1820	CODE:
1760	{	1821	{
1761	int x, y, z;	1822	int x, y, z;
1762		1823
1763	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1824	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1764	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1825	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1826	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766	smooth_key skey;	1827	smooth_key skey;
1767		1828	int pl_x, pl_y;
		1829	maptex pl_tex;
1768	rc_t *rc = rc_alloc ();	1830	rc_t *rc = rc_alloc ();
1769	rc_key_t key;	1831	rc_key_t key;
1770	rc_array_t *arr;	1832	rc_array_t *arr;
		1833
		1834	pl_tex.name = 0;
1771		1835
1772	// thats current max. sorry.	1836	// thats current max. sorry.
1773	if (sw > 255) sw = 255;	1837	if (sw > 255) sw = 255;
1774	if (sh > 255) sh = 255;	1838	if (sh > 255) sh = 255;
1775		1839
…		…
1830	tileid tile = cell->tile [z];	1894	tileid tile = cell->tile [z];
1831		1895
1832	if (tile)	1896	if (tile)
1833	{	1897	{
1834	maptex tex = self->tex [tile];	1898	maptex tex = self->tex [tile];
1835	int px, py;	1899	int px = (x + 1) * T - tex.w;
		1900	int py = (y + 1) * T - tex.h;
1836		1901
1837	if (key.texname != tex.name)	1902	if (key.texname != tex.name)
1838	{	1903	{
1839	if (!tex.name)	1904	if (!tex.name)
1840	tex = self->tex [2]; /* missing, replace by noface */	1905	tex = self->tex [2]; /* missing, replace by noface */
1841		1906
1842	key.texname = tex.name;	1907	key.texname = tex.name;
1843	arr = rc_array (rc, &key);	1908	arr = rc_array (rc, &key);
1844	}	1909	}
1845		1910
1846	px = (x + 1) * T - tex.w;	1911	if (expect_false (cell->player == player) && expect_false (z == 2))
1847	py = (y + 1) * T - tex.h;	1912	{
		1913	pl_x = px;
		1914	pl_y = py;
		1915	pl_tex = tex;
		1916	continue;
		1917	}
1848		1918
1849	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1919	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1920	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1921	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1922	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853		1923
1854	if (cell->flags && z == 2)	1924	if (expect_false (cell->flags) && expect_false (z == 2))
1855	{	1925	{
1856	// overlays such as the speech bubble, probably more to come	1926	// overlays such as the speech bubble, probably more to come
1857	if (cell->flags & 1)	1927	if (cell->flags & 1)
1858	{	1928	{
1859	maptex tex = self->tex [1];	1929	maptex tex = self->tex [1];
…		…
1998	}	2068	}
1999		2069
2000	hv_clear (smooth);	2070	hv_clear (smooth);
2001	}	2071	}
2002		2072
		2073	if (pl_tex.name)
		2074	{
		2075	maptex tex = pl_tex;
		2076	int px = pl_x + pdx;
		2077	int py = pl_y + pdy;
		2078
		2079	key.texname = tex.name;
		2080	arr = rc_array (rc, &key);
		2081
		2082	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2083	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2084	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2086
		2087	rc_draw (rc);
		2088	}
		2089
2003	glDisable (GL_BLEND);	2090	glDisable (GL_BLEND);
2004	rc_free (rc);	2091	rc_free (rc);
2005		2092
2006	// top layer: overlays such as the health bar	2093	// top layer: overlays such as the health bar
2007	for (y = 0; y < sh; y++)	2094	for (y = 0; y < sh; y++)
…		…
2034	}	2121	}
2035	}	2122	}
2036	}	2123	}
2037		2124
2038	void	2125	void
2039	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2126	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040	CODE:	2127	CODE:
2041	{	2128	{
2042	static float color[16][3] = {	2129	static float color[16][3] = {
2043	{ 0.00F, 0.00F, 0.00F },	2130	{ 0.00F, 0.00F, 0.00F },
2044	{ 1.00F, 1.00F, 1.00F },	2131	{ 1.00F, 1.00F, 1.00F },
…		…
2094	glDisable (GL_BLEND);	2181	glDisable (GL_BLEND);
2095	glDisable (GL_TEXTURE_2D);	2182	glDisable (GL_TEXTURE_2D);
2096	}	2183	}
2097		2184
2098	void	2185	void
2099	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2186	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100	PPCODE:	2187	PPCODE:
2101	{	2188	{
2102	int x, y;	2189	int x, y;
2103	int sw1 = sw + 2;	2190	int sw1 = sw + 2;
2104	int sh1 = sh + 2;	2191	int sh1 = sh + 2;
…		…
2175	PUSHs (sv_2mortal (newSViv (sh3)));	2262	PUSHs (sv_2mortal (newSViv (sh3)));
2176	PUSHs (darkness3_sv);	2263	PUSHs (darkness3_sv);
2177	}	2264	}
2178		2265
2179	SV *	2266	SV *
2180	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2267	get_rect (DC::Map self, int x0, int y0, int w, int h)
2181	CODE:	2268	CODE:
2182	{	2269	{
2183	int x, y, x1, y1;	2270	int x, y, x1, y1;
2184	SV data_sv = newSV (w h * 7 + 5);	2271	SV data_sv = newSV (w h * 7 + 5);
2185	uint8_t data = (uint8_t )SvPVX (data_sv);	2272	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2242	else	2329	else
2243	*data++ = 0;	2330	*data++ = 0;
2244	}	2331	}
2245	}	2332	}
2246		2333
		2334	/* if size is wh + 5 then no data has been found /
		2335	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2336	{
2247	SvPOK_only (data_sv);	2337	SvPOK_only (data_sv);
2248	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2338	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2339	}
		2340
2249	RETVAL = data_sv;	2341	RETVAL = data_sv;
2250	}	2342	}
2251	OUTPUT:	2343	OUTPUT:
2252	RETVAL	2344	RETVAL
2253		2345
2254	void	2346	void
2255	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2347	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256	PPCODE:	2348	PPCODE:
2257	{	2349	{
2258	int x, y, z;	2350	int x, y, z;
2259	int w, h;	2351	int w, h;
2260	int x1, y1;	2352	int x1, y1;
		2353	STRLEN len;
		2354	uint8_t data, end;
		2355
		2356	len = SvLEN (data_sv);
		2357	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2358	data = SvPVbyte_nolen (data_sv);
		2359	end = data + len + 8;
		2360
		2361	if (len < 5)
		2362	XSRETURN_EMPTY;
2261		2363
2262	if (*data++ != 0)	2364	if (*data++ != 0)
2263	XSRETURN_EMPTY; /* version mismatch */	2365	XSRETURN_EMPTY; /* version mismatch */
2264		2366
2265	w = data++ << 8; w \|= data++;	2367	w = data++ << 8; w \|= data++;
…		…
2280	{	2382	{
2281	maprow *row = map_get_row (self, y);	2383	maprow *row = map_get_row (self, y);
2282		2384
2283	for (x = x0; x < x1; x++)	2385	for (x = x0; x < x1; x++)
2284	{	2386	{
		2387	uint8_t flags;
		2388
		2389	if (data + 7 >= end)
		2390	XSRETURN_EMPTY;
		2391
2285	uint8_t flags = *data++;	2392	flags = *data++;
2286		2393
2287	if (flags)	2394	if (flags)
2288	{	2395	{
2289	mapcell *cell = row_get_cell (row, x);	2396	mapcell *cell = row_get_cell (row, x);
2290	tileid tile[3] = { 0, 0, 0 };	2397	tileid tile[3] = { 0, 0, 0 };
…		…
2293	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2400	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2294	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2401	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2295		2402
2296	if (cell->darkness == 0)	2403	if (cell->darkness == 0)
2297	{	2404	{
2298	cell->darkness = 0;	2405	/cell->darkness = 0;/
		2406	EXTEND (SP, 3);
2299		2407
2300	for (z = 0; z <= 2; z++)	2408	for (z = 0; z <= 2; z++)
2301	{	2409	{
2302	tileid t = tile [z];	2410	tileid t = tile [z];
2303		2411
2304	if (t >= self->texs \|\| (t && !self->tex [t].name))	2412	if (t >= self->texs \|\| (t && !self->tex [t].name))
2305	{	2413	{
2306	XPUSHs (sv_2mortal (newSViv (t)));	2414	PUSHs (sv_2mortal (newSViv (t)));
2307	need_texid (self, t);	2415	need_texid (self, t);
2308	}	2416	}
2309		2417
2310	cell->tile [z] = t;	2418	cell->tile [z] = t;
2311	}	2419	}
…		…
2313	}	2421	}
2314	}	2422	}
2315	}	2423	}
2316	}	2424	}
2317		2425
2318	MODULE = CFPlus PACKAGE = CFPlus::RW	2426	MODULE = Deliantra::Client PACKAGE = DC::RW
2319		2427
2320	CFPlus::RW	2428	DC::RW
2321	new (SV class, SV data_sv)	2429	new (SV class, SV data_sv)
2322	CODE:	2430	CODE:
2323	{	2431	{
2324	STRLEN datalen;	2432	STRLEN datalen;
2325	char *data = SvPVbyte (data_sv, datalen);	2433	char *data = SvPVbyte (data_sv, datalen);
…		…
2327	RETVAL = SDL_RWFromConstMem (data, datalen);	2435	RETVAL = SDL_RWFromConstMem (data, datalen);
2328	}	2436	}
2329	OUTPUT:	2437	OUTPUT:
2330	RETVAL	2438	RETVAL
2331		2439
2332	CFPlus::RW	2440	DC::RW
2333	new_from_file (SV class, const char path, const char *mode = "rb")	2441	new_from_file (SV class, const char path, const char *mode = "rb")
2334	CODE:	2442	CODE:
2335	RETVAL = SDL_RWFromFile (path, mode);	2443	RETVAL = SDL_RWFromFile (path, mode);
2336	OUTPUT:	2444	OUTPUT:
2337	RETVAL	2445	RETVAL
2338		2446
2339	# fails on win32:	2447	# fails on win32:
2340	# CFPlus.xs(2268) : error C2059: syntax error : '('	2448	# dc.xs(2268) : error C2059: syntax error : '('
2341	#void	2449	#void
2342	#close (CFPlus::RW self)	2450	#close (DC::RW self)
2343	# CODE:	2451	# CODE:
2344	# (self->(close)) (self);	2452	# (self->(close)) (self);
2345		2453
2346	MODULE = CFPlus PACKAGE = CFPlus::Channel	2454	MODULE = Deliantra::Client PACKAGE = DC::Channel
2347		2455
2348	PROTOTYPES: DISABLE	2456	PROTOTYPES: DISABLE
2349		2457
2350	CFPlus::Channel	2458	DC::Channel
2351	find ()	2459	find ()
2352	CODE:	2460	CODE:
2353	{	2461	{
2354	RETVAL = Mix_GroupAvailable (-1);	2462	RETVAL = Mix_GroupAvailable (-1);
2355		2463
…		…
2368	}	2476	}
2369	OUTPUT:	2477	OUTPUT:
2370	RETVAL	2478	RETVAL
2371		2479
2372	void	2480	void
2373	halt (CFPlus::Channel self)	2481	halt (DC::Channel self)
2374	CODE:	2482	CODE:
2375	Mix_HaltChannel (self);	2483	Mix_HaltChannel (self);
2376		2484
2377	void	2485	void
2378	expire (CFPlus::Channel self, int ticks = -1)	2486	expire (DC::Channel self, int ticks = -1)
2379	CODE:	2487	CODE:
2380	Mix_ExpireChannel (self, ticks);	2488	Mix_ExpireChannel (self, ticks);
2381		2489
2382	void	2490	void
2383	fade_out (CFPlus::Channel self, int ticks = -1)	2491	fade_out (DC::Channel self, int ticks = -1)
2384	CODE:	2492	CODE:
2385	Mix_FadeOutChannel (self, ticks);	2493	Mix_FadeOutChannel (self, ticks);
2386		2494
2387	int	2495	int
2388	volume (CFPlus::Channel self, int volume)	2496	volume (DC::Channel self, int volume)
2389	CODE:	2497	CODE:
2390	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2498	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391	OUTPUT:	2499	OUTPUT:
2392	RETVAL	2500	RETVAL
2393		2501
2394	void	2502	void
2395	unregister_all_effects (CFPlus::Channel self)	2503	unregister_all_effects (DC::Channel self)
2396	CODE:	2504	CODE:
2397	Mix_UnregisterAllEffects (self);	2505	Mix_UnregisterAllEffects (self);
2398		2506
2399	void	2507	void
2400	set_panning (CFPlus::Channel self, int left, int right)	2508	set_panning (DC::Channel self, int left, int right)
2401	CODE:	2509	CODE:
2402	left = CLAMP (left , 0, 255);	2510	left = CLAMP (left , 0, 255);
2403	right = CLAMP (right, 0, 255);	2511	right = CLAMP (right, 0, 255);
2404	Mix_SetPanning (self, left, right);	2512	Mix_SetPanning (self, left, right);
2405		2513
2406	void	2514	void
2407	set_distance (CFPlus::Channel self, int distance)	2515	set_distance (DC::Channel self, int distance)
2408	CODE:	2516	CODE:
2409	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2517	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410		2518
2411	void	2519	void
2412	set_position (CFPlus::Channel self, int angle, int distance)	2520	set_position (DC::Channel self, int angle, int distance)
2413	CODE:	2521	CODE:
2414		2522
2415	void	2523	void
2416	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2524	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417	CODE:	2525	CODE:
2418	{	2526	{
2419	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2527	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2528	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2529	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422	}	2530	}
2423		2531
2424	void	2532	void
2425	set_reverse_stereo (CFPlus::Channel self, int flip)	2533	set_reverse_stereo (DC::Channel self, int flip)
2426	CODE:	2534	CODE:
2427	Mix_SetReverseStereo (self, flip);	2535	Mix_SetReverseStereo (self, flip);
2428		2536
2429	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2537	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430		2538
2431	PROTOTYPES: DISABLE	2539	PROTOTYPES: DISABLE
2432		2540
2433	CFPlus::MixChunk	2541	DC::MixChunk
2434	new (SV *class, CFPlus::RW rwops)	2542	new (SV *class, DC::RW rwops)
2435	CODE:	2543	CODE:
2436	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2544	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437	OUTPUT:	2545	OUTPUT:
2438	RETVAL	2546	RETVAL
2439		2547
2440	void	2548	void
2441	DESTROY (CFPlus::MixChunk self)	2549	DESTROY (DC::MixChunk self)
2442	CODE:	2550	CODE:
2443	Mix_FreeChunk (self);	2551	Mix_FreeChunk (self);
2444		2552
2445	int	2553	int
2446	volume (CFPlus::MixChunk self, int volume = -1)	2554	volume (DC::MixChunk self, int volume = -1)
2447	CODE:	2555	CODE:
2448	if (items > 1)	2556	if (items > 1)
2449	volume = CLAMP (volume, 0, 128);	2557	volume = CLAMP (volume, 0, 128);
2450	RETVAL = Mix_VolumeChunk (self, volume);	2558	RETVAL = Mix_VolumeChunk (self, volume);
2451	OUTPUT:	2559	OUTPUT:
2452	RETVAL	2560	RETVAL
2453		2561
2454	CFPlus::Channel	2562	DC::Channel
2455	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2563	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456	CODE:	2564	CODE:
2457	{	2565	{
2458	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2566	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459		2567
2460	if (RETVAL < 0)	2568	if (RETVAL < 0)
…		…
2467	}	2575	}
2468	}	2576	}
2469	OUTPUT:	2577	OUTPUT:
2470	RETVAL	2578	RETVAL
2471		2579
2472	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2580	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473		2581
2474	int	2582	int
2475	volume (int volume = -1)	2583	volume (int volume = -1)
2476	PROTOTYPE: ;$	2584	PROTOTYPE: ;$
2477	CODE:	2585	CODE:
…		…
2489	void	2597	void
2490	halt ()	2598	halt ()
2491	CODE:	2599	CODE:
2492	Mix_HaltMusic ();	2600	Mix_HaltMusic ();
2493		2601
2494	CFPlus::MixMusic	2602	DC::MixMusic
2495	new (SV *class, CFPlus::RW rwops)	2603	new (SV *class, DC::RW rwops)
2496	CODE:	2604	CODE:
2497	RETVAL = Mix_LoadMUS_RW (rwops);	2605	RETVAL = Mix_LoadMUS_RW (rwops);
2498	OUTPUT:	2606	OUTPUT:
2499	RETVAL	2607	RETVAL
2500		2608
2501	void	2609	void
2502	DESTROY (CFPlus::MixMusic self)	2610	DESTROY (DC::MixMusic self)
2503	CODE:	2611	CODE:
2504	Mix_FreeMusic (self);	2612	Mix_FreeMusic (self);
2505		2613
2506	int	2614	int
2507	play (CFPlus::MixMusic self, int loops = -1)	2615	play (DC::MixMusic self, int loops = -1)
2508	CODE:	2616	CODE:
2509	RETVAL = Mix_PlayMusic (self, loops);	2617	RETVAL = Mix_PlayMusic (self, loops);
2510	OUTPUT:	2618	OUTPUT:
2511	RETVAL	2619	RETVAL
2512		2620
2513	void	2621	void
2514	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2622	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515	CODE:	2623	CODE:
2516	Mix_FadeInMusicPos (self, loops, ms, position);	2624	Mix_FadeInMusicPos (self, loops, ms, position);
2517		2625
2518	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2626	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519		2627
2520	PROTOTYPES: ENABLE	2628	PROTOTYPES: ENABLE
2521		2629
2522	BOOT:	2630	BOOT:
2523	{	2631	{
2524	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2632	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525	static const struct {	2633	static const struct {
2526	const char *name;	2634	const char *name;
2527	IV iv;	2635	IV iv;
2528	} *civ, const_iv[] = {	2636	} *civ, const_iv[] = {
2529	# define const_iv(name) { # name, (IV)name }	2637	# define const_iv(name) { # name, (IV)name }
…		…
2822	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2930	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2823	CODE:	2931	CODE:
2824	if (gl.SeparableFilter2D)	2932	if (gl.SeparableFilter2D)
2825	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2933	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826		2934
2827	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2935	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828		2936
2829	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2937	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830		2938
2831	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2939	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832		2940
…		…
2858		2966
2859	void glEndList ()	2967	void glEndList ()
2860		2968
2861	void glCallList (int list)	2969	void glCallList (int list)
2862		2970
2863	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2971	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864		2972
2865	PROTOTYPES: DISABLE	2973	PROTOTYPES: DISABLE
2866		2974
2867	void	2975	void
2868	find_widget (SV *self, NV x, NV y)	2976	find_widget (SV *self, NV x, NV y)
…		…
2872	XPUSHs (self);	2980	XPUSHs (self);
2873	}	2981	}
2874		2982
2875	BOOT:	2983	BOOT:
2876	{	2984	{
2877	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2985	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878		2986
2879	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2987	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2988	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2989	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2990	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883	}	2991	}
2884		2992
2885	void	2993	void
2886	draw (SV *self)	2994	draw (SV *self)
2887	CODE:	2995	CODE:
…		…
2894	SV *draw_w_sv = GvSV (draw_w_gv);	3002	SV *draw_w_sv = GvSV (draw_w_gv);
2895	SV *draw_h_sv = GvSV (draw_h_gv);	3003	SV *draw_h_sv = GvSV (draw_h_gv);
2896	double draw_x, draw_y;	3004	double draw_x, draw_y;
2897		3005
2898	if (!SvROK (self))	3006	if (!SvROK (self))
2899	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3007	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900		3008
2901	hv = (HV *)SvRV (self);	3009	hv = (HV *)SvRV (self);
2902		3010
2903	if (SvTYPE (hv) != SVt_PVHV)	3011	if (SvTYPE (hv) != SVt_PVHV)
2904	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3012	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905		3013
2906	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3014	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908		3016
2909	if (!h \|\| !w)	3017	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs. Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC