[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.163 by root, Thu Feb 8 13:11:18 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"
		37
		38	#include <unistd.h>
		39	#if _POSIX_MEMLOCK
		40	# include <sys/mman.h>
		41	#endif
36		42
37	#include <EXTERN.h>	43	#include <EXTERN.h>
38	#include <perl.h>	44	#include <perl.h>
39	#include <XSUB.h>	45	#include <XSUB.h>
40		46
…		…
94		100
95	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	101	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96		102
97	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
98		104
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 ()	105	attachable::~attachable ()
111	{	106	{
112	assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113	#if 0
114	assert (!rc_next);
115	assert (!refcnt);	107	assert (!self);
116	#endif	108	assert (!cb);
		109	}
		110
		111	int
		112	attachable::refcnt_cnt () const
		113	{
		114	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		115	}
		116
		117	void
		118	attachable::sever_self ()
		119	{
		120	if (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 (!self);
		132	flags \|= 0x80; // severed //D
		133	}
		134	}
		135
		136	void
		137	attachable::optimise ()
		138	{
		139	if (self
		140	&& SvREFCNT (self) == 1
		141	&& !HvTOTALKEYS (self))
		142	flags \|= 0x40,//D
		143	sever_self ();
117	}	144	}
118		145
119	// check wether the object really is dead	146	// check wether the object really is dead
120	void	147	void
121	attachable::do_check ()	148	attachable::do_check ()
122	{	149	{
123	if (refcnt > 0)	150	if (refcnt_cnt () > 0)
124	return;	151	return;
125		152
126	// try to unborrow the refcnt from perl	153	destroy ();
127	if (flags & F_BORROWED)	154	}
		155
		156	void
		157	attachable::do_destroy ()
		158	{
		159	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		160
		161	if (cb)
128	{	162	{
129	assert (self);//D//TODO//remove when stable
130	flags &= ~F_BORROWED;
131	refcnt_inc ();
132	SvREFCNT_dec (self);	163	SvREFCNT_dec (cb);
		164	cb = 0;
133	}	165	}
134		166
135	if (refcnt > 0 \|\| self)	167	if (self)
136	return;	168	sever_self ();
137		169
138	destroy ();	170	flags \|= 0x20; //D
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);	171	mortals.push_back (this);
148	}	172	}
149		173
150	void	174	void
151	attachable::destroy ()	175	attachable::destroy ()
…		…
155		179
156	flags \|= F_DESTROYED;	180	flags \|= F_DESTROYED;
157	do_destroy ();	181	do_destroy ();
158	}	182	}
159		183
		184	void
160	void attachable::check_mortals ()	185	attachable::check_mortals ()
161	{	186	{
162	for (int i = 0; i < mortals.size (); )	187	static int i = 0;
		188
		189	for (;;)
163	{	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
164	attachable *obj = mortals [i];	201	attachable *obj = mortals [i];
165		202
166	obj->refcnt_chk (); // unborrow from perl, if necessary	203	obj->refcnt_chk (); // unborrow from perl, if necessary
167		204
		205	//if (obj->refcnt > 0 \|\| obj->self)
168	if (obj->refcnt \|\| obj->self)	206	if (obj->refcnt \|\| obj->self)
169	{	207	{
170	#if 0	208	//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	209	++i; // further delay freeing
		210
		211	if (!(i & 0x3ff))
		212	break;
176	}//D	213	}
177	else	214	else
178	{	215	{
179	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180	mortals.erase (i);	216	mortals.erase (i);
181	delete obj;	217	delete obj;
182	}	218	}
183	}	219	}
184	}	220	}
…		…
209		245
210	static int	246	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	247	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	248	{
213	attachable at = (attachable )mg->mg_ptr;	249	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	250
		251	//TODO: check if transaction behaviour is really required here
		252	if (SV self = (SV )at->self)
		253	{
215	at->self = 0;	254	at->self = 0;
		255	SvREFCNT_dec (self);
		256	}
		257
216	// 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
217	//at->refcnt_chk ();	259	//at->refcnt_chk ();
218	return 0;	260	return 0;
219	}	261	}
220		262
…		…
228		270
229	if (!obj->self)	271	if (!obj->self)
230	{	272	{
231	obj->self = newHV ();	273	obj->self = newHV ();
232	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);
		275	obj->flags &= ~0xc0;//D
		276	obj->flags \|= 0x10;//D
233		277
234	// borrow the refcnt from the object	278	// now bless the object _once_
235	obj->flags \|= attachable::F_BORROWED;	279	return sv_bless (newRV_inc ((SV *)obj->self), stash);
236	obj->refcnt_dec ();
237	}	280	}
		281	else
		282	{
		283	SV sv = newRV_inc ((SV )obj->self);
238		284
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	285	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		286	SvAMAGIC_on (sv);
		287
		288	return sv;
		289	}
