[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.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
…		…
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 (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	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 \|= (obj->flags & 0xc0) << 8;
240	// borrow the refcnt from the object	276	obj->flags &= ~0xc0;//D
241	// it is important thta no refcnt_chk is being executed here	277	obj->flags \|= 0x10;//D
242	obj->refcnt_dec ();
243		278
244	// now bless the object _once_	279	// now bless the object _once_
245	return sv_bless (newRV_inc ((SV *)obj->self), stash);	280	return sv_bless (newRV_inc ((SV *)obj->self), stash);
246	}	281	}
247	else	282	else
		283	{
248	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	}
249	}	291	}
250		292
251	static void	293	static void
252	clearSVptr (SV *sv)	294	clearSVptr (SV *sv)
253	{	295	{
…		…
306	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); }
307		349
308	inline SV *to_sv (object & v) { return to_sv (&v); }	350	inline SV *to_sv (object & v) { return to_sv (&v); }
309	inline SV *to_sv (living & v) { return to_sv (&v); }	351	inline SV *to_sv (living & v) { return to_sv (&v); }
310		352
311	//TODO:
312	inline SV to_sv (New_Face v) { return to_sv (v->name); }	353	inline SV to_sv (facetile v) { return to_sv (v->name); }
313	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	354	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
314		355
315	inline SV *to_sv (UUID v)	356	inline SV *to_sv (UUID v)
316	{	357	{
317	char buf[128];	358	char buf[128];
318	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	359	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
319	return newSVpv (buf, 0);	360	return newSVpv (buf, 0);
320	}	361	}
321		362
322	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; }
323	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; }
…		…
342	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"); }
343	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"); }
344	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"); }
345	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"); }
346		387
347	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)]; }
348	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)); }
349		390
350	template<class T>	391	template<class T>
351	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; }
352		393
353	template<int N>	394	template<int N>
…		…
489	if (!ext->cb)	530	if (!ext->cb)
490	ext->cb = newAV ();	531	ext->cb = newAV ();
491		532
492	return newRV_inc ((SV *)ext->cb);	533	return newRV_inc ((SV *)ext->cb);
493	}	534	}
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		535
520	/////////////////////////////////////////////////////////////////////////////	536	/////////////////////////////////////////////////////////////////////////////
521		537
522	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)
523	{	539	{
…		…
595	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))
596	{	612	{
597	printf ("unable to initialize perl-interpreter, aborting.\n");	613	printf ("unable to initialize perl-interpreter, aborting.\n");
598	exit (EXIT_FAILURE);	614	exit (EXIT_FAILURE);
599	}	615	}
		616
		617	{
		618	dSP;
		619
		620	PUSHMARK (SP);
		621	PUTBACK;
		622	call_pv ("cf::init", G_DISCARD \| G_VOID);
		623	}
600	}	624	}
601		625
602	void cfperl_main ()	626	void cfperl_main ()
603	{	627	{
604	dSP;	628	dSP;
…		…
825	CALL_BEGIN (0);	849	CALL_BEGIN (0);
826	CALL_CALL ("cf::emergency_save", G_VOID);	850	CALL_CALL ("cf::emergency_save", G_VOID);
827	CALL_END;	851	CALL_END;
828	}	852	}
829		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);
		860	CALL_END;
		861	}
		862
830	maptile *	863	maptile *
831	maptile::find_sync (const char path, maptile origin)	864	maptile::find_sync (const char path, maptile origin)
832	{	865	{
833	CALL_BEGIN (2);	866	CALL_BEGIN (2);
834	CALL_ARG (path);	867	CALL_ARG (path);
835	CALL_ARG (origin);	868	CALL_ARG (origin);
836	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);
837		890
838	maptile *retval;	891	maptile *retval;
839		892
840	if (count)	893	if (count)
841	sv_to (POPs, retval);	894	sv_to (POPs, retval);
…		…
894	void	947	void
895	iw::alloc ()	948	iw::alloc ()
896	{	949	{
897	pe = GEventAPI->new_idle (0, 0);	950	pe = GEventAPI->new_idle (0, 0);
898		951
		952	WaREENTRANT_off (pe);
899	pe->base.callback = (void *)iw_dispatch;	953	pe->base.callback = (void *)iw_dispatch;
900	pe->base.ext_data = (void *)this;	954	pe->base.ext_data = (void *)this;
901	}	955	}
902		956
903	static void iow_dispatch (pe_event *ev)	957	static void iow_dispatch (pe_event *ev)
…		…
909	void	963	void
910	iow::alloc ()	964	iow::alloc ()
911	{	965	{
912	pe = GEventAPI->new_io (0, 0);	966	pe = GEventAPI->new_io (0, 0);
913		967
		968	WaREENTRANT_off (pe);
914	pe->base.callback = (void *)iow_dispatch;	969	pe->base.callback = (void *)iow_dispatch;
915	pe->base.ext_data = (void *)this;	970	pe->base.ext_data = (void *)this;
916		971
917	pe->fd = -1;	972	pe->fd = -1;
918	pe->poll = 0;	973	pe->poll = 0;
…		…
1246	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1301	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1247	const_iv (FLAG_IS_WATER)	1302	const_iv (FLAG_IS_WATER)
1248	const_iv (FLAG_CONTENT_ON_GEN)	1303	const_iv (FLAG_CONTENT_ON_GEN)
1249	const_iv (FLAG_IS_A_TEMPLATE)	1304	const_iv (FLAG_IS_A_TEMPLATE)
1250	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)
1251		1308
1252	const_iv (NDI_BLACK)	1309	const_iv (NDI_BLACK)
1253	const_iv (NDI_WHITE)	1310	const_iv (NDI_WHITE)
1254	const_iv (NDI_NAVY)	1311	const_iv (NDI_NAVY)
1255	const_iv (NDI_RED)	1312	const_iv (NDI_RED)
…		…
1440	const_iv (ATNR_BLIND)	1497	const_iv (ATNR_BLIND)
1441	const_iv (ATNR_INTERNAL)	1498	const_iv (ATNR_INTERNAL)
1442	const_iv (ATNR_LIFE_STEALING)	1499	const_iv (ATNR_LIFE_STEALING)
1443	const_iv (ATNR_DISEASE)	1500	const_iv (ATNR_DISEASE)
1444		1501
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)	1502	const_iv (MAP_IN_MEMORY)
1452	const_iv (MAP_SWAPPED)	1503	const_iv (MAP_SWAPPED)
1453	const_iv (MAP_LOADING)	1504	const_iv (MAP_LOADING)
1454	const_iv (MAP_SAVING)	1505	const_iv (MAP_SAVING)
1455		1506
…		…
1548	}	1599	}
1549		1600
1550	NV floor (NV x)	1601	NV floor (NV x)
1551		1602
1552	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
1553		1616
1554	void server_tick ()	1617	void server_tick ()
1555	CODE:	1618	CODE:
1556	runtime = SvNVx (sv_runtime);	1619	runtime = SvNVx (sv_runtime);
1557	server_tick ();	1620	server_tick ();
…		…
1604	}	1667	}
1605	OUTPUT: RETVAL	1668	OUTPUT: RETVAL
1606		1669
1607	void abort ()	1670	void abort ()
1608		1671
		1672	void fork_abort (char *cause = "cf::fork_abort")
		1673
1609	void cleanup (const char *cause, bool make_core = false)	1674	void cleanup (const char *cause, bool make_core = false)
1610		1675
1611	void emergency_save ()	1676	void emergency_save ()
1612		1677
1613	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
1614		1685
1615	#if _POSIX_MEMLOCK	1686	#if _POSIX_MEMLOCK
1616		1687
1617	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1688	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1618		1689
…		…
1664	RETVAL = newSVpv (resist_plus[atnr], 0);	1735	RETVAL = newSVpv (resist_plus[atnr], 0);
1665	else	1736	else
1666	XSRETURN_UNDEF;	1737	XSRETURN_UNDEF;
1667	OUTPUT: RETVAL	1738	OUTPUT: RETVAL
1668		1739
		1740	bool
		1741	load_regions (const char *filename)
		1742	CODE:
		1743	RETVAL = loader_region ().load (filename);
		1744	OUTPUT: RETVAL
		1745
