[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.163 by root, Thu Feb 8 13:11:18 2007 UTC

…		…
29	#include <plugin_common.h>	29	#include <plugin_common.h>
30	#include <sounds.h>	30	#include <sounds.h>
31	#include <cstdarg>	31	#include <cstdarg>
32	#include <sproto.h>	32	#include <sproto.h>
33		33
		34	#include "loader.h"
34	#include "cfperl.h"	35	#include "cfperl.h"
35	#include "shstr.h"	36	#include "shstr.h"
36		37
37	#include <unistd.h>	38	#include <unistd.h>
38	#if _POSIX_MEMLOCK	39	#if _POSIX_MEMLOCK
…		…
102	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
103		104
104	attachable::~attachable ()	105	attachable::~attachable ()
105	{	106	{
106	assert (!self);	107	assert (!self);
		108	assert (!cb);
107	}	109	}
108		110
109	int	111	int
110	attachable::refcnt_cnt () const	112	attachable::refcnt_cnt () const
111	{	113	{
112	return refcnt + (self ? SvREFCNT (self) : 0);	114	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		115	}
		116
		117	void
		118	attachable::sever_self ()
		119	{
		120	if (self)
		121	{
		122	// keep a refcount because sv_unmagic might call attachable_free,
		123	// which might clear self, causing sv_unmagic to crash on a now
		124	// invalid object.
		125	SvREFCNT_inc (self);
		126	hv_clear (self);
		127	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		128	SvREFCNT_dec (self);
		129
		130	// self must be null now because thats sv_unmagic's job.
		131	assert (!self);
		132	flags \|= 0x80; // severed //D
		133	}
113	}	134	}
114		135
115	void	136	void
116	attachable::optimise ()	137	attachable::optimise ()
117	{	138	{
118	if (self	139	if (self
119	&& SvREFCNT (self) == 1	140	&& SvREFCNT (self) == 1
120	&& !HvTOTALKEYS (self))	141	&& !HvTOTALKEYS (self))
		142	flags \|= 0x40,//D
		143	sever_self ();
		144	}
		145
		146	// check wether the object really is dead
		147	void
		148	attachable::do_check ()
		149	{
		150	if (refcnt_cnt () > 0)
		151	return;
		152
		153	destroy ();
		154	}
		155
		156	void
		157	attachable::do_destroy ()
		158	{
		159	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		160
		161	if (cb)
121	{	162	{
122	refcnt_inc ();
123	SvREFCNT_dec ((SV *)self);	163	SvREFCNT_dec (cb);
		164	cb = 0;
124	}	165	}
125	}
126
127	// check wether the object really is dead
128	void
129	attachable::do_check ()
130	{
131	if (refcnt > 0 \|\| refcnt_cnt () > 0)
132	return;
133
134	destroy ();
135		166
136	if (self)	167	if (self)
137	{	168	sever_self ();
138	hv_clear (self);
139	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140	SvREFCNT_dec (self);
141	self = 0;
142	}
143	}
144		169
145	void	170	flags \|= 0x20; //D
146	attachable::do_destroy ()
147	{
148	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150	if (self)
151	hv_clear (self);
152
153	mortals.push_back (this);	171	mortals.push_back (this);
154	}	172	}
155		173
156	void	174	void
157	attachable::destroy ()	175	attachable::destroy ()
…		…
164	}	182	}
165		183
166	void	184	void
167	attachable::check_mortals ()	185	attachable::check_mortals ()
168	{	186	{
169	for (int i = 0; i < mortals.size (); )	187	static int i = 0;
		188
		189	for (;;)
170	{	190	{
		191	if (i >= mortals.size ())
		192	{
		193	i = 0;
		194
		195	if (mortals.size () > 1000)
		196	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		197
		198	break;
		199	}
		200
171	attachable *obj = mortals [i];	201	attachable *obj = mortals [i];
172		202
173	obj->refcnt_chk (); // unborrow from perl, if necessary	203	obj->refcnt_chk (); // unborrow from perl, if necessary
174		204
		205	//if (obj->refcnt > 0 \|\| obj->self)
175	if (obj->refcnt \|\| obj->self)	206	if (obj->refcnt \|\| obj->self)
176	{	207	{
177	#if 0	208	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
178	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
179	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
180	#endif
181
182	++i; // further delay freeing	209	++i; // further delay freeing
		210
		211	if (!(i & 0x3ff))
		212	break;
183	}//D	213	}
184	else	214	else
185	{	215	{
186	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187	mortals.erase (i);	216	mortals.erase (i);
188	delete obj;	217	delete obj;
189	}	218	}
190	}	219	}
191	}	220	}
…		…
216		245
217	static int	246	static int
218	attachable_free (pTHX_ SV sv, MAGIC mg)	247	attachable_free (pTHX_ SV sv, MAGIC mg)
219	{	248	{
220	attachable at = (attachable )mg->mg_ptr;	249	attachable at = (attachable )mg->mg_ptr;
		250
		251	//TODO: check if transaction behaviour is really required here
		252	if (SV self = (SV )at->self)
		253	{
221	at->self = 0;	254	at->self = 0;
		255	SvREFCNT_dec (self);
		256	}
		257
222	// next line makes sense, but most objects still have refcnt 0 by default	258	// next line makes sense, but most objects still have refcnt 0 by default
223	//at->refcnt_chk ();	259	//at->refcnt_chk ();
224	return 0;	260	return 0;
225	}	261	}
226		262
…		…
234		270
235	if (!obj->self)	271	if (!obj->self)
236	{	272	{
237	obj->self = newHV ();	273	obj->self = newHV ();
238	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	274	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
239		275	obj->flags &= ~0xc0;//D
240	// borrow the refcnt from the object	276	obj->flags \|= 0x10;//D
241	// it is important thta no refcnt_chk is being executed here
242	obj->refcnt_dec ();
243		277
244	// now bless the object _once_	278	// now bless the object _once_
245	return sv_bless (newRV_inc ((SV *)obj->self), stash);	279	return sv_bless (newRV_inc ((SV *)obj->self), stash);
246	}	280	}
247	else	281	else
		282	{
248	return newRV_inc ((SV *)obj->self);	283	SV sv = newRV_inc ((SV )obj->self);
		284
		285	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		286	SvAMAGIC_on (sv);
		287
		288	return sv;
		289	}
249	}	290	}
250		291
251	static void	292	static void
252	clearSVptr (SV *sv)	293	clearSVptr (SV *sv)
253	{	294	{
…		…
306	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	347	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
307		348
308	inline SV *to_sv (object & v) { return to_sv (&v); }	349	inline SV *to_sv (object & v) { return to_sv (&v); }
309	inline SV *to_sv (living & v) { return to_sv (&v); }	350	inline SV *to_sv (living & v) { return to_sv (&v); }
310		351
311	//TODO:
312	inline SV to_sv (New_Face v) { return to_sv (v->name); }	352	inline SV to_sv (facetile v) { return to_sv (v->name); }
313	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	353	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
314		354
315	inline SV *to_sv (UUID v)	355	inline SV *to_sv (UUID v)
316	{	356	{
317	char buf[128];	357	char buf[128];
318	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	358	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
319	return newSVpv (buf, 0);	359	return newSVpv (buf, 0);
320	}	360	}
321		361
322	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	362	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
323	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	363	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
342	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	382	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
343	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	383	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
344	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	384	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
345	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	385	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
346		386
347	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	387	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
348	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	388	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
349		389
350	template<class T>	390	template<class T>
351	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	391	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
352		392
353	template<int N>	393	template<int N>
…		…
489	if (!ext->cb)	529	if (!ext->cb)
490	ext->cb = newAV ();	530	ext->cb = newAV ();
491		531
492	return newRV_inc ((SV *)ext->cb);	532	return newRV_inc ((SV *)ext->cb);
493	}	533	}
494
495	#if 0
496	void attachable::clear ()
497	{
498	if (self)
499	{
500	// disconnect Perl from C, to avoid crashes
501	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
502
503	// clear the perl hash, might or might not be a good idea
504	hv_clear ((HV )SvRV ((SV )self));
505
506	SvREFCNT_dec (self);
507	self = 0;
508	}
509
510	if (cb)
511	{
512	SvREFCNT_dec (cb);
513	cb = 0;
514	}
515
516	attach = 0;
517	}
518	#endif
519		534
520	/////////////////////////////////////////////////////////////////////////////	535	/////////////////////////////////////////////////////////////////////////////
521		536
522	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	537	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
523	{	538	{
…		…
595	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	610	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
596	{	611	{
597	printf ("unable to initialize perl-interpreter, aborting.\n");	612	printf ("unable to initialize perl-interpreter, aborting.\n");
598	exit (EXIT_FAILURE);	613	exit (EXIT_FAILURE);
599	}	614	}
		615
		616	{
		617	dSP;
		618
		619	PUSHMARK (SP);
		620	PUTBACK;
		621	call_pv ("cf::init", G_DISCARD \| G_VOID);
		622	}
600	}	623	}
601		624
602	void cfperl_main ()	625	void cfperl_main ()
603	{	626	{
604	dSP;	627	dSP;
…		…
845	CALL_END;	868	CALL_END;
846		869
847	return retval;	870	return retval;
848	}	871	}
849		872
		873	maptile *
		874	maptile::find_async (const char path, maptile origin)
		875	{
		876	CALL_BEGIN (2);
		877	CALL_ARG (path);
		878	CALL_ARG (origin);
		879	CALL_CALL ("cf::map::find_async", G_SCALAR);
		880
		881	maptile *retval;
		882
		883	if (count)
		884	sv_to (POPs, retval);
		885	else
		886	retval = 0;
		887
		888	CALL_END;
		889
		890	return retval;
		891	}
		892
850	void	893	void
851	maptile::do_load_sync ()	894	maptile::do_load_sync ()
852	{	895	{
853	CALL_BEGIN (1);	896	CALL_BEGIN (1);
854	CALL_ARG (this);	897	CALL_ARG (this);
…		…
894	void	937	void
895	iw::alloc ()	938	iw::alloc ()
896	{	939	{
897	pe = GEventAPI->new_idle (0, 0);	940	pe = GEventAPI->new_idle (0, 0);
898		941
		942	WaREENTRANT_off (pe);
899	pe->base.callback = (void *)iw_dispatch;	943	pe->base.callback = (void *)iw_dispatch;
900	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
901	}	945	}
902		946
903	static void iow_dispatch (pe_event *ev)	947	static void iow_dispatch (pe_event *ev)
…		…
909	void	953	void
910	iow::alloc ()	954	iow::alloc ()
911	{	955	{
912	pe = GEventAPI->new_io (0, 0);	956	pe = GEventAPI->new_io (0, 0);
913		957
		958	WaREENTRANT_off (pe);
914	pe->base.callback = (void *)iow_dispatch;	959	pe->base.callback = (void *)iow_dispatch;
915	pe->base.ext_data = (void *)this;	960	pe->base.ext_data = (void *)this;
916		961
917	pe->fd = -1;	962	pe->fd = -1;
918	pe->poll = 0;	963	pe->poll = 0;
…		…
1246	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1291	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1247	const_iv (FLAG_IS_WATER)	1292	const_iv (FLAG_IS_WATER)
1248	const_iv (FLAG_CONTENT_ON_GEN)	1293	const_iv (FLAG_CONTENT_ON_GEN)
1249	const_iv (FLAG_IS_A_TEMPLATE)	1294	const_iv (FLAG_IS_A_TEMPLATE)
1250	const_iv (FLAG_IS_BUILDABLE)	1295	const_iv (FLAG_IS_BUILDABLE)
		1296	const_iv (FLAG_DESTROY_ON_DEATH)
		1297	const_iv (FLAG_NO_MAP_SAVE)
1251		1298
1252	const_iv (NDI_BLACK)	1299	const_iv (NDI_BLACK)
1253	const_iv (NDI_WHITE)	1300	const_iv (NDI_WHITE)
1254	const_iv (NDI_NAVY)	1301	const_iv (NDI_NAVY)
1255	const_iv (NDI_RED)	1302	const_iv (NDI_RED)
…		…
1440	const_iv (ATNR_BLIND)	1487	const_iv (ATNR_BLIND)
1441	const_iv (ATNR_INTERNAL)	1488	const_iv (ATNR_INTERNAL)
1442	const_iv (ATNR_LIFE_STEALING)	1489	const_iv (ATNR_LIFE_STEALING)
1443	const_iv (ATNR_DISEASE)	1490	const_iv (ATNR_DISEASE)
1444		1491
1445	const_iv (MAP_FLUSH)
1446	const_iv (MAP_PLAYER_UNIQUE)
1447	const_iv (MAP_BLOCK)
1448	const_iv (MAP_STYLE)
1449	const_iv (MAP_OVERLAY)
1450
1451	const_iv (MAP_IN_MEMORY)	1492	const_iv (MAP_IN_MEMORY)
1452	const_iv (MAP_SWAPPED)	1493	const_iv (MAP_SWAPPED)
1453	const_iv (MAP_LOADING)	1494	const_iv (MAP_LOADING)
1454	const_iv (MAP_SAVING)	1495	const_iv (MAP_SAVING)
1455		1496
…		…
1548	}	1589	}
1549		1590
1550	NV floor (NV x)	1591	NV floor (NV x)
1551		1592
1552	NV ceil (NV x)	1593	NV ceil (NV x)
		1594
		1595	NV rndm (...)
		1596	CODE:
		1597	switch (items)
		1598	{
		1599	case 0: RETVAL = rndm (); break;
		1600	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1601	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1602	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1603	}
		1604	OUTPUT:
		1605	RETVAL
1553		1606
1554	void server_tick ()	1607	void server_tick ()
1555	CODE:	1608	CODE:
1556	runtime = SvNVx (sv_runtime);	1609	runtime = SvNVx (sv_runtime);
1557	server_tick ();	1610	server_tick ();
…		…
1604	}	1657	}
1605	OUTPUT: RETVAL	1658	OUTPUT: RETVAL
1606		1659
1607	void abort ()	1660	void abort ()
1608		1661
		1662	void fork_abort (char *cause = "cf::fork_abort")
		1663
1609	void cleanup (const char *cause, bool make_core = false)	1664	void cleanup (const char *cause, bool make_core = false)
1610		1665
1611	void emergency_save ()	1666	void emergency_save ()
1612		1667
1613	void _exit (int status = 0)	1668	void _exit (int status = EXIT_SUCCESS)
		1669
		1670	UV sv_2watcher (SV *w)
		1671	CODE:
		1672	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1673	OUTPUT:
		1674	RETVAL
1614		1675
1615	#if _POSIX_MEMLOCK	1676	#if _POSIX_MEMLOCK
1616		1677
1617	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1678	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1618		1679
…		…
1664	RETVAL = newSVpv (resist_plus[atnr], 0);	1725	RETVAL = newSVpv (resist_plus[atnr], 0);
1665	else	1726	else
1666	XSRETURN_UNDEF;	1727	XSRETURN_UNDEF;
1667	OUTPUT: RETVAL	1728	OUTPUT: RETVAL
1668		1729
		1730	bool
		1731	load_regions (const char *filename)
		1732	CODE:
		1733	RETVAL = loader_region ().load (filename);
		1734	OUTPUT: RETVAL
		1735
1669	MODULE = cf PACKAGE = cf::attachable	1736	MODULE = cf PACKAGE = cf::attachable
1670		1737
1671	int	1738	int
1672	valid (SV *obj)	1739	valid (SV *obj)
1673	CODE:	1740	CODE:
1674	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1741	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1675	OUTPUT:	1742	OUTPUT:
1676	RETVAL	1743	RETVAL
		1744
		1745	int mortals_size ()
		1746	CODE:
		1747	RETVAL = attachable::mortals.size ();
		1748	OUTPUT: RETVAL
		1749
		1750	#object *mortals (U32 index)
		1751	# CODE:
		1752	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1753	# OUTPUT: RETVAL
1677		1754
1678	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1755	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1679		1756
1680	MODULE = cf PACKAGE = cf::global	1757	MODULE = cf PACKAGE = cf::global
1681		1758
…		…
1699	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1776	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1700	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1701		1778
1702	SV registry (object op)	1779	SV registry (object op)
1703		1780
1704	void mortals ()
1705	PPCODE:
1706	EXTEND (SP, object::mortals.size ());
1707	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1708	PUSHs (to_sv (*i));
1709
1710	int objects_size ()	1781	int objects_size ()
1711	CODE:	1782	CODE:
1712	RETVAL = objects.size ();	1783	RETVAL = objects.size ();
1713	OUTPUT: RETVAL	1784	OUTPUT: RETVAL
1714		1785
…		…
1753		1824
1754	void	1825	void
1755	set_animation (object *op, int idx)	1826	set_animation (object *op, int idx)
1756	CODE:	1827	CODE:
1757	SET_ANIMATION (op, idx);	1828	SET_ANIMATION (op, idx);
		1829
		1830	int
		1831	num_animations (object *op)
		1832	CODE:
		1833	RETVAL = NUM_ANIMATIONS (op);
		1834	OUTPUT: RETVAL
1758		1835
1759	object find_best_object_match (object op, const char *match)	1836	object find_best_object_match (object op, const char *match)
1760		1837
1761	object find_marked_object (object op)	1838	object find_marked_object (object op)
1762		1839
…		…
1837		1914
1838	void drop (object who, object op)	1915	void drop (object who, object op)
1839		1916
1840	void pick_up (object who, object op)	1917	void pick_up (object who, object op)
1841		1918
1842	object cf_object_insert_object (object op, object *container)
1843
1844	object cf_object_insert_in_ob (object ob, object *where)
1845
1846	int cf_object_teleport (object op, maptile map, int x, int y)	1919	int cf_object_teleport (object op, maptile map, int x, int y)
1847		1920
1848	void update_object (object *op, int action)	1921	void update_object (object *op, int action)
1849		1922
1850	object cf_create_object_by_name (const char name)	1923	object cf_create_object_by_name (const char name)
…		…
1969	void esrv_update_item (object op, int what, object item)	2042	void esrv_update_item (object op, int what, object item)
1970	C_ARGS: what, op, item	2043	C_ARGS: what, op, item
1971		2044
1972	void clear_los (object *op)	2045	void clear_los (object *op)
1973		2046
1974	int command_teleport (object op, char params)
1975
1976	int command_summon (object op, char params)	2047	int command_summon (object op, char params)
1977		2048
1978	int command_arrest (object op, char params)	2049	int command_arrest (object op, char params)
1979		2050
1980	int command_kick (object op, char params)	2051	int command_kick (object op, char params)
…		…
2005	pl->orig_stats = pl->ob->stats;	2076	pl->orig_stats = pl->ob->stats;
2006		2077
2007	void cf_player_move (player *pl, int dir)	2078	void cf_player_move (player *pl, int dir)
2008		2079
2009	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2080	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2010
2011	player *first ()
2012	CODE:
2013	RETVAL = first_player;
2014	OUTPUT: RETVAL
2015		2081
2016	bool	2082	bool
2017	cell_visible (player *pl, int dx, int dy)	2083	cell_visible (player *pl, int dx, int dy)
2018	CODE:	2084	CODE:
2019	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2085	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2097	for_all_players (pl)	2163	for_all_players (pl)
2098	if (pl->ob && pl->ob->map == THIS)	2164	if (pl->ob && pl->ob->map == THIS)
2099	PUSHs (sv_2mortal (to_sv (pl->ob)));	2165	PUSHs (sv_2mortal (to_sv (pl->ob)));
2100	}	2166	}
2101		2167
		2168	void
		2169	maptile::set_regiondata (SV data, SV plt)
		2170	CODE:
		2171	{
		2172	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2173	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2174
		2175	AV av = (AV )SvRV (plt);
		2176
		2177	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2178
		2179	for (int i = av_len (av) + 1; i--; )
		2180	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2181
		2182	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2183	THIS->regionmap = regionmap;
		2184	}
		2185
2102	void play_sound_map (maptile *map, int x, int y, int sound_num)	2186	void play_sound_map (maptile *map, int x, int y, int sound_num)
2103		2187
2104	int out_of_map (maptile *map, int x, int y)	2188	int out_of_map (maptile *map, int x, int y)
2105		2189
2106	void	2190	void
…		…
2122		2206
2123	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2207	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2124	C_ARGS: str, map, nx, ny	2208	C_ARGS: str, map, nx, ny
2125		2209
2126	void	2210	void
2127	cf_map_normalise (maptile *map, int x, int y)	2211	get_map_flags (maptile *map, int x, int y)
2128	PPCODE:	2212	PPCODE:
2129	{	2213	{
2130	maptile *nmap = 0;	2214	maptile *nmap = 0;
2131	I16 nx = 0, ny = 0;	2215	I16 nx = 0, ny = 0;
2132	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2216	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2187		2271
2188	void fix_walls (maptile *map, int x, int y)	2272	void fix_walls (maptile *map, int x, int y)
2189		2273
2190	void fix_walls_around (maptile *map, int x, int y)	2274	void fix_walls_around (maptile *map, int x, int y)
2191		2275
2192	const char *
2193	region_name (maptile *m)
2194	CODE:
2195	RETVAL = get_name_of_region_for_map (m);
2196	OUTPUT: RETVAL
2197
2198	# worst xs function of my life	2276	# worst xs function of my life
2199	maptile *	2277	bool
2200	_create_random_map (\	2278	_create_random_map (\
2201	char *path,\	2279	maptile *self,\
2202	char *wallstyle,\	2280	char *wallstyle,\
2203	char *wall_name,\	2281	char *wall_name,\
2204	char *floorstyle,\	2282	char *floorstyle,\
2205	char *monsterstyle,\	2283	char *monsterstyle,\
2206	char *treasurestyle,\	2284	char *treasurestyle,\
…		…
2210	char *origin_map,\	2288	char *origin_map,\
2211	char *final_map,\	2289	char *final_map,\
2212	char *exitstyle,\	2290	char *exitstyle,\
2213	char *this_map,\	2291	char *this_map,\
2214	char *exit_on_final_map,\	2292	char *exit_on_final_map,\
2215	int Xsize,\	2293	int xsize,\
2216	int Ysize,\	2294	int ysize,\
2217	int expand2x,\	2295	int expand2x,\
2218	int layoutoptions1,\	2296	int layoutoptions1,\
2219	int layoutoptions2,\	2297	int layoutoptions2,\
2220	int layoutoptions3,\	2298	int layoutoptions3,\
2221	int symmetry,\	2299	int symmetry,\
…		…
2226	int dungeon_depth,\	2304	int dungeon_depth,\
2227	int decoroptions,\	2305	int decoroptions,\
2228	int orientation,\	2306	int orientation,\
2229	int origin_y,\	2307	int origin_y,\
2230	int origin_x,\	2308	int origin_x,\
2231	int random_seed,\	2309	U32 random_seed,\
2232	val64 total_map_hp,\	2310	val64 total_map_hp,\
2233	int map_layout_style,\	2311	int map_layout_style,\
2234	int treasureoptions,\	2312	int treasureoptions,\
2235	int symmetry_used,\	2313	int symmetry_used,\
2236	region *region\	2314	region *region,\
		2315	char *custom\
2237	)	2316	)
2238	CODE:	2317	CODE:
2239	{	2318	{
2240	random_map_params rmp;	2319	random_map_params rmp;
2241		2320
…		…
2251	assign (rmp.exit_on_final_map, exit_on_final_map);	2330	assign (rmp.exit_on_final_map, exit_on_final_map);
2252		2331
2253	rmp.origin_map = origin_map;	2332	rmp.origin_map = origin_map;
2254	rmp.final_map = final_map;	2333	rmp.final_map = final_map;
2255	rmp.this_map = this_map;	2334	rmp.this_map = this_map;
2256	rmp.Xsize = Xsize;	2335	rmp.xsize = xsize;
2257	rmp.Ysize = Ysize;	2336	rmp.ysize = ysize;
2258	rmp.expand2x = expand2x;	2337	rmp.expand2x = expand2x;
2259	rmp.layoutoptions1 = layoutoptions1;	2338	rmp.layoutoptions1 = layoutoptions1;
2260	rmp.layoutoptions2 = layoutoptions2;	2339	rmp.layoutoptions2 = layoutoptions2;
2261	rmp.layoutoptions3 = layoutoptions3;	2340	rmp.layoutoptions3 = layoutoptions3;
2262	rmp.symmetry = symmetry;	2341	rmp.symmetry = symmetry;
…		…
2273	rmp.total_map_hp = total_map_hp;	2352	rmp.total_map_hp = total_map_hp;
2274	rmp.map_layout_style = map_layout_style;	2353	rmp.map_layout_style = map_layout_style;
2275	rmp.treasureoptions = treasureoptions;	2354	rmp.treasureoptions = treasureoptions;
2276	rmp.symmetry_used = symmetry_used;	2355	rmp.symmetry_used = symmetry_used;
2277	rmp.region = region;	2356	rmp.region = region;
		2357	rmp.custom = custom;
2278		2358
2279	RETVAL = generate_random_map (path, &rmp);	2359	RETVAL = self->generate_random_map (&rmp);
2280	}	2360	}
2281	OUTPUT:	2361	OUTPUT:
2282	RETVAL	2362	RETVAL
2283		2363
2284	MODULE = cf PACKAGE = cf::arch	2364	MODULE = cf PACKAGE = cf::arch
…		…
2307		2387
2308	INCLUDE: $PERL genacc partylist ../include/player.h \|	2388	INCLUDE: $PERL genacc partylist ../include/player.h \|
2309		2389
2310	MODULE = cf PACKAGE = cf::region	2390	MODULE = cf PACKAGE = cf::region
2311		2391
2312	region *first ()	2392	void
2313	PROTOTYPE:	2393	list ()
2314	CODE:	2394	PPCODE:
2315	RETVAL = first_region;	2395	for_all_regions (rgn)
2316	OUTPUT: RETVAL	2396	XPUSHs (sv_2mortal (to_sv (rgn)));
2317		2397
2318	region find (char name)	2398	region find (char name)
2319	PROTOTYPE: $	2399	PROTOTYPE: $
2320	CODE:	2400	CODE:
2321	RETVAL = get_region_by_name (name);	2401	RETVAL = region::find (name);
		2402	OUTPUT: RETVAL
		2403
		2404	region find_fuzzy (char name)
		2405	PROTOTYPE: $
		2406	CODE:
		2407	RETVAL = region::find_fuzzy (name);
2322	OUTPUT: RETVAL	2408	OUTPUT: RETVAL
2323		2409
2324	INCLUDE: $PERL genacc region ../include/map.h \|	2410	INCLUDE: $PERL genacc region ../include/map.h \|
2325		2411
2326	MODULE = cf PACKAGE = cf::living	2412	MODULE = cf PACKAGE = cf::living

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs. Revision 1.163 by root, Thu Feb 8 13:11:18 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.163 by root, Thu Feb 8 13:11:18 2007 UTC