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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.164 by root, Sun Feb 11 01:38:49 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
…		…
101		102
102	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
103		104
104	attachable::~attachable ()	105	attachable::~attachable ()
105	{	106	{
106	assert (!(flags & F_BORROWED));	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 (HV *self = this->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 (!this->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	flags &= ~F_BORROWED;
123	refcnt_inc ();
124	SvREFCNT_dec ((SV *)self);	163	SvREFCNT_dec (cb);
		164	cb = 0;
125	}	165	}
126	}
127
128	// check wether the object really is dead
129	void
130	attachable::do_check ()
131	{
132	if (refcnt > 0)
133	return;
134
135	optimise ();
136		166
137	if (self)	167	if (self)
138	{	168	sever_self ();
139	if (refcnt + SvREFCNT (self) > 0)
140	return;
141		169
142	assert (flags & F_BORROWED);	170	flags \|= 0x20; //D
143
144	flags &= ~F_BORROWED;
145	refcnt_inc ();
146	SvREFCNT_dec (self);
147	self = 0;
148	}
149
150	if (refcnt > 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 (self)
162	hv_clear (self);
163
164	mortals.push_back (this);	171	mortals.push_back (this);
165	}	172	}
166		173
167	void	174	void
168	attachable::destroy ()	175	attachable::destroy ()
…		…
175	}	182	}
176		183
177	void	184	void
178	attachable::check_mortals ()	185	attachable::check_mortals ()
179	{	186	{
180	for (int i = 0; i < mortals.size (); )	187	static int i = 0;
		188
		189	for (;;)
181	{	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
182	attachable *obj = mortals [i];	201	attachable *obj = mortals [i];
183		202
184	obj->refcnt_chk (); // unborrow from perl, if necessary	203	obj->refcnt_chk (); // unborrow from perl, if necessary
185		204
		205	//if (obj->refcnt > 0 \|\| obj->self)
186	if (obj->refcnt \|\| obj->self)	206	if (obj->refcnt \|\| obj->self)
187	{	207	{
188	#if 0	208	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
189	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
190	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
191	#endif
192
193	++i; // further delay freeing	209	++i; // further delay freeing
		210
		211	if (!(i & 0x3ff))
		212	break;
194	}//D	213	}
195	else	214	else
196	{	215	{
197	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
198	mortals.erase (i);	216	mortals.erase (i);
199	delete obj;	217	delete obj;
200	}	218	}
201	}	219	}
202	}	220	}
…		…
227		245
228	static int	246	static int
229	attachable_free (pTHX_ SV sv, MAGIC mg)	247	attachable_free (pTHX_ SV sv, MAGIC mg)
230	{	248	{
231	attachable at = (attachable )mg->mg_ptr;	249	attachable at = (attachable )mg->mg_ptr;
232	assert (!(at->flags & attachable::F_BORROWED));	250
		251	//TODO: check if transaction behaviour is really required here
		252	if (SV self = (SV )at->self)
		253	{
233	at->self = 0;	254	at->self = 0;
		255	SvREFCNT_dec (self);
		256	}
		257
234	// 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
235	//at->refcnt_chk ();	259	//at->refcnt_chk ();
236	return 0;	260	return 0;
237	}	261	}
238		262
…		…
246		270
247	if (!obj->self)	271	if (!obj->self)
248	{	272	{
249	obj->self = newHV ();	273	obj->self = newHV ();
250	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);
251		275	obj->flags &= ~0xc0;//D
252	// borrow the refcnt from the object	276	obj->flags \|= 0x10;//D
253	obj->flags \|= attachable::F_BORROWED;
254	obj->refcnt_dec ();
255		277
256	// now bless the object _once_	278	// now bless the object _once_
257	return sv_bless (newRV_inc ((SV *)obj->self), stash);	279	return sv_bless (newRV_inc ((SV *)obj->self), stash);
258	}	280	}
259	else	281	else
		282	{
260	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	}
261	}	290	}
262		291
263	static void	292	static void
264	clearSVptr (SV *sv)	293	clearSVptr (SV *sv)
265	{	294	{
…		…
318	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); }
319		348
320	inline SV *to_sv (object & v) { return to_sv (&v); }	349	inline SV *to_sv (object & v) { return to_sv (&v); }
321	inline SV *to_sv (living & v) { return to_sv (&v); }	350	inline SV *to_sv (living & v) { return to_sv (&v); }
322		351
323	//TODO:
324	inline SV to_sv (New_Face v) { return to_sv (v->name); }	352	inline SV to_sv (facetile v) { return to_sv (v->name); }
325	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	353	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
326		354
327	inline SV *to_sv (UUID v)	355	inline SV *to_sv (UUID v)
328	{	356	{
329	char buf[128];	357	char buf[128];
330	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	358	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
331	return newSVpv (buf, 0);	359	return newSVpv (buf, 0);
332	}	360	}
333		361
334	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; }
335	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; }
…		…
354	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"); }
355	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"); }
356	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"); }
357	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"); }
358		386
359	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)]; }
360	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)); }
361		389
362	template<class T>	390	template<class T>
363	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; }
364		392
365	template<int N>	393	template<int N>
…		…
501	if (!ext->cb)	529	if (!ext->cb)
502	ext->cb = newAV ();	530	ext->cb = newAV ();
503		531
504	return newRV_inc ((SV *)ext->cb);	532	return newRV_inc ((SV *)ext->cb);
505	}	533	}
506
507	#if 0
508	void attachable::clear ()
509	{
510	if (self)
511	{
512	// disconnect Perl from C, to avoid crashes
513	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
514
515	// clear the perl hash, might or might not be a good idea
516	hv_clear ((HV )SvRV ((SV )self));
517
518	SvREFCNT_dec (self);
519	self = 0;
520	}
521
522	if (cb)
523	{
524	SvREFCNT_dec (cb);
525	cb = 0;
526	}
527
528	attach = 0;
529	}
530	#endif
531		534
532	/////////////////////////////////////////////////////////////////////////////	535	/////////////////////////////////////////////////////////////////////////////
533		536
534	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)
535	{	538	{
…		…
607	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))
608	{	611	{
609	printf ("unable to initialize perl-interpreter, aborting.\n");	612	printf ("unable to initialize perl-interpreter, aborting.\n");
610	exit (EXIT_FAILURE);	613	exit (EXIT_FAILURE);
611	}	614	}
		615
		616	{
		617	dSP;
		618
		619	PUSHMARK (SP);
		620	PUTBACK;
		621	call_pv ("cf::init", G_DISCARD \| G_VOID);
		622	}
612	}	623	}
613		624
614	void cfperl_main ()	625	void cfperl_main ()
615	{	626	{
616	dSP;	627	dSP;
…		…
830	}	841	}
831		842
832	/////////////////////////////////////////////////////////////////////////////	843	/////////////////////////////////////////////////////////////////////////////
833		844
834	void	845	void
835	maptile::emergency_save ()	846	cfperl_emergency_save ()
836	{	847	{
837	CALL_BEGIN (0);	848	CALL_BEGIN (0);
838	CALL_CALL ("cf::map::emergency_save", G_VOID);	849	CALL_CALL ("cf::emergency_save", G_VOID);
839	CALL_END;	850	CALL_END;
840	}	851	}
841		852
842	maptile *	853	maptile *
843	maptile::find_sync (const char path, maptile origin)	854	maptile::find_sync (const char path, maptile origin)
844	{	855	{
845	CALL_BEGIN (2);	856	CALL_BEGIN (2);
846	CALL_ARG (path);	857	CALL_ARG (path);
847	CALL_ARG (origin);	858	CALL_ARG (origin);
848	CALL_CALL ("cf::map::find_sync", G_SCALAR);	859	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		860
		861	maptile *retval;
		862
		863	if (count)
		864	sv_to (POPs, retval);
		865	else
		866	retval = 0;
		867
		868	CALL_END;
		869
		870	return retval;
		871	}
		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);
849		880
850	maptile *retval;	881	maptile *retval;
851		882
852	if (count)	883	if (count)
853	sv_to (POPs, retval);	884	sv_to (POPs, retval);
…		…
906	void	937	void
907	iw::alloc ()	938	iw::alloc ()
908	{	939	{
909	pe = GEventAPI->new_idle (0, 0);	940	pe = GEventAPI->new_idle (0, 0);
910		941
		942	WaREENTRANT_off (pe);
911	pe->base.callback = (void *)iw_dispatch;	943	pe->base.callback = (void *)iw_dispatch;
912	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
913	}	945	}
914		946
915	static void iow_dispatch (pe_event *ev)	947	static void iow_dispatch (pe_event *ev)
…		…
921	void	953	void
922	iow::alloc ()	954	iow::alloc ()
923	{	955	{
924	pe = GEventAPI->new_io (0, 0);	956	pe = GEventAPI->new_io (0, 0);
925		957
		958	WaREENTRANT_off (pe);
926	pe->base.callback = (void *)iow_dispatch;	959	pe->base.callback = (void *)iow_dispatch;
927	pe->base.ext_data = (void *)this;	960	pe->base.ext_data = (void *)this;
928		961
929	pe->fd = -1;	962	pe->fd = -1;
930	pe->poll = 0;	963	pe->poll = 0;
…		…
1258	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1291	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1259	const_iv (FLAG_IS_WATER)	1292	const_iv (FLAG_IS_WATER)
1260	const_iv (FLAG_CONTENT_ON_GEN)	1293	const_iv (FLAG_CONTENT_ON_GEN)
1261	const_iv (FLAG_IS_A_TEMPLATE)	1294	const_iv (FLAG_IS_A_TEMPLATE)
1262	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)
1263		1298
1264	const_iv (NDI_BLACK)	1299	const_iv (NDI_BLACK)
1265	const_iv (NDI_WHITE)	1300	const_iv (NDI_WHITE)
1266	const_iv (NDI_NAVY)	1301	const_iv (NDI_NAVY)
1267	const_iv (NDI_RED)	1302	const_iv (NDI_RED)
…		…
1452	const_iv (ATNR_BLIND)	1487	const_iv (ATNR_BLIND)
1453	const_iv (ATNR_INTERNAL)	1488	const_iv (ATNR_INTERNAL)
1454	const_iv (ATNR_LIFE_STEALING)	1489	const_iv (ATNR_LIFE_STEALING)
1455	const_iv (ATNR_DISEASE)	1490	const_iv (ATNR_DISEASE)
1456		1491
1457	const_iv (MAP_FLUSH)
1458	const_iv (MAP_PLAYER_UNIQUE)
1459	const_iv (MAP_BLOCK)
1460	const_iv (MAP_STYLE)
1461	const_iv (MAP_OVERLAY)
1462
1463	const_iv (MAP_IN_MEMORY)	1492	const_iv (MAP_IN_MEMORY)
1464	const_iv (MAP_SWAPPED)	1493	const_iv (MAP_SWAPPED)
1465	const_iv (MAP_LOADING)	1494	const_iv (MAP_LOADING)
1466	const_iv (MAP_SAVING)	1495	const_iv (MAP_SAVING)
1467		1496
…		…
1560	}	1589	}
1561		1590
1562	NV floor (NV x)	1591	NV floor (NV x)
1563		1592
1564	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
1565		1606
1566	void server_tick ()	1607	void server_tick ()
1567	CODE:	1608	CODE:
1568	runtime = SvNVx (sv_runtime);	1609	runtime = SvNVx (sv_runtime);
1569	server_tick ();	1610	server_tick ();
…		…
1616	}	1657	}
1617	OUTPUT: RETVAL	1658	OUTPUT: RETVAL
1618		1659
1619	void abort ()	1660	void abort ()
1620		1661
		1662	void fork_abort (char *cause = "cf::fork_abort")
		1663
		1664	void cleanup (const char *cause, bool make_core = false)
		1665
1621	void emergency_save ()	1666	void emergency_save ()
1622		1667
1623	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
1624		1675
1625	#if _POSIX_MEMLOCK	1676	#if _POSIX_MEMLOCK
1626		1677
1627	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1678	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1628		1679
…		…
1674	RETVAL = newSVpv (resist_plus[atnr], 0);	1725	RETVAL = newSVpv (resist_plus[atnr], 0);
1675	else	1726	else
1676	XSRETURN_UNDEF;	1727	XSRETURN_UNDEF;
1677	OUTPUT: RETVAL	1728	OUTPUT: RETVAL
1678		1729
		1730	bool
		1731	load_regions (const char *filename)
		1732	CODE:
		1733	RETVAL = loader_region ().load (filename);
		1734	OUTPUT: RETVAL
		1735
1679	MODULE = cf PACKAGE = cf::attachable	1736	MODULE = cf PACKAGE = cf::attachable
1680		1737
1681	int	1738	int
1682	valid (SV *obj)	1739	valid (SV *obj)
1683	CODE:	1740	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1741	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1742	OUTPUT:
1686	RETVAL	1743	RETVAL
		1744
		1745	void
		1746	debug_trace (attachable *obj, bool on = true)
		1747	CODE:
		1748	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1749	if (on)
		1750	obj->flags \|= attachable::F_DEBUG_TRACE;
		1751
		1752	int mortals_size ()
		1753	CODE:
		1754	RETVAL = attachable::mortals.size ();
		1755	OUTPUT: RETVAL
		1756
		1757	#object *mortals (U32 index)
		1758	# CODE:
		1759	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1760	# OUTPUT: RETVAL
1687		1761
1688	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1762	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1689		1763
1690	MODULE = cf PACKAGE = cf::global	1764	MODULE = cf PACKAGE = cf::global
1691		1765
…		…
1709	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1783	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1710	OUTPUT: RETVAL	1784	OUTPUT: RETVAL
1711		1785
1712	SV registry (object op)	1786	SV registry (object op)
1713		1787
1714	void mortals ()	1788	int objects_size ()
1715	PPCODE:	1789	CODE:
1716	EXTEND (SP, object::mortals.size ());
1717	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1718	PUSHs (to_sv (*i));
1719
1720	object *first ()
1721	CODE:
1722	RETVAL = object::first;	1790	RETVAL = objects.size ();
		1791	OUTPUT: RETVAL
		1792
		1793	object *objects (U32 index)
		1794	CODE:
		1795	RETVAL = index < objects.size () ? objects [index] : 0;
		1796	OUTPUT: RETVAL
		1797
		1798	int actives_size ()
		1799	CODE:
		1800	RETVAL = actives.size ();
		1801	OUTPUT: RETVAL
		1802
		1803	object *actives (U32 index)
		1804	CODE:
		1805	RETVAL = index < actives.size () ? actives [index] : 0;
1723	OUTPUT: RETVAL	1806	OUTPUT: RETVAL
1724		1807
1725	# missing properties	1808	# missing properties
1726		1809
1727	object head (object op)	1810	object head (object op)
1728	PROTOTYPE: $	1811	PROTOTYPE: $
1729	CODE:	1812	CODE:
1730	RETVAL = op->head ? op->head : op;	1813	RETVAL = op->head_ ();
1731	OUTPUT: RETVAL	1814	OUTPUT: RETVAL
1732		1815
1733	int is_head (object *op)	1816	int is_head (object *op)
1734	PROTOTYPE: $	1817	PROTOTYPE: $
1735	CODE:	1818	CODE:
1736	RETVAL = !op->head;	1819	RETVAL = op->head_ () == op;
1737	OUTPUT: RETVAL	1820	OUTPUT: RETVAL
1738		1821
1739	void	1822	void
1740	inv (object *obj)	1823	inv (object *obj)
1741	PROTOTYPE: $	1824	PROTOTYPE: $
…		…
1748		1831
1749	void	1832	void
1750	set_animation (object *op, int idx)	1833	set_animation (object *op, int idx)
1751	CODE:	1834	CODE:
1752	SET_ANIMATION (op, idx);	1835	SET_ANIMATION (op, idx);
		1836
		1837	int
		1838	num_animations (object *op)
		1839	CODE:
		1840	RETVAL = NUM_ANIMATIONS (op);
		1841	OUTPUT: RETVAL
1753		1842
1754	object find_best_object_match (object op, const char *match)	1843	object find_best_object_match (object op, const char *match)
1755		1844
1756	object find_marked_object (object op)	1845	object find_marked_object (object op)
1757		1846
…		…
1832		1921
1833	void drop (object who, object op)	1922	void drop (object who, object op)
1834		1923
1835	void pick_up (object who, object op)	1924	void pick_up (object who, object op)
1836		1925
1837	object cf_object_insert_object (object op, object *container)
1838
1839	object cf_object_insert_in_ob (object ob, object *where)
1840
1841	int cf_object_teleport (object op, maptile map, int x, int y)	1926	int cf_object_teleport (object op, maptile map, int x, int y)
1842		1927
1843	void update_object (object *op, int action)	1928	void update_object (object *op, int action)
1844		1929
1845	object cf_create_object_by_name (const char name)	1930	object cf_create_object_by_name (const char name)
…		…
1964	void esrv_update_item (object op, int what, object item)	2049	void esrv_update_item (object op, int what, object item)
1965	C_ARGS: what, op, item	2050	C_ARGS: what, op, item
1966		2051
1967	void clear_los (object *op)	2052	void clear_los (object *op)
1968		2053
1969	int command_teleport (object op, char params)
1970
1971	int command_summon (object op, char params)	2054	int command_summon (object op, char params)
1972		2055
1973	int command_arrest (object op, char params)	2056	int command_arrest (object op, char params)
1974		2057
1975	int command_kick (object op, char params)	2058	int command_kick (object op, char params)
…		…
2000	pl->orig_stats = pl->ob->stats;	2083	pl->orig_stats = pl->ob->stats;
2001		2084
2002	void cf_player_move (player *pl, int dir)	2085	void cf_player_move (player *pl, int dir)
2003		2086
2004	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2087	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2005
2006	player *first ()
2007	CODE:
2008	RETVAL = first_player;
2009	OUTPUT: RETVAL
2010		2088
2011	bool	2089	bool
2012	cell_visible (player *pl, int dx, int dy)	2090	cell_visible (player *pl, int dx, int dy)
2013	CODE:	2091	CODE:
2014	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2092	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2092	for_all_players (pl)	2170	for_all_players (pl)
2093	if (pl->ob && pl->ob->map == THIS)	2171	if (pl->ob && pl->ob->map == THIS)
2094	PUSHs (sv_2mortal (to_sv (pl->ob)));	2172	PUSHs (sv_2mortal (to_sv (pl->ob)));
2095	}	2173	}
2096		2174
		2175	void
		2176	maptile::set_regiondata (SV data, SV plt)
		2177	CODE:
		2178	{
		2179	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2180	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2181
		2182	AV av = (AV )SvRV (plt);
		2183
		2184	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2185
		2186	for (int i = av_len (av) + 1; i--; )
		2187	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2188
		2189	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2190	THIS->regionmap = regionmap;
		2191	}
		2192
2097	void play_sound_map (maptile *map, int x, int y, int sound_num)	2193	void play_sound_map (maptile *map, int x, int y, int sound_num)
2098		2194
2099	int out_of_map (maptile *map, int x, int y)	2195	int out_of_map (maptile *map, int x, int y)
2100		2196
2101	void	2197	void
…		…
2117		2213
2118	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2214	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2119	C_ARGS: str, map, nx, ny	2215	C_ARGS: str, map, nx, ny
2120		2216
2121	void	2217	void
2122	cf_map_normalise (maptile *map, int x, int y)	2218	get_map_flags (maptile *map, int x, int y)
2123	PPCODE:	2219	PPCODE:
2124	{	2220	{
2125	maptile *nmap = 0;	2221	maptile *nmap = 0;
2126	I16 nx = 0, ny = 0;	2222	I16 nx = 0, ny = 0;
2127	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2223	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2182		2278
2183	void fix_walls (maptile *map, int x, int y)	2279	void fix_walls (maptile *map, int x, int y)
2184		2280
2185	void fix_walls_around (maptile *map, int x, int y)	2281	void fix_walls_around (maptile *map, int x, int y)
2186		2282
2187	const char *
2188	region_name (maptile *m)
2189	CODE:
2190	RETVAL = get_name_of_region_for_map (m);
2191	OUTPUT: RETVAL
2192
2193	# worst xs function of my life	2283	# worst xs function of my life
2194	maptile *	2284	bool
2195	_create_random_map (\	2285	_create_random_map (\
2196	char *path,\	2286	maptile *self,\
2197	char *wallstyle,\	2287	char *wallstyle,\
2198	char *wall_name,\	2288	char *wall_name,\
2199	char *floorstyle,\	2289	char *floorstyle,\
2200	char *monsterstyle,\	2290	char *monsterstyle,\
2201	char *treasurestyle,\	2291	char *treasurestyle,\
…		…
2205	char *origin_map,\	2295	char *origin_map,\
2206	char *final_map,\	2296	char *final_map,\
2207	char *exitstyle,\	2297	char *exitstyle,\
2208	char *this_map,\	2298	char *this_map,\
2209	char *exit_on_final_map,\	2299	char *exit_on_final_map,\
2210	int Xsize,\	2300	int xsize,\
2211	int Ysize,\	2301	int ysize,\
2212	int expand2x,\	2302	int expand2x,\
2213	int layoutoptions1,\	2303	int layoutoptions1,\
2214	int layoutoptions2,\	2304	int layoutoptions2,\
2215	int layoutoptions3,\	2305	int layoutoptions3,\
2216	int symmetry,\	2306	int symmetry,\
…		…
2221	int dungeon_depth,\	2311	int dungeon_depth,\
2222	int decoroptions,\	2312	int decoroptions,\
2223	int orientation,\	2313	int orientation,\
2224	int origin_y,\	2314	int origin_y,\
2225	int origin_x,\	2315	int origin_x,\
2226	int random_seed,\	2316	U32 random_seed,\
2227	val64 total_map_hp,\	2317	val64 total_map_hp,\
2228	int map_layout_style,\	2318	int map_layout_style,\
2229	int treasureoptions,\	2319	int treasureoptions,\
2230	int symmetry_used,\	2320	int symmetry_used,\
2231	region *region\	2321	region *region,\
		2322	char *custom\
2232	)	2323	)
2233	CODE:	2324	CODE:
2234	{	2325	{
2235	random_map_params rmp;	2326	random_map_params rmp;
2236		2327
…		…
2246	assign (rmp.exit_on_final_map, exit_on_final_map);	2337	assign (rmp.exit_on_final_map, exit_on_final_map);
2247		2338
2248	rmp.origin_map = origin_map;	2339	rmp.origin_map = origin_map;
2249	rmp.final_map = final_map;	2340	rmp.final_map = final_map;
2250	rmp.this_map = this_map;	2341	rmp.this_map = this_map;
2251	rmp.Xsize = Xsize;	2342	rmp.xsize = xsize;
2252	rmp.Ysize = Ysize;	2343	rmp.ysize = ysize;
2253	rmp.expand2x = expand2x;	2344	rmp.expand2x = expand2x;
2254	rmp.layoutoptions1 = layoutoptions1;	2345	rmp.layoutoptions1 = layoutoptions1;
2255	rmp.layoutoptions2 = layoutoptions2;	2346	rmp.layoutoptions2 = layoutoptions2;
2256	rmp.layoutoptions3 = layoutoptions3;	2347	rmp.layoutoptions3 = layoutoptions3;
2257	rmp.symmetry = symmetry;	2348	rmp.symmetry = symmetry;
…		…
2268	rmp.total_map_hp = total_map_hp;	2359	rmp.total_map_hp = total_map_hp;
2269	rmp.map_layout_style = map_layout_style;	2360	rmp.map_layout_style = map_layout_style;
2270	rmp.treasureoptions = treasureoptions;	2361	rmp.treasureoptions = treasureoptions;
2271	rmp.symmetry_used = symmetry_used;	2362	rmp.symmetry_used = symmetry_used;
2272	rmp.region = region;	2363	rmp.region = region;
		2364	rmp.custom = custom;
2273		2365
2274	RETVAL = generate_random_map (path, &rmp);	2366	RETVAL = self->generate_random_map (&rmp);
2275	}	2367	}
2276	OUTPUT:	2368	OUTPUT:
2277	RETVAL	2369	RETVAL
2278		2370
2279	MODULE = cf PACKAGE = cf::arch	2371	MODULE = cf PACKAGE = cf::arch
…		…
2302		2394
2303	INCLUDE: $PERL genacc partylist ../include/player.h \|	2395	INCLUDE: $PERL genacc partylist ../include/player.h \|
2304		2396
2305	MODULE = cf PACKAGE = cf::region	2397	MODULE = cf PACKAGE = cf::region
2306		2398
2307	region *first ()	2399	void
2308	PROTOTYPE:	2400	list ()
2309	CODE:	2401	PPCODE:
2310	RETVAL = first_region;	2402	for_all_regions (rgn)
2311	OUTPUT: RETVAL	2403	XPUSHs (sv_2mortal (to_sv (rgn)));
2312		2404
2313	region find (char name)	2405	region find (char name)
2314	PROTOTYPE: $	2406	PROTOTYPE: $
2315	CODE:	2407	CODE:
2316	RETVAL = get_region_by_name (name);	2408	RETVAL = region::find (name);
		2409	OUTPUT: RETVAL
		2410
		2411	region find_fuzzy (char name)
		2412	PROTOTYPE: $
		2413	CODE:
		2414	RETVAL = region::find_fuzzy (name);
2317	OUTPUT: RETVAL	2415	OUTPUT: RETVAL
2318		2416
2319	INCLUDE: $PERL genacc region ../include/map.h \|	2417	INCLUDE: $PERL genacc region ../include/map.h \|
2320		2418
2321	MODULE = cf PACKAGE = cf::living	2419	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.131 by root, Mon Jan 8 18:18:35 2007 UTC vs. Revision 1.164 by root, Sun Feb 11 01:38:49 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.164 by root, Sun Feb 11 01:38:49 2007 UTC