[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.199 by root, Tue Jul 17 13:53:02 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)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
16	# undef pipe	21	# undef pipe
17	#endif	22	#endif
18		23
		24	#include <assert.h>
19	#include <math.h>	25	#include <math.h>
20	#include <string.h>	26	#include <string.h>
21	#include <stdio.h>	27	#include <stdio.h>
22	#include <stdlib.h>	28	#include <stdlib.h>
23		29
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	62	#else
57	# define PARACHUTE 0	63	# define PARACHUTE 0
58	#endif	64	#endif
59		65
		66	static AV *texture_av;
		67
60	static struct	68	static struct
61	{	69	{
62	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	71	#include "glfunc.h"
64	#undef GL_FUNC	72	#undef GL_FUNC
65	} gl;	73	} gl;
66		74
		75	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	77	{
69	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	82	else
74	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
75	}	84	}
76		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
77	#include "texcache.c"	110	#include "texcache.c"
78		111
79	#include "pango-font.c"	112	#include "pango-font.c"
80	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
81	#include "pango-render.c"	114	#include "pango-render.c"
…		…
154		187
155	*w = rect.width;	188	*w = rect.width;
156	*h = rect.height;	189	*h = rect.height;
157	}	190	}
158		191
		192	typedef uint16_t tileid;
159	typedef uint16_t mapface;	193	typedef uint16_t faceid;
160		194
161	typedef struct {	195	typedef struct {
162	GLint name;	196	int name;
163	int w, h;	197	int w, h;
164	float s, t;	198	float s, t;
165	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
166	} maptex;	202	} maptex;
167		203
168	typedef struct {	204	typedef struct {
169	uint32_t player;	205	uint32_t player;
170	mapface face[3];	206	tileid tile[3];
171	uint16_t darkness;	207	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	209	} mapcell;
174		210
175	typedef struct {	211	typedef struct {
176	int32_t c0, c1;	212	int32_t c0, c1;
177	mapcell *col;	213	mapcell *col;
178	} maprow;	214	} maprow;
179		215
180	typedef struct map {	216	typedef struct map {
181	int x, y, w, h;	217	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	219	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	220	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		221
189	int32_t rows;	222	int32_t rows;
190	maprow *row;	223	maprow *row;
191	} *CFPlus__Map;	224	} *CFPlus__Map;
192		225
…		…
212	return ptr;	245	return ptr;
213	}	246	}
214		247
215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#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))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
217		270
218	static maprow *	271	static maprow *
219	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
220	{	273	{
221	if (0 > y)	274	if (0 > y)
…		…
314	cell->stat_hp = 0;	367	cell->stat_hp = 0;
315	cell->flags = 0;	368	cell->flags = 0;
316	cell->player = 0;	369	cell->player = 0;
317	}	370	}
318	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
319	}	388	}
320		389
321	static void	390	static void
322	music_finished (void)	391	music_finished (void)
323	{	392	{
…		…
492		561
493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495	}	564	}
496		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
497	int	572	int
498	in_destruct ()	573	in_destruct ()
499	CODE:	574	CODE:
500	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
501	OUTPUT:	576	OUTPUT:
…		…
571	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
573	);	648	);
574	if (RETVAL)	649	if (RETVAL)
575	{	650	{
		651	av_clear (texture_av);
		652
576	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578	# include "glfunc.h"	655	# include "glfunc.h"
579	# undef GL_FUNC	656	# undef GL_FUNC
		657
580	}	658	}
581	OUTPUT:	659	OUTPUT:
582	RETVAL	660	RETVAL
583		661
584	void	662	void
585	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
586		664
587	char *	665	char *
588	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
589		667
		668	int
		669	SDL_GetAppState ()
		670
590	void	671	void
591	SDL_PollEvent ()	672	poll_events ()
592	PPCODE:	673	PPCODE:
593	{	674	{
594	SDL_Event ev;	675	SDL_Event ev;
595		676
596	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597	{	679	{
598	HV *hv = newHV ();	680	HV *hv = newHV ();
599	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
600		682
601	switch (ev.type)	683	switch (ev.type)
…		…
613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615	break;	697	break;
616		698
617	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
625	break;	725	break;
626		726
627	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
628	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
658	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
659		759
660	void	760	void
661	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
662	CODE:	762	CODE:
663	#ifndef _WIN32
664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665	#endif
666		764
667	void	765	void
668	win32_proxy_info ()	766	win32_proxy_info ()
669	PPCODE:	767	PPCODE:
670	{	768	{
…		…
811	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
812	#else	910	#else
813	_exit (retval);	911	_exit (retval);
814	#endif	912	#endif
815		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
816	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
817		924
818	CFPlus::Font	925	CFPlus::Font
819	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
820	CODE:	927	CODE:
…		…
1135	flags	1242	flags
1136	);	1243	);
1137		1244
1138	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1139		1246
		1247	int minpot (int n)
		1248
1140	void	1249	void
1141	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1142	CODE:	1251	CODE:
1143	{	1252	{
1144	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1221	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1222	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1223	}	1332	}
1224	}	1333	}
1225		1334
		1335	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1336	CODE:
		1337	{
		1338	GLint width;
		1339	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1340	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1341	RETVAL = width > 0;
		1342	}
		1343	OUTPUT:
		1344	RETVAL
		1345
1226	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1227		1347
1228	CFPlus::Map	1348	CFPlus::Map
1229	new (SV *class)	1349	new (SV *class)
1230	CODE:	1350	CODE:
…		…
1233	RETVAL->y = 0;	1353	RETVAL->y = 0;
1234	RETVAL->w = 0;	1354	RETVAL->w = 0;
1235	RETVAL->h = 0;	1355	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1356	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1357	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1358	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1359	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;	1360	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1361	RETVAL->row = 0;
1244	OUTPUT:	1362	OUTPUT:
1245	RETVAL	1363	RETVAL
1246		1364
1247	void	1365	void
1248	DESTROY (CFPlus::Map self)	1366	DESTROY (CFPlus::Map self)
1249	CODE:	1367	CODE:
1250	{	1368	{
1251	map_clear (self);	1369	map_clear (self);
1252	Safefree (self->face);	1370	Safefree (self->face2tile);
1253	Safefree (self->tex);	1371	Safefree (self->tex);
1254	Safefree (self);	1372	Safefree (self);
1255	}	1373	}
1256		1374
1257	void	1375	void
…		…
1264	clear (CFPlus::Map self)	1382	clear (CFPlus::Map self)
1265	CODE:	1383	CODE:
1266	map_clear (self);	1384	map_clear (self);
1267		1385
1268	void	1386	void
1269	set_face (CFPlus::Map self, int face, int texid)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1388	CODE:
1271	{	1389	{
1272	while (self->faces <= face)	1390	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1391	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1392	}
1275	self->faces *= 2;
1276	}
1277		1393
1278	self->face [face] = texid;	1394	void
		1395	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1396	CODE:
		1397	{
		1398	tileid texid;
		1399	maptex *tex;
		1400
		1401	if (face < 0 \|\| face >= self->faces)
		1402	return;
		1403
		1404	if (smooth < 0 \|\| smooth >= self->faces)
		1405	return;
		1406
		1407	texid = self->face2tile [face];
		1408
		1409	if (!texid)
		1410	return;
		1411
		1412	tex = self->tex + texid;
		1413	tex->smoothtile = self->face2tile [smooth];
		1414	tex->smoothlevel = level;
1279	}	1415	}
1280		1416
1281	void	1417	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)	1418	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:	1419	CODE:
1284	{	1420	{
1285	while (self->texs <= texid)	1421	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1422
1291	{	1423	{
1292	maptex *tex = self->tex + texid;	1424	maptex *tex = self->tex + texid;
1293		1425
1294	tex->name = name;	1426	tex->name = name;
…		…
1338	CODE:	1470	CODE:
1339	{	1471	{
1340	if (dx > 0)	1472	if (dx > 0)
1341	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1342	else if (dx < 0)	1474	else if (dx < 0)
1343	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1475	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344		1476
1345	if (dy > 0)	1477	if (dy > 0)
1346	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1347	else if (dy < 0)	1479	else if (dy < 0)
1348	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1480	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349		1481
1350	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1351	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1352		1484
1353	while (self->y < 0)	1485	while (self->y < 0)
…		…
1405	cell->stat_width = 1;	1537	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1538	cell->stat_hp = *data++;
1407	}	1539	}
1408	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1542	else if (cmd == 0x47)
1411	{	1543	{
1412	if (*data == 4)	1544	if (*data == 4)
1413	; // decode player tag	1545	; // decode player count
1414		1546
1415	data += *data + 1;	1547	data += *data + 1;
1416	}	1548	}
1417	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1559	cell->darkness = *data++ + 1;
1428	}	1560	}
1429		1561
1430	if (flags & 4)	1562	if (flags & 4)
1431	{	1563	{
1432	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1564	faceid face = (data [0] << 8) + data [1]; data += 2;
		1565	need_facenum (self, face);
		1566	cell->tile [0] = self->face2tile [face];
1433	}	1567	}
1434		1568
1435	if (flags & 2)	1569	if (flags & 2)
1436	{	1570	{
1437	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1571	faceid face = (data [0] << 8) + data [1]; data += 2;
		1572	need_facenum (self, face);
		1573	cell->tile [1] = self->face2tile [face];
1438	}	1574	}
1439		1575
1440	if (flags & 1)	1576	if (flags & 1)
1441	{	1577	{
1442	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1578	faceid face = (data [0] << 8) + data [1]; data += 2;
		1579	need_facenum (self, face);
		1580	cell->tile [2] = self->face2tile [face];
1443	}	1581	}
1444	}	1582	}
1445	else	1583	else
1446	cell->darkness = 0;	1584	cell->darkness = 0;
1447	}	1585	}
…		…
1477	{	1615	{
1478	mapcell *cell = row->col + (x - row->c0);	1616	mapcell *cell = row->col + (x - row->c0);
1479		1617
1480	for (z = 0; z <= 0; z++)	1618	for (z = 0; z <= 0; z++)
1481	{	1619	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1620	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1621	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1622	int a1 = tex.a;
1489		1623
1490	r = (r * a0 + tex.r * a1) / 255;	1624	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1625	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1626	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1627	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1628	}
1496	}	1629	}
1497		1630
1498	*map++ = (r )	1631	*map++ = (r )
1499	\| (g << 8)	1632	\| (g << 8)
…		…
1506	}	1639	}
1507	OUTPUT:	1640	OUTPUT:
1508	RETVAL	1641	RETVAL
1509		1642
1510	void	1643	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1644	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1645	CODE:
1513	{	1646	{
		1647	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1648	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1649	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1650	smooth_key skey;
1514	int x, y, z;	1651	int x, y, z;
1515	int last_name;	1652	int last_name;
1516	mapface face;	1653
		1654	// thats current max. sorry.
		1655	if (sw > 255) sw = 255;
		1656	if (sh > 255) sh = 255;
		1657
		1658	// clear key, in case of extra padding
		1659	memset (&skey, 0, sizeof (skey));
1517		1660
1518	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1519		1662
1520	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1670	last_name = 0;
1528		1671
1529	mx += self->x;	1672	mx += self->x;
1530	my += self->y;	1673	my += self->y;
1531		1674
		1675	// first pass: determine smooth_max
		1676	// rather ugly, if you ask me
		1677	// could also be stored inside mapcell and updated on change
		1678	memset (smooth_max, 0, sizeof (smooth_max));
		1679
		1680	for (y = 0; y < sh; y++)
		1681	if (0 <= y + my && y + my < self->rows)
		1682	{
		1683	maprow *row = self->row + (y + my);
		1684
		1685	for (x = 0; x < sw; x++)
		1686	if (row->c0 <= x + mx && x + mx < row->c1)
		1687	{
		1688	mapcell *cell = row->col + (x + mx - row->c0);
		1689
		1690	smooth_max[x + 1][y + 1] =
		1691	MAX (self->tex [cell->tile [0]].smoothlevel,
		1692	MAX (self->tex [cell->tile [1]].smoothlevel,
		1693	self->tex [cell->tile [2]].smoothlevel));
		1694	}
		1695	}
		1696
1532	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1533	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1535	{	1703	{
1536	maprow *row = self->row + (y + my);	1704	maprow *row = self->row + (y + my);
1537		1705
1538	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1708	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	face = cell->face [z];	1710	tileid tile = cell->tile [z];
		1711
		1712	if (tile)
		1713	{
		1714	maptex tex = self->tex [tile];
		1715	int px = (x + 1) * T - tex.w;
		1716	int py = (y + 1) * T - tex.h;
1544		1717
1545	if (face && face < self->texs)	1718	// suppressing texture state switches here
		1719	// is only moderately effective, but worth the extra effort
		1720	if (last_name != tex.name)
		1721	{
		1722	if (!tex.name)
		1723	tex = self->tex [2]; /* missing, replace by noface */
		1724
		1725	glEnd ();
		1726	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1727	glBegin (GL_QUADS);
		1728	}
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1734
		1735	if (cell->flags && z == 2)
		1736	{
		1737	if (cell->flags & 1)
		1738	{
		1739	maptex tex = self->tex [1];
		1740	int px = x * T + T * 2 / 32;
		1741	int py = y * T - T * 6 / 32;
		1742
		1743	glEnd ();
		1744	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1745	glBegin (GL_QUADS);
		1746
		1747	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1748	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1749	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1750	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1751	}
		1752	}
		1753
		1754	// update smooth hash
		1755	if (tex.smoothtile)
		1756	{
		1757	skey.tile = tex.smoothtile;
		1758	skey.level = tex.smoothlevel;
		1759
		1760	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1761
		1762	// add bits to current tile and all neighbours. skey.x\|y is
		1763	// shifted +1\|+1 so we always stay positive.
		1764
		1765	// bits is ___n cccc CCCC bbbb
		1766	// n do not draw borders&corners
		1767	// c draw these corners, but...
		1768	// C ... not these
		1769	// b draw these borders
		1770
		1771	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1772	// ┃· ·· ·┃ ━━
		1773
		1774	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1775	// ·· ·· ·┏ ┓·
		1776
		1777	// full tile
		1778	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1779
		1780	// borders
		1781	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1782	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1783	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1784	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1785
		1786	// corners
		1787	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1788	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1789	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1790	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1791	}
		1792	}
		1793	}
		1794	}
		1795
		1796	// go through all smoothlevels, lowest to highest, then draw.
		1797	// this is basically counting sort
		1798	{
		1799	int w, b;
		1800
		1801	for (w = 0; w < 256 / 32; ++w)
		1802	{
		1803	uint32_t smask = smooth_level [w];
		1804	if (smask)
		1805	for (b = 0; b < 32; ++b)
		1806	if (smask & (((uint32_t)1) << b))
1546	{	1807	{
1547	maptex tex = self->tex [face];	1808	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1809	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1810
1551	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1552	{	1813	{
		1814	smooth_key skey = (smooth_key )HeKEY (he);
		1815	IV bits = SvIVX (HeVAL (he));
		1816
		1817	if (!(bits & 0x1000)
		1818	&& skey->level == level
		1819	&& level > smooth_max [skey->x][skey->y])
		1820	{
		1821	maptex tex = self->tex [skey->tile];
		1822	int px = (((int)skey->x) - 1) * T;
		1823	int py = (((int)skey->y) - 1) * T;
		1824	int border = bits & 15;
		1825	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1826	float dx = tex.s * .0625f; // 16 images/row
		1827	float dy = tex.t * .5f ; // 2 images/column
		1828
		1829	// this time naively avoiding texture state changes
		1830	// save gobs of state changes.
		1831	if (last_name != tex.name)
		1832	{
		1833	if (!tex.name)
		1834	continue; // smoothing not yet available
		1835
1553	glEnd ();	1836	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	glBegin (GL_QUADS);	1838	glBegin (GL_QUADS);
		1839	}
		1840
		1841	if (border)
		1842	{
		1843	float ox = border * dx;
		1844
		1845	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1846	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1847	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1848	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1849	}
		1850
		1851	if (corner)
		1852	{
		1853	float ox = corner * dx;
		1854
		1855	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1856	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1857	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1858	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1859	}
1556	}	1860	}
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	}	1861	}
1581	}	1862	}
1582	}
1583	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1584		1868
1585	glEnd ();	1869	glEnd ();
1586		1870
1587	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1880	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1881	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1882	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1883	mapcell *cell = row->col + (x + mx - row->c0);
1600		1884
1601	int px = x * 32;	1885	int px = x * T;
1602	int py = y * 32;	1886	int py = y * T;
1603		1887
1604	if (cell->stat_hp)	1888	if (cell->stat_hp)
1605	{	1889	{
1606	int width = cell->stat_width * 32;	1890	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1891	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1892
1609	glColor3ub (0, 0, 0);	1893	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1894	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1895	px + width - 1, py);
1612		1896
…		…
1751	if (row && row->c0 <= x && x < row->c1)	2035	if (row && row->c0 <= x && x < row->c1)
1752	{	2036	{
1753	mapcell *cell = row->col + (x - row->c0);	2037	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	2038	uint8_t flags = 0;
1755		2039
1756	if (cell->face [0]) flags \|= 1;	2040	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	2041	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	2042	if (cell->tile [2]) flags \|= 4;
1759		2043
1760	*data++ = flags;	2044	*data++ = flags;
1761		2045
1762	if (flags & 1)	2046	if (flags & 1)
1763	{	2047	{
		2048	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	2049	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	2050	*data++ = tile;
1766	}	2051	}
1767		2052
1768	if (flags & 2)	2053	if (flags & 2)
1769	{	2054	{
		2055	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	2056	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	2057	*data++ = tile;
1772	}	2058	}
1773		2059
1774	if (flags & 4)	2060	if (flags & 4)
1775	{	2061	{
		2062	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	2063	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	2064	*data++ = tile;
1778	}	2065	}
1779	}	2066	}
1780	else	2067	else
1781	*data++ = 0;	2068	*data++ = 0;
1782	}	2069	}
…		…
1822	{	2109	{
1823	uint8_t flags = *data++;	2110	uint8_t flags = *data++;
1824		2111
1825	if (flags)	2112	if (flags)
1826	{	2113	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2114	mapcell *cell = row_get_cell (row, x);
		2115	tileid tile[3] = { 0, 0, 0 };
1830		2116
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2117	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2118	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2119	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2120
1835	if (cell->darkness == 0)	2121	if (cell->darkness == 0)
1836	{	2122	{
1837	cell->darkness = 0;	2123	cell->darkness = 0;
1838		2124
1839	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1840	{	2126	{
1841	cell->face[z] = face[z];	2127	tileid t = tile [z];
1842		2128
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2130	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2131	XPUSHs (sv_2mortal (newSViv (t)));
		2132	need_texid (self, t);
		2133	}
		2134
		2135	cell->tile [z] = t;
1845	}	2136	}
1846	}	2137	}
1847	}	2138	}
1848	}	2139	}
1849	}	2140	}
…		…
1884	CODE:	2175	CODE:
1885	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1886	OUTPUT:	2177	OUTPUT:
1887	RETVAL	2178	RETVAL
1888		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1889	CFPlus::MixMusic	2187	CFPlus::MixMusic
1890	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1891	CODE:	2189	CODE:
1892	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1893	OUTPUT:	2191	OUTPUT:
…		…
1900		2198
1901	int	2199	int
1902	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1903	CODE:	2201	CODE:
1904	RETVAL = Mix_PlayMusic (self, loops);	2202	RETVAL = Mix_PlayMusic (self, loops);
		2203	OUTPUT:
		2204	RETVAL
		2205
		2206	int
		2207	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2208	CODE:
		2209	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1905	OUTPUT:	2210	OUTPUT:
1906	RETVAL	2211	RETVAL
1907		2212
1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1909		2214
…		…
1913	static const struct {	2218	static const struct {
1914	const char *name;	2219	const char *name;
1915	IV iv;	2220	IV iv;
1916	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1917	# define const_iv(name) { # name, (IV)name }	2222	# define const_iv(name) { # name, (IV)name }
		2223	const_iv (GL_VENDOR),
		2224	const_iv (GL_VERSION),
		2225	const_iv (GL_EXTENSIONS),
1918	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1919	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1920	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1921	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1922	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1949	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1950	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1951	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1952	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1953	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1954	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1955	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1956	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1957	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1958	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1998	# undef const_iv	2308	# undef const_iv
1999	};	2309	};
2000		2310
2001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2311	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2312	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2313
		2314	texture_av = newAV ();
		2315	AvREAL_off (texture_av);
2003	}	2316	}
2004		2317
2005	char *	2318	char *
2006	gl_vendor ()	2319	gl_vendor ()
2007	CODE:	2320	CODE:
…		…
2018		2331
2019	char *	2332	char *
2020	gl_extensions ()	2333	gl_extensions ()
2021	CODE:	2334	CODE:
2022	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2335	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2336	OUTPUT:
		2337	RETVAL
		2338
		2339	char *glGetString (GLenum pname)
		2340
		2341	GLint glGetInteger (GLenum pname)
		2342	CODE:
		2343	glGetIntegerv (pname, &RETVAL);
		2344	OUTPUT:
		2345	RETVAL
		2346
		2347	GLdouble glGetDouble (GLenum pname)
		2348	CODE:
		2349	glGetDoublev (pname, &RETVAL);
2023	OUTPUT:	2350	OUTPUT:
2024	RETVAL	2351	RETVAL
2025		2352
2026	int glGetError ()	2353	int glGetError ()
2027		2354
…		…
2152		2479
2153	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2480	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154		2481
2155	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2482	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2156		2483
		2484	void glPixelZoom (float x, float y)
		2485
2157	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2486	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158		2487
2159	int glGenTexture ()	2488	int glGenTexture ()
2160	CODE:	2489	CODE:
2161	{	2490	RETVAL = gen_texture ();
2162	GLuint name;
2163	glGenTextures (1, &name);
2164	RETVAL = name;
2165	}
2166	OUTPUT:	2491	OUTPUT:
2167	RETVAL	2492	RETVAL
2168		2493
2169	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2170	CODE:	2495	CODE:
2171	{
2172	GLuint name_ = name;
2173	glDeleteTextures (1, &name_);	2496	del_texture (name);
2174	}	2497
2175
2176	int glGenList ()	2498	int glGenList ()
2177	CODE:	2499	CODE:
2178	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2179	OUTPUT:	2501	OUTPUT:
2180	RETVAL	2502	RETVAL

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.199 by root, Tue Jul 17 13:53:02 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.199 by root, Tue Jul 17 13:53:02 2007 UTC