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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC vs.
Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
6	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
7	#endif	9	#endif
8		10
9	#include "EXTERN.h"	11	#include "EXTERN.h"
10	#include "perl.h"	12	#include "perl.h"
11	#include "XSUB.h"	13	#include "XSUB.h"
12		14
13	#ifdef _WIN32	15	#ifdef _WIN32
14	# undef pipe	16	# undef pipe
15	#endif	17	#endif
16		18
		19	#include <assert.h>
17	#include <math.h>	20	#include <math.h>
18	#include <string.h>	21	#include <string.h>
19	#include <stdio.h>	22	#include <stdio.h>
20	#include <stdlib.h>	23	#include <stdlib.h>
21		24
36	# include <sys/types.h>	39	# include <sys/types.h>
37	# include <sys/socket.h>	40	# include <sys/socket.h>
38	# include <netinet/in.h>	41	# include <netinet/in.h>
39	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
40	# include <inttypes.h>	43	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	44	#endif
49		45
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		47
52	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
53		49
54	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
…		…
159		155
160	*w = rect.width;	156	*w = rect.width;
161	*h = rect.height;	157	*h = rect.height;
162	}	158	}
163		159
		160	typedef uint16_t tileid;
164	typedef uint16_t mapface;	161	typedef uint16_t faceid;
165		162
166	typedef struct {	163	typedef struct {
167	GLint name;	164	int name;
168	int w, h;	165	int w, h;
169	float s, t;	166	float s, t;
170	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
		168	tileid smoothtile;
		169	uint8_t smoothlevel;
171	} maptex;	170	} maptex;
172		171
173	typedef struct {	172	typedef struct {
		173	uint32_t player;
		174	tileid tile[3];
174	uint16_t darkness;	175	uint16_t darkness;
175	mapface face[3];
176	uint8_t stat_width, stat_hp;	176	uint8_t stat_width, stat_hp, flags, smoothmax;
177	} mapcell;	177	} mapcell;
178		178
179	typedef struct {	179	typedef struct {
180	int32_t c0, c1;	180	int32_t c0, c1;
181	mapcell *col;	181	mapcell *col;
182	} maprow;	182	} maprow;
183		183
184	typedef struct map {	184	typedef struct map {
185	int x, y, w, h;	185	int x, y, w, h;
186	int ox, oy; /* offset to virtual global coordinate system */	186	int ox, oy; /* offset to virtual global coordinate system */
187	int faces;	187	int faces; tileid *face2tile; // [faceid]
188	mapface *face;	188	int texs; maptex *tex; // [tileid]
189
190	int texs;
191	maptex *tex;
192		189
193	int32_t rows;	190	int32_t rows;
194	maprow *row;	191	maprow *row;
195	} *CFPlus__Map;	192	} *CFPlus__Map;
196		193
…		…
216	return ptr;	213	return ptr;
217	}	214	}
218		215
219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	217	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		218
		219	static void
		220	need_facenum (struct map *self, faceid face)
		221	{
		222	while (self->faces <= face)
		223	{
		224	Append (tileid, self->face2tile, self->faces, self->faces);
		225	self->faces *= 2;
		226	}
		227	}
		228
		229	static void
		230	need_texid (struct map *self, int texid)
		231	{
		232	while (self->texs <= texid)
		233	{
		234	Append (maptex, self->tex, self->texs, self->texs);
		235	self->texs *= 2;
		236	}
		237	}
221		238
222	static maprow *	239	static maprow *
223	map_get_row (CFPlus__Map self, int y)	240	map_get_row (CFPlus__Map self, int y)
224	{	241	{
225	if (0 > y)	242	if (0 > y)
…		…
314		331
315	cell = row->col + x - row->c0;	332	cell = row->col + x - row->c0;
316		333
317	cell->darkness = 0;	334	cell->darkness = 0;
318	cell->stat_hp = 0;	335	cell->stat_hp = 0;
		336	cell->flags = 0;
		337	cell->player = 0;
319	}	338	}
320	}	339	}
		340	}
		341
		342	typedef struct {
		343	tileid tile;
		344	uint8_t x, y, level;
		345	} smooth_key;
		346
		347	static void
		348	smooth_or_bits (HV hv, smooth_key key, IV bits)
		349	{
		350	SV *sv = hv_fetch (hv, (char )key, sizeof (key), 1);
		351
		352	if (SvIOK (*sv))
		353	SvIV_set (sv, SvIVX (sv) \| bits);
		354	else
		355	sv_setiv (*sv, bits);
321	}	356	}
322		357
323	static void	358	static void
324	music_finished (void)	359	music_finished (void)
325	{	360	{
…		…
360	n \|= n >> 8;	395	n \|= n >> 8;
361	n \|= n >> 16;	396	n \|= n >> 16;
362		397
363	return n + 1;	398	return n + 1;
364	}	399	}
		400
		401	/* SDL should provide this, really. */
		402	#define SDLK_MODIFIER_MIN 300
		403	#define SDLK_MODIFIER_MAX 314
