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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC vs.
Revision 1.52 by root, Wed Apr 19 21:17:15 2006 UTC

…		…
		1	#ifdef _WIN32
		2	# include <malloc.h>
		3	#endif
		4
1	#include "EXTERN.h"	5	#include "EXTERN.h"
2	#include "perl.h"	6	#include "perl.h"
3	#include "XSUB.h"	7	#include "XSUB.h"
4		8
5	#include <string.h>	9	#include <string.h>
6	#include <stdio.h>	10	#include <stdio.h>
7		11
8	#include <SDL.h>	12	#include <SDL.h>
9	#include <SDL_image.h>	13	#include <SDL_image.h>
		14	#include <SDL_mixer.h>
10	#include <SDL_opengl.h>	15	#include <SDL_opengl.h>
11		16
12	#include <glib/gmacros.h>	17	#include <glib/gmacros.h>
13		18
14	#include <pango/pango.h>	19	#include <pango/pango.h>
15	#include <pango/pangofc-fontmap.h>	20	#include <pango/pangofc-fontmap.h>
16	#include <pango/pangoft2.h>	21	#include <pango/pangoft2.h>
17		22
		23	#ifndef _WIN32
18	#include <sys/types.h>	24	# include <sys/types.h>
19	#include <sys/socket.h>	25	# include <sys/socket.h>
20	#include <netinet/in.h>	26	# include <netinet/in.h>
21	#include <netinet/tcp.h>	27	# include <netinet/tcp.h>
22
23	#include <inttypes.h>	28	# include <inttypes.h>
		29	#else
		30	typedef unsigned char uint8_t;
		31	typedef unsigned short uint16_t;
		32	typedef unsigned int uint32_t;
		33	typedef signed char int8_t;
		34	typedef signed short int16_t;
		35	typedef signed int int32_t;
		36	#endif
24		37
25	#define FOW_DARKNESS 32	38	#define FOW_DARKNESS 32
26		39
27	#define MAP_EXTEND_X 32	40	#define MAP_EXTEND_X 32
28	#define MAP_EXTEND_Y 512	41	#define MAP_EXTEND_Y 512
		42
		43	typedef Mix_Chunk *CFClient__MixChunk;
		44	typedef Mix_Music *CFClient__MixMusic;
29		45
30	static PangoContext *context;	46	static PangoContext *context;
31	static PangoFontMap *fontmap;	47	static PangoFontMap *fontmap;
32		48
33	typedef struct cf_layout {	49	typedef struct cf_layout {
47	{	63	{
48	/* use a random scale factor to account for unknown descenders, 0.8 works	64	/* use a random scale factor to account for unknown descenders, 0.8 works
49	* reasonably well with bitstream vera	65	* reasonably well with bitstream vera
50	*/	66	*/
51	PangoFontDescription *font = pango_context_get_font_description (context);	67	PangoFontDescription *font = pango_context_get_font_description (context);
52	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));	68
		69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
		70
		71	if (pango_font_description_get_size (font) != height)
		72	{
		73	pango_font_description_set_absolute_size (font, height);
		74	pango_layout_context_changed (self->pl);
		75	}
53	}	76	}
54		77
55	static void	78	static void
56	layout_get_pixel_size (CFClient__Layout self, int w, int h)	79	layout_get_pixel_size (CFClient__Layout self, int w, int h)
57	{	80	{
…		…
83	mapcell *col;	106	mapcell *col;
84	} maprow;	107	} maprow;
85		108
86	typedef struct map {	109	typedef struct map {
87	int x, y, w, h;	110	int x, y, w, h;
88	int dx, dy; /* delayed map scrolling */
89	int ox, oy; /* offset to virtual global coordinate system */	111	int ox, oy; /* offset to virtual global coordinate system */
90	int faces;	112	int faces;
91	mapface *face;	113	mapface *face;
92		114
93	int texs;	115	int texs;
94	maptex *tex;	116	maptex *tex;
95		117
96	uint32_t rows;	118	int32_t rows;
97	maprow *row;	119	maprow *row;
98	} *CFClient__Map;	120	} *CFClient__Map;
99		121
100	static char *	122	static char *
101	prepend (char *ptr, int sze, int inc)	123	prepend (char *ptr, int sze, int inc)
…		…
196		218
197	static void	219	static void
198	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	220	map_blank (CFClient__Map self, int x0, int y0, int w, int h)
199	{	221	{
200	int x, y;	222	int x, y;
		223	maprow *row;
201		224
202	for (y = y0; y < y0 + h; y++)	225	for (y = y0; y < y0 + h; y++)
203	if (y >= 0)	226	if (y >= 0)
204	{	227	{
205	if (y >= self->rows)	228	if (y >= self->rows)
206	break;	229	break;
207		230
208	maprow *row = self->row + y;	231	row = self->row + y;
209		232
210	for (x = x0; x < x0 + w; x++)	233	for (x = x0; x < x0 + w; x++)
211	if (x >= row->c0)	234	if (x >= row->c0)
212	{	235	{
213	if (x >= row->c1)	236	if (x >= row->c1)
…		…
222		245
223	PROTOTYPES: ENABLE	246	PROTOTYPES: ENABLE
224		247
225	BOOT:	248	BOOT:
226	{	249	{
		250	HV *stash = gv_stashpv ("CFClient", 1);
		251	static const struct {
		252	const char *name;
		253	IV iv;
		254	} *civ, const_iv[] = {
		255	# define const_iv(name) { # name, (IV)name }
		256	const_iv (SDL_ACTIVEEVENT),
		257	const_iv (SDL_KEYDOWN),
		258	const_iv (SDL_KEYUP),
		259	const_iv (SDL_MOUSEMOTION),
		260	const_iv (SDL_MOUSEBUTTONDOWN),
		261	const_iv (SDL_MOUSEBUTTONUP),
		262	const_iv (SDL_JOYAXISMOTION),
		263	const_iv (SDL_JOYBALLMOTION),
		264	const_iv (SDL_JOYHATMOTION),
		265	const_iv (SDL_JOYBUTTONDOWN),
		266	const_iv (SDL_JOYBUTTONUP),
		267	const_iv (SDL_QUIT),
		268	const_iv (SDL_SYSWMEVENT),
		269	const_iv (SDL_EVENT_RESERVEDA),
		270	const_iv (SDL_EVENT_RESERVEDB),
		271	const_iv (SDL_VIDEORESIZE),
		272	const_iv (SDL_VIDEOEXPOSE),
		273	const_iv (SDL_USEREVENT),
		274	const_iv (SDLK_KP0),
		275	const_iv (SDLK_KP1),
		276	const_iv (SDLK_KP2),
		277	const_iv (SDLK_KP3),
		278	const_iv (SDLK_KP4),
		279	const_iv (SDLK_KP5),
		280	const_iv (SDLK_KP6),
		281	const_iv (SDLK_KP7),
		282	const_iv (SDLK_KP8),
		283	const_iv (SDLK_KP9),
		284	const_iv (SDLK_KP_PERIOD),
		285	const_iv (SDLK_KP_DIVIDE),
		286	const_iv (SDLK_KP_MULTIPLY),
		287	const_iv (SDLK_KP_MINUS),
		288	const_iv (SDLK_KP_PLUS),
		289	const_iv (SDLK_KP_ENTER),
		290	const_iv (SDLK_KP_EQUALS),
		291	const_iv (SDLK_UP),
		292	const_iv (SDLK_DOWN),
		293	const_iv (SDLK_RIGHT),
		294	const_iv (SDLK_LEFT),
		295	const_iv (SDLK_INSERT),
		296	const_iv (SDLK_HOME),
		297	const_iv (SDLK_END),
		298	const_iv (SDLK_PAGEUP),
		299	const_iv (SDLK_PAGEDOWN),
		300	const_iv (SDLK_F1),
		301	const_iv (SDLK_F2),
		302	const_iv (SDLK_F3),
		303	const_iv (SDLK_F4),
		304	const_iv (SDLK_F5),
		305	const_iv (SDLK_F6),
		306	const_iv (SDLK_F7),
		307	const_iv (SDLK_F8),
		308	const_iv (SDLK_F9),
		309	const_iv (SDLK_F10),
		310	const_iv (SDLK_F11),
		311	const_iv (SDLK_F12),
		312	const_iv (SDLK_F13),
		313	const_iv (SDLK_F14),
		314	const_iv (SDLK_F15),
		315	const_iv (SDLK_NUMLOCK),
		316	const_iv (SDLK_CAPSLOCK),
		317	const_iv (SDLK_SCROLLOCK),
		318	const_iv (SDLK_RSHIFT),
		319	const_iv (SDLK_LSHIFT),
		320	const_iv (SDLK_RCTRL),
		321	const_iv (SDLK_LCTRL),
		322	const_iv (SDLK_RALT),
		323	const_iv (SDLK_LALT),
		324	const_iv (SDLK_RMETA),
		325	const_iv (SDLK_LMETA),
		326	const_iv (SDLK_LSUPER),
		327	const_iv (SDLK_RSUPER),
		328	const_iv (SDLK_MODE),
		329	const_iv (SDLK_COMPOSE),
		330	const_iv (SDLK_HELP),
		331	const_iv (SDLK_PRINT),
		332	const_iv (SDLK_SYSREQ),
		333	const_iv (SDLK_BREAK),
		334	const_iv (SDLK_MENU),
		335	const_iv (SDLK_POWER),
		336	const_iv (SDLK_EURO),
		337	const_iv (SDLK_UNDO),
		338	const_iv (KMOD_NONE),
		339	const_iv (KMOD_LSHIFT),
		340	const_iv (KMOD_RSHIFT),
		341	const_iv (KMOD_LCTRL),
		342	const_iv (KMOD_RCTRL),
		343	const_iv (KMOD_LALT),
		344	const_iv (KMOD_RALT),
		345	const_iv (KMOD_LMETA),
		346	const_iv (KMOD_RMETA),
		347	const_iv (KMOD_NUM),
		348	const_iv (KMOD_CAPS),
		349	const_iv (KMOD_MODE),
		350	const_iv (KMOD_CTRL),
		351	const_iv (KMOD_SHIFT),
		352	const_iv (KMOD_ALT),
		353	const_iv (KMOD_META)
		354	# undef const_iv
		355	};
		356
		357	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		359
227	fontmap = pango_ft2_font_map_new ();	360	fontmap = pango_ft2_font_map_new ();
228	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
229	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
230	}	363	}
		364
		365	int
		366	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
		367
		368	void
		369	SDL_Quit ()
		370
		371	void
		372	SDL_ListModes ()
		373	PPCODE:
		374	{
		375	SDL_Rect **m;
		376
		377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
		378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
		379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
		380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
		381
		382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
		383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
		384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
		385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
		386
		387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		390
		391	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
		392
		393	if (m && m != (SDL_Rect **)-1)
		394	while (*m)
		395	{
		396	AV *av = newAV ();
		397	av_push (av, newSViv ((*m)->w));
		398	av_push (av, newSViv ((*m)->h));
		399	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		400
		401	++m;
		402	}
		403	}
		404
		405	int
		406	SDL_SetVideoMode (int w, int h, int fullscreen)
		407	CODE:
		408	RETVAL = !!SDL_SetVideoMode (
		409	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
		410	);
		411	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		412	OUTPUT:
		413	RETVAL
		414
		415	int
		416	Mix_VolumeMusic (int newvol = -1)
		417
		418	int
		419	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		420
		421	void
		422	Mix_CloseAudio ()
		423
		424	int
		425	Mix_AllocateChannels (int numchans = -1)
231		426
232	void	427	void
233	lowdelay (int fd, int val = 1)	428	lowdelay (int fd, int val = 1)
234	CODE:	429	CODE:
		430	#ifndef _WIN32
235	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	431	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
		432	#endif
236		433
237	char *	434	char *
238	gl_version ()	435	gl_version ()
239	CODE:	436	CODE:
240	RETVAL = (char *)glGetString (GL_VERSION);	437	RETVAL = (char *)glGetString (GL_VERSION);
…		…
286	croak ("load_image: %s", SDL_GetError ());	483	croak ("load_image: %s", SDL_GetError ());
287		484
288	fmt.palette = NULL;	485	fmt.palette = NULL;
289	fmt.BitsPerPixel = 32;	486	fmt.BitsPerPixel = 32;
290	fmt.BytesPerPixel = 4;	487	fmt.BytesPerPixel = 4;
		488	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
291	fmt.Rmask = 0x000000ff;	489	fmt.Rmask = 0x000000ff;
292	fmt.Gmask = 0x0000ff00;	490	fmt.Gmask = 0x0000ff00;
293	fmt.Bmask = 0x00ff0000;	491	fmt.Bmask = 0x00ff0000;
294	fmt.Amask = 0xff000000;	492	fmt.Amask = 0xff000000;
		493	#else
		494	fmt.Rmask = 0xff000000;
		495	fmt.Gmask = 0x00ff0000;
		496	fmt.Bmask = 0x0000ff00;
		497	fmt.Amask = 0x000000ff;
		498	#endif
295	fmt.Rloss = 0;	499	fmt.Rloss = 0;
296	fmt.Gloss = 0;	500	fmt.Gloss = 0;
297	fmt.Bloss = 0;	501	fmt.Bloss = 0;
298	fmt.Aloss = 0;	502	fmt.Aloss = 0;
299	fmt.Rshift = 0;	503	fmt.Rshift = 0;
…		…
313	SDL_LockSurface (surface2);	517	SDL_LockSurface (surface2);
314	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	518	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
315	SDL_UnlockSurface (surface2);	519	SDL_UnlockSurface (surface2);
316	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	520	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
317	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	521	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
318	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV)));	522	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
319		523
320	SDL_FreeSurface (surface);	524	SDL_FreeSurface (surface);
321	SDL_FreeSurface (surface2);	525	SDL_FreeSurface (surface2);
322	}	526	}
323		527
…		…
347	}	551	}
348		552
349	void	553	void
350	fatal (char *message)	554	fatal (char *message)
351	CODE:	555	CODE:
352	#ifdef WIN32	556	#ifdef _WIN32
353	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	557	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
354	#else	558	#else
355	fprintf (stderr, "FATAL: %s\n", message);	559	fprintf (stderr, "FATAL: %s\n", message);
356	#endif	560	#endif
357	exit (1);	561	exit (1);
…		…
391	STRLEN textlen;	595	STRLEN textlen;
392	char *text = SvPVutf8 (text_, textlen);	596	char *text = SvPVutf8 (text_, textlen);
393		597
394	pango_layout_set_markup (self->pl, text, textlen);	598	pango_layout_set_markup (self->pl, text, textlen);
395	}	599	}
		600
		601	SV *
		602	get_text (CFClient::Layout self)
		603	CODE:
		604	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
		605	SvUTF8_on (RETVAL);
		606	OUTPUT:
		607	RETVAL
396		608
397	void	609	void
398	set_height (CFClient::Layout self, int base_height)	610	set_height (CFClient::Layout self, int base_height)
399	CODE:	611	CODE:
400	self->base_height = base_height;	612	self->base_height = base_height;
…		…
566	{	778	{
567	Append (maptex, self->tex, self->texs, self->texs);	779	Append (maptex, self->tex, self->texs, self->texs);
568	self->texs *= 2;	780	self->texs *= 2;
569	}	781	}
570		782
		783	{
571	maptex *tex = self->tex + texid;	784	maptex *tex = self->tex + texid;
572		785
573	tex->name = name;	786	tex->name = name;
574	tex->w = w;	787	tex->w = w;
575	tex->h = h;	788	tex->h = h;
576	tex->s = s;	789	tex->s = s;
577	tex->t = t;	790	tex->t = t;
578	tex->r = r;	791	tex->r = r;
579	tex->g = g;	792	tex->g = g;
580	tex->b = b;	793	tex->b = b;
581	tex->a = a;	794	tex->a = a;
		795	}
582	}	796	}
583		797
584	int	798	int
585	ox (CFClient::Map self)	799	ox (CFClient::Map self)
586	ALIAS:	800	ALIAS:
…		…
596		810
597	void	811	void
598	scroll (CFClient::Map self, int dx, int dy)	812	scroll (CFClient::Map self, int dx, int dy)
599	CODE:	813	CODE:
600	{	814	{
601	self->dx += dx; self->ox += dx;
602	self->dy += dy; self->oy += dy;
603	}
604
605	void
606	map1a_update (CFClient::Map self, SV *data_)
607	CODE:
608	{
609	if (self->dx > 0)	815	if (dx > 0)
610	map_blank (self, self->x, self->y, self->dx - 1, self->h);	816	map_blank (self, self->x, self->y, dx - 1, self->h);
611	else if (self->dx < 0)	817	else if (dx < 0)
612	map_blank (self, self->x + self->w + self->dx + 1, self->y, 1 - self->dx, self->h);	818	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);
613		819
614	if (self->dy > 0)	820	if (dy > 0)
615	map_blank (self, self->x, self->y, self->w, self->dy - 1);	821	map_blank (self, self->x, self->y, self->w, dy - 1);
616	else if (self->dy < 0)	822	else if (dy < 0)
617	map_blank (self, self->x, self->y + self->h + self->dy + 1, self->w, 1 - self->dy);	823	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);
618		824
619	self->x += self->dx; self->dx = 0;	825	self->ox += dx; self->x += dx;
620	self->y += self->dy; self->dy = 0;	826	self->oy += dy; self->y += dy;
621		827
622	while (self->y < 0)	828	while (self->y < 0)
623	{	829	{
624	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	830	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);
625		831
626	self->rows += MAP_EXTEND_Y;	832	self->rows += MAP_EXTEND_Y;
627	self->y += MAP_EXTEND_Y;	833	self->y += MAP_EXTEND_Y;
628	}	834	}
		835	}
629		836
		837	void
		838	map1a_update (CFClient::Map self, SV *data_)
		839	CODE:
		840	{
630	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	841	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
631	uint8_t data_end = (uint8_t )SvEND (data_);	842	uint8_t data_end = (uint8_t )SvEND (data_);
		843	mapcell *cell;
		844	int x, y, flags;
632		845
633	while (data < data_end)	846	while (data < data_end)
634	{	847	{
635	int flags = (data [0] << 8) + data [1]; data += 2;	848	flags = (data [0] << 8) + data [1]; data += 2;
636		849
637	int x = ((flags >> 10) & 63) + self->x;	850	x = ((flags >> 10) & 63) + self->x;
638	int y = ((flags >> 4) & 63) + self->y;	851	y = ((flags >> 4) & 63) + self->y;
639		852
640	mapcell *cell = map_get_cell (self, x, y);	853	cell = map_get_cell (self, x, y);
641		854
642	if (flags & 15)	855	if (flags & 15)
643	{	856	{
644	if (cell->darkness < 0) // && x < self->w && y < self->h)	857	if (cell->darkness < 0)
645	{	858	{
646	cell->darkness = 0;	859	cell->darkness = 0;
647	cell->face [0] = 0;	860	cell->face [0] = 0;
648	cell->face [1] = 0;	861	cell->face [1] = 0;
649	cell->face [2] = 0;	862	cell->face [2] = 0;
650	}	863	}
651		864
652	cell->darkness = flags & 8 ? *data++ : 255;	865	cell->darkness = flags & 8 ? *data++ : 255;
653		866
654	//TODO: don't trust server data to be in-range(!)	867	//TODO: don't trust server data to be in-range(!)
655		868
656	if (flags & 4)	869	if (flags & 4)
…		…
735		948
736	void	949	void
737	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	950	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
738	PPCODE:	951	PPCODE:
739	{	952	{
		953	int vx, vy;
		954	int x, y, z;
		955	int last_name;
		956	mapface face;
740	int sw4 = (sw + 3) & ~3;	957	int sw4 = (sw + 3) & ~3;
741	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	958	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
742	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	959	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		960
743	memset (darkness, 255, sw4 * sh);	961	memset (darkness, 255, sw4 * sh);
744	SvPOK_only (darkness_sv);	962	SvPOK_only (darkness_sv);
745	SvCUR_set (darkness_sv, sw4 * sh);	963	SvCUR_set (darkness_sv, sw4 * sh);
746		964
747	int vx = self->x + (self->w - sw) / 2 - shift_x;	965	vx = self->x + (self->w - sw) / 2 - shift_x;
748	int vy = self->y + (self->h - sh) / 2 - shift_y;	966	vy = self->y + (self->h - sh) / 2 - shift_y;
749		967
750	/*	968	/*
751	int vx = self->vx = self->w >= sw	969	int vx = self->vx = self->w >= sw
752	? self->x + (self->w - sw) / 2	970	? self->x + (self->w - sw) / 2
753	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	971	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
762	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	980	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
763	glEnable (GL_BLEND);	981	glEnable (GL_BLEND);
764	glEnable (GL_TEXTURE_2D);	982	glEnable (GL_TEXTURE_2D);
765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	983	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
766		984
767	int x, y, z;
768
769	int last_name = 0;
770
771	glBegin (GL_QUADS);	985	glBegin (GL_QUADS);
		986
		987	last_name = 0;
772		988
773	for (z = 0; z < 3; z++)	989	for (z = 0; z < 3; z++)
774	for (y = 0; y < sh; y++)	990	for (y = 0; y < sh; y++)
775	if (0 <= y + vy && y + vy < self->rows)	991	if (0 <= y + vy && y + vy < self->rows)
776	{	992	{
…		…
783		999
784	darkness[y * sw4 + x] = cell->darkness < 0	1000	darkness[y * sw4 + x] = cell->darkness < 0
785	? 255 - FOW_DARKNESS	1001	? 255 - FOW_DARKNESS
786	: 255 - cell->darkness;	1002	: 255 - cell->darkness;
787		1003
788	mapface face = cell->face [z];	1004	face = cell->face [z];
789		1005
790	if (face)	1006	if (face)
791	{	1007	{
792	maptex tex = self->tex [face];	1008	maptex tex = self->tex [face];
793		1009
…		…
853	for (x = x0; x < x1; x++)	1069	for (x = x0; x < x1; x++)
854	{	1070	{
855	if (row && row->c0 <= x && x < row->c1)	1071	if (row && row->c0 <= x && x < row->c1)
856	{	1072	{
857	mapcell *cell = row->col + (x - row->c0);	1073	mapcell *cell = row->col + (x - row->c0);
858
859	uint8_t flags = 0;	1074	uint8_t flags = 0;
860		1075
861	if (cell->face [0]) flags \|= 1;	1076	if (cell->face [0]) flags \|= 1;
862	if (cell->face [1]) flags \|= 2;	1077	if (cell->face [1]) flags \|= 2;
863	if (cell->face [2]) flags \|= 4;	1078	if (cell->face [2]) flags \|= 4;
…		…
897	void	1112	void
898	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1113	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
899	PPCODE:	1114	PPCODE:
900	{	1115	{
901	int x, y, z;	1116	int x, y, z;
		1117	int w, h;
902	int x1, y1;	1118	int x1, y1;
903		1119
904	if (*data++ != 0)	1120	if (*data++ != 0)
905	return; /* version mismatch */	1121	return; /* version mismatch */
906		1122
907	int w = data++ << 8; w \|= data++;	1123	w = data++ << 8; w \|= data++;
908	int h = data++ << 8; h \|= data++;	1124	h = data++ << 8; h \|= data++;
909		1125
910	// we need to do this 'cause we don't keep an absolute coord system for rows	1126	// we need to do this 'cause we don't keep an absolute coord system for rows
911	// TODO: treat rows as we treat	1127	// TODO: treat rows as we treat
912	map_get_row (self, y0 + self->y - self->oy);//D	1128	map_get_row (self, y0 + self->y - self->oy);//D
913	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1129	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
…		…
951	}	1167	}
952	}	1168	}
953	}	1169	}
954	}	1170	}
955		1171
		1172	MODULE = CFClient PACKAGE = CFClient::MixChunk
		1173
		1174	CFClient::MixChunk
		1175	new_from_file (SV class, char path)
		1176	CODE:
		1177	RETVAL = Mix_LoadWAV (path);
		1178	OUTPUT:
		1179	RETVAL
		1180
		1181	void
		1182	DESTROY (CFClient::MixChunk self)
		1183	CODE:
		1184	Mix_FreeChunk (self);
		1185
		1186	int
		1187	volume (CFClient::MixChunk self, int volume = -1)
		1188	CODE:
		1189	RETVAL = Mix_VolumeChunk (self, volume);
		1190	OUTPUT:
		1191	RETVAL
		1192
		1193	int
		1194	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
		1195	CODE:
		1196	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		1197	OUTPUT:
		1198	RETVAL
		1199
		1200	MODULE = CFClient PACKAGE = CFClient::MixMusic
		1201
		1202	int
		1203	volume (int volume = -1)
		1204	CODE:
		1205	RETVAL = Mix_VolumeMusic (volume);
		1206	OUTPUT:
		1207	RETVAL
		1208
		1209	CFClient::MixMusic
		1210	new_from_file (SV class, char path)
		1211	CODE:
		1212	RETVAL = Mix_LoadMUS (path);
		1213	OUTPUT:
		1214	RETVAL
		1215
		1216	void
		1217	DESTROY (CFClient::MixMusic self)
		1218	CODE:
		1219	Mix_FreeMusic (self);
		1220
		1221	int
		1222	play (CFClient::MixMusic self, int loops = -1)
		1223	CODE:
		1224	RETVAL = Mix_PlayMusic (self, loops);
		1225	OUTPUT:
		1226	RETVAL
		1227

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC vs. Revision 1.52 by root, Wed Apr 19 21:17:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.43 by root, Mon Apr 17 06:50:26 2006 UTC vs.
Revision 1.52 by root, Wed Apr 19 21:17:15 2006 UTC