[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.165 by root, Tue Feb 13 16:23:32 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);
		850	CALL_END;
		851	}
		852
		853	void
		854	cfperl_cleanup (int make_core)
		855	{
		856	CALL_BEGIN (1);
		857	CALL_ARG (make_core);
		858	CALL_CALL ("cf::post_cleanup", G_VOID);
839	CALL_END;	859	CALL_END;
840	}	860	}
841		861
842	maptile *	862	maptile *
843	maptile::find_sync (const char path, maptile origin)	863	maptile::find_sync (const char path, maptile origin)
844	{	864	{
845	CALL_BEGIN (2);	865	CALL_BEGIN (2);
846	CALL_ARG (path);	866	CALL_ARG (path);
847	CALL_ARG (origin);	867	CALL_ARG (origin);
848	CALL_CALL ("cf::map::find_sync", G_SCALAR);	868	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		869
		870	maptile *retval;
		871
		872	if (count)
		873	sv_to (POPs, retval);
		874	else
		875	retval = 0;
		876
		877	CALL_END;
		878
		879	return retval;
		880	}
		881
		882	maptile *
		883	maptile::find_async (const char path, maptile origin)
		884	{
		885	CALL_BEGIN (2);
		886	CALL_ARG (path);
		887	CALL_ARG (origin);
		888	CALL_CALL ("cf::map::find_async", G_SCALAR);
849		889
850	maptile *retval;	890	maptile *retval;
851		891
852	if (count)	892	if (count)
853	sv_to (POPs, retval);	893	sv_to (POPs, retval);
…		…
906	void	946	void
907	iw::alloc ()	947	iw::alloc ()
908	{	948	{
909	pe = GEventAPI->new_idle (0, 0);	949	pe = GEventAPI->new_idle (0, 0);
910		950
		951	WaREENTRANT_off (pe);
911	pe->base.callback = (void *)iw_dispatch;	952	pe->base.callback = (void *)iw_dispatch;
912	pe->base.ext_data = (void *)this;	953	pe->base.ext_data = (void *)this;
913	}	954	}
914		955
915	static void iow_dispatch (pe_event *ev)	956	static void iow_dispatch (pe_event *ev)
…		…
921	void	962	void
922	iow::alloc ()	963	iow::alloc ()
923	{	964	{
924	pe = GEventAPI->new_io (0, 0);	965	pe = GEventAPI->new_io (0, 0);
925		966
		967	WaREENTRANT_off (pe);
926	pe->base.callback = (void *)iow_dispatch;	968	pe->base.callback = (void *)iow_dispatch;
927	pe->base.ext_data = (void *)this;	969	pe->base.ext_data = (void *)this;
928		970
929	pe->fd = -1;	971	pe->fd = -1;
930	pe->poll = 0;	972	pe->poll = 0;
…		…
1258	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1300	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1259	const_iv (FLAG_IS_WATER)	1301	const_iv (FLAG_IS_WATER)
1260	const_iv (FLAG_CONTENT_ON_GEN)	1302	const_iv (FLAG_CONTENT_ON_GEN)
1261	const_iv (FLAG_IS_A_TEMPLATE)	1303	const_iv (FLAG_IS_A_TEMPLATE)
1262	const_iv (FLAG_IS_BUILDABLE)	1304	const_iv (FLAG_IS_BUILDABLE)
		1305	const_iv (FLAG_DESTROY_ON_DEATH)
		1306	const_iv (FLAG_NO_MAP_SAVE)
1263		1307
1264	const_iv (NDI_BLACK)	1308	const_iv (NDI_BLACK)
1265	const_iv (NDI_WHITE)	1309	const_iv (NDI_WHITE)
1266	const_iv (NDI_NAVY)	1310	const_iv (NDI_NAVY)
1267	const_iv (NDI_RED)	1311	const_iv (NDI_RED)
…		…
1452	const_iv (ATNR_BLIND)	1496	const_iv (ATNR_BLIND)
1453	const_iv (ATNR_INTERNAL)	1497	const_iv (ATNR_INTERNAL)
1454	const_iv (ATNR_LIFE_STEALING)	1498	const_iv (ATNR_LIFE_STEALING)
1455	const_iv (ATNR_DISEASE)	1499	const_iv (ATNR_DISEASE)
1456		1500
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)	1501	const_iv (MAP_IN_MEMORY)
1464	const_iv (MAP_SWAPPED)	1502	const_iv (MAP_SWAPPED)
1465	const_iv (MAP_LOADING)	1503	const_iv (MAP_LOADING)
1466	const_iv (MAP_SAVING)	1504	const_iv (MAP_SAVING)
1467		1505
…		…
1560	}	1598	}
1561		1599
1562	NV floor (NV x)	1600	NV floor (NV x)
1563		1601
1564	NV ceil (NV x)	1602	NV ceil (NV x)
		1603
		1604	NV rndm (...)
		1605	CODE:
		1606	switch (items)
		1607	{
		1608	case 0: RETVAL = rndm (); break;
		1609	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1610	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1611	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1612	}
		1613	OUTPUT:
		1614	RETVAL
1565		1615
1566	void server_tick ()	1616	void server_tick ()
1567	CODE:	1617	CODE:
1568	runtime = SvNVx (sv_runtime);	1618	runtime = SvNVx (sv_runtime);
1569	server_tick ();	1619	server_tick ();
…		…
1616	}	1666	}
1617	OUTPUT: RETVAL	1667	OUTPUT: RETVAL
1618		1668
1619	void abort ()	1669	void abort ()
1620		1670
		1671	void fork_abort (char *cause = "cf::fork_abort")
		1672
		1673	void cleanup (const char *cause, bool make_core = false)
		1674
1621	void emergency_save ()	1675	void emergency_save ()
1622		1676
1623	void _exit (int status = 0)	1677	void _exit (int status = EXIT_SUCCESS)
		1678
		1679	UV sv_2watcher (SV *w)
		1680	CODE:
		1681	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1682	OUTPUT:
		1683	RETVAL
1624		1684
1625	#if _POSIX_MEMLOCK	1685	#if _POSIX_MEMLOCK
1626		1686
1627	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1687	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1628		1688
…		…
1674	RETVAL = newSVpv (resist_plus[atnr], 0);	1734	RETVAL = newSVpv (resist_plus[atnr], 0);
1675	else	1735	else
1676	XSRETURN_UNDEF;	1736	XSRETURN_UNDEF;
1677	OUTPUT: RETVAL	1737	OUTPUT: RETVAL
1678		1738
		1739	bool
		1740	load_regions (const char *filename)
		1741	CODE:
		1742	RETVAL = loader_region ().load (filename);
		1743	OUTPUT: RETVAL
		1744
1679	MODULE = cf PACKAGE = cf::attachable	1745	MODULE = cf PACKAGE = cf::attachable
1680		1746
1681	int	1747	int
1682	valid (SV *obj)	1748	valid (SV *obj)
1683	CODE:	1749	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1750	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1751	OUTPUT:
1686	RETVAL	1752	RETVAL
		1753
		1754	void
		1755	debug_trace (attachable *obj, bool on = true)
		1756	CODE:
		1757	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1758	if (on)
		1759	obj->flags \|= attachable::F_DEBUG_TRACE;
		1760
		1761	int mortals_size ()
		1762	CODE:
		1763	RETVAL = attachable::mortals.size ();
		1764	OUTPUT: RETVAL
		1765
		1766	#object *mortals (U32 index)
		1767	# CODE:
		1768	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1769	# OUTPUT: RETVAL
1687		1770
1688	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1771	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1689		1772
1690	MODULE = cf PACKAGE = cf::global	1773	MODULE = cf PACKAGE = cf::global
1691		1774
…		…
1709	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1792	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1710	OUTPUT: RETVAL	1793	OUTPUT: RETVAL
1711		1794
1712	SV registry (object op)	1795	SV registry (object op)
1713		1796
1714	void mortals ()	1797	int objects_size ()
1715	PPCODE:	1798	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;	1799	RETVAL = objects.size ();
		1800	OUTPUT: RETVAL
		1801
		1802	object *objects (U32 index)
		1803	CODE:
		1804	RETVAL = index < objects.size () ? objects [index] : 0;
		1805	OUTPUT: RETVAL
		1806
		1807	int actives_size ()
		1808	CODE:
		1809	RETVAL = actives.size ();
		1810	OUTPUT: RETVAL
		1811
		1812	object *actives (U32 index)
		1813	CODE:
		1814	RETVAL = index < actives.size () ? actives [index] : 0;
1723	OUTPUT: RETVAL	1815	OUTPUT: RETVAL
1724		1816
1725	# missing properties	1817	# missing properties
1726		1818
1727	object head (object op)	1819	object head (object op)
1728	PROTOTYPE: $	1820	PROTOTYPE: $
1729	CODE:	1821	CODE:
1730	RETVAL = op->head ? op->head : op;	1822	RETVAL = op->head_ ();
1731	OUTPUT: RETVAL	1823	OUTPUT: RETVAL
1732		1824
1733	int is_head (object *op)	1825	int is_head (object *op)
1734	PROTOTYPE: $	1826	PROTOTYPE: $
1735	CODE:	1827	CODE:
1736	RETVAL = !op->head;	1828	RETVAL = op->head_ () == op;
1737	OUTPUT: RETVAL	1829	OUTPUT: RETVAL
1738		1830
1739	void	1831	void
1740	inv (object *obj)	1832	inv (object *obj)
1741	PROTOTYPE: $	1833	PROTOTYPE: $
…		…
1748		1840
1749	void	1841	void
1750	set_animation (object *op, int idx)	1842	set_animation (object *op, int idx)
1751	CODE:	1843	CODE:
1752	SET_ANIMATION (op, idx);	1844	SET_ANIMATION (op, idx);
		1845
		1846	int
		1847	num_animations (object *op)
		1848	CODE:
		1849	RETVAL = NUM_ANIMATIONS (op);
		1850	OUTPUT: RETVAL
1753		1851
1754	object find_best_object_match (object op, const char *match)	1852	object find_best_object_match (object op, const char *match)
1755		1853
1756	object find_marked_object (object op)	1854	object find_marked_object (object op)
1757		1855
…		…
1832		1930
1833	void drop (object who, object op)	1931	void drop (object who, object op)
1834		1932
1835	void pick_up (object who, object op)	1933	void pick_up (object who, object op)
1836		1934
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)	1935	int cf_object_teleport (object op, maptile map, int x, int y)
1842		1936
1843	void update_object (object *op, int action)	1937	void update_object (object *op, int action)
1844		1938
1845	object cf_create_object_by_name (const char name)	1939	object cf_create_object_by_name (const char name)
…		…
1964	void esrv_update_item (object op, int what, object item)	2058	void esrv_update_item (object op, int what, object item)
1965	C_ARGS: what, op, item	2059	C_ARGS: what, op, item
1966		2060
1967	void clear_los (object *op)	2061	void clear_los (object *op)
1968		2062
1969	int command_teleport (object op, char params)
1970
1971	int command_summon (object op, char params)	2063	int command_summon (object op, char params)
1972		2064
1973	int command_arrest (object op, char params)	2065	int command_arrest (object op, char params)
1974		2066
1975	int command_kick (object op, char params)	2067	int command_kick (object op, char params)
…		…
2000	pl->orig_stats = pl->ob->stats;	2092	pl->orig_stats = pl->ob->stats;
2001		2093
2002	void cf_player_move (player *pl, int dir)	2094	void cf_player_move (player *pl, int dir)
2003		2095
2004	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2096	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		2097
2011	bool	2098	bool
2012	cell_visible (player *pl, int dx, int dy)	2099	cell_visible (player *pl, int dx, int dy)
2013	CODE:	2100	CODE:
2014	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2101	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2092	for_all_players (pl)	2179	for_all_players (pl)
2093	if (pl->ob && pl->ob->map == THIS)	2180	if (pl->ob && pl->ob->map == THIS)
2094	PUSHs (sv_2mortal (to_sv (pl->ob)));	2181	PUSHs (sv_2mortal (to_sv (pl->ob)));
2095	}	2182	}
2096		2183
		2184	void
		2185	maptile::set_regiondata (SV data, SV plt)
		2186	CODE:
		2187	{
		2188	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2189	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2190
		2191	AV av = (AV )SvRV (plt);
		2192
		2193	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2194
		2195	for (int i = av_len (av) + 1; i--; )
		2196	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2197
		2198	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2199	THIS->regionmap = regionmap;
		2200	}
		2201
2097	void play_sound_map (maptile *map, int x, int y, int sound_num)	2202	void play_sound_map (maptile *map, int x, int y, int sound_num)
2098		2203
2099	int out_of_map (maptile *map, int x, int y)	2204	int out_of_map (maptile *map, int x, int y)
2100		2205
2101	void	2206	void
…		…
2117		2222
2118	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2223	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2119	C_ARGS: str, map, nx, ny	2224	C_ARGS: str, map, nx, ny
2120		2225
2121	void	2226	void
2122	cf_map_normalise (maptile *map, int x, int y)	2227	get_map_flags (maptile *map, int x, int y)
2123	PPCODE:	2228	PPCODE:
2124	{	2229	{
2125	maptile *nmap = 0;	2230	maptile *nmap = 0;
2126	I16 nx = 0, ny = 0;	2231	I16 nx = 0, ny = 0;
2127	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2232	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2182		2287
2183	void fix_walls (maptile *map, int x, int y)	2288	void fix_walls (maptile *map, int x, int y)
2184		2289
2185	void fix_walls_around (maptile *map, int x, int y)	2290	void fix_walls_around (maptile *map, int x, int y)
2186		2291
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	2292	# worst xs function of my life
2194	maptile *	2293	bool
2195	_create_random_map (\	2294	_create_random_map (\
2196	char *path,\	2295	maptile *self,\
2197	char *wallstyle,\	2296	char *wallstyle,\
2198	char *wall_name,\	2297	char *wall_name,\
2199	char *floorstyle,\	2298	char *floorstyle,\
2200	char *monsterstyle,\	2299	char *monsterstyle,\
2201	char *treasurestyle,\	2300	char *treasurestyle,\
…		…
2205	char *origin_map,\	2304	char *origin_map,\
2206	char *final_map,\	2305	char *final_map,\
2207	char *exitstyle,\	2306	char *exitstyle,\
2208	char *this_map,\	2307	char *this_map,\
2209	char *exit_on_final_map,\	2308	char *exit_on_final_map,\
2210	int Xsize,\	2309	int xsize,\
2211	int Ysize,\	2310	int ysize,\
2212	int expand2x,\	2311	int expand2x,\
2213	int layoutoptions1,\	2312	int layoutoptions1,\
2214	int layoutoptions2,\	2313	int layoutoptions2,\
2215	int layoutoptions3,\	2314	int layoutoptions3,\
2216	int symmetry,\	2315	int symmetry,\
…		…
2221	int dungeon_depth,\	2320	int dungeon_depth,\
2222	int decoroptions,\	2321	int decoroptions,\
2223	int orientation,\	2322	int orientation,\
2224	int origin_y,\	2323	int origin_y,\
2225	int origin_x,\	2324	int origin_x,\
2226	int random_seed,\	2325	U32 random_seed,\
2227	val64 total_map_hp,\	2326	val64 total_map_hp,\
2228	int map_layout_style,\	2327	int map_layout_style,\
2229	int treasureoptions,\	2328	int treasureoptions,\
2230	int symmetry_used,\	2329	int symmetry_used,\
2231	region *region\	2330	region *region,\
		2331	char *custom\
2232	)	2332	)
2233	CODE:	2333	CODE:
2234	{	2334	{
2235	random_map_params rmp;	2335	random_map_params rmp;
2236		2336
…		…
2246	assign (rmp.exit_on_final_map, exit_on_final_map);	2346	assign (rmp.exit_on_final_map, exit_on_final_map);
2247		2347
2248	rmp.origin_map = origin_map;	2348	rmp.origin_map = origin_map;
2249	rmp.final_map = final_map;	2349	rmp.final_map = final_map;
2250	rmp.this_map = this_map;	2350	rmp.this_map = this_map;
2251	rmp.Xsize = Xsize;	2351	rmp.xsize = xsize;
2252	rmp.Ysize = Ysize;	2352	rmp.ysize = ysize;
2253	rmp.expand2x = expand2x;	2353	rmp.expand2x = expand2x;
2254	rmp.layoutoptions1 = layoutoptions1;	2354	rmp.layoutoptions1 = layoutoptions1;
2255	rmp.layoutoptions2 = layoutoptions2;	2355	rmp.layoutoptions2 = layoutoptions2;
2256	rmp.layoutoptions3 = layoutoptions3;	2356	rmp.layoutoptions3 = layoutoptions3;
2257	rmp.symmetry = symmetry;	2357	rmp.symmetry = symmetry;
…		…
2268	rmp.total_map_hp = total_map_hp;	2368	rmp.total_map_hp = total_map_hp;
2269	rmp.map_layout_style = map_layout_style;	2369	rmp.map_layout_style = map_layout_style;
2270	rmp.treasureoptions = treasureoptions;	2370	rmp.treasureoptions = treasureoptions;
2271	rmp.symmetry_used = symmetry_used;	2371	rmp.symmetry_used = symmetry_used;
2272	rmp.region = region;	2372	rmp.region = region;
		2373	rmp.custom = custom;
2273		2374
2274	RETVAL = generate_random_map (path, &rmp);	2375	RETVAL = self->generate_random_map (&rmp);
2275	}	2376	}
2276	OUTPUT:	2377	OUTPUT:
2277	RETVAL	2378	RETVAL
2278		2379
2279	MODULE = cf PACKAGE = cf::arch	2380	MODULE = cf PACKAGE = cf::arch
…		…
2302		2403
2303	INCLUDE: $PERL genacc partylist ../include/player.h \|	2404	INCLUDE: $PERL genacc partylist ../include/player.h \|
2304		2405
2305	MODULE = cf PACKAGE = cf::region	2406	MODULE = cf PACKAGE = cf::region
2306		2407
2307	region *first ()	2408	void
2308	PROTOTYPE:	2409	list ()
2309	CODE:	2410	PPCODE:
2310	RETVAL = first_region;	2411	for_all_regions (rgn)
2311	OUTPUT: RETVAL	2412	XPUSHs (sv_2mortal (to_sv (rgn)));
2312		2413
2313	region find (char name)	2414	region find (char name)
2314	PROTOTYPE: $	2415	PROTOTYPE: $
2315	CODE:	2416	CODE:
2316	RETVAL = get_region_by_name (name);	2417	RETVAL = region::find (name);
		2418	OUTPUT: RETVAL
		2419
		2420	region find_fuzzy (char name)
		2421	PROTOTYPE: $
		2422	CODE:
		2423	RETVAL = region::find_fuzzy (name);
2317	OUTPUT: RETVAL	2424	OUTPUT: RETVAL
2318		2425
2319	INCLUDE: $PERL genacc region ../include/map.h \|	2426	INCLUDE: $PERL genacc region ../include/map.h \|
2320		2427
2321	MODULE = cf PACKAGE = cf::living	2428	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.165 by root, Tue Feb 13 16:23:32 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.165 by root, Tue Feb 13 16:23:32 2007 UTC