365		404
366	MODULE = CFPlus PACKAGE = CFPlus	405	MODULE = CFPlus PACKAGE = CFPlus
367		406
368	PROTOTYPES: ENABLE	407	PROTOTYPES: ENABLE
369		408
…		…
373	static const struct {	412	static const struct {
374	const char *name;	413	const char *name;
375	IV iv;	414	IV iv;
376	} *civ, const_iv[] = {	415	} *civ, const_iv[] = {
377	# define const_iv(name) { # name, (IV)name }	416	# define const_iv(name) { # name, (IV)name }
		417	const_iv (SDLK_MODIFIER_MIN),
		418	const_iv (SDLK_MODIFIER_MAX),
		419
378	const_iv (SDL_ACTIVEEVENT),	420	const_iv (SDL_ACTIVEEVENT),
379	const_iv (SDL_KEYDOWN),	421	const_iv (SDL_KEYDOWN),
380	const_iv (SDL_KEYUP),	422	const_iv (SDL_KEYUP),
381	const_iv (SDL_MOUSEMOTION),	423	const_iv (SDL_MOUSEMOTION),
382	const_iv (SDL_MOUSEBUTTONDOWN),	424	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
391	const_iv (SDL_EVENT_RESERVEDA),	433	const_iv (SDL_EVENT_RESERVEDA),
392	const_iv (SDL_EVENT_RESERVEDB),	434	const_iv (SDL_EVENT_RESERVEDB),
393	const_iv (SDL_VIDEORESIZE),	435	const_iv (SDL_VIDEORESIZE),
394	const_iv (SDL_VIDEOEXPOSE),	436	const_iv (SDL_VIDEOEXPOSE),
395	const_iv (SDL_USEREVENT),	437	const_iv (SDL_USEREVENT),
		438
		439	const_iv (SDL_APPINPUTFOCUS),
		440	const_iv (SDL_APPMOUSEFOCUS),
		441	const_iv (SDL_APPACTIVE),
		442
396	const_iv (SDLK_KP0),	443	const_iv (SDLK_KP0),
397	const_iv (SDLK_KP1),	444	const_iv (SDLK_KP1),
398	const_iv (SDLK_KP2),	445	const_iv (SDLK_KP2),
399	const_iv (SDLK_KP3),	446	const_iv (SDLK_KP3),
400	const_iv (SDLK_KP4),	447	const_iv (SDLK_KP4),
…		…
455	const_iv (SDLK_BREAK),	502	const_iv (SDLK_BREAK),
456	const_iv (SDLK_MENU),	503	const_iv (SDLK_MENU),
457	const_iv (SDLK_POWER),	504	const_iv (SDLK_POWER),
458	const_iv (SDLK_EURO),	505	const_iv (SDLK_EURO),
459	const_iv (SDLK_UNDO),	506	const_iv (SDLK_UNDO),
		507
460	const_iv (KMOD_NONE),	508	const_iv (KMOD_NONE),
		509	const_iv (KMOD_SHIFT),
461	const_iv (KMOD_LSHIFT),	510	const_iv (KMOD_LSHIFT),
462	const_iv (KMOD_RSHIFT),	511	const_iv (KMOD_RSHIFT),
		512	const_iv (KMOD_CTRL),
463	const_iv (KMOD_LCTRL),	513	const_iv (KMOD_LCTRL),
464	const_iv (KMOD_RCTRL),	514	const_iv (KMOD_RCTRL),
		515	const_iv (KMOD_ALT),
465	const_iv (KMOD_LALT),	516	const_iv (KMOD_LALT),
466	const_iv (KMOD_RALT),	517	const_iv (KMOD_RALT),
		518	const_iv (KMOD_META),
467	const_iv (KMOD_LMETA),	519	const_iv (KMOD_LMETA),
468	const_iv (KMOD_RMETA),	520	const_iv (KMOD_RMETA),
469	const_iv (KMOD_NUM),	521	const_iv (KMOD_NUM),
470	const_iv (KMOD_CAPS),	522	const_iv (KMOD_CAPS),
471	const_iv (KMOD_MODE),	523	const_iv (KMOD_MODE),
472	const_iv (KMOD_CTRL),
473	const_iv (KMOD_SHIFT),
474	const_iv (KMOD_ALT),
475	const_iv (KMOD_META)
476	# undef const_iv	524	# undef const_iv
477	};	525	};
478		526
479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	527	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	528	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		529
		530	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		531	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
481	}	532	}
		533
		534	void
		535	weaken (SV *rv)
		536	PROTOTYPE: $
		537	CODE:
		538	sv_rvweaken (rv);