240	}	290	}
241		291
242	static void	292	static void
243	clearSVptr (SV *sv)	293	clearSVptr (SV *sv)
244	{	294	{
…		…
297	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); }
298		348
299	inline SV *to_sv (object & v) { return to_sv (&v); }	349	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	350	inline SV *to_sv (living & v) { return to_sv (&v); }
301		351
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	352	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	353	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		354
306	inline SV *to_sv (UUID v)	355	inline SV *to_sv (UUID v)
307	{	356	{
308	char buf[128];	357	char buf[128];
309	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	358	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
310	return newSVpv (buf, 0);	359	return newSVpv (buf, 0);
311	}	360	}
312		361
313	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; }
314	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; }
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	377	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"); }	378	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"); }	379	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"); }	380	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"); }	381	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		382	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"); }	383	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"); }	384	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"); }	385	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		386
337	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)]; }
338	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)); }
339		389
340	template<class T>	390	template<class T>
341	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; }
342		392
343	template<int N>	393	template<int N>
…		…
478	{	528	{
479	if (!ext->cb)	529	if (!ext->cb)
480	ext->cb = newAV ();	530	ext->cb = newAV ();
481		531
482	return newRV_inc ((SV *)ext->cb);	532	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	}	533	}
521		534
522	/////////////////////////////////////////////////////////////////////////////	535	/////////////////////////////////////////////////////////////////////////////
523		536
524	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)
…		…
597	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))
598	{	611	{
599	printf ("unable to initialize perl-interpreter, aborting.\n");	612	printf ("unable to initialize perl-interpreter, aborting.\n");
600	exit (EXIT_FAILURE);	613	exit (EXIT_FAILURE);
601	}	614	}
		615
		616	{
		617	dSP;
		618
		619	PUSHMARK (SP);
		620	PUTBACK;
		621	call_pv ("cf::init", G_DISCARD \| G_VOID);
		622	}
602	}	623	}
603		624
604	void cfperl_main ()	625	void cfperl_main ()
605	{	626	{
606	dSP;	627	dSP;
…		…
820	}	841	}
821		842
822	/////////////////////////////////////////////////////////////////////////////	843	/////////////////////////////////////////////////////////////////////////////
823		844
824	void	845	void
825	maptile::emergency_save ()	846	cfperl_emergency_save ()
826	{	847	{
827	CALL_BEGIN (0);	848	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	849	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	850	CALL_END;
830	}	851	}
831		852
832	maptile *	853	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	854	maptile::find_sync (const char path, maptile origin)
834	{	855	{
835	CALL_BEGIN (2);	856	CALL_BEGIN (2);
836	CALL_ARG (path);	857	CALL_ARG (path);
837	CALL_ARG (origin);	858	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	859	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		860
840	maptile *retval;	861	maptile *retval;
841		862
842	if (count)	863	if (count)
843	sv_to (POPs, retval);	864	sv_to (POPs, retval);
…		…
845	retval = 0;	866	retval = 0;
846		867
847	CALL_END;	868	CALL_END;
848		869
849	return retval;	870	return retval;
		871	}
		872
		873	maptile *
		874	maptile::find_async (const char path, maptile origin)
		875	{
		876	CALL_BEGIN (2);
		877	CALL_ARG (path);
		878	CALL_ARG (origin);
		879	CALL_CALL ("cf::map::find_async", G_SCALAR);
		880
		881	maptile *retval;
		882
		883	if (count)
		884	sv_to (POPs, retval);
		885	else
		886	retval = 0;
		887
		888	CALL_END;
		889
		890	return retval;
		891	}
		892
		893	void
		894	maptile::do_load_sync ()
		895	{
		896	CALL_BEGIN (1);
		897	CALL_ARG (this);
		898	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		899	CALL_END;
850	}	900	}
851		901
852	void	902	void
853	maptile::change_all_map_light (int change)	903	maptile::change_all_map_light (int change)
854	{	904	{
…		…
887	void	937	void
888	iw::alloc ()	938	iw::alloc ()
889	{	939	{
890	pe = GEventAPI->new_idle (0, 0);	940	pe = GEventAPI->new_idle (0, 0);
891		941
		942	WaREENTRANT_off (pe);
892	pe->base.callback = (void *)iw_dispatch;	943	pe->base.callback = (void *)iw_dispatch;
893	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
894	}	945	}
895		946
896	static void iow_dispatch (pe_event *ev)	947	static void iow_dispatch (pe_event *ev)
…		…
902	void	953	void
903	iow::alloc ()	954	iow::alloc ()
904	{	955	{
905	pe = GEventAPI->new_io (0, 0);	956	pe = GEventAPI->new_io (0, 0);
906		957
		958	WaREENTRANT_off (pe);
907	pe->base.callback = (void *)iow_dispatch;	959	pe->base.callback = (void *)iow_dispatch;
908	pe->base.ext_data = (void *)this;	960	pe->base.ext_data = (void *)this;
909		961
910	pe->fd = -1;	962	pe->fd = -1;
911	pe->poll = 0;	963	pe->poll = 0;
…		…
1239	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1291	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240	const_iv (FLAG_IS_WATER)	1292	const_iv (FLAG_IS_WATER)
1241	const_iv (FLAG_CONTENT_ON_GEN)	1293	const_iv (FLAG_CONTENT_ON_GEN)
1242	const_iv (FLAG_IS_A_TEMPLATE)	1294	const_iv (FLAG_IS_A_TEMPLATE)
1243	const_iv (FLAG_IS_BUILDABLE)	1295	const_iv (FLAG_IS_BUILDABLE)
		1296	const_iv (FLAG_DESTROY_ON_DEATH)
		1297	const_iv (FLAG_NO_MAP_SAVE)
1244		1298
1245	const_iv (NDI_BLACK)	1299	const_iv (NDI_BLACK)
1246	const_iv (NDI_WHITE)	1300	const_iv (NDI_WHITE)
1247	const_iv (NDI_NAVY)	1301	const_iv (NDI_NAVY)
1248	const_iv (NDI_RED)	1302	const_iv (NDI_RED)
…		…
1433	const_iv (ATNR_BLIND)	1487	const_iv (ATNR_BLIND)
1434	const_iv (ATNR_INTERNAL)	1488	const_iv (ATNR_INTERNAL)
1435	const_iv (ATNR_LIFE_STEALING)	1489	const_iv (ATNR_LIFE_STEALING)
1436	const_iv (ATNR_DISEASE)	1490	const_iv (ATNR_DISEASE)
1437		1491
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)	1492	const_iv (MAP_IN_MEMORY)
1445	const_iv (MAP_SWAPPED)	1493	const_iv (MAP_SWAPPED)
1446	const_iv (MAP_LOADING)	1494	const_iv (MAP_LOADING)
1447	const_iv (MAP_SAVING)	1495	const_iv (MAP_SAVING)
1448		1496
…		…
1461	const_iv (ST_SETUP)	1509	const_iv (ST_SETUP)
1462	const_iv (ST_PLAYING)	1510	const_iv (ST_PLAYING)
1463	const_iv (ST_CUSTOM)	1511	const_iv (ST_CUSTOM)
1464		1512
1465	const_iv (ST_CHANGE_CLASS)	1513	const_iv (ST_CHANGE_CLASS)
1466	const_iv (ST_CONFIRM_QUIT)
1467	const_iv (ST_GET_PARTY_PASSWORD)
1468		1514
1469	const_iv (IO_HEADER)	1515	const_iv (IO_HEADER)
1470	const_iv (IO_OBJECTS)	1516	const_iv (IO_OBJECTS)
1471	const_iv (IO_UNIQUES)	1517	const_iv (IO_UNIQUES)
1472		1518
…		…
1526		1572
1527	void _global_reattach ()	1573	void _global_reattach ()
1528	CODE:	1574	CODE:
1529	{	1575	{
1530	// reattach to all attachable objects in the game.	1576	// reattach to all attachable objects in the game.
1531	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1577	for_all_clients (ns)
1532	(*i)->reattach ();	1578	ns->reattach ();
1533		1579
1534	for_all_players (pl)	1580	for_all_players (pl)
1535	pl->reattach ();	1581	pl->reattach ();
1536		1582
1537	//TODO	1583	//TODO
1538	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1584	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539	// i->second->reattach ();	1585	// i->second->reattach ();
1540		1586
1541	for (object *op = object::first; op; op = op->next)	1587	for_all_objects (op)
1542	op->reattach ();	1588	op->reattach ();
1543	}	1589	}
1544		1590
1545	NV floor (NV x)	1591	NV floor (NV x)
1546		1592
1547	NV ceil (NV x)	1593	NV ceil (NV x)
		1594
		1595	NV rndm (...)
		1596	CODE:
		1597	switch (items)
		1598	{
		1599	case 0: RETVAL = rndm (); break;
		1600	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1601	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1602	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1603	}
		1604	OUTPUT:
		1605	RETVAL
1548		1606
1549	void server_tick ()	1607	void server_tick ()
1550	CODE:	1608	CODE:
1551	runtime = SvNVx (sv_runtime);	1609	runtime = SvNVx (sv_runtime);
1552	server_tick ();	1610	server_tick ();
…		…
1599	}	1657	}
1600	OUTPUT: RETVAL	1658	OUTPUT: RETVAL
1601		1659
1602	void abort ()	1660	void abort ()
1603		1661
		1662	void fork_abort (char *cause = "cf::fork_abort")
		1663
		1664	void cleanup (const char *cause, bool make_core = false)
		1665
1604	void emergency_save ()	1666	void emergency_save ()
1605		1667
1606	void _exit (int status = 0)	1668	void _exit (int status = EXIT_SUCCESS)
		1669
		1670	UV sv_2watcher (SV *w)
		1671	CODE:
		1672	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1673	OUTPUT:
		1674	RETVAL
		1675
		1676	#if _POSIX_MEMLOCK
		1677
		1678	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1679
		1680	int munlockall ()
		1681
		1682	#endif
1607		1683
1608	int find_animation (char *text)	1684	int find_animation (char *text)
1609	PROTOTYPE: $	1685	PROTOTYPE: $
1610		1686
1611	int random_roll (int min, int max, object *op, int goodbad);	1687	int random_roll (int min, int max, object *op, int goodbad);
…		…
1649	RETVAL = newSVpv (resist_plus[atnr], 0);	1725	RETVAL = newSVpv (resist_plus[atnr], 0);
1650	else	1726	else
1651	XSRETURN_UNDEF;	1727	XSRETURN_UNDEF;
1652	OUTPUT: RETVAL	1728	OUTPUT: RETVAL
1653		1729
		1730	bool
		1731	load_regions (const char *filename)
		1732	CODE:
		1733	RETVAL = loader_region ().load (filename);
		1734	OUTPUT: RETVAL
		1735
1654	MODULE = cf PACKAGE = cf::attachable	1736	MODULE = cf PACKAGE = cf::attachable
1655		1737
1656	int	1738	int
1657	valid (SV *obj)	1739	valid (SV *obj)
1658	CODE:	1740	CODE:
1659	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1741	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660	OUTPUT:	1742	OUTPUT:
1661	RETVAL	1743	RETVAL
1662		1744
1663	#bool	1745	int mortals_size ()
1664	#destroyed (attachable *at)	1746	CODE:
1665	#	1747	RETVAL = attachable::mortals.size ();
1666	#void	1748	OUTPUT: RETVAL
1667	#destroy (attachable *at)	1749
		1750	#object *mortals (U32 index)
		1751	# CODE:
		1752	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1753	# OUTPUT: RETVAL
		1754
		1755	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1668		1756
1669	MODULE = cf PACKAGE = cf::global	1757	MODULE = cf PACKAGE = cf::global
1670		1758
1671	int invoke (SV *klass, int event, ...)	1759	int invoke (SV *klass, int event, ...)
1672	CODE:	1760	CODE:
…		…
1688	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1776	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1689	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1690		1778
1691	SV registry (object op)	1779	SV registry (object op)
1692		1780
1693	void mortals ()	1781	int objects_size ()
1694	PPCODE:	1782	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;	1783	RETVAL = objects.size ();
		1784	OUTPUT: RETVAL
		1785
		1786	object *objects (U32 index)
		1787	CODE:
		1788	RETVAL = index < objects.size () ? objects [index] : 0;
		1789	OUTPUT: RETVAL
		1790
		1791	int actives_size ()
		1792	CODE:
		1793	RETVAL = actives.size ();
		1794	OUTPUT: RETVAL
		1795
		1796	object *actives (U32 index)
		1797	CODE:
		1798	RETVAL = index < actives.size () ? actives [index] : 0;
1702	OUTPUT: RETVAL	1799	OUTPUT: RETVAL
1703		1800
1704	# missing properties	1801	# missing properties
1705		1802
1706	object head (object op)	1803	object head (object op)
1707	PROTOTYPE: $	1804	PROTOTYPE: $
1708	CODE:	1805	CODE:
1709	RETVAL = op->head ? op->head : op;	1806	RETVAL = op->head_ ();
1710	OUTPUT: RETVAL	1807	OUTPUT: RETVAL
1711		1808
1712	int is_head (object *op)	1809	int is_head (object *op)
1713	PROTOTYPE: $	1810	PROTOTYPE: $
1714	CODE:	1811	CODE:
1715	RETVAL = !op->head;	1812	RETVAL = op->head_ () == op;
1716	OUTPUT: RETVAL	1813	OUTPUT: RETVAL
1717		1814
1718	void	1815	void
1719	inv (object *obj)	1816	inv (object *obj)
1720	PROTOTYPE: $	1817	PROTOTYPE: $
…		…
1727		1824
1728	void	1825	void
1729	set_animation (object *op, int idx)	1826	set_animation (object *op, int idx)
1730	CODE:	1827	CODE:
1731	SET_ANIMATION (op, idx);	1828	SET_ANIMATION (op, idx);
		1829
		1830	int
		1831	num_animations (object *op)
		1832	CODE:
		1833	RETVAL = NUM_ANIMATIONS (op);
		1834	OUTPUT: RETVAL
1732		1835
1733	object find_best_object_match (object op, const char *match)	1836	object find_best_object_match (object op, const char *match)
1734		1837
1735	object find_marked_object (object op)	1838	object find_marked_object (object op)
1736		1839
…		…
1811		1914
1812	void drop (object who, object op)	1915	void drop (object who, object op)
1813		1916
1814	void pick_up (object who, object op)	1917	void pick_up (object who, object op)
1815		1918
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)	1919	int cf_object_teleport (object op, maptile map, int x, int y)
1821		1920
1822	void update_object (object *op, int action)	1921	void update_object (object *op, int action)
1823		1922
1824	object cf_create_object_by_name (const char name)	1923	object cf_create_object_by_name (const char name)
…		…
1943	void esrv_update_item (object op, int what, object item)	2042	void esrv_update_item (object op, int what, object item)
1944	C_ARGS: what, op, item	2043	C_ARGS: what, op, item
1945		2044
1946	void clear_los (object *op)	2045	void clear_los (object *op)
1947		2046
1948	int command_teleport (object op, char params)
1949
1950	int command_summon (object op, char params)	2047	int command_summon (object op, char params)
1951		2048
1952	int command_arrest (object op, char params)	2049	int command_arrest (object op, char params)
1953		2050
1954	int command_kick (object op, char params)	2051	int command_kick (object op, char params)
…		…
1976	pl->ob->stats.hp = pl->ob->stats.maxhp;	2073	pl->ob->stats.hp = pl->ob->stats.maxhp;
1977	pl->ob->stats.sp = pl->ob->stats.maxsp;	2074	pl->ob->stats.sp = pl->ob->stats.maxsp;
1978	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2075	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979	pl->orig_stats = pl->ob->stats;	2076	pl->orig_stats = pl->ob->stats;
1980		2077
1981	player cf_player_find (char name)
1982	PROTOTYPE: $
1983
1984	void cf_player_move (player *pl, int dir)	2078	void cf_player_move (player *pl, int dir)
1985		2079
1986	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2080	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		2081
1993	bool	2082	bool
1994	cell_visible (player *pl, int dx, int dy)	2083	cell_visible (player *pl, int dx, int dy)
1995	CODE:	2084	CODE:
1996	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2085	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2033	if (y) sv_to (y, pl->bed_y);	2122	if (y) sv_to (y, pl->bed_y);
2034		2123
2035	void	2124	void
2036	list ()	2125	list ()
2037	PPCODE:	2126	PPCODE:
2038	for (player *pl = first_player; pl; pl = pl->next)	2127	for_all_players (pl)
2039	XPUSHs (sv_2mortal (to_sv (pl)));	2128	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		2129
2063		2130
2064	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2131	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065		2132
2066	int invoke (maptile *map, int event, ...)	2133	int invoke (maptile *map, int event, ...)
…		…
2082	PROTOTYPE:	2149	PROTOTYPE:
2083	CODE:	2150	CODE:
2084	RETVAL = new maptile;	2151	RETVAL = new maptile;
2085	OUTPUT:	2152	OUTPUT:
2086	RETVAL	2153	RETVAL
2087
2088	void
2089	maptile::destroy ()
2090		2154
2091	void	2155	void
2092	maptile::players ()	2156	maptile::players ()
2093	PPCODE:	2157	PPCODE:
2094	if (GIMME_V == G_SCALAR)	2158	if (GIMME_V == G_SCALAR)
…		…
2099	for_all_players (pl)	2163	for_all_players (pl)
2100	if (pl->ob && pl->ob->map == THIS)	2164	if (pl->ob && pl->ob->map == THIS)
2101	PUSHs (sv_2mortal (to_sv (pl->ob)));	2165	PUSHs (sv_2mortal (to_sv (pl->ob)));
2102	}	2166	}
2103		2167
		2168	void
		2169	maptile::set_regiondata (SV data, SV plt)
		2170	CODE:
		2171	{
		2172	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2173	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2174
		2175	AV av = (AV )SvRV (plt);
		2176
		2177	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2178
		2179	for (int i = av_len (av) + 1; i--; )
		2180	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2181
		2182	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2183	THIS->regionmap = regionmap;
		2184	}
		2185
2104	void play_sound_map (maptile *map, int x, int y, int sound_num)	2186	void play_sound_map (maptile *map, int x, int y, int sound_num)
2105		2187
2106	int out_of_map (maptile *map, int x, int y)	2188	int out_of_map (maptile *map, int x, int y)
2107		2189
2108	void	2190	void
…		…
2124		2206
2125	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2207	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2126	C_ARGS: str, map, nx, ny	2208	C_ARGS: str, map, nx, ny
2127		2209
2128	void	2210	void
2129	cf_map_normalise (maptile *map, int x, int y)	2211	get_map_flags (maptile *map, int x, int y)
2130	PPCODE:	2212	PPCODE:
2131	{	2213	{
2132	maptile *nmap = 0;	2214	maptile *nmap = 0;
2133	I16 nx = 0, ny = 0;	2215	I16 nx = 0, ny = 0;
2134	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2216	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2189		2271
2190	void fix_walls (maptile *map, int x, int y)	2272	void fix_walls (maptile *map, int x, int y)
2191		2273
2192	void fix_walls_around (maptile *map, int x, int y)	2274	void fix_walls_around (maptile *map, int x, int y)
2193		2275
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	2276	# worst xs function of my life
2201	maptile *	2277	bool
2202	_create_random_map (\	2278	_create_random_map (\
2203	char *path,\	2279	maptile *self,\
2204	char *wallstyle,\	2280	char *wallstyle,\
2205	char *wall_name,\	2281	char *wall_name,\
2206	char *floorstyle,\	2282	char *floorstyle,\
2207	char *monsterstyle,\	2283	char *monsterstyle,\
2208	char *treasurestyle,\	2284	char *treasurestyle,\
…		…
2212	char *origin_map,\	2288	char *origin_map,\
2213	char *final_map,\	2289	char *final_map,\
2214	char *exitstyle,\	2290	char *exitstyle,\
2215	char *this_map,\	2291	char *this_map,\
2216	char *exit_on_final_map,\	2292	char *exit_on_final_map,\
2217	int Xsize,\	2293	int xsize,\
2218	int Ysize,\	2294	int ysize,\
2219	int expand2x,\	2295	int expand2x,\
2220	int layoutoptions1,\	2296	int layoutoptions1,\
2221	int layoutoptions2,\	2297	int layoutoptions2,\
2222	int layoutoptions3,\	2298	int layoutoptions3,\
2223	int symmetry,\	2299	int symmetry,\
…		…
2228	int dungeon_depth,\	2304	int dungeon_depth,\
2229	int decoroptions,\	2305	int decoroptions,\
2230	int orientation,\	2306	int orientation,\
2231	int origin_y,\	2307	int origin_y,\
2232	int origin_x,\	2308	int origin_x,\
2233	int random_seed,\	2309	U32 random_seed,\
2234	val64 total_map_hp,\	2310	val64 total_map_hp,\
2235	int map_layout_style,\	2311	int map_layout_style,\
2236	int treasureoptions,\	2312	int treasureoptions,\
2237	int symmetry_used,\	2313	int symmetry_used,\
2238	region *region\	2314	region *region,\
		2315	char *custom\
2239	)	2316	)
2240	CODE:	2317	CODE:
2241	{	2318	{
2242	random_map_params rmp;	2319	random_map_params rmp;
2243		2320
…		…
2253	assign (rmp.exit_on_final_map, exit_on_final_map);	2330	assign (rmp.exit_on_final_map, exit_on_final_map);
2254		2331
2255	rmp.origin_map = origin_map;	2332	rmp.origin_map = origin_map;
2256	rmp.final_map = final_map;	2333	rmp.final_map = final_map;
2257	rmp.this_map = this_map;	2334	rmp.this_map = this_map;
2258	rmp.Xsize = Xsize;	2335	rmp.xsize = xsize;
2259	rmp.Ysize = Ysize;	2336	rmp.ysize = ysize;
2260	rmp.expand2x = expand2x;	2337	rmp.expand2x = expand2x;
2261	rmp.layoutoptions1 = layoutoptions1;	2338	rmp.layoutoptions1 = layoutoptions1;
2262	rmp.layoutoptions2 = layoutoptions2;	2339	rmp.layoutoptions2 = layoutoptions2;
2263	rmp.layoutoptions3 = layoutoptions3;	2340	rmp.layoutoptions3 = layoutoptions3;
2264	rmp.symmetry = symmetry;	2341	rmp.symmetry = symmetry;
…		…
2275	rmp.total_map_hp = total_map_hp;	2352	rmp.total_map_hp = total_map_hp;
2276	rmp.map_layout_style = map_layout_style;	2353	rmp.map_layout_style = map_layout_style;
2277	rmp.treasureoptions = treasureoptions;	2354	rmp.treasureoptions = treasureoptions;
2278	rmp.symmetry_used = symmetry_used;	2355	rmp.symmetry_used = symmetry_used;
2279	rmp.region = region;	2356	rmp.region = region;
		2357	rmp.custom = custom;
2280		2358
2281	RETVAL = generate_random_map (path, &rmp);	2359	RETVAL = self->generate_random_map (&rmp);
2282	}	2360	}
2283	OUTPUT:	2361	OUTPUT:
2284	RETVAL	2362	RETVAL
2285		2363
2286	MODULE = cf PACKAGE = cf::arch	2364	MODULE = cf PACKAGE = cf::arch
…		…
2309		2387
2310	INCLUDE: $PERL genacc partylist ../include/player.h \|	2388	INCLUDE: $PERL genacc partylist ../include/player.h \|
2311		2389
2312	MODULE = cf PACKAGE = cf::region	2390	MODULE = cf PACKAGE = cf::region
2313		2391
2314	region *first ()	2392	void
2315	PROTOTYPE:	2393	list ()
2316	CODE:	2394	PPCODE:
2317	RETVAL = first_region;	2395	for_all_regions (rgn)
2318	OUTPUT: RETVAL	2396	XPUSHs (sv_2mortal (to_sv (rgn)));
2319		2397
2320	region find (char name)	2398	region find (char name)
2321	PROTOTYPE: $	2399	PROTOTYPE: $
2322	CODE:	2400	CODE:
2323	RETVAL = get_region_by_name (name);	2401	RETVAL = region::find (name);
		2402	OUTPUT: RETVAL
		2403
		2404	region find_fuzzy (char name)
		2405	PROTOTYPE: $
		2406	CODE:
		2407	RETVAL = region::find_fuzzy (name);
2324	OUTPUT: RETVAL	2408	OUTPUT: RETVAL
2325		2409
2326	INCLUDE: $PERL genacc region ../include/map.h \|	2410	INCLUDE: $PERL genacc region ../include/map.h \|
2327		2411
2328	MODULE = cf PACKAGE = cf::living	2412	MODULE = cf PACKAGE = cf::living
…		…
2362	char *buf = SvPVbyte (packet, len);	2446	char *buf = SvPVbyte (packet, len);
2363		2447
2364	THIS->send_packet (buf, len);	2448	THIS->send_packet (buf, len);
2365	}	2449	}
2366		2450
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.163 by root, Thu Feb 8 13:11:18 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.163 by root, Thu Feb 8 13:11:18 2007 UTC