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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
6	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
7	#endif	14	#endif
8		15
9	#include "EXTERN.h"	16	#include "EXTERN.h"
10	#include "perl.h"	17	#include "perl.h"
11	#include "XSUB.h"	18	#include "XSUB.h"
12		19
13	#ifdef _WIN32	20	#ifdef _WIN32
14	# undef pipe	21	# undef pipe
15	#endif	22	#endif
16		23
		24	#include <assert.h>
17	#include <math.h>	25	#include <math.h>
18	#include <string.h>	26	#include <string.h>
19	#include <stdio.h>	27	#include <stdio.h>
20	#include <stdlib.h>	28	#include <stdlib.h>
21		29
22	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
23	#include <SDL_endian.h>	32	#include <SDL_endian.h>
24	#include <SDL_image.h>	33	#include <SDL_image.h>
25	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
26	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
27		36
36	# include <sys/types.h>	45	# include <sys/types.h>
37	# include <sys/socket.h>	46	# include <sys/socket.h>
38	# include <netinet/in.h>	47	# include <netinet/in.h>
39	# include <netinet/tcp.h>	48	# include <netinet/tcp.h>
40	# include <inttypes.h>	49	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	50	#endif
49		51
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	52	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		53
52	#define FOW_DARKNESS 32	54	#define FOW_DARKNESS 32
53		55
54	#define MAP_EXTEND_X 32	56	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	57	#define MAP_EXTEND_Y 512
…		…
60	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
61	#else	63	#else
62	# define PARACHUTE 0	64	# define PARACHUTE 0
63	#endif	65	#endif
64		66
		67	static AV *texture_av;
		68
65	static struct	69	static struct
66	{	70	{
67	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
68	#include "glfunc.h"	72	#include "glfunc.h"
69	#undef GL_FUNC	73	#undef GL_FUNC
70	} gl;	74	} gl;
71		75
		76	static void
72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73	{	78	{
74	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
75	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
76	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78	else	83	else
79	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
80	}	85	}
81		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
		109	}
		110
82	#include "texcache.c"	111	#include "texcache.c"
83		112
84	#include "pango-font.c"	113	#include "pango-font.c"
85	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
86	#include "pango-render.c"	115	#include "pango-render.c"
…		…
159		188
160	*w = rect.width;	189	*w = rect.width;
161	*h = rect.height;	190	*h = rect.height;
162	}	191	}
163		192
		193	typedef uint16_t tileid;
164	typedef uint16_t mapface;	194	typedef uint16_t faceid;
165		195
166	typedef struct {	196	typedef struct {
167	GLint name;	197	int name;
168	int w, h;	198	int w, h;
169	float s, t;	199	float s, t;
170	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
171	} maptex;	203	} maptex;
172		204
173	typedef struct {	205	typedef struct {
174	uint32_t player;	206	uint32_t player;
175	mapface face[3];	207	tileid tile[3];
176	uint16_t darkness;	208	uint16_t darkness;
177	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
178	} mapcell;	210	} mapcell;
179		211
180	typedef struct {	212	typedef struct {
181	int32_t c0, c1;	213	int32_t c0, c1;
182	mapcell *col;	214	mapcell *col;
183	} maprow;	215	} maprow;
184		216
185	typedef struct map {	217	typedef struct map {
186	int x, y, w, h;	218	int x, y, w, h;
187	int ox, oy; /* offset to virtual global coordinate system */	219	int ox, oy; /* offset to virtual global coordinate system */
188	int faces;	220	int faces; tileid *face2tile; // [faceid]
189	mapface *face;	221	int texs; maptex *tex; // [tileid]
190
191	int texs;
192	maptex *tex;
193		222
194	int32_t rows;	223	int32_t rows;
195	maprow *row;	224	maprow *row;
196	} *CFPlus__Map;	225	} *CFPlus__Map;
197		226
…		…
217	return ptr;	246	return ptr;
218	}	247	}
219		248
220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((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))	250	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		251
		252	static void
		253	need_facenum (struct map *self, faceid face)
		254	{
		255	while (self->faces <= face)
		256	{
		257	Append (tileid, self->face2tile, self->faces, self->faces);
		258	self->faces *= 2;
		259	}
		260	}
		261
		262	static void
		263	need_texid (struct map *self, int texid)
		264	{
		265	while (self->texs <= texid)
		266	{
		267	Append (maptex, self->tex, self->texs, self->texs);
		268	self->texs *= 2;
		269	}
		270	}
222		271
223	static maprow *	272	static maprow *
224	map_get_row (CFPlus__Map self, int y)	273	map_get_row (CFPlus__Map self, int y)
225	{	274	{
226	if (0 > y)	275	if (0 > y)
…		…
321	cell->player = 0;	370	cell->player = 0;
322	}	371	}
323	}	372	}
324	}	373	}
325		374
		375	typedef struct {
		376	tileid tile;
		377	uint8_t x, y, level;
		378	} smooth_key;
		379
		380	static void
		381	smooth_or_bits (HV hv, smooth_key key, IV bits)
		382	{
		383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		384
		385	if (SvIOK (*sv))
		386	SvIV_set (sv, SvIVX (sv) \| bits);
		387	else
		388	sv_setiv (*sv, bits);
		389	}
		390
326	static void	391	static void
327	music_finished (void)	392	music_finished (void)
328	{	393	{
329	SDL_UserEvent ev;	394	SDL_UserEvent ev;
330		395
…		…
363	n \|= n >> 8;	428	n \|= n >> 8;
364	n \|= n >> 16;	429	n \|= n >> 16;
365		430
366	return n + 1;	431	return n + 1;
367	}	432	}
		433
		434	/* SDL should provide this, really. */
		435	#define SDLK_MODIFIER_MIN 300
		436	#define SDLK_MODIFIER_MAX 314
368		437
369	MODULE = CFPlus PACKAGE = CFPlus	438	MODULE = CFPlus PACKAGE = CFPlus
370		439
371	PROTOTYPES: ENABLE	440	PROTOTYPES: ENABLE
372		441
…		…
376	static const struct {	445	static const struct {
377	const char *name;	446	const char *name;
378	IV iv;	447	IV iv;
379	} *civ, const_iv[] = {	448	} *civ, const_iv[] = {
380	# define const_iv(name) { # name, (IV)name }	449	# define const_iv(name) { # name, (IV)name }
		450	const_iv (SDLK_MODIFIER_MIN),
		451	const_iv (SDLK_MODIFIER_MAX),
		452
381	const_iv (SDL_ACTIVEEVENT),	453	const_iv (SDL_ACTIVEEVENT),
382	const_iv (SDL_KEYDOWN),	454	const_iv (SDL_KEYDOWN),
383	const_iv (SDL_KEYUP),	455	const_iv (SDL_KEYUP),
384	const_iv (SDL_MOUSEMOTION),	456	const_iv (SDL_MOUSEMOTION),
385	const_iv (SDL_MOUSEBUTTONDOWN),	457	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
394	const_iv (SDL_EVENT_RESERVEDA),	466	const_iv (SDL_EVENT_RESERVEDA),
395	const_iv (SDL_EVENT_RESERVEDB),	467	const_iv (SDL_EVENT_RESERVEDB),
396	const_iv (SDL_VIDEORESIZE),	468	const_iv (SDL_VIDEORESIZE),
397	const_iv (SDL_VIDEOEXPOSE),	469	const_iv (SDL_VIDEOEXPOSE),
398	const_iv (SDL_USEREVENT),	470	const_iv (SDL_USEREVENT),
		471
		472	const_iv (SDL_APPINPUTFOCUS),
		473	const_iv (SDL_APPMOUSEFOCUS),
		474	const_iv (SDL_APPACTIVE),
		475
399	const_iv (SDLK_KP0),	476	const_iv (SDLK_KP0),
400	const_iv (SDLK_KP1),	477	const_iv (SDLK_KP1),
401	const_iv (SDLK_KP2),	478	const_iv (SDLK_KP2),
402	const_iv (SDLK_KP3),	479	const_iv (SDLK_KP3),
403	const_iv (SDLK_KP4),	480	const_iv (SDLK_KP4),
…		…
458	const_iv (SDLK_BREAK),	535	const_iv (SDLK_BREAK),
459	const_iv (SDLK_MENU),	536	const_iv (SDLK_MENU),
460	const_iv (SDLK_POWER),	537	const_iv (SDLK_POWER),
461	const_iv (SDLK_EURO),	538	const_iv (SDLK_EURO),
462	const_iv (SDLK_UNDO),	539	const_iv (SDLK_UNDO),
		540
463	const_iv (KMOD_NONE),	541	const_iv (KMOD_NONE),
		542	const_iv (KMOD_SHIFT),
464	const_iv (KMOD_LSHIFT),	543	const_iv (KMOD_LSHIFT),
465	const_iv (KMOD_RSHIFT),	544	const_iv (KMOD_RSHIFT),
		545	const_iv (KMOD_CTRL),
466	const_iv (KMOD_LCTRL),	546	const_iv (KMOD_LCTRL),
467	const_iv (KMOD_RCTRL),	547	const_iv (KMOD_RCTRL),
		548	const_iv (KMOD_ALT),
468	const_iv (KMOD_LALT),	549	const_iv (KMOD_LALT),
469	const_iv (KMOD_RALT),	550	const_iv (KMOD_RALT),
		551	const_iv (KMOD_META),
470	const_iv (KMOD_LMETA),	552	const_iv (KMOD_LMETA),
471	const_iv (KMOD_RMETA),	553	const_iv (KMOD_RMETA),
472	const_iv (KMOD_NUM),	554	const_iv (KMOD_NUM),
473	const_iv (KMOD_CAPS),	555	const_iv (KMOD_CAPS),
474	const_iv (KMOD_MODE),	556	const_iv (KMOD_MODE),
475	const_iv (KMOD_CTRL),
476	const_iv (KMOD_SHIFT),
477	const_iv (KMOD_ALT),
478	const_iv (KMOD_META)
479	# undef const_iv	557	# undef const_iv
480	};	558	};
481		559
482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	560	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	561	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		562
		563	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		564	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484	}	565	}
		566
		567	void
		568	weaken (SV *rv)
		569	PROTOTYPE: $
		570	CODE:
		571	sv_rvweaken (rv);
485		572
486	int	573	int
487	in_destruct ()	574	in_destruct ()
488	CODE:	575	CODE:
489	RETVAL = PL_main_cv == Nullcv;	576	RETVAL = PL_main_cv == Nullcv;
…		…
501	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	589	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
504	}	591	}
505		592
		593	char *
		594	SDL_GetError ()
		595
506	int	596	int
507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
508		598
509	void	599	void
510	SDL_Quit ()	600	SDL_Quit ()
511		601
512	void	602	void
513	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
514	PPCODE:	604	PPCODE:
515	{	605	{
516	SDL_Rect **m;	606	SDL_Rect **m;
517		607
518	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
522		612
523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
525		615
526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
530		620
531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535	#endif	625	#endif
536		626
537	SDL_EnableUNICODE (1);
538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
539
540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
541		628
542	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
543	while (*m)	630	while (*m)
544	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
545	AV *av = newAV ();	634	AV *av = newAV ();
546	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
547	av_push (av, newSViv ((*m)->h));	636	av_push (av, newSViv ((*m)->h));
		637	av_push (av, newSViv (rgb));
		638	av_push (av, newSViv (alpha));
548	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
549		641
550	++m;	642	++m;
551	}	643	}
552	}	644	}
553		645
554	char *
555	SDL_GetError ()
556
557	int	646	int
558	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
559	CODE:	648	CODE:
		649	{
		650	SDL_EnableUNICODE (1);
		651	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		652
		653	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		654	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		655	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		656	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		657
560	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
562	);	660	);
		661
563	if (RETVAL)	662	if (RETVAL)
564	{	663	{
		664	av_clear (texture_av);
		665
565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	667	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567	# include "glfunc.h"	668	#include "glfunc.h"
568	# undef GL_FUNC	669	#undef GL_FUNC
569	}	670	}
		671	}
570	OUTPUT:	672	OUTPUT:
571	RETVAL	673	RETVAL
572		674
573	void	675	void
574	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
575		677
576	char *	678	char *
577	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
578		680
		681	int
		682	SDL_GetAppState ()
		683
579	void	684	void
580	SDL_PollEvent ()	685	poll_events ()
581	PPCODE:	686	PPCODE:
582	{	687	{
583	SDL_Event ev;	688	SDL_Event ev;
584		689
585	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
586	{	692	{
587	HV *hv = newHV ();	693	HV *hv = newHV ();
588	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
589		695
590	switch (ev.type)	696	switch (ev.type)
…		…
592	case SDL_KEYDOWN:	698	case SDL_KEYDOWN:
593	case SDL_KEYUP:	699	case SDL_KEYUP:
594	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	700	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	701	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	702	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		703	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
597	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	704	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598	break;	705	break;
599		706
600	case SDL_ACTIVEEVENT:	707	case SDL_ACTIVEEVENT:
601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603	break;	710	break;
604		711
605	case SDL_MOUSEMOTION:	712	case SDL_MOUSEMOTION:
		713	{
		714	int state = ev.motion.state;
		715	int x = ev.motion.x;
		716	int y = ev.motion.y;
		717	int xrel = ev.motion.xrel;
		718	int yrel = ev.motion.yrel;
		719
		720	/* do simplistic event compression */
		721	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		722	&& state == ev.motion.state)
		723	{
		724	xrel += ev.motion.xrel;
		725	yrel += ev.motion.yrel;
		726	x = ev.motion.x;
		727	y = ev.motion.y;
		728	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		729	}
		730
606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
613	break;	738	break;
614		739
615	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
616	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
646	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
647		772
648	void	773	void
649	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
650	CODE:	775	CODE:
		776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		777
		778	void
		779	win32_proxy_info ()
		780	PPCODE:
		781	{
651	#ifndef _WIN32	782	#ifdef _WIN32
652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	783	char buffer[2048];
		784	DWORD buflen;
		785
		786	EXTEND (SP, 3);
		787
		788	buflen = sizeof (buffer);
		789	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		790	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		791	{
		792	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		793
		794	buflen = sizeof (buffer);
		795	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		796	{
		797	PUSHs (newSVpv (buffer, 0));
		798
		799	buflen = sizeof (buffer);
		800	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		801	PUSHs (newSVpv (buffer, 0));
		802	}
		803	}
653	#endif	804	#endif
		805	}
654		806
655	void	807	void
656	add_font (char *file)	808	add_font (char *file)
657	CODE:	809	CODE:
658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	810	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	914	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
763	#endif	915	#endif
764	_exit (1);	916	_exit (1);
765		917
766	void	918	void
767	_exit (int retval)	919	_exit (int retval = 0)
768	CODE:	920	CODE:
		921	#ifdef WIN32
		922	ExitThread (retval); // unclean, please beam me up
		923	#else
769	_exit (retval);	924	_exit (retval);
		925	#endif
		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
770		935
771	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
772		937
773	CFPlus::Font	938	CFPlus::Font
774	new_from_file (SV class, char path, int id = 0)	939	new_from_file (SV class, char path, int id = 0)
…		…
1021	xy_to_index (CFPlus::Layout self, int x, int y)	1186	xy_to_index (CFPlus::Layout self, int x, int y)
1022	CODE:	1187	CODE:
1023	{	1188	{
1024	int index, trailing;	1189	int index, trailing;
1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1190	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026	RETVAL = index;	1191	RETVAL = index + trailing;
1027	}	1192	}
1028	OUTPUT:	1193	OUTPUT:
1029	RETVAL	1194	RETVAL
1030		1195
1031	void	1196	void
…		…
1037		1202
1038	EXTEND (SP, 3);	1203	EXTEND (SP, 3);
1039	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1204	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1205	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1206	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1207	}
		1208
		1209	void
		1210	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1211	PPCODE:
		1212	{
		1213	int line, x;
		1214
		1215	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1216	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1217
		1218	EXTEND (SP, 2);
		1219	PUSHs (sv_2mortal (newSViv (line - 1)));
		1220	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1221	}
		1222
		1223	void
		1224	line_x_to_index (CFPlus::Layout self, int line, int x)
		1225	PPCODE:
		1226	{
		1227	PangoLayoutLine *lp;
		1228	int index, trailing;
		1229
		1230	if (line < 0)
		1231	XSRETURN_EMPTY;
		1232
		1233	if (!(lp = pango_layout_get_line (self->pl, line)))
		1234	XSRETURN_EMPTY; /* do better */
		1235
		1236	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1237
		1238	EXTEND (SP, 2);
		1239	if (GIMME_V == G_SCALAR)
		1240	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1241	else
		1242	{
		1243	PUSHs (sv_2mortal (newSViv (index)));
		1244	PUSHs (sv_2mortal (newSViv (trailing)));
		1245	}
1042	}	1246	}
1043		1247
1044	void	1248	void
1045	render (CFPlus::Layout self, float x, float y, int flags = 0)	1249	render (CFPlus::Layout self, float x, float y, int flags = 0)
1046	PPCODE:	1250	PPCODE:
…		…
1051	flags	1255	flags
1052	);	1256	);
1053		1257
1054	MODULE = CFPlus PACKAGE = CFPlus::Texture	1258	MODULE = CFPlus PACKAGE = CFPlus::Texture
1055		1259
		1260	int minpot (int n)
		1261
1056	void	1262	void
1057	pad2pot (SV data_, SV w_, SV *h_)	1263	pad2pot (SV data_, SV w_, SV *h_)
1058	CODE:	1264	CODE:
1059	{	1265	{
1060	int ow = SvIV (w_);	1266	int ow = SvIV (w_);
…		…
1137	glDisable (GL_ALPHA_TEST);	1343	glDisable (GL_ALPHA_TEST);
1138	glDisable (GL_BLEND);	1344	glDisable (GL_BLEND);
1139	}	1345	}
1140	}	1346	}
1141		1347
		1348	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1349	CODE:
		1350	{
		1351	GLint width;
		1352	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1353	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1354	RETVAL = width > 0;
		1355	}
		1356	OUTPUT:
		1357	RETVAL
		1358
1142	MODULE = CFPlus PACKAGE = CFPlus::Map	1359	MODULE = CFPlus PACKAGE = CFPlus::Map
1143		1360
1144	CFPlus::Map	1361	CFPlus::Map
1145	new (SV *class, int map_width, int map_height)	1362	new (SV *class)
1146	CODE:	1363	CODE:
1147	New (0, RETVAL, 1, struct map);	1364	New (0, RETVAL, 1, struct map);
1148	RETVAL->x = 0;	1365	RETVAL->x = 0;
1149	RETVAL->y = 0;	1366	RETVAL->y = 0;
1150	RETVAL->w = map_width;	1367	RETVAL->w = 0;
1151	RETVAL->h = map_height;	1368	RETVAL->h = 0;
1152	RETVAL->ox = 0;	1369	RETVAL->ox = 0;
1153	RETVAL->oy = 0;	1370	RETVAL->oy = 0;
1154	RETVAL->faces = 8192;	1371	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1372	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156	RETVAL->texs = 8192;
1157	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158	RETVAL->rows = 0;	1373	RETVAL->rows = 0;
1159	RETVAL->row = 0;	1374	RETVAL->row = 0;
1160	OUTPUT:	1375	OUTPUT:
1161	RETVAL	1376	RETVAL
1162		1377
1163	void	1378	void
1164	DESTROY (CFPlus::Map self)	1379	DESTROY (CFPlus::Map self)
1165	CODE:	1380	CODE:
1166	{	1381	{
1167	map_clear (self);	1382	map_clear (self);
1168	Safefree (self->face);	1383	Safefree (self->face2tile);
1169	Safefree (self->tex);	1384	Safefree (self->tex);
1170	Safefree (self);	1385	Safefree (self);
1171	}	1386	}
1172		1387
1173	void	1388	void
		1389	resize (CFPlus::Map self, int map_width, int map_height)
		1390	CODE:
		1391	self->w = map_width;
		1392	self->h = map_height;
		1393
		1394	void
1174	clear (CFPlus::Map self)	1395	clear (CFPlus::Map self)
1175	CODE:	1396	CODE:
1176	map_clear (self);	1397	map_clear (self);
1177		1398
1178	void	1399	void
1179	set_face (CFPlus::Map self, int face, int texid)	1400	set_tileid (CFPlus::Map self, int face, int tile)
1180	CODE:	1401	CODE:
1181	{	1402	{
1182	while (self->faces <= face)	1403	need_facenum (self, face); self->face2tile [face] = tile;
1183	{	1404	need_texid (self, tile);
1184	Append (mapface, self->face, self->faces, self->faces);	1405	}
1185	self->faces *= 2;
1186	}
1187		1406
1188	self->face [face] = texid;	1407	void
		1408	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1409	CODE:
		1410	{
		1411	tileid texid;
		1412	maptex *tex;
		1413
		1414	if (face < 0 \|\| face >= self->faces)
		1415	return;
		1416
		1417	if (smooth < 0 \|\| smooth >= self->faces)
		1418	return;
		1419
		1420	texid = self->face2tile [face];
		1421
		1422	if (!texid)
		1423	return;
		1424
		1425	tex = self->tex + texid;
		1426	tex->smoothtile = self->face2tile [smooth];
		1427	tex->smoothlevel = level;
1189	}	1428	}
1190		1429
1191	void	1430	void
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)	1431	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)
1193	CODE:	1432	CODE:
1194	{	1433	{
1195	while (self->texs <= texid)	1434	need_texid (self, texid);
1196	{
1197	Append (maptex, self->tex, self->texs, self->texs);
1198	self->texs *= 2;
1199	}
1200		1435
1201	{	1436	{
1202	maptex *tex = self->tex + texid;	1437	maptex *tex = self->tex + texid;
1203		1438
1204	tex->name = name;	1439	tex->name = name;
…		…
1248	CODE:	1483	CODE:
1249	{	1484	{
1250	if (dx > 0)	1485	if (dx > 0)
1251	map_blank (self, self->x, self->y, dx, self->h);	1486	map_blank (self, self->x, self->y, dx, self->h);
1252	else if (dx < 0)	1487	else if (dx < 0)
1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1488	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1254		1489
1255	if (dy > 0)	1490	if (dy > 0)
1256	map_blank (self, self->x, self->y, self->w, dy);	1491	map_blank (self, self->x, self->y, self->w, dy);
1257	else if (dy < 0)	1492	else if (dy < 0)
1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1493	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1259		1494
1260	self->ox += dx; self->x += dx;	1495	self->ox += dx; self->x += dx;
1261	self->oy += dy; self->y += dy;	1496	self->oy += dy; self->y += dy;
1262		1497
1263	while (self->y < 0)	1498	while (self->y < 0)
…		…
1315	cell->stat_width = 1;	1550	cell->stat_width = 1;
1316	cell->stat_hp = *data++;	1551	cell->stat_hp = *data++;
1317	}	1552	}
1318	else if (cmd == 6) // monster width	1553	else if (cmd == 6) // monster width
1319	cell->stat_width = *data++ + 1;	1554	cell->stat_width = *data++ + 1;
1320	else if (cmd == 0x47) // monster width	1555	else if (cmd == 0x47)
1321	{	1556	{
1322	if (*data == 4)	1557	if (*data == 4)
1323	; // decode player tag	1558	; // decode player count
1324		1559
1325	data += *data + 1;	1560	data += *data + 1;
1326	}	1561	}
1327	else if (cmd == 8) // cell flags	1562	else if (cmd == 8) // cell flags
1328	cell->flags = *data++;	1563	cell->flags = *data++;
…		…
1333	}	1568	}
1334	while (ext & 0x80);	1569	while (ext & 0x80);
1335	}	1570	}
1336	else	1571	else
1337	cell->darkness = *data++ + 1;	1572	cell->darkness = *data++ + 1;
1338
1339	}	1573	}
1340		1574
1341	if (flags & 4)	1575	if (flags & 4)
1342	{	1576	{
1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1577	faceid face = (data [0] << 8) + data [1]; data += 2;
		1578	need_facenum (self, face);
		1579	cell->tile [0] = self->face2tile [face];
1344	}	1580	}
1345		1581
1346	if (flags & 2)	1582	if (flags & 2)
1347	{	1583	{
1348	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1584	faceid face = (data [0] << 8) + data [1]; data += 2;
		1585	need_facenum (self, face);
		1586	cell->tile [1] = self->face2tile [face];
1349	}	1587	}
1350		1588
1351	if (flags & 1)	1589	if (flags & 1)
1352	{	1590	{
1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1591	faceid face = (data [0] << 8) + data [1]; data += 2;
		1592	need_facenum (self, face);
		1593	cell->tile [2] = self->face2tile [face];
1354	}	1594	}
1355	}	1595	}
1356	else	1596	else
1357	cell->darkness = 0;	1597	cell->darkness = 0;
1358	}	1598	}
…		…
1388	{	1628	{
1389	mapcell *cell = row->col + (x - row->c0);	1629	mapcell *cell = row->col + (x - row->c0);
1390		1630
1391	for (z = 0; z <= 0; z++)	1631	for (z = 0; z <= 0; z++)
1392	{	1632	{
1393	mapface face = cell->face [z];
1394
1395	if (face)
1396	{
1397	maptex tex = self->tex [face];	1633	maptex tex = self->tex [cell->tile [z]];
1398	int a0 = 255 - tex.a;	1634	int a0 = 255 - tex.a;
1399	int a1 = tex.a;	1635	int a1 = tex.a;
1400		1636
1401	r = (r * a0 + tex.r * a1) / 255;	1637	r = (r * a0 + tex.r * a1) / 255;
1402	g = (g * a0 + tex.g * a1) / 255;	1638	g = (g * a0 + tex.g * a1) / 255;
1403	b = (b * a0 + tex.b * a1) / 255;	1639	b = (b * a0 + tex.b * a1) / 255;
1404	a = (a * a0 + tex.a * a1) / 255;	1640	a = (a * a0 + tex.a * a1) / 255;
1405	}
1406	}	1641	}
1407	}	1642	}
1408		1643
1409	*map++ = (r )	1644	*map++ = (r )
1410	\| (g << 8)	1645	\| (g << 8)
…		…
1417	}	1652	}
1418	OUTPUT:	1653	OUTPUT:
1419	RETVAL	1654	RETVAL
1420		1655
1421	void	1656	void
1422	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1657	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1423	CODE:	1658	CODE:
1424	{	1659	{
1425	int vx, vy;	1660	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1661	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1662	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1663	smooth_key skey;
1426	int x, y, z;	1664	int x, y, z;
1427	int last_name;	1665	int last_name;
1428	mapface face;
1429		1666
1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1667	// thats current max. sorry.
1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1668	if (sw > 255) sw = 255;
		1669	if (sh > 255) sh = 255;
1432		1670
1433	/*	1671	// clear key, in case of extra padding
1434	int vx = self->vx = self->w >= sw	1672	memset (&skey, 0, sizeof (skey));
1435	? self->x + (self->w - sw) / 2
1436	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1437
1438	int vy = self->vy = self->h >= sh
1439	? self->y + (self->h - sh) / 2
1440	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1441	*/
1442		1673
1443	glColor4ub (255, 255, 255, 255);	1674	glColor4ub (255, 255, 255, 255);
1444		1675
1445	glEnable (GL_BLEND);	1676	glEnable (GL_BLEND);
1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1677	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1449		1680
1450	glBegin (GL_QUADS);	1681	glBegin (GL_QUADS);
1451		1682
1452	last_name = 0;	1683	last_name = 0;
1453		1684
		1685	mx += self->x;
		1686	my += self->y;
		1687
		1688	// first pass: determine smooth_max
		1689	// rather ugly, if you ask me
		1690	// could also be stored inside mapcell and updated on change
		1691	memset (smooth_max, 0, sizeof (smooth_max));
		1692
		1693	for (y = 0; y < sh; y++)
		1694	if (0 <= y + my && y + my < self->rows)
		1695	{
		1696	maprow *row = self->row + (y + my);
		1697
		1698	for (x = 0; x < sw; x++)
		1699	if (row->c0 <= x + mx && x + mx < row->c1)
		1700	{
		1701	mapcell *cell = row->col + (x + mx - row->c0);
		1702
		1703	smooth_max[x + 1][y + 1] =
		1704	MAX (self->tex [cell->tile [0]].smoothlevel,
		1705	MAX (self->tex [cell->tile [1]].smoothlevel,
		1706	self->tex [cell->tile [2]].smoothlevel));
		1707	}
		1708	}
		1709
1454	for (z = 0; z < 3; z++)	1710	for (z = 0; z <= 2; z++)
		1711	{
		1712	memset (smooth_level, 0, sizeof (smooth_level));
		1713
1455	for (y = 0; y < sh; y++)	1714	for (y = 0; y < sh; y++)
1456	if (0 <= y + vy && y + vy < self->rows)	1715	if (0 <= y + my && y + my < self->rows)
1457	{	1716	{
1458	maprow *row = self->row + (y + vy);	1717	maprow *row = self->row + (y + my);
1459		1718
1460	for (x = 0; x < sw; x++)	1719	for (x = 0; x < sw; x++)
1461	if (row->c0 <= x + vx && x + vx < row->c1)	1720	if (row->c0 <= x + mx && x + mx < row->c1)
1462	{	1721	{
1463	mapcell *cell = row->col + (x + vx - row->c0);	1722	mapcell *cell = row->col + (x + mx - row->c0);
1464
1465	face = cell->face [z];	1723	tileid tile = cell->tile [z];
		1724
		1725	if (tile)
		1726	{
		1727	maptex tex = self->tex [tile];
		1728	int px = (x + 1) * T - tex.w;
		1729	int py = (y + 1) * T - tex.h;
1466		1730
1467	if (face && face < self->texs)	1731	// suppressing texture state switches here
		1732	// is only moderately effective, but worth the extra effort
		1733	if (last_name != tex.name)
		1734	{
		1735	if (!tex.name)
		1736	tex = self->tex [2]; /* missing, replace by noface */
		1737
		1738	glEnd ();
		1739	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1740	glBegin (GL_QUADS);
		1741	}
		1742
		1743	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1744	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1745	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1746	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1747
		1748	if (cell->flags && z == 2)
		1749	{
		1750	if (cell->flags & 1)
		1751	{
		1752	maptex tex = self->tex [1];
		1753	int px = x * T + T * 2 / 32;
		1754	int py = y * T - T * 6 / 32;
		1755
		1756	glEnd ();
		1757	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1758	glBegin (GL_QUADS);
		1759
		1760	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1761	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1762	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1763	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1764	}
		1765	}
		1766
		1767	// update smooth hash
		1768	if (tex.smoothtile)
		1769	{
		1770	skey.tile = tex.smoothtile;
		1771	skey.level = tex.smoothlevel;
		1772
		1773	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1774
		1775	// add bits to current tile and all neighbours. skey.x\|y is
		1776	// shifted +1\|+1 so we always stay positive.
		1777
		1778	// bits is ___n cccc CCCC bbbb
		1779	// n do not draw borders&corners
		1780	// c draw these corners, but...
		1781	// C ... not these
		1782	// b draw these borders
		1783
		1784	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1785	// ┃· ·· ·┃ ━━
		1786
		1787	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1788	// ·· ·· ·┏ ┓·
		1789
		1790	// full tile
		1791	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1792
		1793	// borders
		1794	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1795	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1796	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1797	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1798
		1799	// corners
		1800	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1801	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1802	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1803	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1804	}
		1805	}
		1806	}
		1807	}
		1808
		1809	// go through all smoothlevels, lowest to highest, then draw.
		1810	// this is basically counting sort
		1811	{
		1812	int w, b;
		1813
		1814	for (w = 0; w < 256 / 32; ++w)
		1815	{
		1816	uint32_t smask = smooth_level [w];
		1817	if (smask)
		1818	for (b = 0; b < 32; ++b)
		1819	if (smask & (((uint32_t)1) << b))
1468	{	1820	{
1469	maptex tex = self->tex [face];	1821	int level = (w << 5) \| b;
1470	int px = (x + 1) * 32 - tex.w;	1822	HE *he;
1471	int py = (y + 1) * 32 - tex.h;
1472		1823
1473	if (last_name != tex.name)	1824	hv_iterinit (smooth);
		1825	while ((he = hv_iternext (smooth)))
1474	{	1826	{
		1827	smooth_key skey = (smooth_key )HeKEY (he);
		1828	IV bits = SvIVX (HeVAL (he));
		1829
		1830	if (!(bits & 0x1000)
		1831	&& skey->level == level
		1832	&& level > smooth_max [skey->x][skey->y])
		1833	{
		1834	maptex tex = self->tex [skey->tile];
		1835	int px = (((int)skey->x) - 1) * T;
		1836	int py = (((int)skey->y) - 1) * T;
		1837	int border = bits & 15;
		1838	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1839	float dx = tex.s * .0625f; // 16 images/row
		1840	float dy = tex.t * .5f ; // 2 images/column
		1841
		1842	// this time naively avoiding texture state changes
		1843	// save gobs of state changes.
		1844	if (last_name != tex.name)
		1845	{
		1846	if (!tex.name)
		1847	continue; // smoothing not yet available
		1848
1475	glEnd ();	1849	glEnd ();
1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1850	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1477	glBegin (GL_QUADS);	1851	glBegin (GL_QUADS);
		1852	}
		1853
		1854	if (border)
		1855	{
		1856	float ox = border * dx;
		1857
		1858	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1859	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1860	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1861	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1862	}
		1863
		1864	if (corner)
		1865	{
		1866	float ox = corner * dx;
		1867
		1868	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1869	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1870	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1871	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1872	}
1478	}	1873	}
1479
1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1482	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
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	}	1874	}
1503	}	1875	}
1504	}
1505	}	1876	}
		1877	}
		1878
		1879	hv_clear (smooth);
		1880	}
1506		1881
1507	glEnd ();	1882	glEnd ();
1508		1883
1509	glDisable (GL_TEXTURE_2D);	1884	glDisable (GL_TEXTURE_2D);
1510	glDisable (GL_BLEND);	1885	glDisable (GL_BLEND);
1511		1886
1512	// top layer: overlays such as the health bar	1887	// top layer: overlays such as the health bar
1513	for (y = 0; y < sh; y++)	1888	for (y = 0; y < sh; y++)
1514	if (0 <= y + vy && y + vy < self->rows)	1889	if (0 <= y + my && y + my < self->rows)
1515	{	1890	{
1516	maprow *row = self->row + (y + vy);	1891	maprow *row = self->row + (y + my);
1517		1892
1518	for (x = 0; x < sw; x++)	1893	for (x = 0; x < sw; x++)
1519	if (row->c0 <= x + vx && x + vx < row->c1)	1894	if (row->c0 <= x + mx && x + mx < row->c1)
1520	{	1895	{
1521	mapcell *cell = row->col + (x + vx - row->c0);	1896	mapcell *cell = row->col + (x + mx - row->c0);
1522		1897
1523	int px = x * 32;	1898	int px = x * T;
1524	int py = y * 32;	1899	int py = y * T;
1525		1900
1526	if (cell->stat_hp)	1901	if (cell->stat_hp)
1527	{	1902	{
1528	int width = cell->stat_width * 32;	1903	int width = cell->stat_width * T;
1529	int thick = sh / 28 + 1 + cell->stat_width;	1904	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1530		1905
1531	glColor3ub (0, 0, 0);	1906	glColor3ub (0, 0, 0);
1532	glRectf (px + 1, py - thick - 2,	1907	glRectf (px + 1, py - thick - 2,
1533	px + width - 1, py);	1908	px + width - 1, py);
1534		1909
…		…
1600	glDisable (GL_BLEND);	1975	glDisable (GL_BLEND);
1601	glDisable (GL_TEXTURE_2D);	1976	glDisable (GL_TEXTURE_2D);
1602	}	1977	}
1603		1978
1604	void	1979	void
1605	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1980	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1606	PPCODE:	1981	PPCODE:
1607	{	1982	{
1608	int vx, vy;
1609	int x, y;	1983	int x, y;
1610	int sw4 = (sw + 3) & ~3;	1984	int sw4 = (sw + 3) & ~3;
1611	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1985	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1612	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1986	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1613		1987
1614	memset (darkness, 255, sw4 * sh);	1988	memset (darkness, 255, sw4 * sh);
1615	SvPOK_only (darkness_sv);	1989	SvPOK_only (darkness_sv);
1616	SvCUR_set (darkness_sv, sw4 * sh);	1990	SvCUR_set (darkness_sv, sw4 * sh);
1617		1991
1618	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1992	mx += self->x;
1619	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1993	my += self->y;
1620		1994
1621	for (y = 0; y < sh; y++)	1995	for (y = 0; y < sh; y++)
1622	if (0 <= y + vy && y + vy < self->rows)	1996	if (0 <= y + my && y + my < self->rows)
1623	{	1997	{
1624	maprow *row = self->row + (y + vy);	1998	maprow *row = self->row + (y + my);
1625		1999
1626	for (x = 0; x < sw; x++)	2000	for (x = 0; x < sw; x++)
1627	if (row->c0 <= x + vx && x + vx < row->c1)	2001	if (row->c0 <= x + mx && x + mx < row->c1)
1628	{	2002	{
1629	mapcell *cell = row->col + (x + vx - row->c0);	2003	mapcell *cell = row->col + (x + mx - row->c0);
1630		2004
1631	darkness[y * sw4 + x] = cell->darkness	2005	darkness[y * sw4 + x] = cell->darkness
1632	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1633	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1634	}	2008	}
1635	}	2009	}
		2010
		2011	if (smoothing)
		2012	{
		2013	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		2014	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2015
		2016	SvPOK_only (darkness2_sv);
		2017	SvCUR_set (darkness2_sv, sw4 * sh);
		2018
		2019	for (y = 0; y < sh; ++y)
		2020	for (x = 0; x < sw4; ++x)
		2021	{
		2022	float f = (float )matrix;
		2023	int dx, dy;
		2024	float sum = 0.f;
		2025
		2026	for (dy = -1; dy <= 1; ++dy)
		2027	for (dx = -1; dx <= 1; ++dx)
		2028	{
		2029	unsigned int x2 = x + dx;
		2030	unsigned int y2 = y + dy;
		2031
		2032	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2033	}
		2034
		2035	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2036	}
		2037
		2038	darkness_sv = darkness2_sv;
		2039	}
1636		2040
1637	EXTEND (SP, 3);	2041	EXTEND (SP, 3);
1638	PUSHs (sv_2mortal (newSViv (sw4)));	2042	PUSHs (sv_2mortal (newSViv (sw4)));
1639	PUSHs (sv_2mortal (newSViv (sh)));	2043	PUSHs (sv_2mortal (newSViv (sh)));
1640	PUSHs (darkness_sv);	2044	PUSHs (darkness_sv);
…		…
1674	if (row && row->c0 <= x && x < row->c1)	2078	if (row && row->c0 <= x && x < row->c1)
1675	{	2079	{
1676	mapcell *cell = row->col + (x - row->c0);	2080	mapcell *cell = row->col + (x - row->c0);
1677	uint8_t flags = 0;	2081	uint8_t flags = 0;
1678		2082
1679	if (cell->face [0]) flags \|= 1;	2083	if (cell->tile [0]) flags \|= 1;
1680	if (cell->face [1]) flags \|= 2;	2084	if (cell->tile [1]) flags \|= 2;
1681	if (cell->face [2]) flags \|= 4;	2085	if (cell->tile [2]) flags \|= 4;
1682		2086
1683	*data++ = flags;	2087	*data++ = flags;
1684		2088
1685	if (flags & 1)	2089	if (flags & 1)
1686	{	2090	{
		2091	tileid tile = cell->tile [0];
1687	*data++ = cell->face [0] >> 8;	2092	*data++ = tile >> 8;
1688	*data++ = cell->face [0];	2093	*data++ = tile;
1689	}	2094	}
1690		2095
1691	if (flags & 2)	2096	if (flags & 2)
1692	{	2097	{
		2098	tileid tile = cell->tile [1];
1693	*data++ = cell->face [1] >> 8;	2099	*data++ = tile >> 8;
1694	*data++ = cell->face [1];	2100	*data++ = tile;
1695	}	2101	}
1696		2102
1697	if (flags & 4)	2103	if (flags & 4)
1698	{	2104	{
		2105	tileid tile = cell->tile [2];
1699	*data++ = cell->face [2] >> 8;	2106	*data++ = tile >> 8;
1700	*data++ = cell->face [2];	2107	*data++ = tile;
1701	}	2108	}
1702	}	2109	}
1703	else	2110	else
1704	*data++ = 0;	2111	*data++ = 0;
1705	}	2112	}
…		…
1745	{	2152	{
1746	uint8_t flags = *data++;	2153	uint8_t flags = *data++;
1747		2154
1748	if (flags)	2155	if (flags)
1749	{	2156	{
1750	mapface face[3] = { 0, 0, 0 };
1751
1752	mapcell *cell = row_get_cell (row, x);	2157	mapcell *cell = row_get_cell (row, x);
		2158	tileid tile[3] = { 0, 0, 0 };
1753		2159
1754	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2160	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1755	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2161	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1756	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2162	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1757		2163
1758	if (cell->darkness == 0)	2164	if (cell->darkness == 0)
1759	{	2165	{
1760	cell->darkness = 0;	2166	cell->darkness = 0;
1761		2167
1762	for (z = 0; z <= 2; z++)	2168	for (z = 0; z <= 2; z++)
1763	{	2169	{
1764	cell->face[z] = face[z];	2170	tileid t = tile [z];
1765		2171
1766	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2172	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2173	{
1767	XPUSHs (sv_2mortal (newSViv (face[z])));	2174	XPUSHs (sv_2mortal (newSViv (t)));
		2175	need_texid (self, t);
		2176	}
		2177
		2178	cell->tile [z] = t;
1768	}	2179	}
1769	}	2180	}
1770	}	2181	}
1771	}	2182	}
1772	}	2183	}
…		…
1807	CODE:	2218	CODE:
1808	RETVAL = Mix_VolumeMusic (volume);	2219	RETVAL = Mix_VolumeMusic (volume);
1809	OUTPUT:	2220	OUTPUT:
1810	RETVAL	2221	RETVAL
1811		2222
		2223	int
		2224	fade_out (int ms)
		2225	CODE:
		2226	RETVAL = Mix_FadeOutMusic (ms);
		2227	OUTPUT:
		2228	RETVAL
		2229
1812	CFPlus::MixMusic	2230	CFPlus::MixMusic
1813	new_from_file (SV class, char path)	2231	new_from_file (SV class, char path)
1814	CODE:	2232	CODE:
1815	RETVAL = Mix_LoadMUS (path);	2233	RETVAL = Mix_LoadMUS (path);
1816	OUTPUT:	2234	OUTPUT:
…		…
1823		2241
1824	int	2242	int
1825	play (CFPlus::MixMusic self, int loops = -1)	2243	play (CFPlus::MixMusic self, int loops = -1)
1826	CODE:	2244	CODE:
1827	RETVAL = Mix_PlayMusic (self, loops);	2245	RETVAL = Mix_PlayMusic (self, loops);
		2246	OUTPUT:
		2247	RETVAL
		2248
		2249	int
		2250	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2251	CODE:
		2252	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1828	OUTPUT:	2253	OUTPUT:
1829	RETVAL	2254	RETVAL
1830		2255
1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2256	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1832		2257
…		…
1836	static const struct {	2261	static const struct {
1837	const char *name;	2262	const char *name;
1838	IV iv;	2263	IV iv;
1839	} *civ, const_iv[] = {	2264	} *civ, const_iv[] = {
1840	# define const_iv(name) { # name, (IV)name }	2265	# define const_iv(name) { # name, (IV)name }
		2266	const_iv (GL_VENDOR),
		2267	const_iv (GL_VERSION),
		2268	const_iv (GL_EXTENSIONS),
1841	const_iv (GL_COLOR_MATERIAL),	2269	const_iv (GL_COLOR_MATERIAL),
1842	const_iv (GL_SMOOTH),	2270	const_iv (GL_SMOOTH),
1843	const_iv (GL_FLAT),	2271	const_iv (GL_FLAT),
1844	const_iv (GL_DITHER),	2272	const_iv (GL_DITHER),
1845	const_iv (GL_BLEND),	2273	const_iv (GL_BLEND),
…		…
1872	const_iv (GL_LUMINANCE),	2300	const_iv (GL_LUMINANCE),
1873	const_iv (GL_LUMINANCE_ALPHA),	2301	const_iv (GL_LUMINANCE_ALPHA),
1874	const_iv (GL_FLOAT),	2302	const_iv (GL_FLOAT),
1875	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2303	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1876	const_iv (GL_COMPILE),	2304	const_iv (GL_COMPILE),
		2305	const_iv (GL_PROXY_TEXTURE_1D),
		2306	const_iv (GL_PROXY_TEXTURE_2D),
1877	const_iv (GL_TEXTURE_1D),	2307	const_iv (GL_TEXTURE_1D),
1878	const_iv (GL_TEXTURE_2D),	2308	const_iv (GL_TEXTURE_2D),
1879	const_iv (GL_TEXTURE_ENV),	2309	const_iv (GL_TEXTURE_ENV),
1880	const_iv (GL_TEXTURE_MAG_FILTER),	2310	const_iv (GL_TEXTURE_MAG_FILTER),
1881	const_iv (GL_TEXTURE_MIN_FILTER),	2311	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1921	# undef const_iv	2351	# undef const_iv
1922	};	2352	};
1923		2353
1924	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2354	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1925	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2355	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2356
		2357	texture_av = newAV ();
		2358	AvREAL_off (texture_av);
1926	}	2359	}
1927		2360
1928	char *	2361	char *
1929	gl_vendor ()	2362	gl_vendor ()
1930	CODE:	2363	CODE:
…		…
1941		2374
1942	char *	2375	char *
1943	gl_extensions ()	2376	gl_extensions ()
1944	CODE:	2377	CODE:
1945	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2378	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2379	OUTPUT:
		2380	RETVAL
		2381
		2382	const char *glGetString (GLenum pname)
		2383
		2384	GLint glGetInteger (GLenum pname)
		2385	CODE:
		2386	glGetIntegerv (pname, &RETVAL);
		2387	OUTPUT:
		2388	RETVAL
		2389
		2390	GLdouble glGetDouble (GLenum pname)
		2391	CODE:
		2392	glGetDoublev (pname, &RETVAL);
1946	OUTPUT:	2393	OUTPUT:
1947	RETVAL	2394	RETVAL
1948		2395
1949	int glGetError ()	2396	int glGetError ()
1950		2397
…		…
2075		2522
2076	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2077		2524
2078	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2525	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2079		2526
		2527	void glPixelZoom (float x, float y)
		2528
2080	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2081		2530
2082	int glGenTexture ()	2531	int glGenTexture ()
2083	CODE:	2532	CODE:
2084	{	2533	RETVAL = gen_texture ();
2085	GLuint name;
2086	glGenTextures (1, &name);
2087	RETVAL = name;
2088	}
2089	OUTPUT:	2534	OUTPUT:
2090	RETVAL	2535	RETVAL
2091		2536
2092	void glDeleteTexture (int name)	2537	void glDeleteTexture (int name)
2093	CODE:	2538	CODE:
2094	{
2095	GLuint name_ = name;
2096	glDeleteTextures (1, &name_);	2539	del_texture (name);
2097	}	2540
2098
2099	int glGenList ()	2541	int glGenList ()
2100	CODE:	2542	CODE:
2101	RETVAL = glGenLists (1);	2543	RETVAL = glGenLists (1);
2102	OUTPUT:	2544	OUTPUT:
2103	RETVAL	2545	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC vs. Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC