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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
125	}	162	}
126		163
127	typedef uint16_t mapface;	164	typedef uint16_t mapface;
128		165
129	typedef struct {	166	typedef struct {
…		…
132	float s, t;	169	float s, t;
133	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
134	} maptex;	171	} maptex;
135		172
136	typedef struct {	173	typedef struct {
137	int16_t darkness;	174	uint32_t player;
138	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
139	} mapcell;	178	} mapcell;
140		179
141	typedef struct {	180	typedef struct {
142	int32_t c0, c1;	181	int32_t c0, c1;
143	mapcell *col;	182	mapcell *col;
…		…
152	int texs;	191	int texs;
153	maptex *tex;	192	maptex *tex;
154		193
155	int32_t rows;	194	int32_t rows;
156	maprow *row;	195	maprow *row;
157	} *CFClient__Map;	196	} *CFPlus__Map;
158		197
159	static char *	198	static char *
160	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
161	{	200	{
162	char *p;	201	char *p;
…		…
180		219
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		222
184	static maprow *	223	static maprow *
185	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
186	{	225	{
187	if (0 > y)	226	if (0 > y)
188	{	227	{
189	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
228		267
229	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
230	}	269	}
231		270
232	static mapcell *	271	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
234	{	273	{
235	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
236	}	275	}
237		276
238	static void	277	static void
239	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
240	{	279	{
241	int r;	280	int r;
242		281
243	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
252	self->row = 0;	291	self->row = 0;
253	self->rows = 0;	292	self->rows = 0;
254	}	293	}
255		294
256	static void	295	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	297	{
259	int x, y;	298	int x, y;
260	maprow *row;	299	maprow *row;
		300	mapcell *cell;
261		301
262	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	303	if (y >= 0)
264	{	304	{
265	if (y >= self->rows)	305	if (y >= self->rows)
…		…
271	if (x >= row->c0)	311	if (x >= row->c0)
272	{	312	{
273	if (x >= row->c1)	313	if (x >= row->c1)
274	break;	314	break;
275		315
276	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
		320	cell->flags = 0;
		321	cell->player = 0;
277	}	322	}
278	}	323	}
279	}	324	}
280		325
281	static void	326	static void
…		…
319	n \|= n >> 16;	364	n \|= n >> 16;
320		365
321	return n + 1;	366	return n + 1;
322	}	367	}
323		368
324	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
325		370
326	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
327		372
328	BOOT:	373	BOOT:
329	{	374	{
330	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	376	static const struct {
332	const char *name;	377	const char *name;
333	IV iv;	378	IV iv;
334	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
436		481
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	484	}
440		485
		486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
441	void	497	void
442	pango_init ()	498	pango_init ()
443	CODE:	499	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	500	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
448	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	504	}
467		505
468	int	506	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		508
471	void	509	void
472	SDL_Quit ()	510	SDL_Quit ()
473		511
474	void	512	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		522
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		525
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492		530
493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
		533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
494		536
495	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497		539
498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
585	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587	break;	629	break;
588	}	630	}
589		631
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591	}	633	}
592	}	634	}
593		635
594	int	636	int
595	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
611	#endif	653	#endif
612		654
613	void	655	void
614	add_font (char *file)	656	add_font (char *file)
615	CODE:	657	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		659
622	void	660	void
623	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
624	ALIAS:	662	ALIAS:
625	load_image_file = 1	663	load_image_file = 1
…		…
667		705
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		707
670	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
671		709
		710	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	711	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
681		719
682	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
684	}	722	}
685		723
…		…
728	void	766	void
729	_exit (int retval)	767	_exit (int retval)
730	CODE:	768	CODE:
731	_exit (retval);	769	_exit (retval);
732		770
733	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
734		772
735	CFClient::Font	773	CFPlus::Font
736	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
737	CODE:	775	CODE:
738	{	776	{
739	int count;	777	int count;
740	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
743	}	781	}
744	OUTPUT:	782	OUTPUT:
745	RETVAL	783	RETVAL
746		784
747	void	785	void
748	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
749	CODE:	787	CODE:
750	pango_font_description_free (self);	788	pango_font_description_free (self);
751		789
752	void	790	void
753	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
754	CODE:	792	CODE:
755	default_font = self;	793	default_font = self;
756		794
757	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
758		796
759	CFClient::Layout	797	void
760	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
761	CODE:	804	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
763		806
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	808	RETVAL->r = 1.;
767	RETVAL->g = 1.;	809	RETVAL->g = 1.;
768	RETVAL->b = 1.;	810	RETVAL->b = 1.;
769	RETVAL->a = 1.;	811	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
774	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
775	OUTPUT:	817	OUTPUT:
776	RETVAL	818	RETVAL
777		819
778	void	820	void
779	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
780	CODE:	822	CODE:
781	g_object_unref (self->pl);	823	g_object_unref (self->pl);
782	Safefree (self);	824	Safefree (self);
783		825
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	826	void
792	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
793	CODE:	828	CODE:
794	{	829	{
795	STRLEN textlen;	830	STRLEN textlen;
796	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
797		832
798	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
799	}	834	}
800		835
801	void	836	void
802	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
803	CODE:	838	CODE:
804	{	839	{
805	STRLEN textlen;	840	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
807		842
808	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
809	}	844	}
810		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
811	SV *	931	SV *
812	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
813	CODE:	933	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815	sv_utf8_decode (RETVAL);	935	sv_utf8_decode (RETVAL);
816	OUTPUT:	936	OUTPUT:
817	RETVAL	937	RETVAL
818		938
819	void	939	void
820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821	CODE:	941	CODE:
822	self->r = r;	942	self->r = r;
823	self->g = g;	943	self->g = g;
824	self->b = b;	944	self->b = b;
825	self->a = a;	945	self->a = a;
826		946
827	void	947	void
828	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829	CODE:	949	CODE:
830	if (self->font != font)	950	if (self->font != font)
831	{	951	{
832	self->font = font;	952	self->font = font;
833	layout_update_font (self);	953	layout_update_font (self);
834	}	954	}
835		955
836	void	956	void
837	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
838	CODE:	958	CODE:
839	if (self->base_height != base_height)	959	if (self->base_height != base_height)
840	{	960	{
841	self->base_height = base_height;	961	self->base_height = base_height;
842	layout_update_font (self);	962	layout_update_font (self);
843	}	963	}
844		964
845	void	965	void
846	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
847	CODE:	967	CODE:
848	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849		969
850	void	970	void
851	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
852	CODE:	972	CODE:
853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854		974
855	void	975	void
856	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
857	CODE:	977	CODE:
858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859		979
860	void	980	void
861	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
862	CODE:	982	CODE:
863	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
864	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
867	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
868	);	988	);
869		989
870	void	990	void
871	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
872	CODE:	992	CODE:
873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874		994
875	void	995	void
876	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
877	PPCODE:	997	PPCODE:
878	{	998	{
879	int w, h;	999	int w, h;
880		1000
881	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
886	}	1006	}
887		1007
888	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
889	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
890	CODE:	1022	CODE:
891	{	1023	{
892	int index, trailing;	1024	int index, trailing;
893	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894	RETVAL = index;	1026	RETVAL = index;
895	}	1027	}
896	OUTPUT:	1028	OUTPUT:
897	RETVAL	1029	RETVAL
898		1030
899	void	1031	void
900	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
901	PPCODE:	1033	PPCODE:
902	{	1034	{
903	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
904	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905		1037
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1042	}
911		1043
912	void	1044	void
913	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
914	PPCODE:	1046	PPCODE:
915	{	1047	pango_opengl_render_layout_subpixel (
916	SV *retval;	1048	self->pl,
917	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
918		1050	self->r, self->g, self->b, self->a,
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1051	flags
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t p = (uint32_t )SvPVX (retval);
945	uint32_t e = p + w h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) \| (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) \| a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));
970	PUSHs (sv_2mortal (newSViv (h)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}	1052	);
975	else
976	{
977	FT_Bitmap bitmap;
978		1053
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));
996	PUSHs (sv_2mortal (newSViv (h)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}
1001	}
1002
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
1004		1055
1005	void	1056	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1057	pad2pot (SV data_, SV w_, SV *h_)
1007	CODE:	1058	CODE:
1008	{	1059	{
…		…
1038	}	1089	}
1039	}	1090	}
1040	}	1091	}
1041		1092
1042	void	1093	void
1043	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
1045	ALIAS:	1096	ALIAS:
1046	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
1047	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
1048	CODE:	1099	CODE:
…		…
1086	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1087	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1088	}	1139	}
1089	}	1140	}
1090		1141
1091	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1092		1143
1093	CFClient::Map	1144	CFPlus::Map
1094	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1095	CODE:	1146	CODE:
1096	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1097	RETVAL->x = 0;	1148	RETVAL->x = 0;
1098	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1108	RETVAL->row = 0;	1159	RETVAL->row = 0;
1109	OUTPUT:	1160	OUTPUT:
1110	RETVAL	1161	RETVAL
1111		1162
1112	void	1163	void
1113	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1114	CODE:	1165	CODE:
1115	{	1166	{
1116	map_clear (self);	1167	map_clear (self);
1117	Safefree (self->face);	1168	Safefree (self->face);
1118	Safefree (self->tex);	1169	Safefree (self->tex);
1119	Safefree (self);	1170	Safefree (self);
1120	}	1171	}
1121		1172
1122	void	1173	void
1123	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1124	CODE:	1175	CODE:
1125	map_clear (self);	1176	map_clear (self);
1126		1177
1127	void	1178	void
1128	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1129	CODE:	1180	CODE:
1130	{	1181	{
1131	while (self->faces <= face)	1182	while (self->faces <= face)
1132	{	1183	{
1133	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1136		1187
1137	self->face [face] = texid;	1188	self->face [face] = texid;
1138	}	1189	}
1139		1190
1140	void	1191	void
1141	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1192	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)
1142	CODE:	1193	CODE:
1143	{	1194	{
1144	while (self->texs <= texid)	1195	while (self->texs <= texid)
1145	{	1196	{
1146	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1170	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172	}	1223	}
1173		1224
1174	int	1225	int
1175	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1176	ALIAS:	1227	ALIAS:
1177	oy = 1	1228	oy = 1
1178	x = 2	1229	x = 2
1179	y = 3	1230	y = 3
1180	w = 4	1231	w = 4
…		…
1191	}	1242	}
1192	OUTPUT:	1243	OUTPUT:
1193	RETVAL	1244	RETVAL
1194		1245
1195	void	1246	void
1196	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1197	CODE:	1248	CODE:
1198	{	1249	{
1199	if (dx > 0)	1250	if (dx > 0)
1200	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1201	else if (dx < 0)	1252	else if (dx < 0)
1202	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1203		1254
1204	if (dy > 0)	1255	if (dy > 0)
1205	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1206	else if (dy < 0)	1257	else if (dy < 0)
1207	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1208		1259
1209	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1210	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1211		1262
1212	while (self->y < 0)	1263	while (self->y < 0)
…		…
1217	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1218	}	1269	}
1219	}	1270	}
1220		1271
1221	void	1272	void
1222	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223	CODE:	1274	CODE:
1224	{	1275	{
1225	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1226	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1227	mapcell *cell;	1278	mapcell *cell;
1228	int x, y, flags;	1279	int x, y, flags;
1229		1280
1230	while (data < data_end)	1281	while (data < data_end - 1)
1231	{	1282	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1233		1284
1234	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1236		1287
1237	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1238		1289
1239	if (flags & 15)	1290	if (flags & 15)
1240	{	1291	{
1241	if (cell->darkness < 0)	1292	if (!cell->darkness)
1242	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1243	cell->darkness = 0;	1295	cell->darkness = 256;
1244	cell->face [0] = 0;
1245	cell->face [1] = 0;
1246	cell->face [2] = 0;
1247	}	1296	}
1248		1297
1249	cell->darkness = flags & 8 ? *data++ : 255;
1250
1251	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338
		1339	}
1252		1340
1253	if (flags & 4)	1341	if (flags & 4)
1254	{	1342	{
1255	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256	}	1344	}
…		…
1264	{	1352	{
1265	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266	}	1354	}
1267	}	1355	}
1268	else	1356	else
1269	cell->darkness = -1;	1357	cell->darkness = 0;
1270	}	1358	}
1271	}	1359	}
1272		1360
1273	SV *	1361	SV *
1274	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1362	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275	CODE:	1363	CODE:
1276	{	1364	{
1277	int x1, x;	1365	int x1, x;
1278	int y1, y;	1366	int y1, y;
1279	int z;	1367	int z;
…		…
1329	}	1417	}
1330	OUTPUT:	1418	OUTPUT:
1331	RETVAL	1419	RETVAL
1332		1420
1333	void	1421	void
1334	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335	PPCODE:	1423	CODE:
1336	{	1424	{
1337	int vx, vy;	1425	int vx, vy;
1338	int x, y, z;	1426	int x, y, z;
1339	int last_name;	1427	int last_name;
1340	mapface face;	1428	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1343	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1344		1429
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1432
1352	/*	1433	/*
1353	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1436	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1359	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/	1441	*/
1361		1442
1362	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1363		1444
		1445	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1449
1369	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1370		1451
…		…
1379	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1462	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1383		1464
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387
1388	face = cell->face [z];	1465	face = cell->face [z];
1389		1466
1390	if (face)	1467	if (face && face < self->texs)
1391	{	1468	{
1392	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1393
1394	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1395	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1396		1472
1397	if (last_name != tex.name)	1473	if (last_name != tex.name)
1398	{	1474	{
1399	glEnd ();	1475	glEnd ();
1400	last_name = tex.name;
1401	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1403	}	1478	}
1404		1479
1405	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409	}	1484	}
		1485
		1486	if (cell->flags && z == 2)
		1487	{
		1488	if (cell->flags & 1)
		1489	{
		1490	maptex tex = self->tex [1];
		1491	int px = (x + 1) * 32 - tex.w + 2;
		1492	int py = (y + 1) * 32 - tex.h - 6;
		1493
		1494	glEnd ();
		1495	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1496	glBegin (GL_QUADS);
		1497
		1498	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1499	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1500	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1501	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1502	}
		1503	}
1410	}	1504	}
1411	}	1505	}
1412		1506
1413	glEnd ();	1507	glEnd ();
1414		1508
1415	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1416	glDisable (GL_BLEND);	1510	glDisable (GL_BLEND);
		1511
		1512	// top layer: overlays such as the health bar
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	int px = x * 32;
		1524	int py = y * 32;
		1525
		1526	if (cell->stat_hp)
		1527	{
		1528	int width = cell->stat_width * 32;
		1529	int thick = sh / 28 + 1 + cell->stat_width;
		1530
		1531	glColor3ub (0, 0, 0);
		1532	glRectf (px + 1, py - thick - 2,
		1533	px + width - 1, py);
		1534
		1535	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1536	glRectf (px + 2,
		1537	py - thick - 1,
		1538	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1539	}
		1540	}
		1541	}
		1542	}
		1543
		1544	void
		1545	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1546	CODE:
		1547	{
		1548	static float color[16][3] = {
		1549	{ 0.00F, 0.00F, 0.00F },
		1550	{ 1.00F, 1.00F, 1.00F },
		1551	{ 0.00F, 0.00F, 0.55F },
		1552	{ 1.00F, 0.00F, 0.00F },
		1553
		1554	{ 1.00F, 0.54F, 0.00F },
		1555	{ 0.11F, 0.56F, 1.00F },
		1556	{ 0.93F, 0.46F, 0.00F },
		1557	{ 0.18F, 0.54F, 0.34F },
		1558
		1559	{ 0.56F, 0.73F, 0.56F },
		1560	{ 0.80F, 0.80F, 0.80F },
		1561	{ 0.55F, 0.41F, 0.13F },
		1562	{ 0.99F, 0.77F, 0.26F },
		1563
		1564	{ 0.74F, 0.65F, 0.41F },
		1565
		1566	{ 0.00F, 1.00F, 1.00F },
		1567	{ 1.00F, 0.00F, 1.00F },
		1568	{ 1.00F, 1.00F, 0.00F },
		1569	};
		1570
		1571	int x, y;
		1572
		1573	glEnable (GL_TEXTURE_2D);
		1574	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1575	glEnable (GL_BLEND);
		1576	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1577	glBegin (GL_QUADS);
		1578
		1579	for (y = 0; y < h; y++)
		1580	for (x = 0; x < w; x++)
		1581	{
		1582	unsigned char m = data [x + y * w];
		1583
		1584	if (m)
		1585	{
		1586	float *c = color [m & 15];
		1587
		1588	float tx1 = m & 0x40 ? 0.5 : 0.;
		1589	float tx2 = tx1 + 0.5;
		1590
		1591	glColor4f (c[0], c[1], c[2], 0.75);
		1592	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1593	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1594	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1595	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1596	}
		1597	}
		1598
		1599	glEnd ();
		1600	glDisable (GL_BLEND);
		1601	glDisable (GL_TEXTURE_2D);
		1602	}
		1603
		1604	void
		1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1606	PPCODE:
		1607	{
		1608	int vx, vy;
		1609	int x, y;
		1610	int sw4 = (sw + 3) & ~3;
		1611	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1612	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1613
		1614	memset (darkness, 255, sw4 * sh);
		1615	SvPOK_only (darkness_sv);
		1616	SvCUR_set (darkness_sv, sw4 * sh);
		1617
		1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1620
		1621	for (y = 0; y < sh; y++)
		1622	if (0 <= y + vy && y + vy < self->rows)
		1623	{
		1624	maprow *row = self->row + (y + vy);
		1625
		1626	for (x = 0; x < sw; x++)
		1627	if (row->c0 <= x + vx && x + vx < row->c1)
		1628	{
		1629	mapcell *cell = row->col + (x + vx - row->c0);
		1630
		1631	darkness[y * sw4 + x] = cell->darkness
		1632	? 255 - (cell->darkness - 1)
		1633	: 255 - FOW_DARKNESS;
		1634	}
		1635	}
1417		1636
1418	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1422	}	1641	}
1423		1642
1424	SV *	1643	SV *
1425	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1644	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426	CODE:	1645	CODE:
1427	{	1646	{
1428	int x, y, x1, y1;	1647	int x, y, x1, y1;
1429	SV data_sv = newSV (w h * 7 + 5);	1648	SV data_sv = newSV (w h * 7 + 5);
1430	uint8_t data = (uint8_t )SvPVX (data_sv);	1649	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1492	}	1711	}
1493	OUTPUT:	1712	OUTPUT:
1494	RETVAL	1713	RETVAL
1495		1714
1496	void	1715	void
1497	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1716	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498	PPCODE:	1717	PPCODE:
1499	{	1718	{
1500	int x, y, z;	1719	int x, y, z;
1501	int w, h;	1720	int w, h;
1502	int x1, y1;	1721	int x1, y1;
…		…
1534		1753
1535	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1754	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1536	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1755	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1537	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1756	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1538		1757
1539	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1540	{	1759	{
1541	cell->darkness = -1;	1760	cell->darkness = 0;
1542		1761
1543	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1544	{	1763	{
1545	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1546		1765
…		…
1551	}	1770	}
1552	}	1771	}
1553	}	1772	}
1554	}	1773	}
1555		1774
1556	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557		1776
1558	CFClient::MixChunk	1777	CFPlus::MixChunk
1559	new_from_file (SV class, char path)	1778	new_from_file (SV class, char path)
1560	CODE:	1779	CODE:
1561	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1562	OUTPUT:	1781	OUTPUT:
1563	RETVAL	1782	RETVAL
1564		1783
1565	void	1784	void
1566	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1567	CODE:	1786	CODE:
1568	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1569		1788
1570	int	1789	int
1571	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1572	CODE:	1791	CODE:
1573	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1574	OUTPUT:	1793	OUTPUT:
1575	RETVAL	1794	RETVAL
1576		1795
1577	int	1796	int
1578	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1797	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579	CODE:	1798	CODE:
1580	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581	OUTPUT:	1800	OUTPUT:
1582	RETVAL	1801	RETVAL
1583		1802
1584	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585		1804
1586	int	1805	int
1587	volume (int volume = -1)	1806	volume (int volume = -1)
1588	CODE:	1807	CODE:
1589	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1590	OUTPUT:	1809	OUTPUT:
1591	RETVAL	1810	RETVAL
1592		1811
1593	CFClient::MixMusic	1812	CFPlus::MixMusic
1594	new_from_file (SV class, char path)	1813	new_from_file (SV class, char path)
1595	CODE:	1814	CODE:
1596	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1597	OUTPUT:	1816	OUTPUT:
1598	RETVAL	1817	RETVAL
1599		1818
1600	void	1819	void
1601	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1602	CODE:	1821	CODE:
1603	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1604		1823
1605	int	1824	int
1606	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1607	CODE:	1826	CODE:
1608	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1609	OUTPUT:	1828	OUTPUT:
1610	RETVAL	1829	RETVAL
1611		1830
1612	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613		1832
1614	BOOT:	1833	BOOT:
1615	{	1834	{
1616	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617	static const struct {	1836	static const struct {
1618	const char *name;	1837	const char *name;
1619	IV iv;	1838	IV iv;
1620	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1621	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
…		…
1628	const_iv (GL_SCISSOR_TEST),	1847	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1848	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1849	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1850	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1851	const_iv (GL_RESCALE_NORMAL),
		1852	const_iv (GL_FRONT),
		1853	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1854	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1858	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1861	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1642	const_iv (GL_RGBA),	1863	const_iv (GL_RGBA),
		1864	const_iv (GL_RGBA4),
		1865	const_iv (GL_RGBA8),
		1866	const_iv (GL_RGB5_A1),
1643	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1868	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1869	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1871	const_iv (GL_INTENSITY),
…		…
1679	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1680	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1681	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1682	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1683	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
1684	const_iv (GL_LINE_LOOP),	1909	const_iv (GL_LINE_LOOP),
1685	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1686	const_iv (GL_QUAD_STRIP),	1911	const_iv (GL_QUAD_STRIP),
1687	const_iv (GL_TRIANGLES),	1912	const_iv (GL_TRIANGLES),
1688	const_iv (GL_TRIANGLE_STRIP),	1913	const_iv (GL_TRIANGLE_STRIP),
…		…
1721	OUTPUT:	1946	OUTPUT:
1722	RETVAL	1947	RETVAL
1723		1948
1724	int glGetError ()	1949	int glGetError ()
1725		1950
		1951	void glFinish ()
		1952
1726	void glClear (int mask)	1953	void glClear (int mask)
1727		1954
1728	void glClearColor (float r, float g, float b, float a = 1.0)	1955	void glClearColor (float r, float g, float b, float a = 1.0)
1729	PROTOTYPE: @	1956	PROTOTYPE: @
1730		1957
…		…
1753	void glPushMatrix ()	1980	void glPushMatrix ()
1754		1981
1755	void glPopMatrix ()	1982	void glPopMatrix ()
1756		1983
1757	void glLoadIdentity ()	1984	void glLoadIdentity ()
		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
1758		1989
1759	# near_ and far_ are due to microsofts buggy "c" compiler	1990	# near_ and far_ are due to microsofts buggy "c" compiler
1760	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1991	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761		1992
1762	# near_ and far_ are due to microsofts buggy "c" compiler	1993	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1792	r *= a;	2023	r *= a;
1793	g *= a;	2024	g *= a;
1794	b *= a;	2025	b *= a;
1795	}	2026	}
1796	// microsoft visual "c" rounds instead of truncating...	2027	// microsoft visual "c" rounds instead of truncating...
1797	glColor4ub (MIN ((int)(r * 256.f), 255),	2028	glColor4f (r, g, b, a);
1798	MIN ((int)(g * 256.f), 255),
1799	MIN ((int)(b * 256.f), 255),
1800	MIN ((int)(a * 256.f), 255));
1801		2029
1802	void glInterleavedArrays (int format, int stride, char *data)	2030	void glInterleavedArrays (int format, int stride, char *data)
1803		2031
1804	void glDrawElements (int mode, int count, int type, char *indices)	2032	void glDrawElements (int mode, int count, int type, char *indices)
1805		2033
…		…
1882		2110
1883	void glEndList ()	2111	void glEndList ()
1884		2112
1885	void glCallList (int list)	2113	void glCallList (int list)
1886		2114
1887

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs. Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC