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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC