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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 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	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
14		14
15	#ifdef _WIN32	15	#ifdef _WIN32
16	# undef pipe	16	# undef pipe
17	#endif	17	#endif
18		18
		19	#include <assert.h>
19	#include <math.h>	20	#include <math.h>
20	#include <string.h>	21	#include <string.h>
21	#include <stdio.h>	22	#include <stdio.h>
22	#include <stdlib.h>	23	#include <stdlib.h>
23		24
…		…
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	56	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	57	#else
57	# define PARACHUTE 0	58	# define PARACHUTE 0
58	#endif	59	#endif
59		60
		61	static AV *texture_av;
		62
60	static struct	63	static struct
61	{	64	{
62	#define GL_FUNC(ptr,name) ptr name;	65	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	66	#include "glfunc.h"
64	#undef GL_FUNC	67	#undef GL_FUNC
65	} gl;	68	} gl;
66		69
		70	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	71	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	72	{
69	if (gl.BlendFuncSeparate)	73	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	74	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	75	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	76	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	77	else
74	glBlendFunc (sa, da);	78	glBlendFunc (sa, da);
75	}	79	}
76		80
		81	static GLuint
		82	gen_texture ()
		83	{
		84	GLuint name;
		85
		86	if (AvFILL (texture_av) >= 0)
		87	name = (GLuint)(size_t)av_pop (texture_av);
		88	else
		89	glGenTextures (1, &name);
		90
		91	return name;
		92	}
		93
		94	static void
		95	del_texture (GLuint name)
		96	{
		97	/* make a half-assed attempt at returning the memory used by the texture */
		98	/* textures are frequently being reused by cfplus anyway */
		99	/glBindTexture (GL_TEXTURE_2D, name);/
		100	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		101	av_push (texture_av, (SV *)(size_t)name);
		102	glDeleteTextures (1, &name);
		103	}
		104
77	#include "texcache.c"	105	#include "texcache.c"
78		106
79	#include "pango-font.c"	107	#include "pango-font.c"
80	#include "pango-fontmap.c"	108	#include "pango-fontmap.c"
81	#include "pango-render.c"	109	#include "pango-render.c"
…		…
154		182
155	*w = rect.width;	183	*w = rect.width;
156	*h = rect.height;	184	*h = rect.height;
157	}	185	}
158		186
		187	typedef uint16_t tileid;
159	typedef uint16_t mapface;	188	typedef uint16_t faceid;
160		189
161	typedef struct {	190	typedef struct {
162	GLint name;	191	int name;
163	int w, h;	192	int w, h;
164	float s, t;	193	float s, t;
165	uint8_t r, g, b, a;	194	uint8_t r, g, b, a;
		195	tileid smoothtile;
		196	uint8_t smoothlevel;
166	} maptex;	197	} maptex;
167		198
168	typedef struct {	199	typedef struct {
169	uint32_t player;	200	uint32_t player;
170	mapface face[3];	201	tileid tile[3];
171	uint16_t darkness;	202	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	203	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	204	} mapcell;
174		205
175	typedef struct {	206	typedef struct {
176	int32_t c0, c1;	207	int32_t c0, c1;
177	mapcell *col;	208	mapcell *col;
178	} maprow;	209	} maprow;
179		210
180	typedef struct map {	211	typedef struct map {
181	int x, y, w, h;	212	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	213	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	214	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	215	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		216
189	int32_t rows;	217	int32_t rows;
190	maprow *row;	218	maprow *row;
191	} *CFPlus__Map;	219	} *CFPlus__Map;
192		220
…		…
212	return ptr;	240	return ptr;
213	}	241	}
214		242
215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	243	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	244	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		245
		246	static void
		247	need_facenum (struct map *self, faceid face)
		248	{
		249	while (self->faces <= face)
		250	{
		251	Append (tileid, self->face2tile, self->faces, self->faces);
		252	self->faces *= 2;
		253	}
		254	}
		255
		256	static void
		257	need_texid (struct map *self, int texid)
		258	{
		259	while (self->texs <= texid)
		260	{
		261	Append (maptex, self->tex, self->texs, self->texs);
		262	self->texs *= 2;
		263	}
		264	}
217		265
218	static maprow *	266	static maprow *
219	map_get_row (CFPlus__Map self, int y)	267	map_get_row (CFPlus__Map self, int y)
220	{	268	{
221	if (0 > y)	269	if (0 > y)
…		…
316	cell->player = 0;	364	cell->player = 0;
317	}	365	}
318	}	366	}
319	}	367	}
320		368
		369	typedef struct {
		370	tileid tile;
		371	uint8_t x, y, level;
		372	} smooth_key;
		373
		374	static void
		375	smooth_or_bits (HV hv, smooth_key key, IV bits)
		376	{
		377	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		378
		379	if (SvIOK (*sv))
		380	SvIV_set (sv, SvIVX (sv) \| bits);
		381	else
		382	sv_setiv (*sv, bits);
		383	}
		384
321	static void	385	static void
322	music_finished (void)	386	music_finished (void)
323	{	387	{
324	SDL_UserEvent ev;	388	SDL_UserEvent ev;
325		389
…		…
358	n \|= n >> 8;	422	n \|= n >> 8;
359	n \|= n >> 16;	423	n \|= n >> 16;
360		424
361	return n + 1;	425	return n + 1;
362	}	426	}
		427
		428	/* SDL should provide this, really. */
		429	#define SDLK_MODIFIER_MIN 300
		430	#define SDLK_MODIFIER_MAX 314
363		431
364	MODULE = CFPlus PACKAGE = CFPlus	432	MODULE = CFPlus PACKAGE = CFPlus
365		433
366	PROTOTYPES: ENABLE	434	PROTOTYPES: ENABLE
367		435
…		…
371	static const struct {	439	static const struct {
372	const char *name;	440	const char *name;
373	IV iv;	441	IV iv;
374	} *civ, const_iv[] = {	442	} *civ, const_iv[] = {
375	# define const_iv(name) { # name, (IV)name }	443	# define const_iv(name) { # name, (IV)name }
		444	const_iv (SDLK_MODIFIER_MIN),
		445	const_iv (SDLK_MODIFIER_MAX),
		446
376	const_iv (SDL_ACTIVEEVENT),	447	const_iv (SDL_ACTIVEEVENT),
377	const_iv (SDL_KEYDOWN),	448	const_iv (SDL_KEYDOWN),
378	const_iv (SDL_KEYUP),	449	const_iv (SDL_KEYUP),
379	const_iv (SDL_MOUSEMOTION),	450	const_iv (SDL_MOUSEMOTION),
380	const_iv (SDL_MOUSEBUTTONDOWN),	451	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
389	const_iv (SDL_EVENT_RESERVEDA),	460	const_iv (SDL_EVENT_RESERVEDA),
390	const_iv (SDL_EVENT_RESERVEDB),	461	const_iv (SDL_EVENT_RESERVEDB),
391	const_iv (SDL_VIDEORESIZE),	462	const_iv (SDL_VIDEORESIZE),
392	const_iv (SDL_VIDEOEXPOSE),	463	const_iv (SDL_VIDEOEXPOSE),
393	const_iv (SDL_USEREVENT),	464	const_iv (SDL_USEREVENT),
		465
		466	const_iv (SDL_APPINPUTFOCUS),
		467	const_iv (SDL_APPMOUSEFOCUS),
		468	const_iv (SDL_APPACTIVE),
		469
394	const_iv (SDLK_KP0),	470	const_iv (SDLK_KP0),
395	const_iv (SDLK_KP1),	471	const_iv (SDLK_KP1),
396	const_iv (SDLK_KP2),	472	const_iv (SDLK_KP2),
397	const_iv (SDLK_KP3),	473	const_iv (SDLK_KP3),
398	const_iv (SDLK_KP4),	474	const_iv (SDLK_KP4),
…		…
453	const_iv (SDLK_BREAK),	529	const_iv (SDLK_BREAK),
454	const_iv (SDLK_MENU),	530	const_iv (SDLK_MENU),
455	const_iv (SDLK_POWER),	531	const_iv (SDLK_POWER),
456	const_iv (SDLK_EURO),	532	const_iv (SDLK_EURO),
457	const_iv (SDLK_UNDO),	533	const_iv (SDLK_UNDO),
		534
458	const_iv (KMOD_NONE),	535	const_iv (KMOD_NONE),
		536	const_iv (KMOD_SHIFT),
459	const_iv (KMOD_LSHIFT),	537	const_iv (KMOD_LSHIFT),
460	const_iv (KMOD_RSHIFT),	538	const_iv (KMOD_RSHIFT),
		539	const_iv (KMOD_CTRL),
461	const_iv (KMOD_LCTRL),	540	const_iv (KMOD_LCTRL),
462	const_iv (KMOD_RCTRL),	541	const_iv (KMOD_RCTRL),
		542	const_iv (KMOD_ALT),
463	const_iv (KMOD_LALT),	543	const_iv (KMOD_LALT),
464	const_iv (KMOD_RALT),	544	const_iv (KMOD_RALT),
		545	const_iv (KMOD_META),
465	const_iv (KMOD_LMETA),	546	const_iv (KMOD_LMETA),
466	const_iv (KMOD_RMETA),	547	const_iv (KMOD_RMETA),
467	const_iv (KMOD_NUM),	548	const_iv (KMOD_NUM),
468	const_iv (KMOD_CAPS),	549	const_iv (KMOD_CAPS),
469	const_iv (KMOD_MODE),	550	const_iv (KMOD_MODE),
470	const_iv (KMOD_CTRL),
471	const_iv (KMOD_SHIFT),
472	const_iv (KMOD_ALT),
473	const_iv (KMOD_META)
474	# undef const_iv	551	# undef const_iv
475	};	552	};
476		553
477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	554	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	555	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		556
		557	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		558	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479	}	559	}
		560
		561	void
		562	weaken (SV *rv)
		563	PROTOTYPE: $
		564	CODE:
		565	sv_rvweaken (rv);
480		566
481	int	567	int
482	in_destruct ()	568	in_destruct ()
483	CODE:	569	CODE:
484	RETVAL = PL_main_cv == Nullcv;	570	RETVAL = PL_main_cv == Nullcv;
…		…
555	RETVAL = !!SDL_SetVideoMode (	641	RETVAL = !!SDL_SetVideoMode (
556	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	642	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
557	);	643	);
558	if (RETVAL)	644	if (RETVAL)
559	{	645	{
		646	av_clear (texture_av);
		647
560	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	648	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	649	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562	# include "glfunc.h"	650	# include "glfunc.h"
563	# undef GL_FUNC	651	# undef GL_FUNC
		652
564	}	653	}
565	OUTPUT:	654	OUTPUT:
566	RETVAL	655	RETVAL
567		656
568	void	657	void
…		…
587	case SDL_KEYDOWN:	676	case SDL_KEYDOWN:
588	case SDL_KEYUP:	677	case SDL_KEYUP:
589	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	678	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	679	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	680	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		681	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	682	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593	break;	683	break;
594		684
595	case SDL_ACTIVEEVENT:	685	case SDL_ACTIVEEVENT:
596	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	686	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
641	Mix_AllocateChannels (int numchans = -1)	731	Mix_AllocateChannels (int numchans = -1)
642		732
643	void	733	void
644	lowdelay (int fd, int val = 1)	734	lowdelay (int fd, int val = 1)
645	CODE:	735	CODE:
646	#ifndef _WIN32
647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	736	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648	#endif
649		737
650	void	738	void
651	win32_proxy_info ()	739	win32_proxy_info ()
652	PPCODE:	740	PPCODE:
653	{	741	{
…		…
1049	xy_to_index (CFPlus::Layout self, int x, int y)	1137	xy_to_index (CFPlus::Layout self, int x, int y)
1050	CODE:	1138	CODE:
1051	{	1139	{
1052	int index, trailing;	1140	int index, trailing;
1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1141	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054	RETVAL = index;	1142	RETVAL = index + trailing;
1055	}	1143	}
1056	OUTPUT:	1144	OUTPUT:
1057	RETVAL	1145	RETVAL
1058		1146
1059	void	1147	void
…		…
1065		1153
1066	EXTEND (SP, 3);	1154	EXTEND (SP, 3);
1067	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1155	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1156	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1157	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1158	}
		1159
		1160	void
		1161	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1162	PPCODE:
		1163	{
		1164	int line, x;
		1165
		1166	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1167	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1168
		1169	EXTEND (SP, 2);
		1170	PUSHs (sv_2mortal (newSViv (line - 1)));
		1171	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1172	}
		1173
		1174	void
		1175	line_x_to_index (CFPlus::Layout self, int line, int x)
		1176	PPCODE:
		1177	{
		1178	PangoLayoutLine *lp;
		1179	int index, trailing;
		1180
		1181	if (line < 0)
		1182	XSRETURN_EMPTY;
		1183
		1184	if (!(lp = pango_layout_get_line (self->pl, line)))
		1185	XSRETURN_EMPTY; /* do better */
		1186
		1187	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1188
		1189	EXTEND (SP, 2);
		1190	if (GIMME_V == G_SCALAR)
		1191	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1192	else
		1193	{
		1194	PUSHs (sv_2mortal (newSViv (index)));
		1195	PUSHs (sv_2mortal (newSViv (trailing)));
		1196	}
1070	}	1197	}
1071		1198
1072	void	1199	void
1073	render (CFPlus::Layout self, float x, float y, int flags = 0)	1200	render (CFPlus::Layout self, float x, float y, int flags = 0)
1074	PPCODE:	1201	PPCODE:
…		…
1168	}	1295	}
1169		1296
1170	MODULE = CFPlus PACKAGE = CFPlus::Map	1297	MODULE = CFPlus PACKAGE = CFPlus::Map
1171		1298
1172	CFPlus::Map	1299	CFPlus::Map
1173	new (SV *class, int map_width, int map_height)	1300	new (SV *class)
1174	CODE:	1301	CODE:
1175	New (0, RETVAL, 1, struct map);	1302	New (0, RETVAL, 1, struct map);
1176	RETVAL->x = 0;	1303	RETVAL->x = 0;
1177	RETVAL->y = 0;	1304	RETVAL->y = 0;
1178	RETVAL->w = map_width;	1305	RETVAL->w = 0;
1179	RETVAL->h = map_height;	1306	RETVAL->h = 0;
1180	RETVAL->ox = 0;	1307	RETVAL->ox = 0;
1181	RETVAL->oy = 0;	1308	RETVAL->oy = 0;
1182	RETVAL->faces = 8192;	1309	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1310	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1184	RETVAL->texs = 8192;
1185	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1186	RETVAL->rows = 0;	1311	RETVAL->rows = 0;
1187	RETVAL->row = 0;	1312	RETVAL->row = 0;
1188	OUTPUT:	1313	OUTPUT:
1189	RETVAL	1314	RETVAL
1190		1315
1191	void	1316	void
1192	DESTROY (CFPlus::Map self)	1317	DESTROY (CFPlus::Map self)
1193	CODE:	1318	CODE:
1194	{	1319	{
1195	map_clear (self);	1320	map_clear (self);
1196	Safefree (self->face);	1321	Safefree (self->face2tile);
1197	Safefree (self->tex);	1322	Safefree (self->tex);
1198	Safefree (self);	1323	Safefree (self);
1199	}	1324	}
1200		1325
1201	void	1326	void
		1327	resize (CFPlus::Map self, int map_width, int map_height)
		1328	CODE:
		1329	self->w = map_width;
		1330	self->h = map_height;
		1331
		1332	void
1202	clear (CFPlus::Map self)	1333	clear (CFPlus::Map self)
1203	CODE:	1334	CODE:
1204	map_clear (self);	1335	map_clear (self);
1205		1336
1206	void	1337	void
1207	set_face (CFPlus::Map self, int face, int texid)	1338	set_tileid (CFPlus::Map self, int face, int tile)
1208	CODE:	1339	CODE:
1209	{	1340	{
1210	while (self->faces <= face)	1341	need_facenum (self, face); self->face2tile [face] = tile;
1211	{	1342	need_texid (self, tile);
1212	Append (mapface, self->face, self->faces, self->faces);	1343	}
1213	self->faces *= 2;
1214	}
1215		1344
1216	self->face [face] = texid;	1345	void
		1346	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1347	CODE:
		1348	{
		1349	tileid texid;
		1350	maptex *tex;
		1351
		1352	if (face < 0 \|\| face >= self->faces)
		1353	return;
		1354
		1355	if (smooth < 0 \|\| smooth >= self->faces)
		1356	return;
		1357
		1358	texid = self->face2tile [face];
		1359
		1360	if (!texid)
		1361	return;
		1362
		1363	tex = self->tex + texid;
		1364	tex->smoothtile = self->face2tile [smooth];
		1365	tex->smoothlevel = level;
1217	}	1366	}
1218		1367
1219	void	1368	void
1220	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)	1369	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)
1221	CODE:	1370	CODE:
1222	{	1371	{
1223	while (self->texs <= texid)	1372	need_texid (self, texid);
1224	{
1225	Append (maptex, self->tex, self->texs, self->texs);
1226	self->texs *= 2;
1227	}
1228		1373
1229	{	1374	{
1230	maptex *tex = self->tex + texid;	1375	maptex *tex = self->tex + texid;
1231		1376
1232	tex->name = name;	1377	tex->name = name;
…		…
1276	CODE:	1421	CODE:
1277	{	1422	{
1278	if (dx > 0)	1423	if (dx > 0)
1279	map_blank (self, self->x, self->y, dx, self->h);	1424	map_blank (self, self->x, self->y, dx, self->h);
1280	else if (dx < 0)	1425	else if (dx < 0)
1281	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1426	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1282		1427
1283	if (dy > 0)	1428	if (dy > 0)
1284	map_blank (self, self->x, self->y, self->w, dy);	1429	map_blank (self, self->x, self->y, self->w, dy);
1285	else if (dy < 0)	1430	else if (dy < 0)
1286	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1431	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1287		1432
1288	self->ox += dx; self->x += dx;	1433	self->ox += dx; self->x += dx;
1289	self->oy += dy; self->y += dy;	1434	self->oy += dy; self->y += dy;
1290		1435
1291	while (self->y < 0)	1436	while (self->y < 0)
…		…
1343	cell->stat_width = 1;	1488	cell->stat_width = 1;
1344	cell->stat_hp = *data++;	1489	cell->stat_hp = *data++;
1345	}	1490	}
1346	else if (cmd == 6) // monster width	1491	else if (cmd == 6) // monster width
1347	cell->stat_width = *data++ + 1;	1492	cell->stat_width = *data++ + 1;
1348	else if (cmd == 0x47) // monster width	1493	else if (cmd == 0x47)
1349	{	1494	{
1350	if (*data == 4)	1495	if (*data == 4)
1351	; // decode player tag	1496	; // decode player count
1352		1497
1353	data += *data + 1;	1498	data += *data + 1;
1354	}	1499	}
1355	else if (cmd == 8) // cell flags	1500	else if (cmd == 8) // cell flags
1356	cell->flags = *data++;	1501	cell->flags = *data++;
…		…
1365	cell->darkness = *data++ + 1;	1510	cell->darkness = *data++ + 1;
1366	}	1511	}
1367		1512
1368	if (flags & 4)	1513	if (flags & 4)
1369	{	1514	{
1370	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1515	faceid face = (data [0] << 8) + data [1]; data += 2;
		1516	need_facenum (self, face);
		1517	cell->tile [0] = self->face2tile [face];
1371	}	1518	}
1372		1519
1373	if (flags & 2)	1520	if (flags & 2)
1374	{	1521	{
1375	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1522	faceid face = (data [0] << 8) + data [1]; data += 2;
		1523	need_facenum (self, face);
		1524	cell->tile [1] = self->face2tile [face];
1376	}	1525	}
1377		1526
1378	if (flags & 1)	1527	if (flags & 1)
1379	{	1528	{
1380	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1529	faceid face = (data [0] << 8) + data [1]; data += 2;
		1530	need_facenum (self, face);
		1531	cell->tile [2] = self->face2tile [face];
1381	}	1532	}
1382	}	1533	}
1383	else	1534	else
1384	cell->darkness = 0;	1535	cell->darkness = 0;
1385	}	1536	}
…		…
1415	{	1566	{
1416	mapcell *cell = row->col + (x - row->c0);	1567	mapcell *cell = row->col + (x - row->c0);
1417		1568
1418	for (z = 0; z <= 0; z++)	1569	for (z = 0; z <= 0; z++)
1419	{	1570	{
1420	mapface face = cell->face [z];
1421
1422	if (face)
1423	{
1424	maptex tex = self->tex [face];	1571	maptex tex = self->tex [cell->tile [z]];
1425	int a0 = 255 - tex.a;	1572	int a0 = 255 - tex.a;
1426	int a1 = tex.a;	1573	int a1 = tex.a;
1427		1574
1428	r = (r * a0 + tex.r * a1) / 255;	1575	r = (r * a0 + tex.r * a1) / 255;
1429	g = (g * a0 + tex.g * a1) / 255;	1576	g = (g * a0 + tex.g * a1) / 255;
1430	b = (b * a0 + tex.b * a1) / 255;	1577	b = (b * a0 + tex.b * a1) / 255;
1431	a = (a * a0 + tex.a * a1) / 255;	1578	a = (a * a0 + tex.a * a1) / 255;
1432	}
1433	}	1579	}
1434	}	1580	}
1435		1581
1436	*map++ = (r )	1582	*map++ = (r )
1437	\| (g << 8)	1583	\| (g << 8)
…		…
1444	}	1590	}
1445	OUTPUT:	1591	OUTPUT:
1446	RETVAL	1592	RETVAL
1447		1593
1448	void	1594	void
1449	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1595	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1450	CODE:	1596	CODE:
1451	{	1597	{
1452	int vx, vy;	1598	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1599	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1600	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1601	smooth_key skey;
1453	int x, y, z;	1602	int x, y, z;
1454	int last_name;	1603	int last_name;
1455	mapface face;
1456		1604
1457	vx = self->x + ((self->w - sw) >> 1) - shift_x;	1605	// thats current max. sorry.
1458	vy = self->y + ((self->h - sh) >> 1) - shift_y;	1606	if (sw > 255) sw = 255;
		1607	if (sh > 255) sh = 255;
1459		1608
1460	/*	1609	// clear key, in case of extra padding
1461	int vx = self->vx = self->w >= sw	1610	memset (&skey, 0, sizeof (skey));
1462	? self->x + (self->w - sw) / 2
1463	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1464
1465	int vy = self->vy = self->h >= sh
1466	? self->y + (self->h - sh) / 2
1467	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1468	*/
1469		1611
1470	glColor4ub (255, 255, 255, 255);	1612	glColor4ub (255, 255, 255, 255);
1471		1613
1472	glEnable (GL_BLEND);	1614	glEnable (GL_BLEND);
1473	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1615	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1476		1618
1477	glBegin (GL_QUADS);	1619	glBegin (GL_QUADS);
1478		1620
1479	last_name = 0;	1621	last_name = 0;
1480		1622
		1623	mx += self->x;
		1624	my += self->y;
		1625
		1626	// first pass: determine smooth_max
		1627	// rather ugly, if you ask me
		1628	// could also be stored inside mapcell and updated on change
		1629	memset (smooth_max, 0, sizeof (smooth_max));
		1630
		1631	for (y = 0; y < sh; y++)
		1632	if (0 <= y + my && y + my < self->rows)
		1633	{
		1634	maprow *row = self->row + (y + my);
		1635
		1636	for (x = 0; x < sw; x++)
		1637	if (row->c0 <= x + mx && x + mx < row->c1)
		1638	{
		1639	mapcell *cell = row->col + (x + mx - row->c0);
		1640
		1641	smooth_max[x + 1][y + 1] =
		1642	MAX (self->tex [cell->tile [0]].smoothlevel,
		1643	MAX (self->tex [cell->tile [1]].smoothlevel,
		1644	self->tex [cell->tile [2]].smoothlevel));
		1645	}
		1646	}
		1647
1481	for (z = 0; z < 3; z++)	1648	for (z = 0; z <= 2; z++)
		1649	{
		1650	memset (smooth_level, 0, sizeof (smooth_level));
		1651
1482	for (y = 0; y < sh; y++)	1652	for (y = 0; y < sh; y++)
1483	if (0 <= y + vy && y + vy < self->rows)	1653	if (0 <= y + my && y + my < self->rows)
1484	{	1654	{
1485	maprow *row = self->row + (y + vy);	1655	maprow *row = self->row + (y + my);
1486		1656
1487	for (x = 0; x < sw; x++)	1657	for (x = 0; x < sw; x++)
1488	if (row->c0 <= x + vx && x + vx < row->c1)	1658	if (row->c0 <= x + mx && x + mx < row->c1)
1489	{	1659	{
1490	mapcell *cell = row->col + (x + vx - row->c0);	1660	mapcell *cell = row->col + (x + mx - row->c0);
1491
1492	face = cell->face [z];	1661	tileid tile = cell->tile [z];
		1662
		1663	if (tile)
		1664	{
		1665	maptex tex = self->tex [tile];
		1666	int px = (x + 1) * T - tex.w;
		1667	int py = (y + 1) * T - tex.h;
1493		1668
1494	if (face && face < self->texs)	1669	// suppressing texture state switches here
		1670	// is only moderately effective, but worth the extra effort
		1671	if (last_name != tex.name)
		1672	{
		1673	if (!tex.name)
		1674	tex = self->tex [2]; /* missing, replace by noface */
		1675
		1676	glEnd ();
		1677	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1678	glBegin (GL_QUADS);
		1679	}
		1680
		1681	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1682	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1683	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1684	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1685
		1686	if (cell->flags && z == 2)
		1687	{
		1688	if (cell->flags & 1)
		1689	{
		1690	maptex tex = self->tex [1];
		1691	int px = x * T + T * 2 / 32;
		1692	int py = y * T - T * 6 / 32;
		1693
		1694	glEnd ();
		1695	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1696	glBegin (GL_QUADS);
		1697
		1698	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1699	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1700	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1701	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1702	}
		1703	}
		1704
		1705	// update smooth hash
		1706	if (tex.smoothtile)
		1707	{
		1708	skey.tile = tex.smoothtile;
		1709	skey.level = tex.smoothlevel;
		1710
		1711	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1712
		1713	// add bits to current tile and all neighbours. skey.x\|y is
		1714	// shifted +1\|+1 so we always stay positive.
		1715
		1716	// bits is ___n cccc CCCC bbbb
		1717	// n do not draw borders&corners
		1718	// c draw these corners, but...
		1719	// C ... not these
		1720	// b draw these borders
		1721
		1722	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1723	// ┃· ·· ·┃ ━━
		1724
		1725	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1726	// ·· ·· ·┏ ┓·
		1727
		1728	// full tile
		1729	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1730
		1731	// borders
		1732	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1733	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1734	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1735	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1736
		1737	// corners
		1738	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1739	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1740	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1741	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1742	}
		1743	}
		1744	}
		1745	}
		1746
		1747	// go through all smoothlevels, lowest to highest, then draw.
		1748	// this is basically counting sort
		1749	{
		1750	int w, b;
		1751
		1752	for (w = 0; w < 256 / 32; ++w)
		1753	{
		1754	uint32_t smask = smooth_level [w];
		1755	if (smask)
		1756	for (b = 0; b < 32; ++b)
		1757	if (smask & (((uint32_t)1) << b))
1495	{	1758	{
1496	maptex tex = self->tex [face];	1759	int level = (w << 5) \| b;
1497	int px = (x + 1) * 32 - tex.w;	1760	HE *he;
1498	int py = (y + 1) * 32 - tex.h;
1499		1761
1500	if (last_name != tex.name)	1762	hv_iterinit (smooth);
		1763	while ((he = hv_iternext (smooth)))
1501	{	1764	{
		1765	smooth_key skey = (smooth_key )HeKEY (he);
		1766	IV bits = SvIVX (HeVAL (he));
		1767
		1768	if (!(bits & 0x1000)
		1769	&& skey->level == level
		1770	&& level > smooth_max [skey->x][skey->y])
		1771	{
		1772	maptex tex = self->tex [skey->tile];
		1773	int px = (((int)skey->x) - 1) * T;
		1774	int py = (((int)skey->y) - 1) * T;
		1775	int border = bits & 15;
		1776	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1777	float dx = tex.s * .0625f; // 16 images/row
		1778	float dy = tex.t * .5f ; // 2 images/column
		1779
		1780	// this time naively avoiding texture state changes
		1781	// save gobs of state changes.
		1782	if (last_name != tex.name)
		1783	{
		1784	if (!tex.name)
		1785	continue; // smoothing not yet available
		1786
1502	glEnd ();	1787	glEnd ();
1503	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1788	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1504	glBegin (GL_QUADS);	1789	glBegin (GL_QUADS);
		1790	}
		1791
		1792	if (border)
		1793	{
		1794	float ox = border * dx;
		1795
		1796	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1797	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1798	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1799	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1800	}
		1801
		1802	if (corner)
		1803	{
		1804	float ox = corner * dx;
		1805
		1806	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1807	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1808	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1809	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1810	}
1505	}	1811	}
1506
1507	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1508	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1509	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1510	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1511	}
1512
1513	if (cell->flags && z == 2)
1514	{
1515	if (cell->flags & 1)
1516	{
1517	maptex tex = self->tex [1];
1518	int px = (x + 1) * 32 - tex.w + 2;
1519	int py = (y + 1) * 32 - tex.h - 6;
1520
1521	glEnd ();
1522	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523	glBegin (GL_QUADS);
1524
1525	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529	}	1812	}
1530	}	1813	}
1531	}
1532	}	1814	}
		1815	}
		1816
		1817	hv_clear (smooth);
		1818	}
1533		1819
1534	glEnd ();	1820	glEnd ();
1535		1821
1536	glDisable (GL_TEXTURE_2D);	1822	glDisable (GL_TEXTURE_2D);
1537	glDisable (GL_BLEND);	1823	glDisable (GL_BLEND);
1538		1824
1539	// top layer: overlays such as the health bar	1825	// top layer: overlays such as the health bar
1540	for (y = 0; y < sh; y++)	1826	for (y = 0; y < sh; y++)
1541	if (0 <= y + vy && y + vy < self->rows)	1827	if (0 <= y + my && y + my < self->rows)
1542	{	1828	{
1543	maprow *row = self->row + (y + vy);	1829	maprow *row = self->row + (y + my);
1544		1830
1545	for (x = 0; x < sw; x++)	1831	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + vx && x + vx < row->c1)	1832	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1833	{
1548	mapcell *cell = row->col + (x + vx - row->c0);	1834	mapcell *cell = row->col + (x + mx - row->c0);
1549		1835
1550	int px = x * 32;	1836	int px = x * T;
1551	int py = y * 32;	1837	int py = y * T;
1552		1838
1553	if (cell->stat_hp)	1839	if (cell->stat_hp)
1554	{	1840	{
1555	int width = cell->stat_width * 32;	1841	int width = cell->stat_width * T;
1556	int thick = sh / 28 + 1 + cell->stat_width;	1842	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1557		1843
1558	glColor3ub (0, 0, 0);	1844	glColor3ub (0, 0, 0);
1559	glRectf (px + 1, py - thick - 2,	1845	glRectf (px + 1, py - thick - 2,
1560	px + width - 1, py);	1846	px + width - 1, py);
1561		1847
…		…
1627	glDisable (GL_BLEND);	1913	glDisable (GL_BLEND);
1628	glDisable (GL_TEXTURE_2D);	1914	glDisable (GL_TEXTURE_2D);
1629	}	1915	}
1630		1916
1631	void	1917	void
1632	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1918	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1633	PPCODE:	1919	PPCODE:
1634	{	1920	{
1635	int vx, vy;
1636	int x, y;	1921	int x, y;
1637	int sw4 = (sw + 3) & ~3;	1922	int sw4 = (sw + 3) & ~3;
1638	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1923	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1639	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1924	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1640		1925
1641	memset (darkness, 255, sw4 * sh);	1926	memset (darkness, 255, sw4 * sh);
1642	SvPOK_only (darkness_sv);	1927	SvPOK_only (darkness_sv);
1643	SvCUR_set (darkness_sv, sw4 * sh);	1928	SvCUR_set (darkness_sv, sw4 * sh);
1644		1929
1645	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1930	mx += self->x;
1646	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1931	my += self->y;
1647		1932
1648	for (y = 0; y < sh; y++)	1933	for (y = 0; y < sh; y++)
1649	if (0 <= y + vy && y + vy < self->rows)	1934	if (0 <= y + my && y + my < self->rows)
1650	{	1935	{
1651	maprow *row = self->row + (y + vy);	1936	maprow *row = self->row + (y + my);
1652		1937
1653	for (x = 0; x < sw; x++)	1938	for (x = 0; x < sw; x++)
1654	if (row->c0 <= x + vx && x + vx < row->c1)	1939	if (row->c0 <= x + mx && x + mx < row->c1)
1655	{	1940	{
1656	mapcell *cell = row->col + (x + vx - row->c0);	1941	mapcell *cell = row->col + (x + mx - row->c0);
1657		1942
1658	darkness[y * sw4 + x] = cell->darkness	1943	darkness[y * sw4 + x] = cell->darkness
1659	? 255 - (cell->darkness - 1)	1944	? 255 - (cell->darkness - 1)
1660	: 255 - FOW_DARKNESS;	1945	: 255 - FOW_DARKNESS;
1661	}	1946	}
…		…
1701	if (row && row->c0 <= x && x < row->c1)	1986	if (row && row->c0 <= x && x < row->c1)
1702	{	1987	{
1703	mapcell *cell = row->col + (x - row->c0);	1988	mapcell *cell = row->col + (x - row->c0);
1704	uint8_t flags = 0;	1989	uint8_t flags = 0;
1705		1990
1706	if (cell->face [0]) flags \|= 1;	1991	if (cell->tile [0]) flags \|= 1;
1707	if (cell->face [1]) flags \|= 2;	1992	if (cell->tile [1]) flags \|= 2;
1708	if (cell->face [2]) flags \|= 4;	1993	if (cell->tile [2]) flags \|= 4;
1709		1994
1710	*data++ = flags;	1995	*data++ = flags;
1711		1996
1712	if (flags & 1)	1997	if (flags & 1)
1713	{	1998	{
		1999	tileid tile = cell->tile [0];
1714	*data++ = cell->face [0] >> 8;	2000	*data++ = tile >> 8;
1715	*data++ = cell->face [0];	2001	*data++ = tile;
1716	}	2002	}
1717		2003
1718	if (flags & 2)	2004	if (flags & 2)
1719	{	2005	{
		2006	tileid tile = cell->tile [1];
1720	*data++ = cell->face [1] >> 8;	2007	*data++ = tile >> 8;
1721	*data++ = cell->face [1];	2008	*data++ = tile;
1722	}	2009	}
1723		2010
1724	if (flags & 4)	2011	if (flags & 4)
1725	{	2012	{
		2013	tileid tile = cell->tile [2];
1726	*data++ = cell->face [2] >> 8;	2014	*data++ = tile >> 8;
1727	*data++ = cell->face [2];	2015	*data++ = tile;
1728	}	2016	}
1729	}	2017	}
1730	else	2018	else
1731	*data++ = 0;	2019	*data++ = 0;
1732	}	2020	}
…		…
1772	{	2060	{
1773	uint8_t flags = *data++;	2061	uint8_t flags = *data++;
1774		2062
1775	if (flags)	2063	if (flags)
1776	{	2064	{
1777	mapface face[3] = { 0, 0, 0 };
1778
1779	mapcell *cell = row_get_cell (row, x);	2065	mapcell *cell = row_get_cell (row, x);
		2066	tileid tile[3] = { 0, 0, 0 };
1780		2067
1781	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2068	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1782	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2069	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1783	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2070	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1784		2071
1785	if (cell->darkness == 0)	2072	if (cell->darkness == 0)
1786	{	2073	{
1787	cell->darkness = 0;	2074	cell->darkness = 0;
1788		2075
1789	for (z = 0; z <= 2; z++)	2076	for (z = 0; z <= 2; z++)
1790	{	2077	{
1791	cell->face[z] = face[z];	2078	tileid t = tile [z];
1792		2079
1793	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2080	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2081	{
1794	XPUSHs (sv_2mortal (newSViv (face[z])));	2082	XPUSHs (sv_2mortal (newSViv (t)));
		2083	need_texid (self, t);
		2084	}
		2085
		2086	cell->tile [z] = t;
1795	}	2087	}
1796	}	2088	}
1797	}	2089	}
1798	}	2090	}
1799	}	2091	}
…		…
1948	# undef const_iv	2240	# undef const_iv
1949	};	2241	};
1950		2242
1951	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2243	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1952	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2244	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2245
		2246	texture_av = newAV ();
		2247	AvREAL_off (texture_av);
1953	}	2248	}
1954		2249
1955	char *	2250	char *
1956	gl_vendor ()	2251	gl_vendor ()
1957	CODE:	2252	CODE:
…		…
2106		2401
2107	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2402	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2108		2403
2109	int glGenTexture ()	2404	int glGenTexture ()
2110	CODE:	2405	CODE:
2111	{	2406	RETVAL = gen_texture ();
2112	GLuint name;
2113	glGenTextures (1, &name);
2114	RETVAL = name;
2115	}
2116	OUTPUT:	2407	OUTPUT:
2117	RETVAL	2408	RETVAL
2118		2409
2119	void glDeleteTexture (int name)	2410	void glDeleteTexture (int name)
2120	CODE:	2411	CODE:
2121	{
2122	GLuint name_ = name;
2123	glDeleteTextures (1, &name_);	2412	del_texture (name);
2124	}	2413
2125
2126	int glGenList ()	2414	int glGenList ()
2127	CODE:	2415	CODE:
2128	RETVAL = glGenLists (1);	2416	RETVAL = glGenLists (1);
2129	OUTPUT:	2417	OUTPUT:
2130	RETVAL	2418	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC vs. Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC