[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.148 by root, Sat Jan 20 23:39:09 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	}
		108
		109	int
		110	attachable::refcnt_cnt () const
		111	{
		112	return refcnt + (self ? SvREFCNT (self) : 0);
		113	}
		114
		115	void
		116	attachable::optimise ()
		117	{
		118	if (self
		119	&& SvREFCNT (self) == 1
		120	&& !HvTOTALKEYS (self))
		121	{
		122	refcnt_inc ();
		123	SvREFCNT_dec ((SV *)self);
		124	}
117	}	125	}
118		126
119	// check wether the object really is dead	127	// check wether the object really is dead
120	void	128	void
121	attachable::do_check ()	129	attachable::do_check ()
122	{	130	{
123	if (refcnt > 0)	131	if (refcnt > 0 \|\| refcnt_cnt () > 0)
124	return;	132	return;
125		133
126	// try to unborrow the refcnt from perl	134	destroy ();
127	if (flags & F_BORROWED)	135
		136	if (self)
128	{	137	{
129	assert (self);//D//TODO//remove when stable	138	hv_clear (self);
130	flags &= ~F_BORROWED;	139	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
131	refcnt_inc ();
132	SvREFCNT_dec (self);	140	SvREFCNT_dec (self);
		141	self = 0;
133	}	142	}
134
135	if (refcnt > 0 \|\| self)
136	return;
137
138	destroy ();
139	}	143	}
140		144
141	void	145	void
142	attachable::do_destroy ()	146	attachable::do_destroy ()
143	{	147	{
144	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);	148	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145		149
146	//TODO: call generic destroy callback	150	if (self)
		151	hv_clear (self);
		152
147	mortals.push_back (this);	153	mortals.push_back (this);
148	}	154	}
149		155
150	void	156	void
151	attachable::destroy ()	157	attachable::destroy ()
…		…
155		161
156	flags \|= F_DESTROYED;	162	flags \|= F_DESTROYED;
157	do_destroy ();	163	do_destroy ();
158	}	164	}
159		165
		166	void
160	void attachable::check_mortals ()	167	attachable::check_mortals ()
161	{	168	{
162	for (int i = 0; i < mortals.size (); )	169	for (int i = 0; i < mortals.size (); )
163	{	170	{
164	attachable *obj = mortals [i];	171	attachable *obj = mortals [i];
165		172
…		…
209		216
210	static int	217	static int
211	attachable_free (pTHX_ SV sv, MAGIC mg)	218	attachable_free (pTHX_ SV sv, MAGIC mg)
212	{	219	{
213	attachable at = (attachable )mg->mg_ptr;	220	attachable at = (attachable )mg->mg_ptr;
214	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable
215	at->self = 0;	221	at->self = 0;
216	// next line makes sense, but most objects still have refcnt 0 by default	222	// next line makes sense, but most objects still have refcnt 0 by default
217	//at->refcnt_chk ();	223	//at->refcnt_chk ();
218	return 0;	224	return 0;
219	}	225	}
…		…
230	{	236	{
231	obj->self = newHV ();	237	obj->self = newHV ();
232	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	238	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
233		239
234	// borrow the refcnt from the object	240	// borrow the refcnt from the object
235	obj->flags \|= attachable::F_BORROWED;	241	// it is important thta no refcnt_chk is being executed here
236	obj->refcnt_dec ();	242	obj->refcnt_dec ();
		243
		244	// now bless the object _once_
		245	return sv_bless (newRV_inc ((SV *)obj->self), stash);
237	}	246	}
		247	else
		248	{
		249	SV sv = newRV_inc ((SV )obj->self);
238		250
239	return sv_bless (newRV_inc ((SV *)obj->self), stash);	251	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		252	SvAMAGIC_on (sv);
		253
		254	return sv;
		255	}
240	}	256	}
241		257
242	static void	258	static void
243	clearSVptr (SV *sv)	259	clearSVptr (SV *sv)
244	{	260	{
…		…
297	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	313	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
298		314
299	inline SV *to_sv (object & v) { return to_sv (&v); }	315	inline SV *to_sv (object & v) { return to_sv (&v); }
300	inline SV *to_sv (living & v) { return to_sv (&v); }	316	inline SV *to_sv (living & v) { return to_sv (&v); }
301		317
302	//TODO:
303	inline SV to_sv (New_Face v) { return to_sv (v->name); }	318	inline SV to_sv (facetile v) { return to_sv (v->name); }
304	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	319	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
305		320
306	inline SV *to_sv (UUID v)	321	inline SV *to_sv (UUID v)
307	{	322	{
308	char buf[128];	323	char buf[128];
…		…
328	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	343	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"); }	344	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"); }	345	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"); }	346	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"); }	347	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		348	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"); }	349	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"); }	350	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"); }	351	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336		352
337	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	353	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	354	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339		355
340	template<class T>	356	template<class T>
341	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	357	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
342		358
343	template<int N>	359	template<int N>
…		…
478	{	494	{
479	if (!ext->cb)	495	if (!ext->cb)
480	ext->cb = newAV ();	496	ext->cb = newAV ();
481		497
482	return newRV_inc ((SV *)ext->cb);	498	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	}	499	}
521		500
522	/////////////////////////////////////////////////////////////////////////////	501	/////////////////////////////////////////////////////////////////////////////
523		502
524	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	503	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
820	}	799	}
821		800
822	/////////////////////////////////////////////////////////////////////////////	801	/////////////////////////////////////////////////////////////////////////////
823		802
824	void	803	void
825	maptile::emergency_save ()	804	cfperl_emergency_save ()
826	{	805	{
827	CALL_BEGIN (0);	806	CALL_BEGIN (0);
828	CALL_CALL ("cf::map::emergency_save", G_VOID);	807	CALL_CALL ("cf::emergency_save", G_VOID);
829	CALL_END;	808	CALL_END;
830	}	809	}
831		810
832	maptile *	811	maptile *
833	maptile::load_map_sync (const char path, maptile origin)	812	maptile::find_sync (const char path, maptile origin)
834	{	813	{
835	CALL_BEGIN (2);	814	CALL_BEGIN (2);
836	CALL_ARG (path);	815	CALL_ARG (path);
837	CALL_ARG (origin);	816	CALL_ARG (origin);
838	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	817	CALL_CALL ("cf::map::find_sync", G_SCALAR);
839		818
840	maptile *retval;	819	maptile *retval;
841		820
842	if (count)	821	if (count)
843	sv_to (POPs, retval);	822	sv_to (POPs, retval);
…		…
845	retval = 0;	824	retval = 0;
846		825
847	CALL_END;	826	CALL_END;
848		827
849	return retval;	828	return retval;
		829	}
		830
		831	maptile *
		832	maptile::find_async (const char path, maptile origin)
		833	{
		834	CALL_BEGIN (2);
		835	CALL_ARG (path);
		836	CALL_ARG (origin);
		837	CALL_CALL ("cf::map::find_async", G_SCALAR);
		838
		839	maptile *retval;
		840
		841	if (count)
		842	sv_to (POPs, retval);
		843	else
		844	retval = 0;
		845
		846	CALL_END;
		847
		848	return retval;
		849	}
		850
		851	void
		852	maptile::do_load_sync ()
		853	{
		854	CALL_BEGIN (1);
		855	CALL_ARG (this);
		856	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		857	CALL_END;
850	}	858	}
851		859
852	void	860	void
853	maptile::change_all_map_light (int change)	861	maptile::change_all_map_light (int change)
854	{	862	{
…		…
1239	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1247	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240	const_iv (FLAG_IS_WATER)	1248	const_iv (FLAG_IS_WATER)
1241	const_iv (FLAG_CONTENT_ON_GEN)	1249	const_iv (FLAG_CONTENT_ON_GEN)
1242	const_iv (FLAG_IS_A_TEMPLATE)	1250	const_iv (FLAG_IS_A_TEMPLATE)
1243	const_iv (FLAG_IS_BUILDABLE)	1251	const_iv (FLAG_IS_BUILDABLE)
		1252	const_iv (FLAG_DESTROY_ON_DEATH)
		1253	const_iv (FLAG_NO_MAP_SAVE)
1244		1254
1245	const_iv (NDI_BLACK)	1255	const_iv (NDI_BLACK)
1246	const_iv (NDI_WHITE)	1256	const_iv (NDI_WHITE)
1247	const_iv (NDI_NAVY)	1257	const_iv (NDI_NAVY)
1248	const_iv (NDI_RED)	1258	const_iv (NDI_RED)
…		…
1433	const_iv (ATNR_BLIND)	1443	const_iv (ATNR_BLIND)
1434	const_iv (ATNR_INTERNAL)	1444	const_iv (ATNR_INTERNAL)
1435	const_iv (ATNR_LIFE_STEALING)	1445	const_iv (ATNR_LIFE_STEALING)
1436	const_iv (ATNR_DISEASE)	1446	const_iv (ATNR_DISEASE)
1437		1447
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)	1448	const_iv (MAP_IN_MEMORY)
1445	const_iv (MAP_SWAPPED)	1449	const_iv (MAP_SWAPPED)
1446	const_iv (MAP_LOADING)	1450	const_iv (MAP_LOADING)
1447	const_iv (MAP_SAVING)	1451	const_iv (MAP_SAVING)
1448		1452
…		…
1461	const_iv (ST_SETUP)	1465	const_iv (ST_SETUP)
1462	const_iv (ST_PLAYING)	1466	const_iv (ST_PLAYING)
1463	const_iv (ST_CUSTOM)	1467	const_iv (ST_CUSTOM)
1464		1468
1465	const_iv (ST_CHANGE_CLASS)	1469	const_iv (ST_CHANGE_CLASS)
1466	const_iv (ST_CONFIRM_QUIT)
1467	const_iv (ST_GET_PARTY_PASSWORD)
1468		1470
1469	const_iv (IO_HEADER)	1471	const_iv (IO_HEADER)
1470	const_iv (IO_OBJECTS)	1472	const_iv (IO_OBJECTS)
1471	const_iv (IO_UNIQUES)	1473	const_iv (IO_UNIQUES)
1472		1474
…		…
1526		1528
1527	void _global_reattach ()	1529	void _global_reattach ()
1528	CODE:	1530	CODE:
1529	{	1531	{
1530	// reattach to all attachable objects in the game.	1532	// reattach to all attachable objects in the game.
1531	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1533	for_all_clients (ns)
1532	(*i)->reattach ();	1534	ns->reattach ();
1533		1535
1534	for_all_players (pl)	1536	for_all_players (pl)
1535	pl->reattach ();	1537	pl->reattach ();
1536		1538
1537	//TODO	1539	//TODO
1538	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1540	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539	// i->second->reattach ();	1541	// i->second->reattach ();
1540		1542
1541	for (object *op = object::first; op; op = op->next)	1543	for_all_objects (op)
1542	op->reattach ();	1544	op->reattach ();
1543	}	1545	}
1544		1546
1545	NV floor (NV x)	1547	NV floor (NV x)
1546		1548
1547	NV ceil (NV x)	1549	NV ceil (NV x)
		1550
		1551	NV rndm (...)
		1552	CODE:
		1553	switch (items)
		1554	{
		1555	case 0: RETVAL = rndm (); break;
		1556	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1557	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1558	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1559	}
		1560	OUTPUT:
		1561	RETVAL
1548		1562
1549	void server_tick ()	1563	void server_tick ()
1550	CODE:	1564	CODE:
1551	runtime = SvNVx (sv_runtime);	1565	runtime = SvNVx (sv_runtime);
1552	server_tick ();	1566	server_tick ();
…		…
1599	}	1613	}
1600	OUTPUT: RETVAL	1614	OUTPUT: RETVAL
1601		1615
1602	void abort ()	1616	void abort ()
1603		1617
		1618	void fork_abort (char *cause = "cf::fork_abort")
		1619
		1620	void cleanup (const char *cause, bool make_core = false)
		1621
1604	void emergency_save ()	1622	void emergency_save ()
1605		1623
1606	void _exit (int status = 0)	1624	void _exit (int status = 0)
		1625
		1626	#if _POSIX_MEMLOCK
		1627
		1628	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
		1629
		1630	int munlockall ()
		1631
		1632	#endif
1607		1633
1608	int find_animation (char *text)	1634	int find_animation (char *text)
1609	PROTOTYPE: $	1635	PROTOTYPE: $
1610		1636
1611	int random_roll (int min, int max, object *op, int goodbad);	1637	int random_roll (int min, int max, object *op, int goodbad);
…		…
1658	CODE:	1684	CODE:
1659	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1685	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660	OUTPUT:	1686	OUTPUT:
1661	RETVAL	1687	RETVAL
1662		1688
1663	#bool	1689	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1664	#destroyed (attachable *at)
1665	#
1666	#void
1667	#destroy (attachable *at)
1668		1690
1669	MODULE = cf PACKAGE = cf::global	1691	MODULE = cf PACKAGE = cf::global
1670		1692
1671	int invoke (SV *klass, int event, ...)	1693	int invoke (SV *klass, int event, ...)
1672	CODE:	1694	CODE:
…		…
1694	PPCODE:	1716	PPCODE:
1695	EXTEND (SP, object::mortals.size ());	1717	EXTEND (SP, object::mortals.size ());
1696	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)	1718	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697	PUSHs (to_sv (*i));	1719	PUSHs (to_sv (*i));
1698		1720
1699	object *first ()	1721	int objects_size ()
1700	CODE:	1722	CODE:
1701	RETVAL = object::first;	1723	RETVAL = objects.size ();
		1724	OUTPUT: RETVAL
		1725
		1726	object *objects (U32 index)
		1727	CODE:
		1728	RETVAL = index < objects.size () ? objects [index] : 0;
		1729	OUTPUT: RETVAL
		1730
		1731	int actives_size ()
		1732	CODE:
		1733	RETVAL = actives.size ();
		1734	OUTPUT: RETVAL
		1735
		1736	object *actives (U32 index)
		1737	CODE:
		1738	RETVAL = index < actives.size () ? actives [index] : 0;
1702	OUTPUT: RETVAL	1739	OUTPUT: RETVAL
1703		1740
1704	# missing properties	1741	# missing properties
1705		1742
1706	object head (object op)	1743	object head (object op)
1707	PROTOTYPE: $	1744	PROTOTYPE: $
1708	CODE:	1745	CODE:
1709	RETVAL = op->head ? op->head : op;	1746	RETVAL = op->head_ ();
1710	OUTPUT: RETVAL	1747	OUTPUT: RETVAL
1711		1748
1712	int is_head (object *op)	1749	int is_head (object *op)
1713	PROTOTYPE: $	1750	PROTOTYPE: $
1714	CODE:	1751	CODE:
1715	RETVAL = !op->head;	1752	RETVAL = op->head_ () == op;
1716	OUTPUT: RETVAL	1753	OUTPUT: RETVAL
1717		1754
1718	void	1755	void
1719	inv (object *obj)	1756	inv (object *obj)
1720	PROTOTYPE: $	1757	PROTOTYPE: $
…		…
1811		1848
1812	void drop (object who, object op)	1849	void drop (object who, object op)
1813		1850
1814	void pick_up (object who, object op)	1851	void pick_up (object who, object op)
1815		1852
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)	1853	int cf_object_teleport (object op, maptile map, int x, int y)
1821		1854
1822	void update_object (object *op, int action)	1855	void update_object (object *op, int action)
1823		1856
1824	object cf_create_object_by_name (const char name)	1857	object cf_create_object_by_name (const char name)
…		…
1943	void esrv_update_item (object op, int what, object item)	1976	void esrv_update_item (object op, int what, object item)
1944	C_ARGS: what, op, item	1977	C_ARGS: what, op, item
1945		1978
1946	void clear_los (object *op)	1979	void clear_los (object *op)
1947		1980
1948	int command_teleport (object op, char params)
1949
1950	int command_summon (object op, char params)	1981	int command_summon (object op, char params)
1951		1982
1952	int command_arrest (object op, char params)	1983	int command_arrest (object op, char params)
1953		1984
1954	int command_kick (object op, char params)	1985	int command_kick (object op, char params)
…		…
1975	CODE:	2006	CODE:
1976	pl->ob->stats.hp = pl->ob->stats.maxhp;	2007	pl->ob->stats.hp = pl->ob->stats.maxhp;
1977	pl->ob->stats.sp = pl->ob->stats.maxsp;	2008	pl->ob->stats.sp = pl->ob->stats.maxsp;
1978	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2009	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979	pl->orig_stats = pl->ob->stats;	2010	pl->orig_stats = pl->ob->stats;
1980
1981	player cf_player_find (char name)
1982	PROTOTYPE: $
1983		2011
1984	void cf_player_move (player *pl, int dir)	2012	void cf_player_move (player *pl, int dir)
1985		2013
1986	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2014	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987		2015
…		…
2033	if (y) sv_to (y, pl->bed_y);	2061	if (y) sv_to (y, pl->bed_y);
2034		2062
2035	void	2063	void
2036	list ()	2064	list ()
2037	PPCODE:	2065	PPCODE:
2038	for (player *pl = first_player; pl; pl = pl->next)	2066	for_all_players (pl)
2039	XPUSHs (sv_2mortal (to_sv (pl)));	2067	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		2068
2063		2069
2064	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2070	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065		2071
2066	int invoke (maptile *map, int event, ...)	2072	int invoke (maptile *map, int event, ...)
…		…
2082	PROTOTYPE:	2088	PROTOTYPE:
2083	CODE:	2089	CODE:
2084	RETVAL = new maptile;	2090	RETVAL = new maptile;
2085	OUTPUT:	2091	OUTPUT:
2086	RETVAL	2092	RETVAL
2087
2088	void
2089	maptile::destroy ()
2090		2093
2091	void	2094	void
2092	maptile::players ()	2095	maptile::players ()
2093	PPCODE:	2096	PPCODE:
2094	if (GIMME_V == G_SCALAR)	2097	if (GIMME_V == G_SCALAR)
…		…
2124		2127
2125	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2128	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2126	C_ARGS: str, map, nx, ny	2129	C_ARGS: str, map, nx, ny
2127		2130
2128	void	2131	void
2129	cf_map_normalise (maptile *map, int x, int y)	2132	get_map_flags (maptile *map, int x, int y)
2130	PPCODE:	2133	PPCODE:
2131	{	2134	{
2132	maptile *nmap = 0;	2135	maptile *nmap = 0;
2133	I16 nx = 0, ny = 0;	2136	I16 nx = 0, ny = 0;
2134	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2137	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2196	CODE:	2199	CODE:
2197	RETVAL = get_name_of_region_for_map (m);	2200	RETVAL = get_name_of_region_for_map (m);
2198	OUTPUT: RETVAL	2201	OUTPUT: RETVAL
2199		2202
2200	# worst xs function of my life	2203	# worst xs function of my life
2201	maptile *	2204	bool
2202	_create_random_map (\	2205	_create_random_map (\
2203	char *path,\	2206	maptile *self,\
2204	char *wallstyle,\	2207	char *wallstyle,\
2205	char *wall_name,\	2208	char *wall_name,\
2206	char *floorstyle,\	2209	char *floorstyle,\
2207	char *monsterstyle,\	2210	char *monsterstyle,\
2208	char *treasurestyle,\	2211	char *treasurestyle,\
…		…
2212	char *origin_map,\	2215	char *origin_map,\
2213	char *final_map,\	2216	char *final_map,\
2214	char *exitstyle,\	2217	char *exitstyle,\
2215	char *this_map,\	2218	char *this_map,\
2216	char *exit_on_final_map,\	2219	char *exit_on_final_map,\
2217	int Xsize,\	2220	int xsize,\
2218	int Ysize,\	2221	int ysize,\
2219	int expand2x,\	2222	int expand2x,\
2220	int layoutoptions1,\	2223	int layoutoptions1,\
2221	int layoutoptions2,\	2224	int layoutoptions2,\
2222	int layoutoptions3,\	2225	int layoutoptions3,\
2223	int symmetry,\	2226	int symmetry,\
…		…
2228	int dungeon_depth,\	2231	int dungeon_depth,\
2229	int decoroptions,\	2232	int decoroptions,\
2230	int orientation,\	2233	int orientation,\
2231	int origin_y,\	2234	int origin_y,\
2232	int origin_x,\	2235	int origin_x,\
2233	int random_seed,\	2236	U32 random_seed,\
2234	val64 total_map_hp,\	2237	val64 total_map_hp,\
2235	int map_layout_style,\	2238	int map_layout_style,\
2236	int treasureoptions,\	2239	int treasureoptions,\
2237	int symmetry_used,\	2240	int symmetry_used,\
2238	region *region\	2241	region *region,\
		2242	char *custom\
2239	)	2243	)
2240	CODE:	2244	CODE:
2241	{	2245	{
2242	random_map_params rmp;	2246	random_map_params rmp;
2243		2247
…		…
2253	assign (rmp.exit_on_final_map, exit_on_final_map);	2257	assign (rmp.exit_on_final_map, exit_on_final_map);
2254		2258
2255	rmp.origin_map = origin_map;	2259	rmp.origin_map = origin_map;
2256	rmp.final_map = final_map;	2260	rmp.final_map = final_map;
2257	rmp.this_map = this_map;	2261	rmp.this_map = this_map;
2258	rmp.Xsize = Xsize;	2262	rmp.xsize = xsize;
2259	rmp.Ysize = Ysize;	2263	rmp.ysize = ysize;
2260	rmp.expand2x = expand2x;	2264	rmp.expand2x = expand2x;
2261	rmp.layoutoptions1 = layoutoptions1;	2265	rmp.layoutoptions1 = layoutoptions1;
2262	rmp.layoutoptions2 = layoutoptions2;	2266	rmp.layoutoptions2 = layoutoptions2;
2263	rmp.layoutoptions3 = layoutoptions3;	2267	rmp.layoutoptions3 = layoutoptions3;
2264	rmp.symmetry = symmetry;	2268	rmp.symmetry = symmetry;
…		…
2275	rmp.total_map_hp = total_map_hp;	2279	rmp.total_map_hp = total_map_hp;
2276	rmp.map_layout_style = map_layout_style;	2280	rmp.map_layout_style = map_layout_style;
2277	rmp.treasureoptions = treasureoptions;	2281	rmp.treasureoptions = treasureoptions;
2278	rmp.symmetry_used = symmetry_used;	2282	rmp.symmetry_used = symmetry_used;
2279	rmp.region = region;	2283	rmp.region = region;
		2284	rmp.custom = custom;
2280		2285
2281	RETVAL = generate_random_map (path, &rmp);	2286	RETVAL = self->generate_random_map (&rmp);
2282	}	2287	}
2283	OUTPUT:	2288	OUTPUT:
2284	RETVAL	2289	RETVAL
2285		2290
2286	MODULE = cf PACKAGE = cf::arch	2291	MODULE = cf PACKAGE = cf::arch
…		…
2362	char *buf = SvPVbyte (packet, len);	2367	char *buf = SvPVbyte (packet, len);
2363		2368
2364	THIS->send_packet (buf, len);	2369	THIS->send_packet (buf, len);
2365	}	2370	}
2366		2371
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.148 by root, Sat Jan 20 23:39:09 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.148 by root, Sat Jan 20 23:39:09 2007 UTC