1669	MODULE = cf PACKAGE = cf::attachable	1746	MODULE = cf PACKAGE = cf::attachable
1670		1747
1671	int	1748	int
1672	valid (SV *obj)	1749	valid (SV *obj)
1673	CODE:	1750	CODE:
1674	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1751	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1675	OUTPUT:	1752	OUTPUT:
1676	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
1677		1771
1678	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1772	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1679		1773
1680	MODULE = cf PACKAGE = cf::global	1774	MODULE = cf PACKAGE = cf::global
1681		1775
…		…
1699	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1793	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1700	OUTPUT: RETVAL	1794	OUTPUT: RETVAL
1701		1795
1702	SV registry (object op)	1796	SV registry (object op)
1703		1797
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 ()	1798	int objects_size ()
1711	CODE:	1799	CODE:
1712	RETVAL = objects.size ();	1800	RETVAL = objects.size ();
1713	OUTPUT: RETVAL	1801	OUTPUT: RETVAL
1714		1802
…		…
1753		1841
1754	void	1842	void
1755	set_animation (object *op, int idx)	1843	set_animation (object *op, int idx)
1756	CODE:	1844	CODE:
1757	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
1758		1852
1759	object find_best_object_match (object op, const char *match)	1853	object find_best_object_match (object op, const char *match)
1760		1854
1761	object find_marked_object (object op)	1855	object find_marked_object (object op)
1762		1856
…		…
1837		1931
1838	void drop (object who, object op)	1932	void drop (object who, object op)
1839		1933
1840	void pick_up (object who, object op)	1934	void pick_up (object who, object op)
1841		1935
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)	1936	int cf_object_teleport (object op, maptile map, int x, int y)
1847		1937
1848	void update_object (object *op, int action)	1938	void update_object (object *op, int action)
1849		1939
1850	object cf_create_object_by_name (const char name)	1940	object cf_create_object_by_name (const char name)
…		…
1969	void esrv_update_item (object op, int what, object item)	2059	void esrv_update_item (object op, int what, object item)
1970	C_ARGS: what, op, item	2060	C_ARGS: what, op, item
1971		2061
1972	void clear_los (object *op)	2062	void clear_los (object *op)
1973		2063
1974	int command_teleport (object op, char params)
1975
1976	int command_summon (object op, char params)	2064	int command_summon (object op, char params)
1977		2065
1978	int command_arrest (object op, char params)	2066	int command_arrest (object op, char params)
1979		2067
1980	int command_kick (object op, char params)	2068	int command_kick (object op, char params)
…		…
2005	pl->orig_stats = pl->ob->stats;	2093	pl->orig_stats = pl->ob->stats;
2006		2094
2007	void cf_player_move (player *pl, int dir)	2095	void cf_player_move (player *pl, int dir)
2008		2096
2009	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);
2010
2011	player *first ()
2012	CODE:
2013	RETVAL = first_player;
2014	OUTPUT: RETVAL
2015		2098
2016	bool	2099	bool
2017	cell_visible (player *pl, int dx, int dy)	2100	cell_visible (player *pl, int dx, int dy)
2018	CODE:	2101	CODE:
2019	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
…		…
2097	for_all_players (pl)	2180	for_all_players (pl)
2098	if (pl->ob && pl->ob->map == THIS)	2181	if (pl->ob && pl->ob->map == THIS)
2099	PUSHs (sv_2mortal (to_sv (pl->ob)));	2182	PUSHs (sv_2mortal (to_sv (pl->ob)));
2100	}	2183	}
2101		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
2102	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)
2103		2204
2104	int out_of_map (maptile *map, int x, int y)	2205	int out_of_map (maptile *map, int x, int y)
2105		2206
2106	void	2207	void
…		…
2122		2223
2123	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)
2124	C_ARGS: str, map, nx, ny	2225	C_ARGS: str, map, nx, ny
2125		2226
2126	void	2227	void
2127	cf_map_normalise (maptile *map, int x, int y)	2228	get_map_flags (maptile *map, int x, int y)
2128	PPCODE:	2229	PPCODE:
2129	{	2230	{
2130	maptile *nmap = 0;	2231	maptile *nmap = 0;
2131	I16 nx = 0, ny = 0;	2232	I16 nx = 0, ny = 0;
2132	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2233	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2187		2288
2188	void fix_walls (maptile *map, int x, int y)	2289	void fix_walls (maptile *map, int x, int y)
2189		2290
2190	void fix_walls_around (maptile *map, int x, int y)	2291	void fix_walls_around (maptile *map, int x, int y)
2191		2292
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	2293	# worst xs function of my life
2199	maptile *	2294	bool
2200	_create_random_map (\	2295	_create_random_map (\
2201	char *path,\	2296	maptile *self,\
2202	char *wallstyle,\	2297	char *wallstyle,\
2203	char *wall_name,\	2298	char *wall_name,\
2204	char *floorstyle,\	2299	char *floorstyle,\
2205	char *monsterstyle,\	2300	char *monsterstyle,\
2206	char *treasurestyle,\	2301	char *treasurestyle,\
…		…
2210	char *origin_map,\	2305	char *origin_map,\
2211	char *final_map,\	2306	char *final_map,\
2212	char *exitstyle,\	2307	char *exitstyle,\
2213	char *this_map,\	2308	char *this_map,\
2214	char *exit_on_final_map,\	2309	char *exit_on_final_map,\
2215	int Xsize,\	2310	int xsize,\
2216	int Ysize,\	2311	int ysize,\
2217	int expand2x,\	2312	int expand2x,\
2218	int layoutoptions1,\	2313	int layoutoptions1,\
2219	int layoutoptions2,\	2314	int layoutoptions2,\
2220	int layoutoptions3,\	2315	int layoutoptions3,\
2221	int symmetry,\	2316	int symmetry,\
…		…
2226	int dungeon_depth,\	2321	int dungeon_depth,\
2227	int decoroptions,\	2322	int decoroptions,\
2228	int orientation,\	2323	int orientation,\
2229	int origin_y,\	2324	int origin_y,\
2230	int origin_x,\	2325	int origin_x,\
2231	int random_seed,\	2326	U32 random_seed,\
2232	val64 total_map_hp,\	2327	val64 total_map_hp,\
2233	int map_layout_style,\	2328	int map_layout_style,\
2234	int treasureoptions,\	2329	int treasureoptions,\
2235	int symmetry_used,\	2330	int symmetry_used,\
2236	region *region\	2331	region *region,\
		2332	char *custom\
2237	)	2333	)
2238	CODE:	2334	CODE:
2239	{	2335	{
2240	random_map_params rmp;	2336	random_map_params rmp;
2241		2337
…		…
2251	assign (rmp.exit_on_final_map, exit_on_final_map);	2347	assign (rmp.exit_on_final_map, exit_on_final_map);
2252		2348
2253	rmp.origin_map = origin_map;	2349	rmp.origin_map = origin_map;
2254	rmp.final_map = final_map;	2350	rmp.final_map = final_map;
2255	rmp.this_map = this_map;	2351	rmp.this_map = this_map;
2256	rmp.Xsize = Xsize;	2352	rmp.xsize = xsize;
2257	rmp.Ysize = Ysize;	2353	rmp.ysize = ysize;
2258	rmp.expand2x = expand2x;	2354	rmp.expand2x = expand2x;
2259	rmp.layoutoptions1 = layoutoptions1;	2355	rmp.layoutoptions1 = layoutoptions1;
2260	rmp.layoutoptions2 = layoutoptions2;	2356	rmp.layoutoptions2 = layoutoptions2;
2261	rmp.layoutoptions3 = layoutoptions3;	2357	rmp.layoutoptions3 = layoutoptions3;
2262	rmp.symmetry = symmetry;	2358	rmp.symmetry = symmetry;
…		…
2273	rmp.total_map_hp = total_map_hp;	2369	rmp.total_map_hp = total_map_hp;
2274	rmp.map_layout_style = map_layout_style;	2370	rmp.map_layout_style = map_layout_style;
2275	rmp.treasureoptions = treasureoptions;	2371	rmp.treasureoptions = treasureoptions;
2276	rmp.symmetry_used = symmetry_used;	2372	rmp.symmetry_used = symmetry_used;
2277	rmp.region = region;	2373	rmp.region = region;
		2374	rmp.custom = custom;
2278		2375
2279	RETVAL = generate_random_map (path, &rmp);	2376	RETVAL = self->generate_random_map (&rmp);
2280	}	2377	}
2281	OUTPUT:	2378	OUTPUT:
2282	RETVAL	2379	RETVAL
2283		2380
2284	MODULE = cf PACKAGE = cf::arch	2381	MODULE = cf PACKAGE = cf::arch
…		…
2307		2404
2308	INCLUDE: $PERL genacc partylist ../include/player.h \|	2405	INCLUDE: $PERL genacc partylist ../include/player.h \|
2309		2406
2310	MODULE = cf PACKAGE = cf::region	2407	MODULE = cf PACKAGE = cf::region
2311		2408
2312	region *first ()	2409	void
2313	PROTOTYPE:	2410	list ()
2314	CODE:	2411	PPCODE:
2315	RETVAL = first_region;	2412	for_all_regions (rgn)
2316	OUTPUT: RETVAL	2413	XPUSHs (sv_2mortal (to_sv (rgn)));
2317		2414
2318	region find (char name)	2415	region find (char name)
2319	PROTOTYPE: $	2416	PROTOTYPE: $
2320	CODE:	2417	CODE:
2321	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);
2322	OUTPUT: RETVAL	2425	OUTPUT: RETVAL
2323		2426
2324	INCLUDE: $PERL genacc region ../include/map.h \|	2427	INCLUDE: $PERL genacc region ../include/map.h \|
2325		2428
2326	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.134 by root, Tue Jan 9 21:32:42 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.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.166 by root, Tue Feb 13 19:25:45 2007 UTC