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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
48	#endif	53	#endif
49		54
50	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
52		57
53	#include <glib/gmacros.h>	58	#include <glib.h>
54		59
55	#include <pango/pango.h>	60	#include <pango/pango.h>
56		61
57	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
100	#define KMOD_LRAM 0x10000 // our extension	105	#define KMOD_LRAM 0x10000 // our extension
101		106
102	#define TEXID_SPEECH 1	107	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	108	#define TEXID_NOFACE 2
104		109
		110	static char *
		111	fast_sv_grow (SV *sv, STRLEN need)
		112	{
		113	STRLEN len = SvLEN (sv);
		114	STRLEN want = SvCUR (sv) + need;
		115
		116	if (expect_false (len < want))
		117	{
		118	do
		119	len *= 2;
		120	while (len < want);
		121
		122	sv_grow (sv, len);
		123	}
		124
		125	SvCUR_set (sv, want);
		126	return SvEND (sv) - need;
		127	}
		128
105	static AV *texture_av;	129	static AV *texture_av;
106		130
107	static struct	131	static struct
108	{	132	{
109	#define GL_FUNC(ptr,name) ptr name;	133	#define GL_FUNC(ptr,name) ptr name;
…		…
165	{	189	{
166	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
167		191
168	while (attrs)	192	while (attrs)
169	{	193	{
170	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
171		195
172	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
173	return 1;	197	return 1;
174		198
175	attrs = attrs->next;	199	attrs = attrs->next;
176	}	200	}
177		201
178	return 0;	202	return 0;
179	}	203	}
180		204
181	typedef struct cf_layout {	205	struct cf_layout {
182	PangoLayout *pl;	206	PangoLayout *pl;
183	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
184	int base_height;	208	int base_height;
185	DC__Font font;	209	DC__Font font;
186	rc_t *rc;	210	rc_t rc;
187	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
188		214
189	static DC__Font default_font;	215	static DC__Font default_font;
190	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
191	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
192		218
193	static void	219	static void
194	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
195	{	221	{
196	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
197	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
198	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199	#endif	225	#endif
200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201	}	227	}
202		228
203	static void	229	static void
…		…
233	}	259	}
234		260
235	typedef uint16_t tileid;	261	typedef uint16_t tileid;
236	typedef uint16_t faceid;	262	typedef uint16_t faceid;
237		263
238	typedef struct {	264	struct maptex
		265	{
239	GLuint name;	266	GLuint name;
240	int w, h;	267	int w, h;
241	float s, t;	268	float s, t;
242	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
243	tileid smoothtile;	270	tileid smoothtile;
244	uint8_t smoothlevel;	271	uint8_t smoothlevel;
245	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
246	} maptex;	273	};
247		274
248	typedef struct {	275	struct mapcell
		276	{
249	uint32_t player;	277	uint32_t player;
250	tileid tile[3];	278	tileid tile[3];
251	uint16_t darkness;	279	uint16_t darkness;
252	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
253	} mapcell;	281	};
254		282
255	typedef struct {	283	struct maprow
		284	{
256	int32_t c0, c1;	285	int32_t c0, c1;
257	mapcell *col;	286	mapcell *col;
258	} maprow;	287	};
259		288
260	typedef struct map {	289	struct mapgrid {
261	int x, y, w, h;	290	int x, y, w, h;
262	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
263	int faces; tileid *face2tile; // [faceid]	292	std::vector<tileid> tile;
264	int texs; maptex *tex; // [tileid]	293	std::vector<maptex> tex;
265		294
266	int32_t rows;	295	int32_t rows;
267	maprow *row;	296	maprow *row;
268	} *DC__Map;	297
		298	~mapgrid ()
		299	{
		300	clear_cells ();
		301	}
		302
		303	void clear_cells ();
		304	};
		305
		306	typedef mapgrid *DC__Map;
269		307
270	static char *	308	static char *
271	prepend (char *ptr, int sze, int inc)	309	prepend (char *ptr, int sze, int inc)
272	{	310	{
273	char *p;	311	char *p;
…		…
290	}	328	}
291		329
292	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	330	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	331	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294		332
295	static void
296	need_facenum (struct map *self, faceid face)
297	{
298	while (self->faces <= face)
299	{
300	Append (tileid, self->face2tile, self->faces, self->faces);
301	self->faces *= 2;
302	}
303	}
304
305	static void
306	need_texid (struct map *self, int texid)
307	{
308	while (self->texs <= texid)
309	{
310	Append (maptex, self->tex, self->texs, self->texs);
311	self->texs *= 2;
312	}
313	}
314
315	static maprow *	333	static maprow *
316	map_get_row (DC__Map self, int y)	334	map_get_row (mapgrid *self, int y)
317	{	335	{
318	if (0 > y)	336	if (0 > y)
319	{	337	{
320	int extend = - y + MAP_EXTEND_Y;	338	int extend = - y + MAP_EXTEND_Y;
321	Prepend (maprow, self->row, self->rows, extend);	339	Prepend (maprow, self->row, self->rows, extend);
…		…
359		377
360	return row->col + (x - row->c0);	378	return row->col + (x - row->c0);
361	}	379	}
362		380
363	static mapcell *	381	static mapcell *
364	map_get_cell (DC__Map self, int x, int y)	382	map_get_cell (mapgrid *self, int x, int y)
365	{	383	{
366	return row_get_cell (map_get_row (self, y), x);	384	return row_get_cell (map_get_row (self, y), x);
367	}	385	}
368		386
369	static void	387	void mapgrid::clear_cells ()
370	map_clear (DC__Map self)
371	{	388	{
372	int r;	389	int r;
373		390
374	for (r = 0; r < self->rows; r++)	391	for (r = 0; r < rows; r++)
375	Safefree (self->row[r].col);	392	Safefree (row[r].col);
376		393
377	Safefree (self->row);	394	Safefree (row);
378		395
379	self->x = 0;	396	x = 0;
380	self->y = 0;	397	y = 0;
381	self->ox = 0;	398	ox = 0;
382	self->oy = 0;	399	oy = 0;
383	self->row = 0;	400	row = 0;
384	self->rows = 0;	401	rows = 0;
385	}	402	}
386		403
387	#define CELL_CLEAR(cell) \	404	#define CELL_CLEAR(cell) \
388	do { \	405	do { \
389	if ((cell)->player) \	406	if ((cell)->player) \
…		…
393	(cell)->flags = 0; \	410	(cell)->flags = 0; \
394	(cell)->player = 0; \	411	(cell)->player = 0; \
395	} while (0)	412	} while (0)
396		413
397	static void	414	static void
398	map_blank (DC__Map self, int x0, int y0, int w, int h)	415	map_blank (mapgrid *self, int x0, int y0, int w, int h)
399	{	416	{
400	int x, y;	417	int x, y;
401	maprow *row;	418	maprow *row;
402	mapcell *cell;	419	mapcell *cell;
403		420
…		…
420	CELL_CLEAR (cell);	437	CELL_CLEAR (cell);
421	}	438	}
422	}	439	}
423	}	440	}
424		441
425	typedef struct {	442	struct smooth_key
		443	{
426	tileid tile;	444	tileid tile;
427	uint8_t x, y, level;	445	uint8_t x, y, level;
428	} smooth_key;	446
		447	bool operator == (const smooth_key &o) const
		448	{
		449	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		450	}
		451	};
		452
		453	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		454
		455	namespace std {
		456	template <>
		457	struct hash<smooth_key>
		458	{
		459	size_t operator () (const smooth_key &v) const
		460	{
		461	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		462	}
		463	};
		464	}
429		465
430	static void	466	static void
431	smooth_or_bits (HV hv, smooth_key key, IV bits)	467	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432	{	468	{
433	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	469	auto &&it = h.find (key);
434		470
435	if (SvIOK (*sv))	471	if (it == h.end ())
436	SvIV_set (sv, SvIVX (sv) \| bits);	472	h.insert (std::make_pair (key, bits));
437	else	473	else
438	sv_setiv (*sv, bits);	474	it->second \|= bits;
439	}	475	}
440		476
441	static void	477	static void
442	music_finished (void)	478	music_finished (void)
443	{	479	{
…		…
460	ev.code = 1;	496	ev.code = 1;
461	ev.data1 = (void *)(long)channel;	497	ev.data1 = (void *)(long)channel;
462	ev.data2 = 0;	498	ev.data2 = 0;
463		499
464	SDL_PushEvent ((SDL_Event *)&ev);	500	SDL_PushEvent ((SDL_Event *)&ev);
		501	}
		502
		503	// approximately divide by 255
		504	static unsigned int
		505	div255 (unsigned int n)
		506	{
		507	return (n + (n >> 8)) >> 8;
465	}	508	}
466		509
467	static unsigned int	510	static unsigned int
468	minpot (unsigned int n)	511	minpot (unsigned int n)
469	{	512	{
…		…
552		595
553	return mod;	596	return mod;
554	}	597	}
555		598
556	static void	599	static void
557	deliantra_main ()	600	deliantra_main (SV *real_main)
558	{	601	{
559	char *argv[] = { 0 };	602	dSP;
560	call_argv ("::main", G_DISCARD \| G_VOID, argv);	603
		604	PUSHMARK (SP);
		605	call_sv (real_main, G_DISCARD \| G_VOID);
561	}	606	}
562		607
563	#ifdef __MACOSX__	608	#ifdef __MACOSX__
		609	static SV *real_main;
		610
564	/* to due surprising braindamage on the side of SDL design, we	611	/* to due surprising braindamage on the side of SDL design, we
565	* do some mind-boggling hack here: SDL requires a custom main()	612	* do some mind-boggling hack here: SDL requires a custom main()
566	* on OS X, so... we provide one and call the original main(), which,	613	* on OS X, so... we provide one and call the original main(), which,
567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	614	* due to shared library magic, calls -lSDLmain's main, not perl's main,
568	* and which calls our main (== SDL_main) back.	615	* and which calls our main (== SDL_main) back.
569	*/	616	*/
570	extern C_LINKAGE int	617	extern C_LINKAGE int
571	main (int argc, char *argv[])	618	main (int argc, char *argv[])
572	{	619	{
573	deliantra_main ();	620	deliantra_main (real_main);
574	}	621	}
575		622
576	#undef main	623	#undef main
577		624
578	extern C_LINKAGE int main (int argc, char *argv[]);	625	extern C_LINKAGE int main (int argc, char *argv[]);
579		626
580	static void	627	static void
581	SDL_braino (void)	628	SDL_main_hack (SV *real_main_)
582	{	629	{
		630	real_main = real_main_;
		631
583	char *argv[] = { "deliantra client", 0 };	632	char *argv[] = { "deliantra client", 0 };
584	(main) (1, argv);	633	(main) (1, argv);
585	}	634	}
586	#else	635	#else
587	static void	636	static void
588	SDL_braino (void)	637	SDL_main_hack (SV *real_main)
589	{	638	{
590	deliantra_main ();	639	deliantra_main (real_main);
591	}	640	}
592	#endif	641	#endif
593		642
594	MODULE = Deliantra::Client PACKAGE = DC	643	MODULE = Deliantra::Client PACKAGE = DC
595		644
…		…
796		845
797	const_iv (FOW_DARKNESS)	846	const_iv (FOW_DARKNESS)
798	# undef const_iv	847	# undef const_iv
799	};	848	};
800		849
801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	850	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	851	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803		852
804	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	853	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	854	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806	}	855	}
807		856
…		…
846	#endif	895	#endif
847	}	896	}
848		897
849	char *SDL_GetError ()	898	char *SDL_GetError ()
850		899
851	void SDL_braino ()	900	void SDL_main_hack (SV *real_main)
		901	PROTOTYPE: &
852		902
853	int SDL_Init (U32 flags)	903	int SDL_Init (U32 flags)
854		904
855	int SDL_InitSubSystem (U32 flags)	905	int SDL_InitSubSystem (U32 flags)
856		906
857	void SDL_QuitSubSystem (U32 flags)	907	void SDL_QuitSubSystem (U32 flags)
858		908
859	void SDL_Quit ()	909	void SDL_Quit ()
860		910
861	int SDL_GL_SetAttribute (int attr, int value)	911	int SDL_GL_SetAttribute (int attr, int value)
		912	C_ARGS: (SDL_GLattr)attr, value
862		913
863	int SDL_GL_GetAttribute (int attr)	914	int SDL_GL_GetAttribute (int attr)
864	CODE:	915	CODE:
865	if (SDL_GL_GetAttribute (attr, &RETVAL))	916	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866	XSRETURN_UNDEF;	917	XSRETURN_UNDEF;
867	OUTPUT:	918	OUTPUT:
868	RETVAL	919	RETVAL
869		920
870	void	921	void
…		…
925	);	976	);
926		977
927	if (RETVAL)	978	if (RETVAL)
928	{	979	{
929	av_clear (texture_av);	980	av_clear (texture_av);
930
931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	981	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933	#include "glfunc.h"	982	#include "glfunc.h"
934	#undef GL_FUNC	983	#undef GL_FUNC
935
936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	984	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	985	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938	}	986	}
939	}	987	}
940	OUTPUT:	988	OUTPUT:
941	RETVAL	989	RETVAL
942		990
943	void	991	void
		992	SDL_WM_SetCaption (const char title, const char icon)
		993
		994	void
944	SDL_GL_SwapBuffers ()	995	SDL_GL_SwapBuffers ()
945		996
946	char *	997	char *
947	SDL_GetKeyName (int sym)	998	SDL_GetKeyName (int sym)
		999	C_ARGS: (SDLKey)sym
948		1000
949	int	1001	int
950	SDL_GetAppState ()	1002	SDL_GetAppState ()
951		1003
952	int	1004	int
953	SDL_GetModState ()	1005	SDL_GetModState ()
954		1006
		1007	int
		1008	SDL_WaitEvent ()
		1009	C_ARGS: 0
		1010
955	void	1011	void
		1012	SDL_PumpEvents ()
		1013
		1014	void
956	poll_events ()	1015	peep_events ()
957	PPCODE:	1016	PPCODE:
958	{	1017	{
959	SDL_Event ev;	1018	SDL_Event ev;
960		1019
961	SDL_PumpEvents ();	1020	SDL_PumpEvents ();
…		…
1042	OUTPUT:	1101	OUTPUT:
1043	RETVAL	1102	RETVAL
1044		1103
1045	int	1104	int
1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1105	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1047	POSTCALL:	1106	POSTCALL:
1048	Mix_HookMusicFinished (music_finished);	1107	Mix_HookMusicFinished (music_finished);
1049	Mix_ChannelFinished (channel_finished);	1108	Mix_ChannelFinished (channel_finished);
1050		1109
1051	void	1110	void
1052	Mix_QuerySpec ()	1111	Mix_QuerySpec ()
…		…
1111	add_font (char *file)	1170	add_font (char *file)
1112	CODE:	1171	CODE:
1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1172	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114	OUTPUT:	1173	OUTPUT:
1115	RETVAL	1174	RETVAL
		1175
		1176	void
		1177	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1178
		1179	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1180	void
		1181	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1116		1182
1117	void	1183	void
1118	load_image_inline (SV *image_)	1184	load_image_inline (SV *image_)
1119	ALIAS:	1185	ALIAS:
1120	load_image_file = 1	1186	load_image_file = 1
…		…
1166		1232
1167	SDL_LockSurface (surface2);	1233	SDL_LockSurface (surface2);
1168	EXTEND (SP, 6);	1234	EXTEND (SP, 6);
1169	PUSHs (sv_2mortal (newSViv (surface2->w)));	1235	PUSHs (sv_2mortal (newSViv (surface2->w)));
1170	PUSHs (sv_2mortal (newSViv (surface2->h)));	1236	PUSHs (sv_2mortal (newSViv (surface2->h)));
1171	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1237	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1172	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1238	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1173	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1239	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1174	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1240	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1175	SDL_UnlockSurface (surface2);	1241	SDL_UnlockSurface (surface2);
1176		1242
…		…
1248	MODULE = Deliantra::Client PACKAGE = DC::Font	1314	MODULE = Deliantra::Client PACKAGE = DC::Font
1249		1315
1250	PROTOTYPES: DISABLE	1316	PROTOTYPES: DISABLE
1251		1317
1252	DC::Font	1318	DC::Font
1253	new_from_file (SV class, char path, int id = 0)	1319	new_from_file (SV klass, char path, int id = 0)
1254	CODE:	1320	CODE:
1255	{	1321	{
1256	int count;	1322	int count;
1257	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1323	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1258	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1324	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1287	PROTOTYPE:	1353	PROTOTYPE:
1288	CODE:	1354	CODE:
1289	tc_restore ();	1355	tc_restore ();
1290		1356
1291	DC::Layout	1357	DC::Layout
1292	new (SV *class)	1358	new (SV *klass)
1293	CODE:	1359	CODE:
1294	New (0, RETVAL, 1, struct cf_layout);	1360	RETVAL = new cf_layout;
1295		1361
1296	RETVAL->pl = pango_layout_new (opengl_context);	1362	RETVAL->pl = pango_layout_new (opengl_context);
1297	RETVAL->r = 1.;	1363	RETVAL->r = 1.;
1298	RETVAL->g = 1.;	1364	RETVAL->g = 1.;
1299	RETVAL->b = 1.;	1365	RETVAL->b = 1.;
1300	RETVAL->a = 1.;	1366	RETVAL->a = 1.;
1301	RETVAL->base_height = MIN_FONT_HEIGHT;	1367	RETVAL->base_height = MIN_FONT_HEIGHT;
1302	RETVAL->font = 0;	1368	RETVAL->font = 0;
1303	RETVAL->rc = rc_alloc ();
1304		1369
1305	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1370	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1306	layout_update_font (RETVAL);	1371	layout_update_font (RETVAL);
1307	OUTPUT:	1372	OUTPUT:
1308	RETVAL	1373	RETVAL
1309		1374
1310	void	1375	void
1311	DESTROY (DC::Layout self)	1376	DESTROY (DC::Layout self)
1312	CODE:	1377	CODE:
1313	g_object_unref (self->pl);	1378	g_object_unref (self->pl);
1314	rc_free (self->rc);
1315	Safefree (self);	1379	delete self;
1316		1380
1317	void	1381	void
1318	set_text (DC::Layout self, SV *text_)	1382	set_text (DC::Layout self, SV *text_)
1319	CODE:	1383	CODE:
1320	{	1384	{
…		…
1446		1510
1447	void	1511	void
1448	set_height (DC::Layout self, int base_height)	1512	set_height (DC::Layout self, int base_height)
1449	CODE:	1513	CODE:
1450	if (self->base_height != base_height)	1514	if (self->base_height != base_height)
1451	{	1515	{
1452	self->base_height = base_height;	1516	self->base_height = base_height;
1453	layout_update_font (self);	1517	layout_update_font (self);
1454	}	1518	}
1455		1519
1456	void	1520	void
…		…
1574	}	1638	}
1575		1639
1576	void	1640	void
1577	render (DC::Layout self, float x, float y, int flags = 0)	1641	render (DC::Layout self, float x, float y, int flags = 0)
1578	CODE:	1642	CODE:
1579	rc_clear (self->rc);	1643	self->rc.clear ();
1580	pango_opengl_render_layout_subpixel (	1644	pango_opengl_render_layout_subpixel (
1581	self->pl,	1645	self->pl,
1582	self->rc,	1646	&self->rc,
1583	x * PANGO_SCALE, y * PANGO_SCALE,	1647	x * PANGO_SCALE, y * PANGO_SCALE,
1584	self->r, self->g, self->b, self->a,	1648	self->r, self->g, self->b, self->a,
1585	flags	1649	flags
1586	);	1650	);
1587	// we assume that context_change actually clears/frees stuff	1651	// we assume that context_change actually clears/frees stuff
…		…
1598	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1662	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1663	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600	glEnable (GL_ALPHA_TEST);	1664	glEnable (GL_ALPHA_TEST);
1601	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1665	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602		1666
1603	rc_draw (self->rc);	1667	self->rc.draw ();
1604		1668
1605	glDisable (GL_ALPHA_TEST);	1669	glDisable (GL_ALPHA_TEST);
1606	glDisable (GL_BLEND);	1670	glDisable (GL_BLEND);
1607	glDisable (GL_TEXTURE_2D);	1671	glDisable (GL_TEXTURE_2D);
1608	}	1672	}
…		…
1820	MODULE = Deliantra::Client PACKAGE = DC::Map	1884	MODULE = Deliantra::Client PACKAGE = DC::Map
1821		1885
1822	PROTOTYPES: DISABLE	1886	PROTOTYPES: DISABLE
1823		1887
1824	DC::Map	1888	DC::Map
1825	new (SV *class)	1889	new (SV *klass)
1826	CODE:	1890	CODE:
1827	New (0, RETVAL, 1, struct map);	1891	RETVAL = new mapgrid;
1828	RETVAL->x = 0;	1892	RETVAL->x = 0;
1829	RETVAL->y = 0;	1893	RETVAL->y = 0;
1830	RETVAL->w = 0;	1894	RETVAL->w = 0;
1831	RETVAL->h = 0;	1895	RETVAL->h = 0;
1832	RETVAL->ox = 0;	1896	RETVAL->ox = 0;
1833	RETVAL->oy = 0;	1897	RETVAL->oy = 0;
1834	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1835	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1836	RETVAL->rows = 0;	1898	RETVAL->rows = 0;
1837	RETVAL->row = 0;	1899	RETVAL->row = 0;
1838	OUTPUT:	1900	OUTPUT:
1839	RETVAL	1901	RETVAL
1840		1902
1841	void	1903	void
1842	DESTROY (DC::Map self)	1904	DESTROY (DC::Map self)
1843	CODE:	1905	CODE:
1844	{	1906	{
1845	map_clear (self);
1846	Safefree (self->face2tile);
1847	Safefree (self->tex);
1848	Safefree (self);	1907	delete self;
1849	}	1908	}
1850		1909
1851	void	1910	void
1852	resize (DC::Map self, int map_width, int map_height)	1911	resize (DC::Map self, int map_width, int map_height)
1853	CODE:	1912	CODE:
…		…
1855	self->h = map_height;	1914	self->h = map_height;
1856		1915
1857	void	1916	void
1858	clear (DC::Map self)	1917	clear (DC::Map self)
1859	CODE:	1918	CODE:
1860	map_clear (self);	1919	self->clear_cells ();
1861		1920
1862	void	1921	void
1863	set_tileid (DC::Map self, int face, int tile)	1922	set_tileid (DC::Map self, int face, int tile)
1864	CODE:	1923	CODE:
1865	{	1924	{
1866	need_facenum (self, face); self->face2tile [face] = tile;	1925	if (self->tile.size () <= face) self->tile.resize (face + 1);
1867	need_texid (self, tile);	1926	self->tile[face] = tile;
		1927	if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1868	}	1928	}
1869		1929
1870	void	1930	void
1871	set_smooth (DC::Map self, int face, int smooth, int level)	1931	set_smooth (DC::Map self, int face, int smooth, int level)
1872	CODE:	1932	CODE:
1873	{	1933	{
1874	tileid texid;
1875	maptex *tex;
1876
1877	if (face < 0 \|\| face >= self->faces)	1934	if (face < 0 \|\| face >= self->tile.size ())
1878	return;	1935	return;
1879		1936
1880	if (smooth < 0 \|\| smooth >= self->faces)	1937	if (smooth < 0 \|\| smooth >= self->tile.size ())
1881	return;	1938	return;
1882		1939
1883	texid = self->face2tile [face];	1940	tileid texid = self->tile[face];
1884		1941
1885	if (!texid)	1942	if (!texid)
1886	return;	1943	return;
1887		1944
1888	tex = self->tex + texid;	1945	maptex &tex = self->tex[texid];
1889	tex->smoothtile = self->face2tile [smooth];	1946	tex.smoothtile = self->tile[smooth];
1890	tex->smoothlevel = level;	1947	tex.smoothlevel = level;
1891	}	1948	}
1892		1949
1893	void	1950	void
1894	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1951	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1895	CODE:	1952	CODE:
1896	{	1953	{
1897	need_texid (self, texid);	1954	if (self->tex.size () < texid) self->tex.resize (texid + 1);
1898		1955
1899	{	1956	{
1900	maptex *tex = self->tex + texid;	1957	maptex &tex = self->tex[texid];
1901		1958
1902	tex->name = name;	1959	tex.name = name;
1903	tex->w = w;	1960	tex.w = w;
1904	tex->h = h;	1961	tex.h = h;
1905	tex->s = s;	1962	tex.s = s;
1906	tex->t = t;	1963	tex.t = t;
1907	tex->r = r;	1964	tex.r = r;
1908	tex->g = g;	1965	tex.g = g;
1909	tex->b = b;	1966	tex.b = b;
1910	tex->a = a;	1967	tex.a = a;
1911	}	1968	}
1912		1969
1913	// somewhat hackish, but for textures that require it, it really	1970	// somewhat hackish, but for textures that require it, it really
1914	// improves the look, and most others don't suffer.	1971	// improves the look, and most others don't suffer.
1915	glBindTexture (GL_TEXTURE_2D, name);	1972	glBindTexture (GL_TEXTURE_2D, name);
…		…
1921	}	1978	}
1922		1979
1923	void	1980	void
1924	expire_textures (DC::Map self, int texid, int count)	1981	expire_textures (DC::Map self, int texid, int count)
1925	PPCODE:	1982	PPCODE:
1926	for (; texid < self->texs && count; ++texid, --count)	1983	for (; texid < self->tex.size () && count; ++texid, --count)
1927	{	1984	{
1928	maptex *tex = self->tex + texid;	1985	maptex &tex = self->tex[texid];
1929		1986
1930	if (tex->name)	1987	if (tex.name)
1931	{	1988	{
1932	if (tex->unused)	1989	if (tex.unused)
1933	{	1990	{
1934	tex->name = 0;	1991	tex.name = 0;
1935	tex->unused = 0;	1992	tex.unused = 0;
1936	XPUSHs (sv_2mortal (newSViv (texid)));	1993	XPUSHs (sv_2mortal (newSViv (texid)));
1937	}	1994	}
1938	else	1995	else
1939	tex->unused = 1;	1996	tex.unused = 1;
1940	}	1997	}
1941	}	1998	}
1942		1999
1943	int	2000	int
1944	ox (DC::Map self)	2001	ox (DC::Map self)
…		…
1986	self->y += MAP_EXTEND_Y;	2043	self->y += MAP_EXTEND_Y;
1987	}	2044	}
1988	}	2045	}
1989		2046
1990	SV *	2047	SV *
1991	map1a_update (DC::Map self, SV *data_, int extmap)	2048	map1a_update (DC::Map self, SV *data_)
1992	CODE:	2049	CODE:
1993	{	2050	{
1994	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2051	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1995	uint8_t data_end = (uint8_t )SvEND (data_);	2052	uint8_t data_end = (uint8_t )SvEND (data_);
1996	mapcell *cell;	2053	mapcell *cell;
…		…
2017		2074
2018	//TODO: don't trust server data to be in-range(!)	2075	//TODO: don't trust server data to be in-range(!)
2019		2076
2020	if (flags & 8)	2077	if (flags & 8)
2021	{	2078	{
		2079	uint8_t ext, cmd;
		2080
2022	if (extmap)	2081	do
2023	{	2082	{
2024	uint8_t ext, cmd;	2083	ext = *data++;
		2084	cmd = ext & 0x7f;
2025		2085
2026	do	2086	if (cmd < 4)
		2087	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2088	else if (cmd == 5) // health
2027	{	2089	{
2028	ext = *data++;
2029	cmd = ext & 0x7f;
2030
2031	if (cmd < 4)
2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2033	else if (cmd == 5) // health
2034	{
2035	cell->stat_width = 1;	2090	cell->stat_width = 1;
2036	cell->stat_hp = *data++;	2091	cell->stat_hp = *data++;
2037	}
2038	else if (cmd == 6) // monster width
2039	cell->stat_width = *data++ + 1;
2040	else if (cmd == 0x47)
2041	{
2042	if (*data == 1) cell->player = data [1];
2043	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2046
2047	data += *data + 1;
2048	}
2049	else if (cmd == 8) // cell flags
2050	cell->flags = *data++;
2051	else if (ext & 0x40) // unknown, multibyte => skip
2052	data += *data + 1;
2053	else
2054	data++;
2055	}	2092	}
2056	while (ext & 0x80);	2093	else if (cmd == 6) // monster width
		2094	cell->stat_width = *data++ + 1;
		2095	else if (cmd == 0x47)
		2096	{
		2097	if (*data == 1) cell->player = data [1];
		2098	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2099	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2100	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2101
		2102	data += *data + 1;
		2103	}
		2104	else if (cmd == 8) // cell flags
		2105	cell->flags = *data++;
		2106	else if (ext & 0x40) // unknown, multibyte => skip
		2107	data += *data + 1;
		2108	else
		2109	data++;
2057	}	2110	}
2058	else	2111	while (ext & 0x80);
2059	cell->darkness = *data++ + 1;
2060	}	2112	}
2061		2113
2062	for (z = 0; z <= 2; ++z)	2114	for (z = 0; z <= 2; ++z)
2063	if (flags & (4 >> z))	2115	if (flags & (4 >> z))
2064	{	2116	{
2065	faceid face = (data [0] << 8) + data [1]; data += 2;	2117	faceid face = (data[0] << 8) + data[1]; data += 2;
2066	need_facenum (self, face);	2118	if (self->tile.size () <= face) self->tile.resize (face + 1);
2067	cell->tile [z] = self->face2tile [face];	2119	cell->tile[z] = self->tile[face];
2068		2120
2069	if (cell->tile [z])	2121	if (cell->tile[z])
2070	{	2122	{
2071	maptex *tex = self->tex + cell->tile [z];	2123	maptex &tex = self->tex[cell->tile[z]];
2072	tex->unused = 0;	2124	tex.unused = 0;
2073	if (!tex->name)	2125	if (!tex.name)
2074	av_push (missing, newSViv (cell->tile [z]));	2126	av_push (missing, newSViv (cell->tile [z]));
2075		2127
2076	if (tex->smoothtile)	2128	if (tex.smoothtile)
2077	{	2129	{
2078	maptex *smooth = self->tex + tex->smoothtile;	2130	maptex &smooth = self->tex[tex.smoothtile];
2079	smooth->unused = 0;	2131	smooth.unused = 0;
2080	if (!smooth->name)	2132	if (!smooth.name)
2081	av_push (missing, newSViv (tex->smoothtile));	2133	av_push (missing, newSViv (tex.smoothtile));
2082	}	2134	}
2083	}	2135	}
2084	}	2136	}
2085	}	2137	}
2086	else	2138	else
…		…
2112	? self->row + y	2164	? self->row + y
2113	: 0;	2165	: 0;
2114		2166
2115	for (x = x0; x < x1; x++)	2167	for (x = x0; x < x1; x++)
2116	{	2168	{
2117	int r = 32, g = 32, b = 32, a = 192;	2169	unsigned int r = 32, g = 32, b = 32, a = 192;
2118		2170
2119	if (row && row->c0 <= x && x < row->c1)	2171	if (row && row->c0 <= x && x < row->c1)
2120	{	2172	{
2121	mapcell *cell = row->col + (x - row->c0);	2173	mapcell *cell = row->col + (x - row->c0);
2122		2174
…		…
2124	{	2176	{
2125	maptex tex = self->tex [cell->tile [z]];	2177	maptex tex = self->tex [cell->tile [z]];
2126	int a0 = 255 - tex.a;	2178	int a0 = 255 - tex.a;
2127	int a1 = tex.a;	2179	int a1 = tex.a;
2128		2180
2129	r = (r * a0 + tex.r * a1) / 255;	2181	r = div255 (r * a0 + tex.r * a1);
2130	g = (g * a0 + tex.g * a1) / 255;	2182	g = div255 (g * a0 + tex.g * a1);
2131	b = (b * a0 + tex.b * a1) / 255;	2183	b = div255 (b * a0 + tex.b * a1);
2132	a = (a * a0 + tex.a * a1) / 255;	2184	a = div255 (a * a0 + tex.a * a1);
2133	}	2185	}
2134	}	2186	}
2135		2187
2136	*map++ = (r )	2188	*map++ = (r )
2137	\| (g << 8)	2189	\| (g << 8)
2138	\| (b << 16)	2190	\| (b << 16)
2139	\| (a << 24);	2191	\| (a << 24);
2140	}	2192	}
2141	}	2193	}
2142		2194
2143	RETVAL = map_sv;	2195	RETVAL = map_sv;
2144	}	2196	}
2145	OUTPUT:	2197	OUTPUT:
2146	RETVAL	2198	RETVAL
2147		2199
2148	void	2200	void
2149	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2201	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2150	CODE:	2202	CODE:
2151	{	2203	{
2152	int x, y, z;	2204	int x, y, z;
2153		2205
2154	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2155	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2156	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2206	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2157	smooth_key skey;
2158	int pl_x, pl_y;	2207	int pl_x, pl_y;
2159	maptex pl_tex;	2208	maptex pl_tex;
2160	rc_t *rc = rc_alloc ();	2209	rc_t rc;
2161	rc_t *rc_ov = rc_alloc ();	2210	rc_t rc_ov;
2162	rc_key_t key;	2211	rc_key_t key;
2163	rc_array_t *arr;	2212	rc_t::array_t *arr;
2164		2213
2165	pl_tex.name = 0;	2214	pl_tex.name = 0;
2166		2215
2167	// that's current max. sorry.	2216	// that's current max. sorry.
2168	if (sw > 255) sw = 255;	2217	if (sw > 255) sw = 255;
2169	if (sh > 255) sh = 255;	2218	if (sh > 255) sh = 255;
2170
2171	// clear key, in case of extra padding
2172	memset (&skey, 0, sizeof (skey));
2173		2219
2174	memset (&key, 0, sizeof (key));	2220	memset (&key, 0, sizeof (key));
2175	key.r = 255;	2221	key.r = 255;
2176	key.g = 255;	2222	key.g = 255;
2177	key.b = 255;	2223	key.b = 255;
…		…
2183	my += self->y;	2229	my += self->y;
2184		2230
2185	// first pass: determine smooth_max	2231	// first pass: determine smooth_max
2186	// rather ugly, if you ask me	2232	// rather ugly, if you ask me
2187	// could also be stored inside mapcell and updated on change	2233	// could also be stored inside mapcell and updated on change
2188	memset (smooth_max, 0, sizeof (smooth_max));	2234	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2189		2235
2190	for (y = 0; y < sh; y++)	2236	for (y = 0; y < sh; y++)
2191	if (0 <= y + my && y + my < self->rows)	2237	if (0 <= y + my && y + my < self->rows)
2192	{	2238	{
2193	maprow *row = self->row + (y + my);	2239	maprow *row = self->row + (y + my);
…		…
2208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2254	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2255	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210		2256
2211	for (z = 0; z <= 2; z++)	2257	for (z = 0; z <= 2; z++)
2212	{	2258	{
2213	memset (smooth_level, 0, sizeof (smooth_level));	2259	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2260	smooth_key skey;
		2261	smooth_hash smooth;
2214	key.texname = -1;	2262	key.texname = -1;
2215		2263
2216	for (y = 0; y < sh; y++)	2264	for (y = 0; y < sh; y++)
2217	if (0 <= y + my && y + my < self->rows)	2265	if (0 <= y + my && y + my < self->rows)
2218	{	2266	{
…		…
2235		2283
2236	if (!tex.name)	2284	if (!tex.name)
2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2285	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2238		2286
2239	key.texname = tex.name;	2287	key.texname = tex.name;
2240	arr = rc_array (rc, &key);	2288	arr = &rc.array (key);
2241	}	2289	}
2242		2290
2243	px = (x + 1) * T - tex.w;	2291	px = (x + 1) * Th - tex.w;
2244	py = (y + 1) * T - tex.h;	2292	py = (y + 1) * Tw - tex.h;
2245		2293
2246	if (expect_false (cell->player == player) && expect_false (z == 2))	2294	if (expect_false (cell->player == player) && expect_false (z == 2))
2247	{	2295	{
2248	pl_x = px;	2296	pl_x = px;
2249	pl_y = py;	2297	pl_y = py;
2250	pl_tex = tex;	2298	pl_tex = tex;
2251	continue;	2299	continue;
2252	}	2300	}
2253		2301
2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2302	arr->t2f_v3f (0 , 0 , px , py , 0);
2255	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2303	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2256	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2304	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2257	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2305	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2258		2306
2259	// update smooth hash	2307	// update smooth hash
2260	if (tex.smoothtile)	2308	if (tex.smoothtile)
2261	{	2309	{
2262	skey.tile = tex.smoothtile;	2310	skey.tile = tex.smoothtile;
2263	skey.level = tex.smoothlevel;	2311	skey.level = tex.smoothlevel;
2264		2312
2265	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2313	smooth_level[tex.smoothlevel] = 1;
2266		2314
2267	// add bits to current tile and all neighbours. skey.x\|y is	2315	// add bits to current tile and all neighbours. skey.x\|y is
2268	// shifted +1\|+1 so we always stay positive.	2316	// shifted +1\|+1 so we always stay positive.
2269		2317
2270	// bits is ___n cccc CCCC bbbb	2318	// bits is ___n cccc CCCC bbbb
…		…
2278		2326
2279	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2327	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2280	// ·· ·· ·┏ ┓·	2328	// ·· ·· ·┏ ┓·
2281		2329
2282	// full tile	2330	// full tile
2283	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2331	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2284		2332
2285	// borders	2333	// borders
2286	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2334	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2287	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2335	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2288	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2336	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2289	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2337	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2290		2338
2291	// corners	2339	// corners
2292	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2340	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2293	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2341	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2294	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2342	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2295	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2343	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2296	}	2344	}
2297	}	2345	}
2298		2346
2299	if (expect_false (z == 2) && expect_false (cell->flags))	2347	if (expect_false (z == 2) && expect_false (cell->flags))
2300	{	2348	{
2301	// overlays such as the speech bubble, probably more to come	2349	// overlays such as the speech bubble, probably more to come
2302	if (cell->flags & 1)	2350	if (cell->flags & 1)
2303	{	2351	{
2304	rc_key_t key_ov = key;	2352	rc_key_t key_ov = key;
2305	maptex tex = self->tex [TEXID_SPEECH];	2353	maptex tex = self->tex[TEXID_SPEECH];
2306	rc_array_t *arr;
2307	int px = x * T + T * 2 / 32;	2354	int px = x * Tw + Tw * 2 / 32;
2308	int py = y * T - T * 6 / 32;	2355	int py = y * Th - Th * 6 / 32;
2309		2356
2310	key_ov.texname = tex.name;	2357	key_ov.texname = tex.name;
2311	arr = rc_array (rc_ov, &key_ov);	2358	rc_t::array_t &arr = rc_ov.array (key_ov);
2312		2359
2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2360	arr.t2f_v3f (0 , 0 , px , py , 0);
2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2361	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2315	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2362	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2363	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2317	}	2364	}
2318	}	2365	}
2319	}	2366	}
2320	}	2367	}
2321		2368
2322	rc_draw (rc);	2369	rc.draw ();
2323	rc_clear (rc);	2370	rc.clear ();
2324		2371
2325	// go through all smoothlevels, lowest to highest, then draw.	2372	// go through all smoothlevels, lowest to highest, then draw.
2326	// this is basically counting sort	2373	// this is basically counting sort
2327	{	2374	{
2328	int w, b;	2375	int w, b;
2329		2376
2330	glEnable (GL_TEXTURE_2D);	2377	glEnable (GL_TEXTURE_2D);
2331	glBegin (GL_QUADS);	2378	glBegin (GL_QUADS);
2332	for (w = 0; w < 256 / 32; ++w)	2379	for (int level = 0; level < smooth_level.size (); ++level)
		2380	if (smooth_level[level])
		2381	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2333	{	2382	{
2334	uint32_t smask = smooth_level [w];	2383	smooth_key &skey = it->first;
2335	if (smask)	2384	IV bits = it->second;
2336	for (b = 0; b < 32; ++b)	2385
2337	if (smask & (((uint32_t)1) << b))	2386	if (!(bits & 0x1000)
		2387	&& skey.level == level
		2388	&& level > smooth_max [skey.x][skey.y])
2338	{	2389	{
2339	int level = (w << 5) \| b;	2390	maptex tex = self->tex [skey.tile];
		2391	int px = (((int)skey.x) - 1) * Tw;
		2392	int py = (((int)skey.y) - 1) * Th;
		2393	int border = bits & 15;
		2394	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2395	float dx = tex.s * .0625f; // 16 images/row
		2396	float dy = tex.t * .5f ; // 2 images/column
		2397
2340	HE *he;	2398	if (tex.name)
2341
2342	hv_iterinit (smooth);
2343	while ((he = hv_iternext (smooth)))
2344	{	2399	{
2345	smooth_key skey = (smooth_key )HeKEY (he);	2400	// this time avoiding texture state changes
2346	IV bits = SvIVX (HeVAL (he));	2401	// save gobs of state changes.
2347		2402	if (key.texname != tex.name)
2348	if (!(bits & 0x1000)
2349	&& skey->level == level
2350	&& level > smooth_max [skey->x][skey->y])
2351	{	2403	{
2352	maptex tex = self->tex [skey->tile];
2353	int px = (((int)skey->x) - 1) * T;
2354	int py = (((int)skey->y) - 1) * T;
2355	int border = bits & 15;
2356	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357	float dx = tex.s * .0625f; // 16 images/row
2358	float dy = tex.t * .5f ; // 2 images/column
2359
2360	if (tex.name)
2361	{
2362	// this time avoiding texture state changes
2363	// save gobs of state changes.
2364	if (key.texname != tex.name)
2365	{
2366	self->tex [skey->tile].unused = 0;	2404	self->tex [skey.tile].unused = 0;
2367		2405
2368	glEnd ();	2406	glEnd ();
2369	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2407	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2370	glBegin (GL_QUADS);	2408	glBegin (GL_QUADS);
2371	}	2409	}
2372		2410
2373	if (border)	2411	if (border)
2374	{	2412	{
2375	float ox = border * dx;	2413	float ox = border * dx;
2376		2414
2377	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2415	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381	}	2419	}
2382		2420
2383	if (corner)	2421	if (corner)
2384	{	2422	{
2385	float ox = corner * dx;	2423	float ox = corner * dx;
2386		2424
2387	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2425	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2426	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2427	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2428	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391	}
2392	}
2393	}	2429	}
2394	}	2430	}
2395	}	2431	}
2396	}	2432	}
2397		2433
2398	glEnd ();	2434	glEnd ();
2399	glDisable (GL_TEXTURE_2D);	2435	glDisable (GL_TEXTURE_2D);
2400	key.texname = -1;	2436	key.texname = -1;
2401	}	2437	}
2402
2403	hv_clear (smooth);
2404	}	2438	}
2405		2439
2406	if (pl_tex.name)	2440	if (pl_tex.name)
2407	{	2441	{
2408	maptex tex = pl_tex;	2442	maptex tex = pl_tex;
2409	int px = pl_x + sdx;	2443	int px = pl_x + sdx;
2410	int py = pl_y + sdy;	2444	int py = pl_y + sdy;
2411		2445
2412	key.texname = tex.name;	2446	key.texname = tex.name;
2413	arr = rc_array (rc, &key);	2447	rc_t::array_t &arr = rc.array (key);
2414		2448
2415	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2449	arr.t2f_v3f (0 , 0 , px , py , 0);
2416	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2450	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2417	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2451	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2452	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2419		2453
2420	rc_draw (rc);	2454	rc.draw ();
2421	}	2455	}
2422		2456
2423	rc_draw (rc_ov);	2457	rc_ov.draw ();
2424	rc_clear (rc_ov);	2458	rc_ov.clear ();
2425		2459
2426	glDisable (GL_BLEND);	2460	glDisable (GL_BLEND);
2427	rc_free (rc);
2428	rc_free (rc_ov);
2429		2461
2430	// top layer: overlays such as the health bar	2462	// top layer: overlays such as the health bar
2431	for (y = 0; y < sh; y++)	2463	for (y = 0; y < sh; y++)
2432	if (0 <= y + my && y + my < self->rows)	2464	if (0 <= y + my && y + my < self->rows)
2433	{	2465	{
…		…
2436	for (x = 0; x < sw; x++)	2468	for (x = 0; x < sw; x++)
2437	if (row->c0 <= x + mx && x + mx < row->c1)	2469	if (row->c0 <= x + mx && x + mx < row->c1)
2438	{	2470	{
2439	mapcell *cell = row->col + (x + mx - row->c0);	2471	mapcell *cell = row->col + (x + mx - row->c0);
2440		2472
2441	int px = x * T;	2473	int px = x * Tw;
2442	int py = y * T;	2474	int py = y * Th;
2443		2475
2444	if (expect_false (cell->player == player))	2476	if (expect_false (cell->player == player))
2445	{	2477	{
2446	px += sdx;	2478	px += sdx;
2447	py += sdy;	2479	py += sdy;
2448	}	2480	}
2449		2481
2450	if (cell->stat_hp)	2482	if (cell->stat_hp)
2451	{	2483	{
2452	int width = cell->stat_width * T;	2484	int width = cell->stat_width * Tw;
2453	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2485	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454		2486
2455	glColor3ub (0, 0, 0);	2487	glColor3ub (0, 0, 0);
2456	glRectf (px + 1, py - thick - 2,	2488	glRectf (px + 1, py - thick - 2,
2457	px + width - 1, py);	2489	px + width - 1, py);
2458		2490
…		…
2538	int x, y;	2570	int x, y;
2539	int sw1 = sw + 2;	2571	int sw1 = sw + 2;
2540	int sh1 = sh + 2;	2572	int sh1 = sh + 2;
2541	int sh3 = sh * 3;	2573	int sh3 = sh * 3;
2542	int sw3 = sw * 3;	2574	int sw3 = sw * 3;
2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2575	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2545	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2576	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2577	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2578	memset (darkness1, 0, sw1*sh1);
2546		2579
2547	SvPOK_only (darkness3_sv);	2580	SvPOK_only (darkness3_sv);
2548	SvCUR_set (darkness3_sv, sw3 * sh3);	2581	SvCUR_set (darkness3_sv, sw3 * sh3);
2549		2582
2550	mx += self->x - 1;	2583	mx += self->x - 1;
…		…
2676	else	2709	else
2677	*data++ = 0;	2710	*data++ = 0;
2678	}	2711	}
2679	}	2712	}
2680		2713
2681	/* if size is wh + 5 then no data has been found /	2714	/* if size is wh + 5 then no data has been found /
2682	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2715	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2683	{	2716	{
2684	SvPOK_only (data_sv);	2717	SvPOK_only (data_sv);
2685	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2718	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686	}	2719	}
2687		2720
2688	RETVAL = data_sv;	2721	RETVAL = data_sv;
2689	}	2722	}
2690	OUTPUT:	2723	OUTPUT:
2691	RETVAL	2724	RETVAL
2692		2725
2693	void	2726	void
…		…
2700	STRLEN len;	2733	STRLEN len;
2701	uint8_t data, end;	2734	uint8_t data, end;
2702		2735
2703	len = SvLEN (data_sv);	2736	len = SvLEN (data_sv);
2704	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2737	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705	data = SvPVbyte_nolen (data_sv);	2738	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2706	end = data + len + 8;	2739	end = data + len + 8;
2707		2740
2708	if (len < 5)	2741	if (len < 5)
2709	XSRETURN_EMPTY;	2742	XSRETURN_EMPTY;
2710		2743
…		…
2754		2787
2755	for (z = 0; z <= 2; z++)	2788	for (z = 0; z <= 2; z++)
2756	{	2789	{
2757	tileid t = tile [z];	2790	tileid t = tile [z];
2758		2791
2759	if (t >= self->texs \|\| (t && !self->tex [t].name))	2792	if (t >= self->tex.size () \|\| (t && !self->tex[t].name))
2760	{	2793	{
2761	PUSHs (sv_2mortal (newSViv (t)));	2794	PUSHs (sv_2mortal (newSViv (t)));
2762	need_texid (self, t);	2795	if (self->tex.size () <= t) self->tex.resize (t + 1);
2763	}	2796	}
2764		2797
2765	cell->tile [z] = t;	2798	cell->tile[z] = t;
2766	}	2799	}
2767	}	2800	}
2768	}	2801	}
2769	}	2802	}
2770	}	2803	}
2771	}	2804	}
2772		2805
2773	MODULE = Deliantra::Client PACKAGE = DC::RW	2806	MODULE = Deliantra::Client PACKAGE = DC::RW
2774		2807
2775	DC::RW	2808	DC::RW
2776	new (SV class, SV data_sv)	2809	new (SV klass, SV data_sv)
2777	CODE:	2810	CODE:
2778	{	2811	{
2779	STRLEN datalen;	2812	STRLEN datalen;
2780	char *data = SvPVbyte (data_sv, datalen);	2813	char *data = SvPVbyte (data_sv, datalen);
2781		2814
…		…
2783	}	2816	}
2784	OUTPUT:	2817	OUTPUT:
2785	RETVAL	2818	RETVAL
2786		2819
2787	DC::RW	2820	DC::RW
2788	new_from_file (SV class, const char path, const char *mode = "rb")	2821	new_from_file (SV klass, const char path, const char *mode = "rb")
2789	CODE:	2822	CODE:
2790	RETVAL = SDL_RWFromFile (path, mode);	2823	RETVAL = SDL_RWFromFile (path, mode);
2791	OUTPUT:	2824	OUTPUT:
2792	RETVAL	2825	RETVAL
2793		2826
…		…
2902	#else	2935	#else
2903	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2936	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904	#endif	2937	#endif
2905		2938
2906	DC::MixChunk	2939	DC::MixChunk
2907	new (SV *class, DC::RW rwops)	2940	new (SV *klass, DC::RW rwops)
2908	CODE:	2941	CODE:
2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2942	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910	OUTPUT:	2943	OUTPUT:
2911	RETVAL	2944	RETVAL
2912		2945
…		…
2982	RETVAL = Mix_PlayingMusic ();	3015	RETVAL = Mix_PlayingMusic ();
2983	OUTPUT:	3016	OUTPUT:
2984	RETVAL	3017	RETVAL
2985		3018
2986	DC::MixMusic	3019	DC::MixMusic
2987	new (SV *class, DC::RW rwops)	3020	new (SV *klass, DC::RW rwops)
2988	CODE:	3021	CODE:
2989	RETVAL = Mix_LoadMUS_RW (rwops);	3022	RETVAL = Mix_LoadMUS_RW (rwops);
2990	OUTPUT:	3023	OUTPUT:
2991	RETVAL	3024	RETVAL
2992		3025
…		…
3129	const_iv (GL_FUNC_SUBTRACT),	3162	const_iv (GL_FUNC_SUBTRACT),
3130	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3163	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131	# undef const_iv	3164	# undef const_iv
3132	};	3165	};
3133		3166
3134	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3167	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3168	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136		3169
3137	texture_av = newAV ();	3170	texture_av = newAV ();
3138	AvREAL_off (texture_av);	3171	AvREAL_off (texture_av);
3139	}	3172	}
3140		3173
…		…
3145	gl.BlendFuncSeparateEXT = 0;	3178	gl.BlendFuncSeparateEXT = 0;
3146		3179
3147	void	3180	void
3148	apple_nvidia_bug (int enable)	3181	apple_nvidia_bug (int enable)
3149		3182
3150	char *	3183	const char *
3151	gl_vendor ()	3184	gl_vendor ()
3152	CODE:	3185	CODE:
3153	RETVAL = (char *)glGetString (GL_VENDOR);	3186	RETVAL = (const char *)glGetString (GL_VENDOR);
3154	OUTPUT:	3187	OUTPUT:
3155	RETVAL	3188	RETVAL
3156		3189
3157	char *	3190	const char *
3158	gl_version ()	3191	gl_version ()
3159	CODE:	3192	CODE:
3160	RETVAL = (char *)glGetString (GL_VERSION);	3193	RETVAL = (const char *)glGetString (GL_VERSION);
3161	OUTPUT:	3194	OUTPUT:
3162	RETVAL	3195	RETVAL
3163		3196
3164	char *	3197	const char *
3165	gl_extensions ()	3198	gl_extensions ()
3166	CODE:	3199	CODE:
3167	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3200	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3168	OUTPUT:	3201	OUTPUT:
3169	RETVAL	3202	RETVAL
3170		3203
3171	const char *glGetString (GLenum pname)	3204	const char *glGetString (GLenum pname)
		3205	CODE:
		3206	RETVAL = (const char *)glGetString (pname);
		3207	OUTPUT:
		3208	RETVAL
3172		3209
3173	GLint glGetInteger (GLenum pname)	3210	GLint glGetInteger (GLenum pname)
3174	CODE:	3211	CODE:
3175	glGetIntegerv (pname, &RETVAL);	3212	glGetIntegerv (pname, &RETVAL);
3176	OUTPUT:	3213	OUTPUT:
…		…
3183	RETVAL	3220	RETVAL
3184		3221
3185	int glGetError ()	3222	int glGetError ()
3186		3223
3187	void glFinish ()	3224	void glFinish ()
		3225
		3226	void glFlush ()
3188		3227
3189	void glClear (int mask)	3228	void glClear (int mask)
3190		3229
3191	void glClearColor (float r, float g, float b, float a = 1.0)	3230	void glClearColor (float r, float g, float b, float a = 1.0)
3192	PROTOTYPE: @	3231	PROTOTYPE: @
…		…
3377		3416
3378	void	3417	void
3379	find_widget (SV *self, NV x, NV y)	3418	find_widget (SV *self, NV x, NV y)
3380	PPCODE:	3419	PPCODE:
3381	{	3420	{
3382	if (within_widget (self, x, y))	3421	if (within_widget (self, x, y))
3383	XPUSHs (self);	3422	XPUSHs (self);
3384	}	3423	}
3385		3424
3386	BOOT:	3425	BOOT:
3387	{	3426	{
…		…
3395		3434
3396	void	3435	void
3397	draw (SV *self)	3436	draw (SV *self)
3398	CODE:	3437	CODE:
3399	{	3438	{
3400	HV *hv;	3439	HV *hv;
3401	SV **svp;	3440	SV **svp;
3402	NV x, y, w, h;	3441	NV x, y, w, h;
3403	SV *draw_x_sv = GvSV (draw_x_gv);	3442	SV *draw_x_sv = GvSV (draw_x_gv);
3404	SV *draw_y_sv = GvSV (draw_y_gv);	3443	SV *draw_y_sv = GvSV (draw_y_gv);
3405	SV *draw_w_sv = GvSV (draw_w_gv);	3444	SV *draw_w_sv = GvSV (draw_w_gv);
3406	SV *draw_h_sv = GvSV (draw_h_gv);	3445	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC vs. Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC