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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.127 by root, Thu Jan 4 20:15:16 2007 UTC vs.
Revision 1.154 by root, Fri Jan 26 21:44:11 2007 UTC

…		…
99		99
100	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	100	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
101		101
102	unordered_vector<attachable *> attachable::mortals;	102	unordered_vector<attachable *> attachable::mortals;
103		103
104	#if 0
105	attachable *attachable::rc_first;
106
107	attachable::attachable ()
108	{
109	refcnt = 0;
110	rc_next = rc_first;
111	rc_first = this;
112	}
113	#endif
114
115	attachable::~attachable ()	104	attachable::~attachable ()
116	{	105	{
117	assert (!(flags & F_BORROWED));//D//TODO//remove when stable
118	#if 0
119	assert (!rc_next);
120	assert (!refcnt);	106	assert (!self);
121	#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::optimise ()
		118	{
		119	if (self
		120	&& SvREFCNT (self) == 1
		121	&& !HvTOTALKEYS (self))
		122	{
		123	SV self = (SV )this->self;
		124
		125	SvREFCNT_inc (self);
		126	sv_unmagic (self, PERL_MAGIC_ext);
		127	SvREFCNT_dec (self);
		128	assert (!this->self);
		129	}
122	}	130	}
123		131
124	// check wether the object really is dead	132	// check wether the object really is dead
125	void	133	void
126	attachable::do_check ()	134	attachable::do_check ()
127	{	135	{
128	if (refcnt > 0)	136	if (refcnt_cnt () > 0)
129	return;	137	return;
130		138
131	// try to unborrow the refcnt from perl	139	destroy ();
132	if (flags & F_BORROWED)	140	}
		141
		142	void
		143	attachable::do_destroy ()
		144	{
		145	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		146
		147	if (cb)
133	{	148	{
134	assert (self);//D//TODO//remove when stable	149	SvREFCNT_dec (cb);
135	flags &= ~F_BORROWED;	150	cb = 0;
136	refcnt_inc ();	151	}
		152
		153	if (self)
		154	{
		155	hv_clear (self);
		156
		157	SV self = (SV )this->self;
		158	SvREFCNT_inc (self);
		159	sv_unmagic (self, PERL_MAGIC_ext);
137	SvREFCNT_dec (self);	160	SvREFCNT_dec (self);
		161	// self is now 0
		162	assert (!this->self);//D//TODO remove soon
138	}	163	}
139		164
140	if (refcnt > 0 \|\| self)
141	return;
142
143	destroy ();
144	}
145
146	void
147	attachable::do_destroy ()
148	{
149	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
150
151	if (self)
152	hv_clear (self);
153
154	//TODO: call generic destroy callback
155	mortals.push_back (this);	165	mortals.push_back (this);
156	}	166	}
157		167
158	void	168	void
159	attachable::destroy ()	169	attachable::destroy ()
…		…
163		173
164	flags \|= F_DESTROYED;	174	flags \|= F_DESTROYED;
165	do_destroy ();	175	do_destroy ();
166	}	176	}
167		177
		178	void
168	void attachable::check_mortals ()	179	attachable::check_mortals ()
169	{	180	{
170	for (int i = 0; i < mortals.size (); )	181	static int i = 0;
		182
		183	for (;;)
171	{	184	{
		185	if (i >= mortals.size ())
		186	{
		187	i = 0;
		188
		189	if (mortals.size () > 1000)
		190	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		191
		192	break;
		193	}
		194
172	attachable *obj = mortals [i];	195	attachable *obj = mortals [i];
173		196
174	obj->refcnt_chk (); // unborrow from perl, if necessary	197	obj->refcnt_chk (); // unborrow from perl, if necessary
175		198
		199	//if (obj->refcnt > 0 \|\| obj->self)
176	if (obj->refcnt \|\| obj->self)	200	if (obj->refcnt \|\| obj->self)
177	{	201	{
178	#if 0	202	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
179	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
180	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
181	#endif
182
183	++i; // further delay freeing	203	++i; // further delay freeing
		204
		205	if (!(i & 0x3ff))
		206	break;
184	}//D	207	}
185	else	208	else
186	{	209	{
187	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
188	mortals.erase (i);	210	mortals.erase (i);
189	delete obj;	211	delete obj;
190	}	212	}
191	}	213	}
192	}	214	}
…		…
217		239
218	static int	240	static int
219	attachable_free (pTHX_ SV sv, MAGIC mg)	241	attachable_free (pTHX_ SV sv, MAGIC mg)
220	{	242	{
221	attachable at = (attachable )mg->mg_ptr;	243	attachable at = (attachable )mg->mg_ptr;
222	assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable	244
		245	//TODO: check if transaction behaviour is really required here
		246	if (SV self = (SV )at->self)
		247	{
223	at->self = 0;	248	at->self = 0;
		249	SvREFCNT_dec (self);
		250	}
		251
224	// next line makes sense, but most objects still have refcnt 0 by default	252	// next line makes sense, but most objects still have refcnt 0 by default
225	//at->refcnt_chk ();	253	//at->refcnt_chk ();
226	return 0;	254	return 0;
227	}	255	}
228		256
…		…
237	if (!obj->self)	265	if (!obj->self)
238	{	266	{
239	obj->self = newHV ();	267	obj->self = newHV ();
240	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	268	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
241		269
242	// borrow the refcnt from the object	270	// now bless the object _once_
243	obj->flags \|= attachable::F_BORROWED;	271	return sv_bless (newRV_inc ((SV *)obj->self), stash);
244	obj->refcnt_dec ();
245	}	272	}
		273	else
		274	{
		275	SV sv = newRV_inc ((SV )obj->self);
246		276
247	return sv_bless (newRV_inc ((SV *)obj->self), stash);	277	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		278	SvAMAGIC_on (sv);
		279
		280	return sv;
		281	}
248	}	282	}
249		283
250	static void	284	static void
251	clearSVptr (SV *sv)	285	clearSVptr (SV *sv)
252	{	286	{
…		…
305	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	339	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
306		340
307	inline SV *to_sv (object & v) { return to_sv (&v); }	341	inline SV *to_sv (object & v) { return to_sv (&v); }
308	inline SV *to_sv (living & v) { return to_sv (&v); }	342	inline SV *to_sv (living & v) { return to_sv (&v); }
309		343
310	//TODO:
311	inline SV to_sv (New_Face v) { return to_sv (v->name); }	344	inline SV to_sv (facetile v) { return to_sv (v->name); }
312	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	345	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
313		346
314	inline SV *to_sv (UUID v)	347	inline SV *to_sv (UUID v)
315	{	348	{
316	char buf[128];	349	char buf[128];
…		…
336	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	369	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }
337	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }	370	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }
338	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }	371	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }
339	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }	372	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }
340	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }	373	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
		374	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
341	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	375	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
342	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	376	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
343	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	377	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
344		378
345	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	379	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
346	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	380	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
347		381
348	template<class T>	382	template<class T>
349	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	383	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
350		384
351	template<int N>	385	template<int N>
…		…
486	{	520	{
487	if (!ext->cb)	521	if (!ext->cb)
488	ext->cb = newAV ();	522	ext->cb = newAV ();
489		523
490	return newRV_inc ((SV *)ext->cb);	524	return newRV_inc ((SV *)ext->cb);
491	}
492
493	#if 0
494	void attachable::clear ()
495	{
496	if (self)
497	{
498	// disconnect Perl from C, to avoid crashes
499	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
500
501	// clear the perl hash, might or might not be a good idea
502	hv_clear ((HV )SvRV ((SV )self));
503
504	SvREFCNT_dec (self);
505	self = 0;
506	}
507
508	if (cb)
509	{
510	SvREFCNT_dec (cb);
511	cb = 0;
512	}
513
514	attach = 0;
515	}
516	#endif
517
518	void attachable::optimise ()
519	{
520	if (self
521	&& SvREFCNT (self) == 1
522	&& !HvTOTALKEYS (self))
523	{
524	flags &= ~F_BORROWED;
525	refcnt_inc ();
526	SvREFCNT_dec ((SV *)self);
527	}
528	}	525	}
529		526
530	/////////////////////////////////////////////////////////////////////////////	527	/////////////////////////////////////////////////////////////////////////////
531		528
532	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	529	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
…		…
828	}	825	}
829		826
830	/////////////////////////////////////////////////////////////////////////////	827	/////////////////////////////////////////////////////////////////////////////
831		828
832	void	829	void
833	maptile::emergency_save ()	830	cfperl_emergency_save ()
834	{	831	{
835	CALL_BEGIN (0);	832	CALL_BEGIN (0);
836	CALL_CALL ("cf::map::emergency_save", G_VOID);	833	CALL_CALL ("cf::emergency_save", G_VOID);
837	CALL_END;	834	CALL_END;
838	}	835	}
839		836
840	maptile *	837	maptile *
841	maptile::find_sync (const char path, maptile origin)	838	maptile::find_sync (const char path, maptile origin)
842	{	839	{
843	CALL_BEGIN (2);	840	CALL_BEGIN (2);
844	CALL_ARG (path);	841	CALL_ARG (path);
845	CALL_ARG (origin);	842	CALL_ARG (origin);
846	CALL_CALL ("cf::map::find_sync", G_SCALAR);	843	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		844
		845	maptile *retval;
		846
		847	if (count)
		848	sv_to (POPs, retval);
		849	else
		850	retval = 0;
		851
		852	CALL_END;
		853
		854	return retval;
		855	}
		856
		857	maptile *
		858	maptile::find_async (const char path, maptile origin)
		859	{
		860	CALL_BEGIN (2);
		861	CALL_ARG (path);
		862	CALL_ARG (origin);
		863	CALL_CALL ("cf::map::find_async", G_SCALAR);
847		864
848	maptile *retval;	865	maptile *retval;
849		866
850	if (count)	867	if (count)
851	sv_to (POPs, retval);	868	sv_to (POPs, retval);
…		…
904	void	921	void
905	iw::alloc ()	922	iw::alloc ()
906	{	923	{
907	pe = GEventAPI->new_idle (0, 0);	924	pe = GEventAPI->new_idle (0, 0);
908		925
		926	WaREENTRANT_off (pe);
909	pe->base.callback = (void *)iw_dispatch;	927	pe->base.callback = (void *)iw_dispatch;
910	pe->base.ext_data = (void *)this;	928	pe->base.ext_data = (void *)this;
911	}	929	}
912		930
913	static void iow_dispatch (pe_event *ev)	931	static void iow_dispatch (pe_event *ev)
…		…
919	void	937	void
920	iow::alloc ()	938	iow::alloc ()
921	{	939	{
922	pe = GEventAPI->new_io (0, 0);	940	pe = GEventAPI->new_io (0, 0);
923		941
		942	WaREENTRANT_off (pe);
924	pe->base.callback = (void *)iow_dispatch;	943	pe->base.callback = (void *)iow_dispatch;
925	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
926		945
927	pe->fd = -1;	946	pe->fd = -1;
928	pe->poll = 0;	947	pe->poll = 0;
…		…
1256	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1275	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1257	const_iv (FLAG_IS_WATER)	1276	const_iv (FLAG_IS_WATER)
1258	const_iv (FLAG_CONTENT_ON_GEN)	1277	const_iv (FLAG_CONTENT_ON_GEN)
1259	const_iv (FLAG_IS_A_TEMPLATE)	1278	const_iv (FLAG_IS_A_TEMPLATE)
1260	const_iv (FLAG_IS_BUILDABLE)	1279	const_iv (FLAG_IS_BUILDABLE)
		1280	const_iv (FLAG_DESTROY_ON_DEATH)
		1281	const_iv (FLAG_NO_MAP_SAVE)
1261		1282
1262	const_iv (NDI_BLACK)	1283	const_iv (NDI_BLACK)
1263	const_iv (NDI_WHITE)	1284	const_iv (NDI_WHITE)
1264	const_iv (NDI_NAVY)	1285	const_iv (NDI_NAVY)
1265	const_iv (NDI_RED)	1286	const_iv (NDI_RED)
…		…
1450	const_iv (ATNR_BLIND)	1471	const_iv (ATNR_BLIND)
1451	const_iv (ATNR_INTERNAL)	1472	const_iv (ATNR_INTERNAL)
1452	const_iv (ATNR_LIFE_STEALING)	1473	const_iv (ATNR_LIFE_STEALING)
1453	const_iv (ATNR_DISEASE)	1474	const_iv (ATNR_DISEASE)
1454		1475
1455	const_iv (MAP_FLUSH)
1456	const_iv (MAP_PLAYER_UNIQUE)
1457	const_iv (MAP_BLOCK)
1458	const_iv (MAP_STYLE)
1459	const_iv (MAP_OVERLAY)
1460
1461	const_iv (MAP_IN_MEMORY)	1476	const_iv (MAP_IN_MEMORY)
1462	const_iv (MAP_SWAPPED)	1477	const_iv (MAP_SWAPPED)
1463	const_iv (MAP_LOADING)	1478	const_iv (MAP_LOADING)
1464	const_iv (MAP_SAVING)	1479	const_iv (MAP_SAVING)
1465		1480
…		…
1478	const_iv (ST_SETUP)	1493	const_iv (ST_SETUP)
1479	const_iv (ST_PLAYING)	1494	const_iv (ST_PLAYING)
1480	const_iv (ST_CUSTOM)	1495	const_iv (ST_CUSTOM)
1481		1496
1482	const_iv (ST_CHANGE_CLASS)	1497	const_iv (ST_CHANGE_CLASS)
1483	const_iv (ST_CONFIRM_QUIT)
1484	const_iv (ST_GET_PARTY_PASSWORD)
1485		1498
1486	const_iv (IO_HEADER)	1499	const_iv (IO_HEADER)
1487	const_iv (IO_OBJECTS)	1500	const_iv (IO_OBJECTS)
1488	const_iv (IO_UNIQUES)	1501	const_iv (IO_UNIQUES)
1489		1502
…		…
1543		1556
1544	void _global_reattach ()	1557	void _global_reattach ()
1545	CODE:	1558	CODE:
1546	{	1559	{
1547	// reattach to all attachable objects in the game.	1560	// reattach to all attachable objects in the game.
1548	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1561	for_all_clients (ns)
1549	(*i)->reattach ();	1562	ns->reattach ();
1550		1563
1551	for_all_players (pl)	1564	for_all_players (pl)
1552	pl->reattach ();	1565	pl->reattach ();
1553		1566
1554	//TODO	1567	//TODO
1555	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1568	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1556	// i->second->reattach ();	1569	// i->second->reattach ();
1557		1570
1558	for (object *op = object::first; op; op = op->next)	1571	for_all_objects (op)
1559	op->reattach ();	1572	op->reattach ();
1560	}	1573	}
1561		1574
1562	NV floor (NV x)	1575	NV floor (NV x)
1563		1576
1564	NV ceil (NV x)	1577	NV ceil (NV x)
		1578
		1579	NV rndm (...)
		1580	CODE:
		1581	switch (items)
		1582	{
		1583	case 0: RETVAL = rndm (); break;
		1584	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1585	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1586	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1587	}
		1588	OUTPUT:
		1589	RETVAL
1565		1590
1566	void server_tick ()	1591	void server_tick ()
1567	CODE:	1592	CODE:
1568	runtime = SvNVx (sv_runtime);	1593	runtime = SvNVx (sv_runtime);
1569	server_tick ();	1594	server_tick ();
…		…
1616	}	1641	}
1617	OUTPUT: RETVAL	1642	OUTPUT: RETVAL
1618		1643
1619	void abort ()	1644	void abort ()
1620		1645
		1646	void fork_abort (char *cause = "cf::fork_abort")
		1647
		1648	void cleanup (const char *cause, bool make_core = false)
		1649
1621	void emergency_save ()	1650	void emergency_save ()
		1651
		1652	UV sv_2watcher (SV *w)
		1653	CODE:
		1654	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1655	OUTPUT:
		1656	RETVAL
1622		1657
1623	void _exit (int status = 0)	1658	void _exit (int status = 0)
1624		1659
1625	#if _POSIX_MEMLOCK	1660	#if _POSIX_MEMLOCK
1626		1661
…		…
1683	CODE:	1718	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1719	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1720	OUTPUT:
1686	RETVAL	1721	RETVAL
1687		1722
1688	#bool	1723	int mortals_size ()
1689	#destroyed (attachable *at)	1724	CODE:
1690	#	1725	RETVAL = attachable::mortals.size ();
1691	#void	1726	OUTPUT: RETVAL
1692	#destroy (attachable *at)	1727
		1728	#object *mortals (U32 index)
		1729	# CODE:
		1730	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1731	# OUTPUT: RETVAL
		1732
		1733	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1693		1734
1694	MODULE = cf PACKAGE = cf::global	1735	MODULE = cf PACKAGE = cf::global
1695		1736
1696	int invoke (SV *klass, int event, ...)	1737	int invoke (SV *klass, int event, ...)
1697	CODE:	1738	CODE:
…		…
1713	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1754	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1714	OUTPUT: RETVAL	1755	OUTPUT: RETVAL
1715		1756
1716	SV registry (object op)	1757	SV registry (object op)
1717		1758
1718	void mortals ()	1759	int objects_size ()
1719	PPCODE:	1760	CODE:
1720	EXTEND (SP, object::mortals.size ());
1721	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1722	PUSHs (to_sv (*i));
1723
1724	object *first ()
1725	CODE:
1726	RETVAL = object::first;	1761	RETVAL = objects.size ();
		1762	OUTPUT: RETVAL
		1763
		1764	object *objects (U32 index)
		1765	CODE:
		1766	RETVAL = index < objects.size () ? objects [index] : 0;
		1767	OUTPUT: RETVAL
		1768
		1769	int actives_size ()
		1770	CODE:
		1771	RETVAL = actives.size ();
		1772	OUTPUT: RETVAL
		1773
		1774	object *actives (U32 index)
		1775	CODE:
		1776	RETVAL = index < actives.size () ? actives [index] : 0;
1727	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1728		1778
1729	# missing properties	1779	# missing properties
1730		1780
1731	object head (object op)	1781	object head (object op)
1732	PROTOTYPE: $	1782	PROTOTYPE: $
1733	CODE:	1783	CODE:
1734	RETVAL = op->head ? op->head : op;	1784	RETVAL = op->head_ ();
1735	OUTPUT: RETVAL	1785	OUTPUT: RETVAL
1736		1786
1737	int is_head (object *op)	1787	int is_head (object *op)
1738	PROTOTYPE: $	1788	PROTOTYPE: $
1739	CODE:	1789	CODE:
1740	RETVAL = !op->head;	1790	RETVAL = op->head_ () == op;
1741	OUTPUT: RETVAL	1791	OUTPUT: RETVAL
1742		1792
1743	void	1793	void
1744	inv (object *obj)	1794	inv (object *obj)
1745	PROTOTYPE: $	1795	PROTOTYPE: $
…		…
1836		1886
1837	void drop (object who, object op)	1887	void drop (object who, object op)
1838		1888
1839	void pick_up (object who, object op)	1889	void pick_up (object who, object op)
1840		1890
1841	object cf_object_insert_object (object op, object *container)
1842
1843	object cf_object_insert_in_ob (object ob, object *where)
1844
1845	int cf_object_teleport (object op, maptile map, int x, int y)	1891	int cf_object_teleport (object op, maptile map, int x, int y)
1846		1892
1847	void update_object (object *op, int action)	1893	void update_object (object *op, int action)
1848		1894
1849	object cf_create_object_by_name (const char name)	1895	object cf_create_object_by_name (const char name)
…		…
1968	void esrv_update_item (object op, int what, object item)	2014	void esrv_update_item (object op, int what, object item)
1969	C_ARGS: what, op, item	2015	C_ARGS: what, op, item
1970		2016
1971	void clear_los (object *op)	2017	void clear_los (object *op)
1972		2018
1973	int command_teleport (object op, char params)
1974
1975	int command_summon (object op, char params)	2019	int command_summon (object op, char params)
1976		2020
1977	int command_arrest (object op, char params)	2021	int command_arrest (object op, char params)
1978		2022
1979	int command_kick (object op, char params)	2023	int command_kick (object op, char params)
…		…
2000	CODE:	2044	CODE:
2001	pl->ob->stats.hp = pl->ob->stats.maxhp;	2045	pl->ob->stats.hp = pl->ob->stats.maxhp;
2002	pl->ob->stats.sp = pl->ob->stats.maxsp;	2046	pl->ob->stats.sp = pl->ob->stats.maxsp;
2003	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2047	pl->ob->stats.grace = pl->ob->stats.maxgrace;
2004	pl->orig_stats = pl->ob->stats;	2048	pl->orig_stats = pl->ob->stats;
2005
2006	player cf_player_find (char name)
2007	PROTOTYPE: $
2008		2049
2009	void cf_player_move (player *pl, int dir)	2050	void cf_player_move (player *pl, int dir)
2010		2051
2011	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2052	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2012		2053
…		…
2058	if (y) sv_to (y, pl->bed_y);	2099	if (y) sv_to (y, pl->bed_y);
2059		2100
2060	void	2101	void
2061	list ()	2102	list ()
2062	PPCODE:	2103	PPCODE:
2063	for (player *pl = first_player; pl; pl = pl->next)	2104	for_all_players (pl)
2064	XPUSHs (sv_2mortal (to_sv (pl)));	2105	XPUSHs (sv_2mortal (to_sv (pl)));
2065
2066	bool
2067	peaceful (player *pl, bool new_setting = 0)
2068	PROTOTYPE: $;$
2069	CODE:
2070	RETVAL = pl->peaceful;
2071	if (items > 1)
2072	pl->peaceful = new_setting;
2073	OUTPUT:
2074	RETVAL
2075
2076	living *
2077	orig_stats (player *pl)
2078	CODE:
2079	RETVAL = &pl->orig_stats;
2080	OUTPUT: RETVAL
2081
2082	living *
2083	last_stats (player *pl)
2084	CODE:
2085	RETVAL = &pl->last_stats;
2086	OUTPUT: RETVAL
2087		2106
2088		2107
2089	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2108	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2090		2109
2091	int invoke (maptile *map, int event, ...)	2110	int invoke (maptile *map, int event, ...)
…		…
2107	PROTOTYPE:	2126	PROTOTYPE:
2108	CODE:	2127	CODE:
2109	RETVAL = new maptile;	2128	RETVAL = new maptile;
2110	OUTPUT:	2129	OUTPUT:
2111	RETVAL	2130	RETVAL
2112
2113	void
2114	maptile::destroy ()
2115		2131
2116	void	2132	void
2117	maptile::players ()	2133	maptile::players ()
2118	PPCODE:	2134	PPCODE:
2119	if (GIMME_V == G_SCALAR)	2135	if (GIMME_V == G_SCALAR)
…		…
2149		2165
2150	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2166	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2151	C_ARGS: str, map, nx, ny	2167	C_ARGS: str, map, nx, ny
2152		2168
2153	void	2169	void
2154	cf_map_normalise (maptile *map, int x, int y)	2170	get_map_flags (maptile *map, int x, int y)
2155	PPCODE:	2171	PPCODE:
2156	{	2172	{
2157	maptile *nmap = 0;	2173	maptile *nmap = 0;
2158	I16 nx = 0, ny = 0;	2174	I16 nx = 0, ny = 0;
2159	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2175	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2221	CODE:	2237	CODE:
2222	RETVAL = get_name_of_region_for_map (m);	2238	RETVAL = get_name_of_region_for_map (m);
2223	OUTPUT: RETVAL	2239	OUTPUT: RETVAL
2224		2240
2225	# worst xs function of my life	2241	# worst xs function of my life
2226	maptile *	2242	bool
2227	_create_random_map (\	2243	_create_random_map (\
2228	char *path,\	2244	maptile *self,\
2229	char *wallstyle,\	2245	char *wallstyle,\
2230	char *wall_name,\	2246	char *wall_name,\
2231	char *floorstyle,\	2247	char *floorstyle,\
2232	char *monsterstyle,\	2248	char *monsterstyle,\
2233	char *treasurestyle,\	2249	char *treasurestyle,\
…		…
2237	char *origin_map,\	2253	char *origin_map,\
2238	char *final_map,\	2254	char *final_map,\
2239	char *exitstyle,\	2255	char *exitstyle,\
2240	char *this_map,\	2256	char *this_map,\
2241	char *exit_on_final_map,\	2257	char *exit_on_final_map,\
2242	int Xsize,\	2258	int xsize,\
2243	int Ysize,\	2259	int ysize,\
2244	int expand2x,\	2260	int expand2x,\
2245	int layoutoptions1,\	2261	int layoutoptions1,\
2246	int layoutoptions2,\	2262	int layoutoptions2,\
2247	int layoutoptions3,\	2263	int layoutoptions3,\
2248	int symmetry,\	2264	int symmetry,\
…		…
2253	int dungeon_depth,\	2269	int dungeon_depth,\
2254	int decoroptions,\	2270	int decoroptions,\
2255	int orientation,\	2271	int orientation,\
2256	int origin_y,\	2272	int origin_y,\
2257	int origin_x,\	2273	int origin_x,\
2258	int random_seed,\	2274	U32 random_seed,\
2259	val64 total_map_hp,\	2275	val64 total_map_hp,\
2260	int map_layout_style,\	2276	int map_layout_style,\
2261	int treasureoptions,\	2277	int treasureoptions,\
2262	int symmetry_used,\	2278	int symmetry_used,\
2263	region *region\	2279	region *region,\
		2280	char *custom\
2264	)	2281	)
2265	CODE:	2282	CODE:
2266	{	2283	{
2267	random_map_params rmp;	2284	random_map_params rmp;
2268		2285
…		…
2278	assign (rmp.exit_on_final_map, exit_on_final_map);	2295	assign (rmp.exit_on_final_map, exit_on_final_map);
2279		2296
2280	rmp.origin_map = origin_map;	2297	rmp.origin_map = origin_map;
2281	rmp.final_map = final_map;	2298	rmp.final_map = final_map;
2282	rmp.this_map = this_map;	2299	rmp.this_map = this_map;
2283	rmp.Xsize = Xsize;	2300	rmp.xsize = xsize;
2284	rmp.Ysize = Ysize;	2301	rmp.ysize = ysize;
2285	rmp.expand2x = expand2x;	2302	rmp.expand2x = expand2x;
2286	rmp.layoutoptions1 = layoutoptions1;	2303	rmp.layoutoptions1 = layoutoptions1;
2287	rmp.layoutoptions2 = layoutoptions2;	2304	rmp.layoutoptions2 = layoutoptions2;
2288	rmp.layoutoptions3 = layoutoptions3;	2305	rmp.layoutoptions3 = layoutoptions3;
2289	rmp.symmetry = symmetry;	2306	rmp.symmetry = symmetry;
…		…
2300	rmp.total_map_hp = total_map_hp;	2317	rmp.total_map_hp = total_map_hp;
2301	rmp.map_layout_style = map_layout_style;	2318	rmp.map_layout_style = map_layout_style;
2302	rmp.treasureoptions = treasureoptions;	2319	rmp.treasureoptions = treasureoptions;
2303	rmp.symmetry_used = symmetry_used;	2320	rmp.symmetry_used = symmetry_used;
2304	rmp.region = region;	2321	rmp.region = region;
		2322	rmp.custom = custom;
2305		2323
2306	RETVAL = generate_random_map (path, &rmp);	2324	RETVAL = self->generate_random_map (&rmp);
2307	}	2325	}
2308	OUTPUT:	2326	OUTPUT:
2309	RETVAL	2327	RETVAL
2310		2328
2311	MODULE = cf PACKAGE = cf::arch	2329	MODULE = cf PACKAGE = cf::arch
…		…
2387	char *buf = SvPVbyte (packet, len);	2405	char *buf = SvPVbyte (packet, len);
2388		2406
2389	THIS->send_packet (buf, len);	2407	THIS->send_packet (buf, len);
2390	}	2408	}
2391		2409
2392	void
2393	client::destroy ()
2394

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.127 by root, Thu Jan 4 20:15:16 2007 UTC vs. Revision 1.154 by root, Fri Jan 26 21:44:11 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.127 by root, Thu Jan 4 20:15:16 2007 UTC vs.
Revision 1.154 by root, Fri Jan 26 21:44:11 2007 UTC