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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.161 by root, Thu Feb 1 19:15:39 2007 UTC

…		…
32	#include <sproto.h>	32	#include <sproto.h>
33		33
34	#include "cfperl.h"	34	#include "cfperl.h"
35	#include "shstr.h"	35	#include "shstr.h"
36		36
		37	#include <unistd.h>
		38	#if _POSIX_MEMLOCK
		39	# include <sys/mman.h>
		40	#endif
		41
37	#include <EXTERN.h>	42	#include <EXTERN.h>
38	#include <perl.h>	43	#include <perl.h>
39	#include <XSUB.h>	44	#include <XSUB.h>
40		45
41	#include "CoroAPI.h"	46	#include "CoroAPI.h"
…		…
94		99
95	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	100	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96		101
97	unordered_vector<attachable *> attachable::mortals;	102	unordered_vector<attachable *> attachable::mortals;
98		103
99	#if 0
100	attachable *attachable::rc_first;
101
102	attachable::attachable ()
103	{
104	refcnt = 0;
105	rc_next = rc_first;
106	rc_first = this;
107	}
108	#endif
109
110	attachable::~attachable ()	104	attachable::~attachable ()
111	{	105	{
112	assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113	#if 0
114	assert (!rc_next);
115	assert (!refcnt);	106	assert (!self);
116	#endif	107	assert (!cb);
		108	}
		109
		110	int
		111	attachable::refcnt_cnt () const
		112	{
		113	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		114	}
		115
		116	void
		117	attachable::sever_self ()
		118	{
		119	if (HV *self = this->self)
		120	{
		121	// keep a refcount because sv_unmagic might call attachable_free,
		122	// which might clear self, causing sv_unmagic to crash on a now
		123	// invalid object.
		124	SvREFCNT_inc (self);
		125	hv_clear (self);
		126	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		127	SvREFCNT_dec (self);
		128
		129	// self must be null now because thats sv_unmagic's job.
		130	assert (!this->self);
		131	}
		132	}
		133
		134	void
		135	attachable::optimise ()
		136	{
		137	if (self
		138	&& SvREFCNT (self) == 1
		139	&& !HvTOTALKEYS (self))
		140	sever_self ();
117	}	141	}
118		142
119	// check wether the object really is dead	143	// check wether the object really is dead
120	void	144	void
121	attachable::do_check ()	145	attachable::do_check ()
122	{	146	{
123	if (refcnt > 0)	147	if (refcnt_cnt () > 0)
124	return;	148	return;
125		149
126	// try to unborrow the refcnt from perl	150	destroy ();
127	if (flags & F_BORROWED)	151	}
		152
		153	void
		154	attachable::do_destroy ()
		155	{
		156	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		157
		158	if (cb)
128	{	159	{
129	assert (self);//D//TODO//remove when stable
130	flags &= ~F_BORROWED;
131	refcnt_inc ();
132	SvREFCNT_dec (self);	160	SvREFCNT_dec (cb);
		161	cb = 0;
133	}	162	}
134		163
135	if (refcnt > 0 \|\| self)	164	if (self)
136	return;	165	sever_self ();
137		166
138	destroy ();
139	}
140
141	void
142	attachable::do_destroy ()
143	{
144	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145
146	//TODO: call generic destroy callback
147	mortals.push_back (this);	167	mortals.push_back (this);
148	}	168	}
149		169
150	void	170	void
151	attachable::destroy ()	171	attachable::destroy ()
…		…
155		175
156	flags \|= F_DESTROYED;	176	flags \|= F_DESTROYED;
157	do_destroy ();	177	do_destroy ();
158	}	178	}
159		179
		180	void
160	void attachable::check_mortals ()	181	attachable::check_mortals ()
161	{	182	{
162	for (int i = 0; i < mortals.size (); )	183	static int i = 0;
		184
		185	for (;;)
163	{	186	{
		187	if (i >= mortals.size ())
		188	{
		189	i = 0;
		190
		191	if (mortals.size () > 1000)
		192	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		193
		194	break;
		195	}
		196
164	attachable *obj = mortals [i];	197	attachable *obj = mortals [i];
165		198
166	obj->refcnt_chk (); // unborrow from perl, if necessary	199	obj->refcnt_chk (); // unborrow from perl, if necessary
167		200
		201	//if (obj->refcnt > 0 \|\| obj->self)
168	if (obj->refcnt \|\| obj->self)	202	if (obj->refcnt \|\| obj->self)
169	{	203	{
170	#if 0	204	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
171	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
172	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
173	#endif
174
175	++i; // further delay freeing	205	++i; // further delay freeing
		206
		207	if (!(i & 0x3ff))
		208	break;
176	}//D	209	}
177	else	210	else
178	{	211	{
179	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180	mortals.erase (i);	212	mortals.erase (i);
181	delete obj;	213	delete obj;
182	}	214	}
183	}	215	}
184	}	216	}
…		…
209		241
210	static int	242	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	243	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	244	{
213	attachable at = (attachable )mg->mg_ptr;	245	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	246
		247	//TODO: check if transaction behaviour is really required here
		248	if (SV self = (SV )at->self)
		249	{
215	at->self = 0;	250	at->self = 0;
		251	SvREFCNT_dec (self);
		252	}
		253
216	// next line makes sense, but most objects still have refcnt 0 by default	254	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	255	//at->refcnt_chk ();
218	return 0;	256	return 0;
219	}	257	}
220		258
…		…
229	if (!obj->self)	267	if (!obj->self)
230	{	268	{
231	obj->self = newHV ();	269	obj->self = newHV ();
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	270	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
233		271
234	// borrow the refcnt from the object	272	// now bless the object _once_
235	obj->flags \|= attachable::F_BORROWED;	273	return sv_bless (newRV_inc ((SV *)obj->self), stash);
236	obj->refcnt_dec ();
237	}	274	}
		275	else
		276	{
		277	SV sv = newRV_inc ((SV )obj->self);
238		278
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	279	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		280	SvAMAGIC_on (sv);
		281
		282	return sv;
		283	}
240	}	284	}
241		285
242	static void	286	static void
243	clearSVptr (SV *sv)	287	clearSVptr (SV *sv)
244	{	288	{
…		…
297	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	341	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
298		342
299	inline SV *to_sv (object & v) { return to_sv (&v); }	343	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	344	inline SV *to_sv (living & v) { return to_sv (&v); }
301		345
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	346	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	347	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		348
306	inline SV *to_sv (UUID v)	349	inline SV *to_sv (UUID v)
307	{	350	{
308	char buf[128];	351	char buf[128];
309	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	352	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
310	return newSVpv (buf, 0);	353	return newSVpv (buf, 0);
311	}	354	}
312		355
313	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	356	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
314	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	357	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	371	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }
329	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }	372	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }
330	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }	373	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }
331	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }	374	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }
332	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }	375	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		376	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
333	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	377	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
334	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	378	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
335	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	379	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		380
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	381	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
338	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	382	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339		383
340	template<class T>	384	template<class T>
341	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	385	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
342		386
343	template<int N>	387	template<int N>
…		…
478	{	522	{
479	if (!ext->cb)	523	if (!ext->cb)
480	ext->cb = newAV ();	524	ext->cb = newAV ();
481		525
482	return newRV_inc ((SV *)ext->cb);	526	return newRV_inc ((SV *)ext->cb);
483	}
484
485	#if 0
486	void attachable::clear ()
487	{
488	if (self)
489	{
490	// disconnect Perl from C, to avoid crashes
491	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
492
493	// clear the perl hash, might or might not be a good idea
494	hv_clear ((HV )SvRV ((SV )self));
495
496	SvREFCNT_dec (self);
497	self = 0;
498	}
499
500	if (cb)
501	{
502	SvREFCNT_dec (cb);
503	cb = 0;
504	}
505
506	attach = 0;
507	}
508	#endif
509
510	void attachable::optimise ()
511	{
512	if (self
513	&& SvREFCNT (self) == 1
514	&& !HvTOTALKEYS (self))
515	{
516	flags &= ~F_BORROWED;
517	refcnt_inc ();
518	SvREFCNT_dec ((SV *)self);
519	}
520	}	527	}
521		528
522	/////////////////////////////////////////////////////////////////////////////	529	/////////////////////////////////////////////////////////////////////////////
523		530
524	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	531	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
820	}	827	}
821		828
822	/////////////////////////////////////////////////////////////////////////////	829	/////////////////////////////////////////////////////////////////////////////
823		830
824	void	831	void
825	maptile::emergency_save ()	832	cfperl_emergency_save ()
826	{	833	{
827	CALL_BEGIN (0);	834	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	835	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	836	CALL_END;
830	}	837	}
831		838
832	maptile *	839	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	840	maptile::find_sync (const char path, maptile origin)
834	{	841	{
835	CALL_BEGIN (2);	842	CALL_BEGIN (2);
836	CALL_ARG (path);	843	CALL_ARG (path);
837	CALL_ARG (origin);	844	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	845	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		846
840	maptile *retval;	847	maptile *retval;
841		848
842	if (count)	849	if (count)
843	sv_to (POPs, retval);	850	sv_to (POPs, retval);
…		…
845	retval = 0;	852	retval = 0;
846		853
847	CALL_END;	854	CALL_END;
848		855
849	return retval;	856	return retval;
		857	}
		858
		859	maptile *
		860	maptile::find_async (const char path, maptile origin)
		861	{
		862	CALL_BEGIN (2);
		863	CALL_ARG (path);
		864	CALL_ARG (origin);
		865	CALL_CALL ("cf::map::find_async", G_SCALAR);
		866
		867	maptile *retval;
		868
		869	if (count)
		870	sv_to (POPs, retval);
		871	else
		872	retval = 0;
		873
		874	CALL_END;
		875
		876	return retval;
		877	}
		878
		879	void
		880	maptile::do_load_sync ()
		881	{
		882	CALL_BEGIN (1);
		883	CALL_ARG (this);
		884	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		885	CALL_END;
850	}	886	}
851		887
852	void	888	void
853	maptile::change_all_map_light (int change)	889	maptile::change_all_map_light (int change)
854	{	890	{
…		…
887	void	923	void
888	iw::alloc ()	924	iw::alloc ()
889	{	925	{
890	pe = GEventAPI->new_idle (0, 0);	926	pe = GEventAPI->new_idle (0, 0);
891		927
		928	WaREENTRANT_off (pe);
892	pe->base.callback = (void *)iw_dispatch;	929	pe->base.callback = (void *)iw_dispatch;
893	pe->base.ext_data = (void *)this;	930	pe->base.ext_data = (void *)this;
894	}	931	}
895		932
896	static void iow_dispatch (pe_event *ev)	933	static void iow_dispatch (pe_event *ev)
…		…
902	void	939	void
903	iow::alloc ()	940	iow::alloc ()
904	{	941	{
905	pe = GEventAPI->new_io (0, 0);	942	pe = GEventAPI->new_io (0, 0);
906		943
		944	WaREENTRANT_off (pe);
907	pe->base.callback = (void *)iow_dispatch;	945	pe->base.callback = (void *)iow_dispatch;
908	pe->base.ext_data = (void *)this;	946	pe->base.ext_data = (void *)this;
909		947
910	pe->fd = -1;	948	pe->fd = -1;
911	pe->poll = 0;	949	pe->poll = 0;
…		…
1239	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1277	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240	const_iv (FLAG_IS_WATER)	1278	const_iv (FLAG_IS_WATER)
1241	const_iv (FLAG_CONTENT_ON_GEN)	1279	const_iv (FLAG_CONTENT_ON_GEN)
1242	const_iv (FLAG_IS_A_TEMPLATE)	1280	const_iv (FLAG_IS_A_TEMPLATE)
1243	const_iv (FLAG_IS_BUILDABLE)	1281	const_iv (FLAG_IS_BUILDABLE)
		1282	const_iv (FLAG_DESTROY_ON_DEATH)
		1283	const_iv (FLAG_NO_MAP_SAVE)
1244		1284
1245	const_iv (NDI_BLACK)	1285	const_iv (NDI_BLACK)
1246	const_iv (NDI_WHITE)	1286	const_iv (NDI_WHITE)
1247	const_iv (NDI_NAVY)	1287	const_iv (NDI_NAVY)
1248	const_iv (NDI_RED)	1288	const_iv (NDI_RED)
…		…
1433	const_iv (ATNR_BLIND)	1473	const_iv (ATNR_BLIND)
1434	const_iv (ATNR_INTERNAL)	1474	const_iv (ATNR_INTERNAL)
1435	const_iv (ATNR_LIFE_STEALING)	1475	const_iv (ATNR_LIFE_STEALING)
1436	const_iv (ATNR_DISEASE)	1476	const_iv (ATNR_DISEASE)
1437		1477
1438	const_iv (MAP_FLUSH)
1439	const_iv (MAP_PLAYER_UNIQUE)
1440	const_iv (MAP_BLOCK)
1441	const_iv (MAP_STYLE)
1442	const_iv (MAP_OVERLAY)
1443
1444	const_iv (MAP_IN_MEMORY)	1478	const_iv (MAP_IN_MEMORY)
1445	const_iv (MAP_SWAPPED)	1479	const_iv (MAP_SWAPPED)
1446	const_iv (MAP_LOADING)	1480	const_iv (MAP_LOADING)
1447	const_iv (MAP_SAVING)	1481	const_iv (MAP_SAVING)
1448		1482
…		…
1461	const_iv (ST_SETUP)	1495	const_iv (ST_SETUP)
1462	const_iv (ST_PLAYING)	1496	const_iv (ST_PLAYING)
1463	const_iv (ST_CUSTOM)	1497	const_iv (ST_CUSTOM)
1464		1498
1465	const_iv (ST_CHANGE_CLASS)	1499	const_iv (ST_CHANGE_CLASS)
1466	const_iv (ST_CONFIRM_QUIT)
1467	const_iv (ST_GET_PARTY_PASSWORD)
1468		1500
1469	const_iv (IO_HEADER)	1501	const_iv (IO_HEADER)
1470	const_iv (IO_OBJECTS)	1502	const_iv (IO_OBJECTS)
1471	const_iv (IO_UNIQUES)	1503	const_iv (IO_UNIQUES)
1472		1504
…		…
1526		1558
1527	void _global_reattach ()	1559	void _global_reattach ()
1528	CODE:	1560	CODE:
1529	{	1561	{
1530	// reattach to all attachable objects in the game.	1562	// reattach to all attachable objects in the game.
1531	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1563	for_all_clients (ns)
1532	(*i)->reattach ();	1564	ns->reattach ();
1533		1565
1534	for_all_players (pl)	1566	for_all_players (pl)
1535	pl->reattach ();	1567	pl->reattach ();
1536		1568
1537	//TODO	1569	//TODO
1538	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1570	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539	// i->second->reattach ();	1571	// i->second->reattach ();
1540		1572
1541	for (object *op = object::first; op; op = op->next)	1573	for_all_objects (op)
1542	op->reattach ();	1574	op->reattach ();
1543	}	1575	}
1544		1576
1545	NV floor (NV x)	1577	NV floor (NV x)
1546		1578
1547	NV ceil (NV x)	1579	NV ceil (NV x)
		1580
		1581	NV rndm (...)
		1582	CODE:
		1583	switch (items)
		1584	{
		1585	case 0: RETVAL = rndm (); break;
		1586	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1587	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1588	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1589	}
		1590	OUTPUT:
		1591	RETVAL
1548		1592
1549	void server_tick ()	1593	void server_tick ()
1550	CODE:	1594	CODE:
1551	runtime = SvNVx (sv_runtime);	1595	runtime = SvNVx (sv_runtime);
1552	server_tick ();	1596	server_tick ();
…		…
1599	}	1643	}
1600	OUTPUT: RETVAL	1644	OUTPUT: RETVAL
1601		1645
1602	void abort ()	1646	void abort ()
1603		1647
		1648	void fork_abort (char *cause = "cf::fork_abort")
		1649
		1650	void cleanup (const char *cause, bool make_core = false)
		1651
1604	void emergency_save ()	1652	void emergency_save ()
1605		1653
1606	void _exit (int status = 0)	1654	void _exit (int status = EXIT_SUCCESS)
		1655
		1656	UV sv_2watcher (SV *w)
		1657	CODE:
		1658	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1659	OUTPUT:
		1660	RETVAL
		1661
		1662	#if _POSIX_MEMLOCK
		1663
		1664	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1665
		1666	int munlockall ()
		1667
		1668	#endif
1607		1669
1608	int find_animation (char *text)	1670	int find_animation (char *text)
1609	PROTOTYPE: $	1671	PROTOTYPE: $
1610		1672
1611	int random_roll (int min, int max, object *op, int goodbad);	1673	int random_roll (int min, int max, object *op, int goodbad);
…		…
1658	CODE:	1720	CODE:
1659	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1721	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660	OUTPUT:	1722	OUTPUT:
1661	RETVAL	1723	RETVAL
1662		1724
1663	#bool	1725	int mortals_size ()
1664	#destroyed (attachable *at)	1726	CODE:
1665	#	1727	RETVAL = attachable::mortals.size ();
1666	#void	1728	OUTPUT: RETVAL
1667	#destroy (attachable *at)	1729
		1730	#object *mortals (U32 index)
		1731	# CODE:
		1732	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1733	# OUTPUT: RETVAL
		1734
		1735	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1668		1736
1669	MODULE = cf PACKAGE = cf::global	1737	MODULE = cf PACKAGE = cf::global
1670		1738
1671	int invoke (SV *klass, int event, ...)	1739	int invoke (SV *klass, int event, ...)
1672	CODE:	1740	CODE:
…		…
1688	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1756	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1689	OUTPUT: RETVAL	1757	OUTPUT: RETVAL
1690		1758
1691	SV registry (object op)	1759	SV registry (object op)
1692		1760
1693	void mortals ()	1761	int objects_size ()
1694	PPCODE:	1762	CODE:
1695	EXTEND (SP, object::mortals.size ());
1696	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697	PUSHs (to_sv (*i));
1698
1699	object *first ()
1700	CODE:
1701	RETVAL = object::first;	1763	RETVAL = objects.size ();
		1764	OUTPUT: RETVAL
		1765
		1766	object *objects (U32 index)
		1767	CODE:
		1768	RETVAL = index < objects.size () ? objects [index] : 0;
		1769	OUTPUT: RETVAL
		1770
		1771	int actives_size ()
		1772	CODE:
		1773	RETVAL = actives.size ();
		1774	OUTPUT: RETVAL
		1775
		1776	object *actives (U32 index)
		1777	CODE:
		1778	RETVAL = index < actives.size () ? actives [index] : 0;
1702	OUTPUT: RETVAL	1779	OUTPUT: RETVAL
1703		1780
1704	# missing properties	1781	# missing properties
1705		1782
1706	object head (object op)	1783	object head (object op)
1707	PROTOTYPE: $	1784	PROTOTYPE: $
1708	CODE:	1785	CODE:
1709	RETVAL = op->head ? op->head : op;	1786	RETVAL = op->head_ ();
1710	OUTPUT: RETVAL	1787	OUTPUT: RETVAL
1711		1788
1712	int is_head (object *op)	1789	int is_head (object *op)
1713	PROTOTYPE: $	1790	PROTOTYPE: $
1714	CODE:	1791	CODE:
1715	RETVAL = !op->head;	1792	RETVAL = op->head_ () == op;
1716	OUTPUT: RETVAL	1793	OUTPUT: RETVAL
1717		1794
1718	void	1795	void
1719	inv (object *obj)	1796	inv (object *obj)
1720	PROTOTYPE: $	1797	PROTOTYPE: $
…		…
1727		1804
1728	void	1805	void
1729	set_animation (object *op, int idx)	1806	set_animation (object *op, int idx)
1730	CODE:	1807	CODE:
1731	SET_ANIMATION (op, idx);	1808	SET_ANIMATION (op, idx);
		1809
		1810	int
		1811	num_animations (object *op)
		1812	CODE:
		1813	RETVAL = NUM_ANIMATIONS (op);
		1814	OUTPUT: RETVAL
1732		1815
1733	object find_best_object_match (object op, const char *match)	1816	object find_best_object_match (object op, const char *match)
1734		1817
1735	object find_marked_object (object op)	1818	object find_marked_object (object op)
1736		1819
…		…
1811		1894
1812	void drop (object who, object op)	1895	void drop (object who, object op)
1813		1896
1814	void pick_up (object who, object op)	1897	void pick_up (object who, object op)
1815		1898
1816	object cf_object_insert_object (object op, object *container)
1817
1818	object cf_object_insert_in_ob (object ob, object *where)
1819
1820	int cf_object_teleport (object op, maptile map, int x, int y)	1899	int cf_object_teleport (object op, maptile map, int x, int y)
1821		1900
1822	void update_object (object *op, int action)	1901	void update_object (object *op, int action)
1823		1902
1824	object cf_create_object_by_name (const char name)	1903	object cf_create_object_by_name (const char name)
…		…
1943	void esrv_update_item (object op, int what, object item)	2022	void esrv_update_item (object op, int what, object item)
1944	C_ARGS: what, op, item	2023	C_ARGS: what, op, item
1945		2024
1946	void clear_los (object *op)	2025	void clear_los (object *op)
1947		2026
1948	int command_teleport (object op, char params)
1949
1950	int command_summon (object op, char params)	2027	int command_summon (object op, char params)
1951		2028
1952	int command_arrest (object op, char params)	2029	int command_arrest (object op, char params)
1953		2030
1954	int command_kick (object op, char params)	2031	int command_kick (object op, char params)
…		…
1976	pl->ob->stats.hp = pl->ob->stats.maxhp;	2053	pl->ob->stats.hp = pl->ob->stats.maxhp;
1977	pl->ob->stats.sp = pl->ob->stats.maxsp;	2054	pl->ob->stats.sp = pl->ob->stats.maxsp;
1978	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2055	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979	pl->orig_stats = pl->ob->stats;	2056	pl->orig_stats = pl->ob->stats;
1980		2057
1981	player cf_player_find (char name)
1982	PROTOTYPE: $
1983
1984	void cf_player_move (player *pl, int dir)	2058	void cf_player_move (player *pl, int dir)
1985		2059
1986	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2060	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987
1988	player *first ()
1989	CODE:
1990	RETVAL = first_player;
1991	OUTPUT: RETVAL
1992		2061
1993	bool	2062	bool
1994	cell_visible (player *pl, int dx, int dy)	2063	cell_visible (player *pl, int dx, int dy)
1995	CODE:	2064	CODE:
1996	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2065	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2033	if (y) sv_to (y, pl->bed_y);	2102	if (y) sv_to (y, pl->bed_y);
2034		2103
2035	void	2104	void
2036	list ()	2105	list ()
2037	PPCODE:	2106	PPCODE:
2038	for (player *pl = first_player; pl; pl = pl->next)	2107	for_all_players (pl)
2039	XPUSHs (sv_2mortal (to_sv (pl)));	2108	XPUSHs (sv_2mortal (to_sv (pl)));
2040
2041	bool
2042	peaceful (player *pl, bool new_setting = 0)
2043	PROTOTYPE: $;$
2044	CODE:
2045	RETVAL = pl->peaceful;
2046	if (items > 1)
2047	pl->peaceful = new_setting;
2048	OUTPUT:
2049	RETVAL
2050
2051	living *
2052	orig_stats (player *pl)
2053	CODE:
2054	RETVAL = &pl->orig_stats;
2055	OUTPUT: RETVAL
2056
2057	living *
2058	last_stats (player *pl)
2059	CODE:
2060	RETVAL = &pl->last_stats;
2061	OUTPUT: RETVAL
2062		2109
2063		2110
2064	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2111	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065		2112
2066	int invoke (maptile *map, int event, ...)	2113	int invoke (maptile *map, int event, ...)
…		…
2082	PROTOTYPE:	2129	PROTOTYPE:
2083	CODE:	2130	CODE:
2084	RETVAL = new maptile;	2131	RETVAL = new maptile;
2085	OUTPUT:	2132	OUTPUT:
2086	RETVAL	2133	RETVAL
2087
2088	void
2089	maptile::destroy ()
2090		2134
2091	void	2135	void
2092	maptile::players ()	2136	maptile::players ()
2093	PPCODE:	2137	PPCODE:
2094	if (GIMME_V == G_SCALAR)	2138	if (GIMME_V == G_SCALAR)
…		…
2099	for_all_players (pl)	2143	for_all_players (pl)
2100	if (pl->ob && pl->ob->map == THIS)	2144	if (pl->ob && pl->ob->map == THIS)
2101	PUSHs (sv_2mortal (to_sv (pl->ob)));	2145	PUSHs (sv_2mortal (to_sv (pl->ob)));
2102	}	2146	}
2103		2147
		2148	void
		2149	maptile::set_regiondata (SV data, SV plt)
		2150	CODE:
		2151	{
		2152	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2153	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2154
		2155	AV av = (AV )SvRV (plt);
		2156
		2157	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2158
		2159	for (int i = av_len (av) + 1; i--; )
		2160	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2161
		2162	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2163	THIS->regionmap = regionmap;
		2164	}
		2165
2104	void play_sound_map (maptile *map, int x, int y, int sound_num)	2166	void play_sound_map (maptile *map, int x, int y, int sound_num)
2105		2167
2106	int out_of_map (maptile *map, int x, int y)	2168	int out_of_map (maptile *map, int x, int y)
2107		2169
2108	void	2170	void
…		…
2124		2186
2125	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2187	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2126	C_ARGS: str, map, nx, ny	2188	C_ARGS: str, map, nx, ny
2127		2189
2128	void	2190	void
2129	cf_map_normalise (maptile *map, int x, int y)	2191	get_map_flags (maptile *map, int x, int y)
2130	PPCODE:	2192	PPCODE:
2131	{	2193	{
2132	maptile *nmap = 0;	2194	maptile *nmap = 0;
2133	I16 nx = 0, ny = 0;	2195	I16 nx = 0, ny = 0;
2134	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2196	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2189		2251
2190	void fix_walls (maptile *map, int x, int y)	2252	void fix_walls (maptile *map, int x, int y)
2191		2253
2192	void fix_walls_around (maptile *map, int x, int y)	2254	void fix_walls_around (maptile *map, int x, int y)
2193		2255
2194	const char *
2195	region_name (maptile *m)
2196	CODE:
2197	RETVAL = get_name_of_region_for_map (m);
2198	OUTPUT: RETVAL
2199
2200	# worst xs function of my life	2256	# worst xs function of my life
2201	maptile *	2257	bool
2202	_create_random_map (\	2258	_create_random_map (\
2203	char *path,\	2259	maptile *self,\
2204	char *wallstyle,\	2260	char *wallstyle,\
2205	char *wall_name,\	2261	char *wall_name,\
2206	char *floorstyle,\	2262	char *floorstyle,\
2207	char *monsterstyle,\	2263	char *monsterstyle,\
2208	char *treasurestyle,\	2264	char *treasurestyle,\
…		…
2212	char *origin_map,\	2268	char *origin_map,\
2213	char *final_map,\	2269	char *final_map,\
2214	char *exitstyle,\	2270	char *exitstyle,\
2215	char *this_map,\	2271	char *this_map,\
2216	char *exit_on_final_map,\	2272	char *exit_on_final_map,\
2217	int Xsize,\	2273	int xsize,\
2218	int Ysize,\	2274	int ysize,\
2219	int expand2x,\	2275	int expand2x,\
2220	int layoutoptions1,\	2276	int layoutoptions1,\
2221	int layoutoptions2,\	2277	int layoutoptions2,\
2222	int layoutoptions3,\	2278	int layoutoptions3,\
2223	int symmetry,\	2279	int symmetry,\
…		…
2228	int dungeon_depth,\	2284	int dungeon_depth,\
2229	int decoroptions,\	2285	int decoroptions,\
2230	int orientation,\	2286	int orientation,\
2231	int origin_y,\	2287	int origin_y,\
2232	int origin_x,\	2288	int origin_x,\
2233	int random_seed,\	2289	U32 random_seed,\
2234	val64 total_map_hp,\	2290	val64 total_map_hp,\
2235	int map_layout_style,\	2291	int map_layout_style,\
2236	int treasureoptions,\	2292	int treasureoptions,\
2237	int symmetry_used,\	2293	int symmetry_used,\
2238	region *region\	2294	region *region,\
		2295	char *custom\
2239	)	2296	)
2240	CODE:	2297	CODE:
2241	{	2298	{
2242	random_map_params rmp;	2299	random_map_params rmp;
2243		2300
…		…
2253	assign (rmp.exit_on_final_map, exit_on_final_map);	2310	assign (rmp.exit_on_final_map, exit_on_final_map);
2254		2311
2255	rmp.origin_map = origin_map;	2312	rmp.origin_map = origin_map;
2256	rmp.final_map = final_map;	2313	rmp.final_map = final_map;
2257	rmp.this_map = this_map;	2314	rmp.this_map = this_map;
2258	rmp.Xsize = Xsize;	2315	rmp.xsize = xsize;
2259	rmp.Ysize = Ysize;	2316	rmp.ysize = ysize;
2260	rmp.expand2x = expand2x;	2317	rmp.expand2x = expand2x;
2261	rmp.layoutoptions1 = layoutoptions1;	2318	rmp.layoutoptions1 = layoutoptions1;
2262	rmp.layoutoptions2 = layoutoptions2;	2319	rmp.layoutoptions2 = layoutoptions2;
2263	rmp.layoutoptions3 = layoutoptions3;	2320	rmp.layoutoptions3 = layoutoptions3;
2264	rmp.symmetry = symmetry;	2321	rmp.symmetry = symmetry;
…		…
2275	rmp.total_map_hp = total_map_hp;	2332	rmp.total_map_hp = total_map_hp;
2276	rmp.map_layout_style = map_layout_style;	2333	rmp.map_layout_style = map_layout_style;
2277	rmp.treasureoptions = treasureoptions;	2334	rmp.treasureoptions = treasureoptions;
2278	rmp.symmetry_used = symmetry_used;	2335	rmp.symmetry_used = symmetry_used;
2279	rmp.region = region;	2336	rmp.region = region;
		2337	rmp.custom = custom;
2280		2338
2281	RETVAL = generate_random_map (path, &rmp);	2339	RETVAL = self->generate_random_map (&rmp);
2282	}	2340	}
2283	OUTPUT:	2341	OUTPUT:
2284	RETVAL	2342	RETVAL
2285		2343
2286	MODULE = cf PACKAGE = cf::arch	2344	MODULE = cf PACKAGE = cf::arch
…		…
2309		2367
2310	INCLUDE: $PERL genacc partylist ../include/player.h \|	2368	INCLUDE: $PERL genacc partylist ../include/player.h \|
2311		2369
2312	MODULE = cf PACKAGE = cf::region	2370	MODULE = cf PACKAGE = cf::region
2313		2371
2314	region *first ()	2372	void
2315	PROTOTYPE:	2373	list ()
2316	CODE:	2374	PPCODE:
2317	RETVAL = first_region;	2375	for_all_regions (rgn)
2318	OUTPUT: RETVAL	2376	XPUSHs (sv_2mortal (to_sv (rgn)));
2319		2377
2320	region find (char name)	2378	region find (char name)
2321	PROTOTYPE: $	2379	PROTOTYPE: $
2322	CODE:	2380	CODE:
2323	RETVAL = get_region_by_name (name);	2381	RETVAL = region::find (name);
		2382	OUTPUT: RETVAL
		2383
		2384	region find_fuzzy (char name)
		2385	PROTOTYPE: $
		2386	CODE:
		2387	RETVAL = region::find_fuzzy (name);
2324	OUTPUT: RETVAL	2388	OUTPUT: RETVAL
2325		2389
2326	INCLUDE: $PERL genacc region ../include/map.h \|	2390	INCLUDE: $PERL genacc region ../include/map.h \|
2327		2391
2328	MODULE = cf PACKAGE = cf::living	2392	MODULE = cf PACKAGE = cf::living
…		…
2362	char *buf = SvPVbyte (packet, len);	2426	char *buf = SvPVbyte (packet, len);
2363		2427
2364	THIS->send_packet (buf, len);	2428	THIS->send_packet (buf, len);
2365	}	2429	}
2366		2430
2367	void
2368	client::destroy ()
2369

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs. Revision 1.161 by root, Thu Feb 1 19:15:39 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.161 by root, Thu Feb 1 19:15:39 2007 UTC