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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.177 by root, Tue Apr 10 10:13:10 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
…		…
154		155
155	*w = rect.width;	156	*w = rect.width;
156	*h = rect.height;	157	*h = rect.height;
157	}	158	}
158		159
		160	typedef uint16_t tileid;
159	typedef uint16_t mapface;	161	typedef uint16_t faceid;
160		162
161	typedef struct {	163	typedef struct {
162	GLint name;	164	int name;
163	int w, h;	165	int w, h;
164	float s, t;	166	float s, t;
165	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
		168	tileid smoothtile;
		169	uint8_t smoothlevel;
166	} maptex;	170	} maptex;
167		171
168	typedef struct {	172	typedef struct {
169	uint32_t player;	173	uint32_t player;
170	mapface face[3];	174	tileid tile[3];
171	uint16_t darkness;	175	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	176	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	177	} mapcell;
174		178
175	typedef struct {	179	typedef struct {
176	int32_t c0, c1;	180	int32_t c0, c1;
177	mapcell *col;	181	mapcell *col;
178	} maprow;	182	} maprow;
179		183
180	typedef struct map {	184	typedef struct map {
181	int x, y, w, h;	185	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	186	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	187	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	188	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		189
189	int32_t rows;	190	int32_t rows;
190	maprow *row;	191	maprow *row;
191	} *CFPlus__Map;	192	} *CFPlus__Map;
192		193
…		…
212	return ptr;	213	return ptr;
213	}	214	}
214		215
215	#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))
216	#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	}
217		238
218	static maprow *	239	static maprow *
219	map_get_row (CFPlus__Map self, int y)	240	map_get_row (CFPlus__Map self, int y)
220	{	241	{
221	if (0 > y)	242	if (0 > y)
…		…
314	cell->stat_hp = 0;	335	cell->stat_hp = 0;
315	cell->flags = 0;	336	cell->flags = 0;
316	cell->player = 0;	337	cell->player = 0;
317	}	338	}
318	}	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);
319	}	356	}
320		357
321	static void	358	static void
322	music_finished (void)	359	music_finished (void)
323	{	360	{
…		…
492		529
493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	530	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	531	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495	}	532	}
496		533
		534	void
		535	weaken (SV *rv)
		536	PROTOTYPE: $
		537	CODE:
		538	sv_rvweaken (rv);
		539
497	int	540	int
498	in_destruct ()	541	in_destruct ()
499	CODE:	542	CODE:
500	RETVAL = PL_main_cv == Nullcv;	543	RETVAL = PL_main_cv == Nullcv;
501	OUTPUT:	544	OUTPUT:
…		…
1233	RETVAL->y = 0;	1276	RETVAL->y = 0;
1234	RETVAL->w = 0;	1277	RETVAL->w = 0;
1235	RETVAL->h = 0;	1278	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240	RETVAL->texs = 8192;
1241	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1284	RETVAL->row = 0;
1244	OUTPUT:	1285	OUTPUT:
1245	RETVAL	1286	RETVAL
1246		1287
1247	void	1288	void
1248	DESTROY (CFPlus::Map self)	1289	DESTROY (CFPlus::Map self)
1249	CODE:	1290	CODE:
1250	{	1291	{
1251	map_clear (self);	1292	map_clear (self);
1252	Safefree (self->face);	1293	Safefree (self->face2tile);
1253	Safefree (self->tex);	1294	Safefree (self->tex);
1254	Safefree (self);	1295	Safefree (self);
1255	}	1296	}
1256		1297
1257	void	1298	void
…		…
1264	clear (CFPlus::Map self)	1305	clear (CFPlus::Map self)
1265	CODE:	1306	CODE:
1266	map_clear (self);	1307	map_clear (self);
1267		1308
1268	void	1309	void
1269	set_face (CFPlus::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1311	CODE:
1271	{	1312	{
1272	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1314	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1315	}
1275	self->faces *= 2;
1276	}
1277		1316
1278	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;
1279	}	1338	}
1280		1339
1281	void	1340	void
1282	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)
1283	CODE:	1342	CODE:
1284	{	1343	{
1285	while (self->texs <= texid)	1344	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1345
1291	{	1346	{
1292	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1293		1348
1294	tex->name = name;	1349	tex->name = name;
…		…
1405	cell->stat_width = 1;	1460	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1461	cell->stat_hp = *data++;
1407	}	1462	}
1408	else if (cmd == 6) // monster width	1463	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1464	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1465	else if (cmd == 0x47)
1411	{	1466	{
1412	if (*data == 4)	1467	if (*data == 8)
1413	; // decode player tag	1468	; // decode player uuid
1414		1469
1415	data += *data + 1;	1470	data += *data + 1;
1416	}	1471	}
1417	else if (cmd == 8) // cell flags	1472	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1473	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1482	cell->darkness = *data++ + 1;
1428	}	1483	}
1429		1484
1430	if (flags & 4)	1485	if (flags & 4)
1431	{	1486	{
1432	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];
1433	}	1490	}
1434		1491
1435	if (flags & 2)	1492	if (flags & 2)
1436	{	1493	{
1437	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];
1438	}	1497	}
1439		1498
1440	if (flags & 1)	1499	if (flags & 1)
1441	{	1500	{
1442	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];
1443	}	1504	}
1444	}	1505	}
1445	else	1506	else
1446	cell->darkness = 0;	1507	cell->darkness = 0;
1447	}	1508	}
…		…
1477	{	1538	{
1478	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1479		1540
1480	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1481	{	1542	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1545	int a1 = tex.a;
1489		1546
1490	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1551	}
1496	}	1552	}
1497		1553
1498	*map++ = (r )	1554	*map++ = (r )
1499	\| (g << 8)	1555	\| (g << 8)
…		…
1506	}	1562	}
1507	OUTPUT:	1563	OUTPUT:
1508	RETVAL	1564	RETVAL
1509		1565
1510	void	1566	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1568	CODE:
1513	{	1569	{
		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;
1514	int x, y, z;	1574	int x, y, z;
1515	int last_name;	1575	int last_name;
1516	mapface face;	1576
		1577	// thats current max. sorry.
		1578	if (sw > 255) sw = 255;
		1579	if (sh > 255) sh = 255;
		1580
		1581	// clear key, in case of extra padding
		1582	memset (&skey, 0, sizeof (skey));
1517		1583
1518	glColor4ub (255, 255, 255, 255);	1584	glColor4ub (255, 255, 255, 255);
1519		1585
1520	glEnable (GL_BLEND);	1586	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1587	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1593	last_name = 0;
1528		1594
1529	mx += self->x;	1595	mx += self->x;
1530	my += self->y;	1596	my += self->y;
1531		1597
		1598	// first pass: determine smooth_max
		1599	// rather ugly, if you ask me
		1600	// could also be stored inside mapcell and updated on change
		1601	memset (smooth_max, 0, sizeof (smooth_max));
		1602
		1603	for (y = 0; y < sh; y++)
		1604	if (0 <= y + my && y + my < self->rows)
		1605	{
		1606	maprow *row = self->row + (y + my);
		1607
		1608	for (x = 0; x < sw; x++)
		1609	if (row->c0 <= x + mx && x + mx < row->c1)
		1610	{
		1611	mapcell *cell = row->col + (x + mx - row->c0);
		1612
		1613	smooth_max[x + 1][y + 1] =
		1614	MAX (self->tex [cell->tile [0]].smoothlevel,
		1615	MAX (self->tex [cell->tile [1]].smoothlevel,
		1616	self->tex [cell->tile [2]].smoothlevel));
		1617	}
		1618	}
		1619
1532	for (z = 0; z < 3; z++)	1620	for (z = 0; z <= 2; z++)
		1621	{
		1622	memset (smooth_level, 0, sizeof (smooth_level));
		1623
1533	for (y = 0; y < sh; y++)	1624	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1625	if (0 <= y + my && y + my < self->rows)
1535	{	1626	{
1536	maprow *row = self->row + (y + my);	1627	maprow *row = self->row + (y + my);
1537		1628
1538	for (x = 0; x < sw; x++)	1629	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1630	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1631	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1632	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	face = cell->face [z];	1633	tileid tile = cell->tile [z];
		1634
		1635	if (tile)
		1636	{
		1637	maptex tex = self->tex [tile];
		1638	int px = (x + 1) * T - tex.w;
		1639	int py = (y + 1) * T - tex.h;
1544		1640
1545	if (face && face < self->texs)	1641	// suppressing texture state switches here
		1642	// is only moderately effective, but worth the extra effort
		1643	if (last_name != tex.name)
		1644	{
		1645	if (!tex.name)
		1646	tex = self->tex [2]; /* missing, replace by noface */
		1647
		1648	glEnd ();
		1649	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1650	glBegin (GL_QUADS);
		1651	}
		1652
		1653	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1654	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1655	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1656	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1657
		1658	if (cell->flags && z == 2)
		1659	{
		1660	if (cell->flags & 1)
		1661	{
		1662	maptex tex = self->tex [1];
		1663	int px = x * T + T * 2 / 32;
		1664	int py = y * T - T * 6 / 32;
		1665
		1666	glEnd ();
		1667	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1668	glBegin (GL_QUADS);
		1669
		1670	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1671	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1672	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1673	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1674	}
		1675	}
		1676
		1677	// update smooth hash
		1678	if (tex.smoothtile)
		1679	{
		1680	skey.tile = tex.smoothtile;
		1681	skey.level = tex.smoothlevel;
		1682
		1683	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1684
		1685	// add bits to current tile and all neighbours. skey.x\|y is
		1686	// shifted +1\|+1 so we always stay positive.
		1687
		1688	// full tile
		1689	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1690
		1691	// borders
		1692	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1693	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1694	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1695	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1696
		1697	// corners
		1698	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1699	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1700	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1701	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1702	}
		1703	}
		1704	}
		1705	}
		1706
		1707	// go through all smoothlevels, lowest to highest, then draw
		1708	// this is basically counting sort
		1709	{
		1710	int w, b;
		1711
		1712	for (w = 0; w < 256 / 32; ++w)
		1713	{
		1714	uint32_t smask = smooth_level [w];
		1715	if (smask)
		1716	for (b = 0; b < 32; ++b)
		1717	if (smask & (((uint32_t)1) << b))
1546	{	1718	{
1547	maptex tex = self->tex [face];	1719	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1720	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1721
1551	if (last_name != tex.name)	1722	hv_iterinit (smooth);
		1723	while ((he = hv_iternext (smooth)))
1552	{	1724	{
		1725	smooth_key skey = (smooth_key )HeKEY (he);
		1726	IV bits = SvIVX (HeVAL (he));
		1727
		1728	// bits is ___n cccc CCCC bbbb
		1729	// n do not draw borders&corners
		1730	// c draw these corners, but...
		1731	// C ... not these
		1732	// b draw these borders
		1733
		1734	if (!(bits & 0x1000)
		1735	&& skey->level == level
		1736	&& level >= smooth_max [skey->x][skey->y])
		1737	{
		1738	maptex tex = self->tex [skey->tile];
		1739	int px = (((int)skey->x) - 1) * T;
		1740	int py = (((int)skey->y) - 1) * T;
		1741	int border = bits & 15;
		1742	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1743	float dx = tex.s * .0625f; // 16 images/row
		1744	float dy = tex.t * .5f ; // 2 images/column
		1745
		1746	// this time naively avoiding texture state changes
		1747	// save gobs of state changes.
		1748	if (last_name != tex.name)
		1749	{
		1750	if (!tex.name)
		1751	continue; // smoothing not yet available
		1752
1553	glEnd ();	1753	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1754	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	glBegin (GL_QUADS);	1755	glBegin (GL_QUADS);
		1756	}
		1757
		1758	if (border)
		1759	{
		1760	float ox = border * dx;
		1761
		1762	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1763	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1764	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1765	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1766	}
		1767
		1768	if (corner)
		1769	{
		1770	float ox = corner * dx;
		1771
		1772	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1773	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1774	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1775	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1776	}
1556	}	1777	}
1557
1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562	}
1563
1564	if (cell->flags && z == 2)
1565	{
1566	if (cell->flags & 1)
1567	{
1568	maptex tex = self->tex [1];
1569	int px = (x + 1) * 32 - tex.w + 2;
1570	int py = (y + 1) * 32 - tex.h - 6;
1571
1572	glEnd ();
1573	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574	glBegin (GL_QUADS);
1575
1576	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580	}	1778	}
1581	}	1779	}
1582	}
1583	}	1780	}
		1781	}
		1782
		1783	hv_clear (smooth);
		1784	}
1584		1785
1585	glEnd ();	1786	glEnd ();
1586		1787
1587	glDisable (GL_TEXTURE_2D);	1788	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1789	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1797	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1798	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1799	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1800	mapcell *cell = row->col + (x + mx - row->c0);
1600		1801
1601	int px = x * 32;	1802	int px = x * T;
1602	int py = y * 32;	1803	int py = y * T;
1603		1804
1604	if (cell->stat_hp)	1805	if (cell->stat_hp)
1605	{	1806	{
1606	int width = cell->stat_width * 32;	1807	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1808	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1809
1609	glColor3ub (0, 0, 0);	1810	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1811	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1812	px + width - 1, py);
1612		1813
…		…
1751	if (row && row->c0 <= x && x < row->c1)	1952	if (row && row->c0 <= x && x < row->c1)
1752	{	1953	{
1753	mapcell *cell = row->col + (x - row->c0);	1954	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	1955	uint8_t flags = 0;
1755		1956
1756	if (cell->face [0]) flags \|= 1;	1957	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	1958	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	1959	if (cell->tile [2]) flags \|= 4;
1759		1960
1760	*data++ = flags;	1961	*data++ = flags;
1761		1962
1762	if (flags & 1)	1963	if (flags & 1)
1763	{	1964	{
		1965	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	1966	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	1967	*data++ = tile;
1766	}	1968	}
1767		1969
1768	if (flags & 2)	1970	if (flags & 2)
1769	{	1971	{
		1972	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	1973	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	1974	*data++ = tile;
1772	}	1975	}
1773		1976
1774	if (flags & 4)	1977	if (flags & 4)
1775	{	1978	{
		1979	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	1980	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	1981	*data++ = tile;
1778	}	1982	}
1779	}	1983	}
1780	else	1984	else
1781	*data++ = 0;	1985	*data++ = 0;
1782	}	1986	}
…		…
1822	{	2026	{
1823	uint8_t flags = *data++;	2027	uint8_t flags = *data++;
1824		2028
1825	if (flags)	2029	if (flags)
1826	{	2030	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2031	mapcell *cell = row_get_cell (row, x);
		2032	tileid tile[3] = { 0, 0, 0 };
1830		2033
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2034	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2035	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2036	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2037
1835	if (cell->darkness == 0)	2038	if (cell->darkness == 0)
1836	{	2039	{
1837	cell->darkness = 0;	2040	cell->darkness = 0;
1838		2041
1839	for (z = 0; z <= 2; z++)	2042	for (z = 0; z <= 2; z++)
1840	{	2043	{
1841	cell->face[z] = face[z];	2044	tileid t = tile [z];
1842		2045
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2046	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2047	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2048	XPUSHs (sv_2mortal (newSViv (t)));
		2049	need_texid (self, t);
		2050	}
		2051
		2052	cell->tile [z] = t;
1845	}	2053	}
1846	}	2054	}
1847	}	2055	}
1848	}	2056	}
1849	}	2057	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs. Revision 1.177 by root, Tue Apr 10 10:13:10 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.177 by root, Tue Apr 10 10:13:10 2007 UTC