482		539
483	int	540	int
484	in_destruct ()	541	in_destruct ()
485	CODE:	542	CODE:
486	RETVAL = PL_main_cv == Nullcv;	543	RETVAL = PL_main_cv == Nullcv;
…		…
589	case SDL_KEYDOWN:	646	case SDL_KEYDOWN:
590	case SDL_KEYUP:	647	case SDL_KEYUP:
591	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	648	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	649	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	650	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		651	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
594	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	652	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595	break;	653	break;
596		654
597	case SDL_ACTIVEEVENT:	655	case SDL_ACTIVEEVENT:
598	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
646	lowdelay (int fd, int val = 1)	704	lowdelay (int fd, int val = 1)
647	CODE:	705	CODE:
648	#ifndef _WIN32	706	#ifndef _WIN32
649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
650	#endif	708	#endif
		709
		710	void
		711	win32_proxy_info ()
		712	PPCODE:
		713	{
		714	#ifdef _WIN32
		715	char buffer[2048];
		716	DWORD buflen;
		717
		718	EXTEND (SP, 3);
		719
		720	buflen = sizeof (buffer);
		721	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		722	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		723	{
		724	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		725
		726	buflen = sizeof (buffer);
		727	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		728	{
		729	PUSHs (newSVpv (buffer, 0));
		730
		731	buflen = sizeof (buffer);
		732	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		733	PUSHs (newSVpv (buffer, 0));
		734	}
		735	}
		736	#endif
		737	}
651		738
652	void	739	void
653	add_font (char *file)	740	add_font (char *file)
654	CODE:	741	CODE:
655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	742	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	846	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
760	#endif	847	#endif
761	_exit (1);	848	_exit (1);
762		849
763	void	850	void
764	_exit (int retval)	851	_exit (int retval = 0)
765	CODE:	852	CODE:
		853	#ifdef WIN32
		854	ExitThread (retval); // unclean, please beam me up
		855	#else
766	_exit (retval);	856	_exit (retval);
		857	#endif
767		858
768	MODULE = CFPlus PACKAGE = CFPlus::Font	859	MODULE = CFPlus PACKAGE = CFPlus::Font
769		860
770	CFPlus::Font	861	CFPlus::Font
771	new_from_file (SV class, char path, int id = 0)	862	new_from_file (SV class, char path, int id = 0)
…		…
1018	xy_to_index (CFPlus::Layout self, int x, int y)	1109	xy_to_index (CFPlus::Layout self, int x, int y)
1019	CODE:	1110	CODE:
1020	{	1111	{
1021	int index, trailing;	1112	int index, trailing;
1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1113	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023	RETVAL = index;	1114	RETVAL = index + trailing;
1024	}	1115	}
1025	OUTPUT:	1116	OUTPUT:
1026	RETVAL	1117	RETVAL
1027		1118
1028	void	1119	void
…		…
1034		1125
1035	EXTEND (SP, 3);	1126	EXTEND (SP, 3);
1036	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1127	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1128	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1129	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1130	}
		1131
		1132	void
		1133	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1134	PPCODE:
		1135	{
		1136	int line, x;
		1137
		1138	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1139	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1140
		1141	EXTEND (SP, 2);
		1142	PUSHs (sv_2mortal (newSViv (line - 1)));
		1143	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1144	}
		1145
		1146	void
		1147	line_x_to_index (CFPlus::Layout self, int line, int x)
		1148	PPCODE:
		1149	{
		1150	PangoLayoutLine *lp;
		1151	int index, trailing;
		1152
		1153	if (line < 0)
		1154	XSRETURN_EMPTY;
		1155
		1156	if (!(lp = pango_layout_get_line (self->pl, line)))
		1157	XSRETURN_EMPTY; /* do better */
		1158
		1159	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1160
		1161	EXTEND (SP, 2);
		1162	if (GIMME_V == G_SCALAR)
		1163	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1164	else
		1165	{
		1166	PUSHs (sv_2mortal (newSViv (index)));
		1167	PUSHs (sv_2mortal (newSViv (trailing)));
		1168	}
1039	}	1169	}
1040		1170
1041	void	1171	void
1042	render (CFPlus::Layout self, float x, float y, int flags = 0)	1172	render (CFPlus::Layout self, float x, float y, int flags = 0)
1043	PPCODE:	1173	PPCODE:
…		…
1137	}	1267	}
1138		1268
1139	MODULE = CFPlus PACKAGE = CFPlus::Map	1269	MODULE = CFPlus PACKAGE = CFPlus::Map
1140		1270
1141	CFPlus::Map	1271	CFPlus::Map
1142	new (SV *class, int map_width, int map_height)	1272	new (SV *class)
1143	CODE:	1273	CODE:
1144	New (0, RETVAL, 1, struct map);	1274	New (0, RETVAL, 1, struct map);
1145	RETVAL->x = 0;	1275	RETVAL->x = 0;
1146	RETVAL->y = 0;	1276	RETVAL->y = 0;
1147	RETVAL->w = map_width;	1277	RETVAL->w = 0;
1148	RETVAL->h = map_height;	1278	RETVAL->h = 0;
1149	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1150	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1151	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1152	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1153	RETVAL->texs = 8192;
1154	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1155	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1156	RETVAL->row = 0;	1284	RETVAL->row = 0;
1157	OUTPUT:	1285	OUTPUT:
1158	RETVAL	1286	RETVAL
1159		1287
1160	void	1288	void
1161	DESTROY (CFPlus::Map self)	1289	DESTROY (CFPlus::Map self)
1162	CODE:	1290	CODE:
1163	{	1291	{
1164	map_clear (self);	1292	map_clear (self);
1165	Safefree (self->face);	1293	Safefree (self->face2tile);
1166	Safefree (self->tex);	1294	Safefree (self->tex);
1167	Safefree (self);	1295	Safefree (self);
1168	}	1296	}
1169		1297
1170	void	1298	void
		1299	resize (CFPlus::Map self, int map_width, int map_height)
		1300	CODE:
		1301	self->w = map_width;
		1302	self->h = map_height;
		1303
		1304	void
