[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.166 by root, Tue Feb 13 19:25:45 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 \|= (obj->flags & 0xc0) << 8;
252	// borrow the refcnt from the object	276	obj->flags &= ~0xc0;//D
253	obj->flags \|= attachable::F_BORROWED;	277	obj->flags \|= 0x10;//D
254	obj->refcnt_dec ();
255		278
256	// now bless the object _once_	279	// now bless the object _once_
257	return sv_bless (newRV_inc ((SV *)obj->self), stash);	280	return sv_bless (newRV_inc ((SV *)obj->self), stash);
258	}	281	}
259	else	282	else
		283	{
260	return newRV_inc ((SV *)obj->self);	284	SV sv = newRV_inc ((SV )obj->self);
		285
		286	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		287	SvAMAGIC_on (sv);
		288
		289	return sv;
		290	}
261	}	291	}
262		292
263	static void	293	static void
264	clearSVptr (SV *sv)	294	clearSVptr (SV *sv)
265	{	295	{
…		…
318	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	348	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
319		349
320	inline SV *to_sv (object & v) { return to_sv (&v); }	350	inline SV *to_sv (object & v) { return to_sv (&v); }
321	inline SV *to_sv (living & v) { return to_sv (&v); }	351	inline SV *to_sv (living & v) { return to_sv (&v); }
322		352
323	//TODO:
324	inline SV to_sv (New_Face v) { return to_sv (v->name); }	353	inline SV to_sv (facetile v) { return to_sv (v->name); }
325	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	354	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
326		355
327	inline SV *to_sv (UUID v)	356	inline SV *to_sv (UUID v)
328	{	357	{
329	char buf[128];	358	char buf[128];
330	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	359	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
331	return newSVpv (buf, 0);	360	return newSVpv (buf, 0);
332	}	361	}
333		362
334	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	363	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; }	364	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"); }	383	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"); }	384	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"); }	385	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"); }	386	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
358		387
359	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	388	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	389	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
361		390
362	template<class T>	391	template<class T>
363	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	392	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
364		393
365	template<int N>	394	template<int N>
…		…
501	if (!ext->cb)	530	if (!ext->cb)
502	ext->cb = newAV ();	531	ext->cb = newAV ();
503		532
504	return newRV_inc ((SV *)ext->cb);	533	return newRV_inc ((SV *)ext->cb);
505	}	534	}
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		535
532	/////////////////////////////////////////////////////////////////////////////	536	/////////////////////////////////////////////////////////////////////////////
533		537
534	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	538	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
535	{	539	{
…		…
607	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	611	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
608	{	612	{
609	printf ("unable to initialize perl-interpreter, aborting.\n");	613	printf ("unable to initialize perl-interpreter, aborting.\n");
610	exit (EXIT_FAILURE);	614	exit (EXIT_FAILURE);
611	}	615	}
		616
		617	{
		618	dSP;
		619
		620	PUSHMARK (SP);
		621	PUTBACK;
		622	call_pv ("cf::init", G_DISCARD \| G_VOID);
		623	}
612	}	624	}
613		625
614	void cfperl_main ()	626	void cfperl_main ()
615	{	627	{
616	dSP;	628	dSP;
…		…
830	}	842	}
831		843
832	/////////////////////////////////////////////////////////////////////////////	844	/////////////////////////////////////////////////////////////////////////////
833		845
834	void	846	void
835	maptile::emergency_save ()	847	cfperl_emergency_save ()
836	{	848	{
837	CALL_BEGIN (0);	849	CALL_BEGIN (0);
838	CALL_CALL ("cf::map::emergency_save", G_VOID);	850	CALL_CALL ("cf::emergency_save", G_VOID);
		851	CALL_END;
		852	}
		853
		854	void
		855	cfperl_cleanup (int make_core)
		856	{
		857	CALL_BEGIN (1);
		858	CALL_ARG (make_core);
		859	CALL_CALL ("cf::post_cleanup", G_VOID);
839	CALL_END;	860	CALL_END;
840	}	861	}
841		862
842	maptile *	863	maptile *
843	maptile::find_sync (const char path, maptile origin)	864	maptile::find_sync (const char path, maptile origin)
844	{	865	{
845	CALL_BEGIN (2);	866	CALL_BEGIN (2);
846	CALL_ARG (path);	867	CALL_ARG (path);
847	CALL_ARG (origin);	868	CALL_ARG (origin);
848	CALL_CALL ("cf::map::find_sync", G_SCALAR);	869	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		870
		871	maptile *retval;
		872
		873	if (count)
		874	sv_to (POPs, retval);
		875	else
		876	retval = 0;
		877
		878	CALL_END;
		879
		880	return retval;
		881	}
		882
		883	maptile *
		884	maptile::find_async (const char path, maptile origin)
		885	{
		886	CALL_BEGIN (2);
		887	CALL_ARG (path);
		888	CALL_ARG (origin);
		889	CALL_CALL ("cf::map::find_async", G_SCALAR);
849		890
850	maptile *retval;	891	maptile *retval;
851		892
852	if (count)	893	if (count)
853	sv_to (POPs, retval);	894	sv_to (POPs, retval);
…		…
906	void	947	void
907	iw::alloc ()	948	iw::alloc ()
908	{	949	{
909	pe = GEventAPI->new_idle (0, 0);	950	pe = GEventAPI->new_idle (0, 0);
910		951
		952	WaREENTRANT_off (pe);
911	pe->base.callback = (void *)iw_dispatch;	953	pe->base.callback = (void *)iw_dispatch;
912	pe->base.ext_data = (void *)this;	954	pe->base.ext_data = (void *)this;
913	}	955	}
914		956
915	static void iow_dispatch (pe_event *ev)	957	static void iow_dispatch (pe_event *ev)
…		…
921	void	963	void
922	iow::alloc ()	964	iow::alloc ()
923	{	965	{
924	pe = GEventAPI->new_io (0, 0);	966	pe = GEventAPI->new_io (0, 0);
925		967
		968	WaREENTRANT_off (pe);
926	pe->base.callback = (void *)iow_dispatch;	969	pe->base.callback = (void *)iow_dispatch;
927	pe->base.ext_data = (void *)this;	970	pe->base.ext_data = (void *)this;
928		971
929	pe->fd = -1;	972	pe->fd = -1;
930	pe->poll = 0;	973	pe->poll = 0;
…		…
1258	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1301	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1259	const_iv (FLAG_IS_WATER)	1302	const_iv (FLAG_IS_WATER)
1260	const_iv (FLAG_CONTENT_ON_GEN)	1303	const_iv (FLAG_CONTENT_ON_GEN)
1261	const_iv (FLAG_IS_A_TEMPLATE)	1304	const_iv (FLAG_IS_A_TEMPLATE)
1262	const_iv (FLAG_IS_BUILDABLE)	1305	const_iv (FLAG_IS_BUILDABLE)
		1306	const_iv (FLAG_DESTROY_ON_DEATH)
		1307	const_iv (FLAG_NO_MAP_SAVE)
1263		1308
1264	const_iv (NDI_BLACK)	1309	const_iv (NDI_BLACK)
1265	const_iv (NDI_WHITE)	1310	const_iv (NDI_WHITE)
1266	const_iv (NDI_NAVY)	1311	const_iv (NDI_NAVY)
1267	const_iv (NDI_RED)	1312	const_iv (NDI_RED)
…		…
1452	const_iv (ATNR_BLIND)	1497	const_iv (ATNR_BLIND)
1453	const_iv (ATNR_INTERNAL)	1498	const_iv (ATNR_INTERNAL)
1454	const_iv (ATNR_LIFE_STEALING)	1499	const_iv (ATNR_LIFE_STEALING)
1455	const_iv (ATNR_DISEASE)	1500	const_iv (ATNR_DISEASE)
1456		1501
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)	1502	const_iv (MAP_IN_MEMORY)
1464	const_iv (MAP_SWAPPED)	1503	const_iv (MAP_SWAPPED)
1465	const_iv (MAP_LOADING)	1504	const_iv (MAP_LOADING)
1466	const_iv (MAP_SAVING)	1505	const_iv (MAP_SAVING)
1467		1506
…		…
1560	}	1599	}
1561		1600
1562	NV floor (NV x)	1601	NV floor (NV x)
1563		1602
1564	NV ceil (NV x)	1603	NV ceil (NV x)
		1604
		1605	NV rndm (...)
		1606	CODE:
		1607	switch (items)
		1608	{
		1609	case 0: RETVAL = rndm (); break;
		1610	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1611	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1612	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1613	}
		1614	OUTPUT:
		1615	RETVAL
1565		1616
1566	void server_tick ()	1617	void server_tick ()
1567	CODE:	1618	CODE:
1568	runtime = SvNVx (sv_runtime);	1619	runtime = SvNVx (sv_runtime);
1569	server_tick ();	1620	server_tick ();
…		…
1616	}	1667	}
1617	OUTPUT: RETVAL	1668	OUTPUT: RETVAL
1618		1669
1619	void abort ()	1670	void abort ()
1620		1671
		1672	void fork_abort (char *cause = "cf::fork_abort")
		1673
		1674	void cleanup (const char *cause, bool make_core = false)
		1675
1621	void emergency_save ()	1676	void emergency_save ()
1622		1677
1623	void _exit (int status = 0)	1678	void _exit (int status = EXIT_SUCCESS)
		1679
		1680	UV sv_2watcher (SV *w)
		1681	CODE:
		1682	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1683	OUTPUT:
		1684	RETVAL
1624		1685
1625	#if _POSIX_MEMLOCK	1686	#if _POSIX_MEMLOCK
1626		1687
1627	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1688	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1628		1689
…		…
1674	RETVAL = newSVpv (resist_plus[atnr], 0);	1735	RETVAL = newSVpv (resist_plus[atnr], 0);
1675	else	1736	else
1676	XSRETURN_UNDEF;	1737	XSRETURN_UNDEF;
1677	OUTPUT: RETVAL	1738	OUTPUT: RETVAL
1678		1739
		1740	bool
		1741	load_regions (const char *filename)
		1742	CODE:
		1743	RETVAL = loader_region ().load (filename);
		1744	OUTPUT: RETVAL
		1745
1679	MODULE = cf PACKAGE = cf::attachable	1746	MODULE = cf PACKAGE = cf::attachable
1680		1747
1681	int	1748	int
1682	valid (SV *obj)	1749	valid (SV *obj)
1683	CODE:	1750	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1751	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1752	OUTPUT:
1686	RETVAL	1753	RETVAL
		1754
		1755	void
		1756	debug_trace (attachable *obj, bool on = true)
		1757	CODE:
		1758	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1759	if (on)
		1760	obj->flags \|= attachable::F_DEBUG_TRACE;
		1761
		1762	int mortals_size ()
		1763	CODE:
		1764	RETVAL = attachable::mortals.size ();
		1765	OUTPUT: RETVAL
		1766
		1767	#object *mortals (U32 index)
		1768	# CODE:
		1769	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1770	# OUTPUT: RETVAL
1687		1771
1688	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1772	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1689		1773
1690	MODULE = cf PACKAGE = cf::global	1774	MODULE = cf PACKAGE = cf::global
1691		1775
…		…
1709	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1793	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1710	OUTPUT: RETVAL	1794	OUTPUT: RETVAL
1711		1795
1712	SV registry (object op)	1796	SV registry (object op)
1713		1797
1714	void mortals ()	1798	int objects_size ()
1715	PPCODE:	1799	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;	1800	RETVAL = objects.size ();
		1801	OUTPUT: RETVAL
		1802
		1803	object *objects (U32 index)
		1804	CODE:
		1805	RETVAL = index < objects.size () ? objects [index] : 0;
		1806	OUTPUT: RETVAL
		1807
		1808	int actives_size ()
		1809	CODE:
		1810	RETVAL = actives.size ();
		1811	OUTPUT: RETVAL
		1812
		1813	object *actives (U32 index)
		1814	CODE:
		1815	RETVAL = index < actives.size () ? actives [index] : 0;
1723	OUTPUT: RETVAL	1816	OUTPUT: RETVAL
1724		1817
1725	# missing properties	1818	# missing properties
1726		1819
1727	object head (object op)	1820	object head (object op)
1728	PROTOTYPE: $	1821	PROTOTYPE: $
1729	CODE:	1822	CODE:
1730	RETVAL = op->head ? op->head : op;	1823	RETVAL = op->head_ ();
1731	OUTPUT: RETVAL	1824	OUTPUT: RETVAL
1732		1825
1733	int is_head (object *op)	1826	int is_head (object *op)
1734	PROTOTYPE: $	1827	PROTOTYPE: $
1735	CODE:	1828	CODE:
1736	RETVAL = !op->head;	1829	RETVAL = op->head_ () == op;
1737	OUTPUT: RETVAL	1830	OUTPUT: RETVAL
1738		1831
1739	void	1832	void
1740	inv (object *obj)	1833	inv (object *obj)
1741	PROTOTYPE: $	1834	PROTOTYPE: $
…		…
1748		1841
1749	void	1842	void
1750	set_animation (object *op, int idx)	1843	set_animation (object *op, int idx)
1751	CODE:	1844	CODE:
1752	SET_ANIMATION (op, idx);	1845	SET_ANIMATION (op, idx);
		1846
		1847	int
		1848	num_animations (object *op)
		1849	CODE:
		1850	RETVAL = NUM_ANIMATIONS (op);
		1851	OUTPUT: RETVAL
1753		1852
1754	object find_best_object_match (object op, const char *match)	1853	object find_best_object_match (object op, const char *match)
1755		1854
1756	object find_marked_object (object op)	1855	object find_marked_object (object op)
1757		1856
…		…
1832		1931
1833	void drop (object who, object op)	1932	void drop (object who, object op)
1834		1933
1835	void pick_up (object who, object op)	1934	void pick_up (object who, object op)
1836		1935
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)	1936	int cf_object_teleport (object op, maptile map, int x, int y)
1842		1937
1843	void update_object (object *op, int action)	1938	void update_object (object *op, int action)
1844		1939
1845	object cf_create_object_by_name (const char name)	1940	object cf_create_object_by_name (const char name)
…		…
1964	void esrv_update_item (object op, int what, object item)	2059	void esrv_update_item (object op, int what, object item)
1965	C_ARGS: what, op, item	2060	C_ARGS: what, op, item
1966		2061
1967	void clear_los (object *op)	2062	void clear_los (object *op)
1968		2063
1969	int command_teleport (object op, char params)
1970
1971	int command_summon (object op, char params)	2064	int command_summon (object op, char params)
1972		2065
1973	int command_arrest (object op, char params)	2066	int command_arrest (object op, char params)
1974		2067
1975	int command_kick (object op, char params)	2068	int command_kick (object op, char params)
…		…
2000	pl->orig_stats = pl->ob->stats;	2093	pl->orig_stats = pl->ob->stats;
2001		2094
2002	void cf_player_move (player *pl, int dir)	2095	void cf_player_move (player *pl, int dir)
2003		2096
2004	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2097	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		2098
2011	bool	2099	bool
2012	cell_visible (player *pl, int dx, int dy)	2100	cell_visible (player *pl, int dx, int dy)
2013	CODE:	2101	CODE:
2014	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2102	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2092	for_all_players (pl)	2180	for_all_players (pl)
2093	if (pl->ob && pl->ob->map == THIS)	2181	if (pl->ob && pl->ob->map == THIS)
2094	PUSHs (sv_2mortal (to_sv (pl->ob)));	2182	PUSHs (sv_2mortal (to_sv (pl->ob)));
2095	}	2183	}
2096		2184
		2185	void
		2186	maptile::set_regiondata (SV data, SV plt)
		2187	CODE:
		2188	{
		2189	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2190	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2191
		2192	AV av = (AV )SvRV (plt);
		2193
		2194	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2195
		2196	for (int i = av_len (av) + 1; i--; )
		2197	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2198
		2199	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2200	THIS->regionmap = regionmap;
		2201	}
		2202
2097	void play_sound_map (maptile *map, int x, int y, int sound_num)	2203	void play_sound_map (maptile *map, int x, int y, int sound_num)
2098		2204
2099	int out_of_map (maptile *map, int x, int y)	2205	int out_of_map (maptile *map, int x, int y)
2100		2206
2101	void	2207	void
…		…
2117		2223
2118	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2224	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2119	C_ARGS: str, map, nx, ny	2225	C_ARGS: str, map, nx, ny
2120		2226
2121	void	2227	void
2122	cf_map_normalise (maptile *map, int x, int y)	2228	get_map_flags (maptile *map, int x, int y)
2123	PPCODE:	2229	PPCODE:
2124	{	2230	{
2125	maptile *nmap = 0;	2231	maptile *nmap = 0;
2126	I16 nx = 0, ny = 0;	2232	I16 nx = 0, ny = 0;
2127	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2233	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2182		2288
2183	void fix_walls (maptile *map, int x, int y)	2289	void fix_walls (maptile *map, int x, int y)
2184		2290
2185	void fix_walls_around (maptile *map, int x, int y)	2291	void fix_walls_around (maptile *map, int x, int y)
2186		2292
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	2293	# worst xs function of my life
2194	maptile *	2294	bool
2195	_create_random_map (\	2295	_create_random_map (\
2196	char *path,\	2296	maptile *self,\
2197	char *wallstyle,\	2297	char *wallstyle,\
2198	char *wall_name,\	2298	char *wall_name,\
2199	char *floorstyle,\	2299	char *floorstyle,\
2200	char *monsterstyle,\	2300	char *monsterstyle,\
2201	char *treasurestyle,\	2301	char *treasurestyle,\
…		…
2205	char *origin_map,\	2305	char *origin_map,\
2206	char *final_map,\	2306	char *final_map,\
2207	char *exitstyle,\	2307	char *exitstyle,\
2208	char *this_map,\	2308	char *this_map,\
2209	char *exit_on_final_map,\	2309	char *exit_on_final_map,\
2210	int Xsize,\	2310	int xsize,\
2211	int Ysize,\	2311	int ysize,\
2212	int expand2x,\	2312	int expand2x,\
2213	int layoutoptions1,\	2313	int layoutoptions1,\
2214	int layoutoptions2,\	2314	int layoutoptions2,\
2215	int layoutoptions3,\	2315	int layoutoptions3,\
2216	int symmetry,\	2316	int symmetry,\
…		…
2221	int dungeon_depth,\	2321	int dungeon_depth,\
2222	int decoroptions,\	2322	int decoroptions,\
2223	int orientation,\	2323	int orientation,\
2224	int origin_y,\	2324	int origin_y,\
2225	int origin_x,\	2325	int origin_x,\
2226	int random_seed,\	2326	U32 random_seed,\
2227	val64 total_map_hp,\	2327	val64 total_map_hp,\
2228	int map_layout_style,\	2328	int map_layout_style,\
2229	int treasureoptions,\	2329	int treasureoptions,\
2230	int symmetry_used,\	2330	int symmetry_used,\
2231	region *region\	2331	region *region,\
		2332	char *custom\
2232	)	2333	)
2233	CODE:	2334	CODE:
2234	{	2335	{
2235	random_map_params rmp;	2336	random_map_params rmp;
2236		2337
…		…
2246	assign (rmp.exit_on_final_map, exit_on_final_map);	2347	assign (rmp.exit_on_final_map, exit_on_final_map);
2247		2348
2248	rmp.origin_map = origin_map;	2349	rmp.origin_map = origin_map;
2249	rmp.final_map = final_map;	2350	rmp.final_map = final_map;
2250	rmp.this_map = this_map;	2351	rmp.this_map = this_map;
2251	rmp.Xsize = Xsize;	2352	rmp.xsize = xsize;
2252	rmp.Ysize = Ysize;	2353	rmp.ysize = ysize;
2253	rmp.expand2x = expand2x;	2354	rmp.expand2x = expand2x;
2254	rmp.layoutoptions1 = layoutoptions1;	2355	rmp.layoutoptions1 = layoutoptions1;
2255	rmp.layoutoptions2 = layoutoptions2;	2356	rmp.layoutoptions2 = layoutoptions2;
2256	rmp.layoutoptions3 = layoutoptions3;	2357	rmp.layoutoptions3 = layoutoptions3;
2257	rmp.symmetry = symmetry;	2358	rmp.symmetry = symmetry;
…		…
2268	rmp.total_map_hp = total_map_hp;	2369	rmp.total_map_hp = total_map_hp;
2269	rmp.map_layout_style = map_layout_style;	2370	rmp.map_layout_style = map_layout_style;
2270	rmp.treasureoptions = treasureoptions;	2371	rmp.treasureoptions = treasureoptions;
2271	rmp.symmetry_used = symmetry_used;	2372	rmp.symmetry_used = symmetry_used;
2272	rmp.region = region;	2373	rmp.region = region;
		2374	rmp.custom = custom;
2273		2375
2274	RETVAL = generate_random_map (path, &rmp);	2376	RETVAL = self->generate_random_map (&rmp);
2275	}	2377	}
2276	OUTPUT:	2378	OUTPUT:
2277	RETVAL	2379	RETVAL
2278		2380
2279	MODULE = cf PACKAGE = cf::arch	2381	MODULE = cf PACKAGE = cf::arch
…		…
2302		2404
2303	INCLUDE: $PERL genacc partylist ../include/player.h \|	2405	INCLUDE: $PERL genacc partylist ../include/player.h \|
2304		2406
2305	MODULE = cf PACKAGE = cf::region	2407	MODULE = cf PACKAGE = cf::region
2306		2408
2307	region *first ()	2409	void
2308	PROTOTYPE:	2410	list ()
2309	CODE:	2411	PPCODE:
2310	RETVAL = first_region;	2412	for_all_regions (rgn)
2311	OUTPUT: RETVAL	2413	XPUSHs (sv_2mortal (to_sv (rgn)));
2312		2414
2313	region find (char name)	2415	region find (char name)
2314	PROTOTYPE: $	2416	PROTOTYPE: $
2315	CODE:	2417	CODE:
2316	RETVAL = get_region_by_name (name);	2418	RETVAL = region::find (name);
		2419	OUTPUT: RETVAL
		2420
		2421	region find_fuzzy (char name)
		2422	PROTOTYPE: $
		2423	CODE:
		2424	RETVAL = region::find_fuzzy (name);
2317	OUTPUT: RETVAL	2425	OUTPUT: RETVAL
2318		2426
2319	INCLUDE: $PERL genacc region ../include/map.h \|	2427	INCLUDE: $PERL genacc region ../include/map.h \|
2320		2428
2321	MODULE = cf PACKAGE = cf::living	2429	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.166 by root, Tue Feb 13 19:25:45 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.166 by root, Tue Feb 13 19:25:45 2007 UTC