1171	clear (CFPlus::Map self)	1305	clear (CFPlus::Map self)
1172	CODE:	1306	CODE:
1173	map_clear (self);	1307	map_clear (self);
1174		1308
1175	void	1309	void
1176	set_face (CFPlus::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1177	CODE:	1311	CODE:
1178	{	1312	{
1179	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1180	{	1314	need_texid (self, tile);
1181	Append (mapface, self->face, self->faces, self->faces);	1315	}
1182	self->faces *= 2;
1183	}
1184		1316
1185	self->face [face] = texid;	1317	void
		1318	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1319	CODE:
		1320	{
		1321	tileid texid;
		1322	maptex *tex;
		1323
		1324	if (face < 0 \|\| face >= self->faces)
		1325	return;
		1326
		1327	if (smooth < 0 \|\| smooth >= self->faces)
		1328	return;
		1329
		1330	texid = self->face2tile [face];
		1331
		1332	if (!texid)
		1333	return;
		1334
		1335	tex = self->tex + texid;
		1336	tex->smoothtile = self->face2tile [smooth];
		1337	tex->smoothlevel = level;
1186	}	1338	}
1187		1339
1188	void	1340	void
1189	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)	1341	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)
1190	CODE:	1342	CODE:
1191	{	1343	{
1192	while (self->texs <= texid)	1344	need_texid (self, texid);
1193	{
1194	Append (maptex, self->tex, self->texs, self->texs);
1195	self->texs *= 2;
1196	}
1197		1345
1198	{	1346	{
1199	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1200		1348
1201	tex->name = name;	1349	tex->name = name;
…		…
1243	void	1391	void
1244	scroll (CFPlus::Map self, int dx, int dy)	1392	scroll (CFPlus::Map self, int dx, int dy)
1245	CODE:	1393	CODE:
1246	{	1394	{
1247	if (dx > 0)	1395	if (dx > 0)
1248	map_blank (self, self->x, self->y, dx - 1, self->h);	1396	map_blank (self, self->x, self->y, dx, self->h);
1249	else if (dx < 0)	1397	else if (dx < 0)
1250	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1398	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1251		1399
1252	if (dy > 0)	1400	if (dy > 0)
1253	map_blank (self, self->x, self->y, self->w, dy - 1);	1401	map_blank (self, self->x, self->y, self->w, dy);
1254	else if (dy < 0)	1402	else if (dy < 0)
1255	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1403	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1256		1404
1257	self->ox += dx; self->x += dx;	1405	self->ox += dx; self->x += dx;
1258	self->oy += dy; self->y += dy;	1406	self->oy += dy; self->y += dy;
1259		1407
1260	while (self->y < 0)	1408	while (self->y < 0)
…		…
1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1421	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1274	uint8_t data_end = (uint8_t )SvEND (data_);	1422	uint8_t data_end = (uint8_t )SvEND (data_);
1275	mapcell *cell;	1423	mapcell *cell;
1276	int x, y, flags;	1424	int x, y, flags;
1277		1425
1278	while (data < data_end)	1426	while (data < data_end - 1)
1279	{	1427	{
1280	flags = (data [0] << 8) + data [1]; data += 2;	1428	flags = (data [0] << 8) + data [1]; data += 2;
1281		1429
1282	x = self->x + ((flags >> 10) & 63);	1430	x = self->x + ((flags >> 10) & 63);
1283	y = self->y + ((flags >> 4) & 63);	1431	y = self->y + ((flags >> 4) & 63);
…		…
1286		1434
1287	if (flags & 15)	1435	if (flags & 15)
1288	{	1436	{
1289	if (!cell->darkness)	1437	if (!cell->darkness)
1290	{	1438	{
		1439	memset (cell, 0, sizeof (*cell));
1291	cell->darkness = 256;	1440	cell->darkness = 256;
1292	cell->face [0] = 0;
1293	cell->face [1] = 0;
1294	cell->face [2] = 0;
1295	}	1441	}
1296		1442
1297	//TODO: don't trust server data to be in-range(!)	1443	//TODO: don't trust server data to be in-range(!)
1298		1444
1299	if (flags & 8)	1445	if (flags & 8)
…		…
1314	cell->stat_width = 1;	1460	cell->stat_width = 1;
1315	cell->stat_hp = *data++;	1461	cell->stat_hp = *data++;
1316	}	1462	}
1317	else if (cmd == 6) // monster width	1463	else if (cmd == 6) // monster width
1318	cell->stat_width = *data++ + 1;	1464	cell->stat_width = *data++ + 1;
		1465	else if (cmd == 0x47)
		1466	{
		1467	if (*data == 8)
		1468	; // decode player uuid
		1469
		1470	data += *data + 1;
		1471	}
		1472	else if (cmd == 8) // cell flags
		1473	cell->flags = *data++;
1319	else if (ext & 0x40) // unknown, multibyte => skip	1474	else if (ext & 0x40) // unknown, multibyte => skip
1320	data += *data + 1;	1475	data += *data + 1;
1321	else	1476	else
1322	data++;	1477	data++;
1323	}	1478	}
…		…
1327	cell->darkness = *data++ + 1;	1482	cell->darkness = *data++ + 1;
1328	}	1483	}
1329		1484
1330	if (flags & 4)	1485	if (flags & 4)
1331	{	1486	{
1332	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1487	faceid face = (data [0] << 8) + data [1]; data += 2;
		1488	need_facenum (self, face);
		1489	cell->tile [0] = self->face2tile [face];
1333	}	1490	}
1334		1491
1335	if (flags & 2)	1492	if (flags & 2)
1336	{	1493	{
1337	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1494	faceid face = (data [0] << 8) + data [1]; data += 2;
		1495	need_facenum (self, face);
		1496	cell->tile [1] = self->face2tile [face];
1338	}	1497	}
1339		1498
1340	if (flags & 1)	1499	if (flags & 1)
1341	{	1500	{
1342	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1501	faceid face = (data [0] << 8) + data [1]; data += 2;
		1502	need_facenum (self, face);
		1503	cell->tile [2] = self->face2tile [face];
1343	}	1504	}
1344	}	1505	}
1345	else	1506	else
1346	{
1347	cell->darkness = 0;	1507	cell->darkness = 0;
1348	cell->stat_hp = 0;
1349	}
1350	}	1508	}
1351	}	1509	}
1352		1510
1353	SV *	1511	SV *
1354	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1512	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
…		…
1380	{	1538	{
1381	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1382		1540
1383	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1384	{	1542	{
1385	mapface face = cell->face [z];
1386
1387	if (face)
1388	{
1389	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1390	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1391	int a1 = tex.a;	1545	int a1 = tex.a;
1392		1546
1393	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1394	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1395	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1396	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1397	}
1398	}	1551	}
1399	}	1552	}
1400		1553
1401	*map++ = (r )	1554	*map++ = (r )
1402	\| (g << 8)	1555	\| (g << 8)
…		…
1409	}	1562	}
1410	OUTPUT:	1563	OUTPUT:
1411	RETVAL	1564	RETVAL
1412		1565
1413	void	1566	void
1414	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1415	CODE:	1568	CODE:
1416	{	1569	{
1417	int vx, vy;	1570	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1571	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1572	uint8_t smooth_max[256][256];
		1573	smooth_key skey;
1418	int x, y, z;	1574	int x, y, z;
1419	int last_name;	1575	int last_name;
1420	mapface face;
1421		1576
1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1577	// thats current max. sorry.
1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1578	if (sw > 255) sw = 255;
		1579	if (sh > 255) sh = 255;
1424		1580
1425	/*	1581	// clear key, in case of extra padding
1426	int vx = self->vx = self->w >= sw	1582	memset (&skey, 0, sizeof (skey));
1427	? self->x + (self->w - sw) / 2
1428	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1429
1430	int vy = self->vy = self->h >= sh
1431	? self->y + (self->h - sh) / 2
1432	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1433	*/
1434		1583
1435	glColor4ub (255, 255, 255, 255);	1584	glColor4ub (255, 255, 255, 255);
1436		1585
1437	glEnable (GL_BLEND);	1586	glEnable (GL_BLEND);
1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1587	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1441		1590
1442	glBegin (GL_QUADS);	1591	glBegin (GL_QUADS);
1443		1592
1444	last_name = 0;	1593	last_name = 0;
1445		1594
1446	for (z = 0; z < 3; z++)	1595	mx += self->x;
1447	for (y = 0; y < sh; y++)	1596	my += self->y;
1448	if (0 <= y + vy && y + vy < self->rows)
1449	{
1450	maprow *row = self->row + (y + vy);
1451		1597
1452	for (x = 0; x < sw; x++)	1598	// first pass: determine smooth_max
1453	if (row->c0 <= x + vx && x + vx < row->c1)	1599	// rather ugly, if you ask me
1454	{	1600	// could also be stored inside mapcell and updated on change
1455	mapcell *cell = row->col + (x + vx - row->c0);	1601	memset (smooth_max, 0, sizeof (smooth_max));
1456		1602
1457	face = cell->face [z];
1458
1459	if (face && face < self->texs)
1460	{
1461	maptex tex = self->tex [face];
1462
1463	int px = (x + 1) * 32 - tex.w;
1464	int py = (y + 1) * 32 - tex.h;
1465
1466	if (last_name != tex.name)
1467	{
1468	glEnd ();
1469	last_name = tex.name;
1470	glBindTexture (GL_TEXTURE_2D, last_name);
1471	glBegin (GL_QUADS);
1472	}
1473
1474	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1478	}
1479	}
1480	}
1481
1482	glEnd ();
1483
1484	glDisable (GL_TEXTURE_2D);
1485
1486	// top layer: overlays such as the health bar
1487	for (y = 0; y < sh; y++)	1603	for (y = 0; y < sh; y++)
1488	if (0 <= y + vy && y + vy < self->rows)	1604	if (0 <= y + my && y + my < self->rows)
1489	{	1605	{
1490	maprow *row = self->row + (y + vy);	1606	maprow *row = self->row + (y + my);
1491		1607
1492	for (x = 0; x < sw; x++)	1608	for (x = 0; x < sw; x++)
1493	if (row->c0 <= x + vx && x + vx < row->c1)	1609	if (row->c0 <= x + mx && x + mx < row->c1)
1494	{	1610	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1611	mapcell *cell = row->col + (x + mx - row->c0);
1496		1612
1497	int px = x * 32;	1613	for (z = 0; z <= 2; z++)
1498	int py = y * 32;
1499
1500	if (cell->stat_hp)
1501	{	1614	{
1502	int width = cell->stat_width * 32;	1615	uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1503	int thick = sh / 28 + 1 + cell->stat_width;	1616	if (level > smooth_max [x + 1][y + 1])
1504		1617	smooth_max [x + 1][y + 1] = level;
1505	glColor4ub (0, 0, 0, 128);
1506	glRectf (px + 1, py,
1507	px + width - 1, py + thick + 2);
1508
1509	glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 192);
1510	glRectf (px + 2,
1511	py + 1,
1512	px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
1513	}	1618	}
1514	}	1619	}
1515	}	1620	}
1516		1621
		1622	for (z = 0; z <= 2; z++)
		1623	{
		1624	memset (smooth_level, 0, sizeof (smooth_level));
		1625
		1626	for (y = 0; y < sh; y++)
		1627	if (0 <= y + my && y + my < self->rows)
		1628	{
		1629	maprow *row = self->row + (y + my);
		1630
		1631	for (x = 0; x < sw; x++)
		1632	if (row->c0 <= x + mx && x + mx < row->c1)
		1633	{
		1634	mapcell *cell = row->col + (x + mx - row->c0);
		1635	tileid tile = cell->tile [z];
		1636
		1637	if (tile)
		1638	{
		1639	maptex tex = self->tex [tile];
		1640	int px = (x + 1) * T - tex.w;
		1641	int py = (y + 1) * T - tex.h;
		1642
		1643	// suppressing texture state switches here
		1644	// is only moderately effective, but worth the extra effort
		1645	if (last_name != tex.name)
		1646	{
		1647	if (!tex.name)
		1648	tex = self->tex [2]; /* missing, replace by noface */
		1649
		1650	glEnd ();
		1651	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1652	glBegin (GL_QUADS);
		1653	}
		1654
		1655	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1656	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1657	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1658	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1659
		1660	if (cell->flags && z == 2)
		1661	{
		1662	if (cell->flags & 1)
		1663	{
		1664	maptex tex = self->tex [1];
		1665	int px = x * T + T * 2 / 32;
		1666	int py = y * T - T * 6 / 32;
		1667
		1668	glEnd ();
		1669	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1670	glBegin (GL_QUADS);
		1671
		1672	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1673	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1674	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1675	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1676	}
		1677	}
		1678
		1679	// update smooth hash
		1680	if (tex.smoothtile)
		1681	{
		1682	skey.tile = tex.smoothtile;
		1683	skey.level = tex.smoothlevel;
		1684
		1685	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1686
		1687	// add bits to current tile and all neighbours. skey.x\|y is
		1688	// shifted +1\|+1 so we always stay positive.
		1689
		1690	// full tile
		1691	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1692
		1693	// borders
		1694	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1695	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1696	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1697	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1698
		1699	// corners
		1700	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1701	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1702	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1703	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1704	}
		1705	}
		1706	}
		1707	}
		1708
		1709	// go through all smoothlevels, lowest to highest, then draw
		1710	// this is basically counting sort
		1711	{
		1712	int w, b;
		1713
		1714	for (w = 0; w < 256 / 32; ++w)
		1715	{
		1716	uint32_t smask = smooth_level [w];
		1717	if (smask)
		1718	for (b = 0; b < 32; ++b)
		1719	if (smask & (((uint32_t)1) << b))
		1720	{
		1721	int level = (w << 5) \| b;
		1722	HE *he;
		1723
		1724	hv_iterinit (smooth);
		1725	while ((he = hv_iternext (smooth)))
		1726	{
		1727	smooth_key skey = (smooth_key )HeKEY (he);
		1728	IV bits = SvIVX (HeVAL (he));
		1729
		1730	// bits is ___n cccc CCCC bbbb
		1731	// n do not draw borders&corners
		1732	// c draw these corners, but...
		1733	// C ... not these
		1734	// b draw these borders
		1735
		1736	if (!(bits & 0x1000)
		1737	&& skey->level == level
		1738	&& level >= smooth_max [skey->x][skey->y])
		1739	{
		1740	maptex tex = self->tex [skey->tile];
		1741	int px = (((int)skey->x) - 1) * T;
		1742	int py = (((int)skey->y) - 1) * T;
		1743	int border = bits & 15;
		1744	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1745	float dx = tex.s * .0625f; // 16 images/row
		1746	float dy = tex.t * .5f ; // 2 images/column
		1747
		1748	// this time naively avoiding texture state changes
		1749	// save gobs of state changes.
		1750	if (last_name != tex.name)
		1751	{
		1752	if (!tex.name)
		1753	continue; // smoothing not yet available
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758	}
		1759
		1760	if (border)
		1761	{
		1762	float ox = border * dx;
		1763
		1764	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1765	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1766	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1767	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1768	}
		1769
		1770	if (corner)
		1771	{
		1772	float ox = corner * dx;
		1773
		1774	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1775	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1776	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1777	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1778	}
		1779	}
		1780	}
		1781	}
		1782	}
		1783	}
		1784
		1785	hv_clear (smooth);
		1786	}
		1787
		1788	glEnd ();
		1789
		1790	glDisable (GL_TEXTURE_2D);
1517	glDisable (GL_BLEND);	1791	glDisable (GL_BLEND);
		1792
		1793	// top layer: overlays such as the health bar
		1794	for (y = 0; y < sh; y++)
		1795	if (0 <= y + my && y + my < self->rows)
		1796	{
		1797	maprow *row = self->row + (y + my);
		1798
		1799	for (x = 0; x < sw; x++)
		1800	if (row->c0 <= x + mx && x + mx < row->c1)
		1801	{
		1802	mapcell *cell = row->col + (x + mx - row->c0);
		1803
		1804	int px = x * T;
		1805	int py = y * T;
		1806
		1807	if (cell->stat_hp)
		1808	{
		1809	int width = cell->stat_width * T;
		1810	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1811
		1812	glColor3ub (0, 0, 0);
		1813	glRectf (px + 1, py - thick - 2,
		1814	px + width - 1, py);
		1815
		1816	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1817	glRectf (px + 2,
		1818	py - thick - 1,
		1819	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1820	}
		1821	}
		1822	}
1518	}	1823	}
1519		1824
1520	void	1825	void
1521	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	1826	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1522	CODE:	1827	CODE:
…		…
1576	glDisable (GL_BLEND);	1881	glDisable (GL_BLEND);
1577	glDisable (GL_TEXTURE_2D);	1882	glDisable (GL_TEXTURE_2D);
1578	}	1883	}
1579		1884
1580	void	1885	void
1581	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1886	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1582	PPCODE:	1887	PPCODE:
1583	{	1888	{
1584	int vx, vy;
1585	int x, y;	1889	int x, y;
1586	int sw4 = (sw + 3) & ~3;	1890	int sw4 = (sw + 3) & ~3;
1587	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1891	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1588	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1892	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1589		1893
1590	memset (darkness, 255, sw4 * sh);	1894	memset (darkness, 255, sw4 * sh);
1591	SvPOK_only (darkness_sv);	1895	SvPOK_only (darkness_sv);
1592	SvCUR_set (darkness_sv, sw4 * sh);	1896	SvCUR_set (darkness_sv, sw4 * sh);
1593		1897
1594	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1898	mx += self->x;
1595	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1899	my += self->y;
1596		1900
1597	for (y = 0; y < sh; y++)	1901	for (y = 0; y < sh; y++)
1598	if (0 <= y + vy && y + vy < self->rows)	1902	if (0 <= y + my && y + my < self->rows)
1599	{	1903	{
1600	maprow *row = self->row + (y + vy);	1904	maprow *row = self->row + (y + my);
1601		1905
1602	for (x = 0; x < sw; x++)	1906	for (x = 0; x < sw; x++)
1603	if (row->c0 <= x + vx && x + vx < row->c1)	1907	if (row->c0 <= x + mx && x + mx < row->c1)
1604	{	1908	{
1605	mapcell *cell = row->col + (x + vx - row->c0);	1909	mapcell *cell = row->col + (x + mx - row->c0);
1606		1910
1607	darkness[y * sw4 + x] = cell->darkness	1911	darkness[y * sw4 + x] = cell->darkness
1608	? 255 - (cell->darkness - 1)	1912	? 255 - (cell->darkness - 1)
1609	: 255 - FOW_DARKNESS;	1913	: 255 - FOW_DARKNESS;
1610	}	1914	}
…		…
1650	if (row && row->c0 <= x && x < row->c1)	1954	if (row && row->c0 <= x && x < row->c1)
1651	{	1955	{
1652	mapcell *cell = row->col + (x - row->c0);	1956	mapcell *cell = row->col + (x - row->c0);
1653	uint8_t flags = 0;	1957	uint8_t flags = 0;
1654		1958
1655	if (cell->face [0]) flags \|= 1;	1959	if (cell->tile [0]) flags \|= 1;
1656	if (cell->face [1]) flags \|= 2;	1960	if (cell->tile [1]) flags \|= 2;
1657	if (cell->face [2]) flags \|= 4;	1961	if (cell->tile [2]) flags \|= 4;
1658		1962
1659	*data++ = flags;	1963	*data++ = flags;
1660		1964
1661	if (flags & 1)	1965	if (flags & 1)
1662	{	1966	{
		1967	tileid tile = cell->tile [0];
1663	*data++ = cell->face [0] >> 8;	1968	*data++ = tile >> 8;
1664	*data++ = cell->face [0];	1969	*data++ = tile;
1665	}	1970	}
1666		1971
1667	if (flags & 2)	1972	if (flags & 2)
1668	{	1973	{
		1974	tileid tile = cell->tile [1];
1669	*data++ = cell->face [1] >> 8;	1975	*data++ = tile >> 8;
1670	*data++ = cell->face [1];	1976	*data++ = tile;
1671	}	1977	}
1672		1978
1673	if (flags & 4)	1979	if (flags & 4)
1674	{	1980	{
		1981	tileid tile = cell->tile [2];
1675	*data++ = cell->face [2] >> 8;	1982	*data++ = tile >> 8;
1676	*data++ = cell->face [2];	1983	*data++ = tile;
1677	}	1984	}
1678	}	1985	}
1679	else	1986	else
1680	*data++ = 0;	1987	*data++ = 0;
1681	}	1988	}
…		…
1721	{	2028	{
1722	uint8_t flags = *data++;	2029	uint8_t flags = *data++;
1723		2030
1724	if (flags)	2031	if (flags)
1725	{	2032	{
1726	mapface face[3] = { 0, 0, 0 };
1727
1728	mapcell *cell = row_get_cell (row, x);	2033	mapcell *cell = row_get_cell (row, x);
		2034	tileid tile[3] = { 0, 0, 0 };
1729		2035
1730	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2036	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1731	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2037	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1732	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2038	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1733		2039
1734	if (cell->darkness == 0)	2040	if (cell->darkness == 0)
1735	{	2041	{
1736	cell->darkness = 0;	2042	cell->darkness = 0;
1737		2043
1738	for (z = 0; z <= 2; z++)	2044	for (z = 0; z <= 2; z++)
1739	{	2045	{
1740	cell->face[z] = face[z];	2046	tileid t = tile [z];
1741		2047
1742	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2048	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2049	{
1743	XPUSHs (sv_2mortal (newSViv (face[z])));	2050	XPUSHs (sv_2mortal (newSViv (t)));
		2051	need_texid (self, t);
		2052	}
		2053
		2054	cell->tile [z] = t;
1744	}	2055	}
1745	}	2056	}
1746	}	2057	}
1747	}	2058	}
1748	}	2059	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC vs. Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC vs.
Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC