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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.125 by root, Thu Jan 4 00:53:54 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	//TODO: call generic destroy callback
152	mortals.push_back (this);	165	mortals.push_back (this);
153	}	166	}
154		167
155	void	168	void
156	attachable::destroy ()	169	attachable::destroy ()
…		…
160		173
161	flags \|= F_DESTROYED;	174	flags \|= F_DESTROYED;
162	do_destroy ();	175	do_destroy ();
163	}	176	}
164		177
		178	void
165	void attachable::check_mortals ()	179	attachable::check_mortals ()
166	{	180	{
167	for (int i = 0; i < mortals.size (); )	181	static int i = 0;
		182
		183	for (;;)
168	{	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
169	attachable *obj = mortals [i];	195	attachable *obj = mortals [i];
170		196
171	obj->refcnt_chk (); // unborrow from perl, if necessary	197	obj->refcnt_chk (); // unborrow from perl, if necessary
172		198
		199	//if (obj->refcnt > 0 \|\| obj->self)
173	if (obj->refcnt \|\| obj->self)	200	if (obj->refcnt \|\| obj->self)
174	{	201	{
175	#if 0	202	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
176	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
177	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
178	#endif
179
180	++i; // further delay freeing	203	++i; // further delay freeing
		204
		205	if (!(i & 0x3ff))
		206	break;
181	}//D	207	}
182	else	208	else
183	{	209	{
184	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
185	mortals.erase (i);	210	mortals.erase (i);
186	delete obj;	211	delete obj;
187	}	212	}
188	}	213	}
189	}	214	}
…		…
214		239
215	static int	240	static int
216	attachable_free (pTHX_ SV sv, MAGIC mg)	241	attachable_free (pTHX_ SV sv, MAGIC mg)
217	{	242	{
218	attachable at = (attachable )mg->mg_ptr;	243	attachable at = (attachable )mg->mg_ptr;
219	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	{
220	at->self = 0;	248	at->self = 0;
		249	SvREFCNT_dec (self);
		250	}
		251
221	// 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
222	//at->refcnt_chk ();	253	//at->refcnt_chk ();
223	return 0;	254	return 0;
224	}	255	}
225		256
…		…
234	if (!obj->self)	265	if (!obj->self)
235	{	266	{
236	obj->self = newHV ();	267	obj->self = newHV ();
237	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);
238		269
239	// borrow the refcnt from the object	270	// now bless the object _once_
240	obj->flags \|= attachable::F_BORROWED;	271	return sv_bless (newRV_inc ((SV *)obj->self), stash);
241	obj->refcnt_dec ();
242	}	272	}
		273	else
		274	{
		275	SV sv = newRV_inc ((SV )obj->self);
243		276
244	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	}
245	}	282	}
246		283
247	static void	284	static void
248	clearSVptr (SV *sv)	285	clearSVptr (SV *sv)
249	{	286	{
…		…
302	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); }
303		340
304	inline SV *to_sv (object & v) { return to_sv (&v); }	341	inline SV *to_sv (object & v) { return to_sv (&v); }
305	inline SV *to_sv (living & v) { return to_sv (&v); }	342	inline SV *to_sv (living & v) { return to_sv (&v); }
306		343
307	//TODO:
308	inline SV to_sv (New_Face v) { return to_sv (v->name); }	344	inline SV to_sv (facetile v) { return to_sv (v->name); }
309	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	345	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
310		346
311	inline SV *to_sv (UUID v)	347	inline SV *to_sv (UUID v)
312	{	348	{
313	char buf[128];	349	char buf[128];
…		…
333	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"); }
334	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"); }
335	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"); }
336	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"); }
337	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"); }
338	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"); }
339	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"); }
340	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"); }
341		378
342	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)]; }
343	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)); }
344		381
345	template<class T>	382	template<class T>
346	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; }
347		384
348	template<int N>	385	template<int N>
…		…
483	{	520	{
484	if (!ext->cb)	521	if (!ext->cb)
485	ext->cb = newAV ();	522	ext->cb = newAV ();
486		523
487	return newRV_inc ((SV *)ext->cb);	524	return newRV_inc ((SV *)ext->cb);
488	}
489
490	#if 0
491	void attachable::clear ()
492	{
493	if (self)
494	{
495	// disconnect Perl from C, to avoid crashes
496	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
497
498	// clear the perl hash, might or might not be a good idea
499	hv_clear ((HV )SvRV ((SV )self));
500
501	SvREFCNT_dec (self);
502	self = 0;
503	}
504
505	if (cb)
506	{
507	SvREFCNT_dec (cb);
508	cb = 0;
509	}
510
511	attach = 0;
512	}
513	#endif
514
515	void attachable::optimise ()
516	{
517	if (self
518	&& SvREFCNT (self) == 1
519	&& !HvTOTALKEYS (self))
520	{
521	flags &= ~F_BORROWED;
522	refcnt_inc ();
523	SvREFCNT_dec ((SV *)self);
524	}
525	}	525	}
526		526
527	/////////////////////////////////////////////////////////////////////////////	527	/////////////////////////////////////////////////////////////////////////////
528		528
529	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)
…		…
825	}	825	}
826		826
827	/////////////////////////////////////////////////////////////////////////////	827	/////////////////////////////////////////////////////////////////////////////
828		828
829	void	829	void
830	maptile::emergency_save ()	830	cfperl_emergency_save ()
831	{	831	{
832	CALL_BEGIN (0);	832	CALL_BEGIN (0);
833	CALL_CALL ("cf::map::emergency_save", G_VOID);	833	CALL_CALL ("cf::emergency_save", G_VOID);
834	CALL_END;	834	CALL_END;
835	}	835	}
836		836
837	maptile *	837	maptile *
838	maptile::load_map_sync (const char path, maptile origin)	838	maptile::find_sync (const char path, maptile origin)
839	{	839	{
840	CALL_BEGIN (2);	840	CALL_BEGIN (2);
841	CALL_ARG (path);	841	CALL_ARG (path);
842	CALL_ARG (origin);	842	CALL_ARG (origin);
843	CALL_CALL ("cf::map::load_map_sync", G_SCALAR);	843	CALL_CALL ("cf::map::find_sync", G_SCALAR);
844		844
845	maptile *retval;	845	maptile *retval;
846		846
847	if (count)	847	if (count)
848	sv_to (POPs, retval);	848	sv_to (POPs, retval);
…		…
850	retval = 0;	850	retval = 0;
851		851
852	CALL_END;	852	CALL_END;
853		853
854	return retval;	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);
		864
		865	maptile *retval;
		866
		867	if (count)
		868	sv_to (POPs, retval);
		869	else
		870	retval = 0;
		871
		872	CALL_END;
		873
		874	return retval;
		875	}
		876
		877	void
		878	maptile::do_load_sync ()
		879	{
		880	CALL_BEGIN (1);
		881	CALL_ARG (this);
		882	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
		883	CALL_END;
855	}	884	}
856		885
857	void	886	void
858	maptile::change_all_map_light (int change)	887	maptile::change_all_map_light (int change)
859	{	888	{
…		…
892	void	921	void
893	iw::alloc ()	922	iw::alloc ()
894	{	923	{
895	pe = GEventAPI->new_idle (0, 0);	924	pe = GEventAPI->new_idle (0, 0);
896		925
		926	WaREENTRANT_off (pe);
897	pe->base.callback = (void *)iw_dispatch;	927	pe->base.callback = (void *)iw_dispatch;
898	pe->base.ext_data = (void *)this;	928	pe->base.ext_data = (void *)this;
899	}	929	}
900		930
901	static void iow_dispatch (pe_event *ev)	931	static void iow_dispatch (pe_event *ev)
…		…
907	void	937	void
908	iow::alloc ()	938	iow::alloc ()
909	{	939	{
910	pe = GEventAPI->new_io (0, 0);	940	pe = GEventAPI->new_io (0, 0);
911		941
		942	WaREENTRANT_off (pe);
912	pe->base.callback = (void *)iow_dispatch;	943	pe->base.callback = (void *)iow_dispatch;
913	pe->base.ext_data = (void *)this;	944	pe->base.ext_data = (void *)this;
914		945
915	pe->fd = -1;	946	pe->fd = -1;
916	pe->poll = 0;	947	pe->poll = 0;
…		…
1244	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1275	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1245	const_iv (FLAG_IS_WATER)	1276	const_iv (FLAG_IS_WATER)
1246	const_iv (FLAG_CONTENT_ON_GEN)	1277	const_iv (FLAG_CONTENT_ON_GEN)
1247	const_iv (FLAG_IS_A_TEMPLATE)	1278	const_iv (FLAG_IS_A_TEMPLATE)
1248	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)
1249		1282
1250	const_iv (NDI_BLACK)	1283	const_iv (NDI_BLACK)
1251	const_iv (NDI_WHITE)	1284	const_iv (NDI_WHITE)
1252	const_iv (NDI_NAVY)	1285	const_iv (NDI_NAVY)
1253	const_iv (NDI_RED)	1286	const_iv (NDI_RED)
…		…
1438	const_iv (ATNR_BLIND)	1471	const_iv (ATNR_BLIND)
1439	const_iv (ATNR_INTERNAL)	1472	const_iv (ATNR_INTERNAL)
1440	const_iv (ATNR_LIFE_STEALING)	1473	const_iv (ATNR_LIFE_STEALING)
1441	const_iv (ATNR_DISEASE)	1474	const_iv (ATNR_DISEASE)
1442		1475
1443	const_iv (MAP_FLUSH)
1444	const_iv (MAP_PLAYER_UNIQUE)
1445	const_iv (MAP_BLOCK)
1446	const_iv (MAP_STYLE)
1447	const_iv (MAP_OVERLAY)
1448
1449	const_iv (MAP_IN_MEMORY)	1476	const_iv (MAP_IN_MEMORY)
1450	const_iv (MAP_SWAPPED)	1477	const_iv (MAP_SWAPPED)
1451	const_iv (MAP_LOADING)	1478	const_iv (MAP_LOADING)
1452	const_iv (MAP_SAVING)	1479	const_iv (MAP_SAVING)
1453		1480
…		…
1466	const_iv (ST_SETUP)	1493	const_iv (ST_SETUP)
1467	const_iv (ST_PLAYING)	1494	const_iv (ST_PLAYING)
1468	const_iv (ST_CUSTOM)	1495	const_iv (ST_CUSTOM)
1469		1496
1470	const_iv (ST_CHANGE_CLASS)	1497	const_iv (ST_CHANGE_CLASS)
1471	const_iv (ST_CONFIRM_QUIT)
1472	const_iv (ST_GET_PARTY_PASSWORD)
1473		1498
1474	const_iv (IO_HEADER)	1499	const_iv (IO_HEADER)
1475	const_iv (IO_OBJECTS)	1500	const_iv (IO_OBJECTS)
1476	const_iv (IO_UNIQUES)	1501	const_iv (IO_UNIQUES)
1477		1502
…		…
1531		1556
1532	void _global_reattach ()	1557	void _global_reattach ()
1533	CODE:	1558	CODE:
1534	{	1559	{
1535	// reattach to all attachable objects in the game.	1560	// reattach to all attachable objects in the game.
1536	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)	1561	for_all_clients (ns)
1537	(*i)->reattach ();	1562	ns->reattach ();
1538		1563
1539	for_all_players (pl)	1564	for_all_players (pl)
1540	pl->reattach ();	1565	pl->reattach ();
1541		1566
1542	//TODO	1567	//TODO
1543	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)	1568	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1544	// i->second->reattach ();	1569	// i->second->reattach ();
1545		1570
1546	for (object *op = object::first; op; op = op->next)	1571	for_all_objects (op)
1547	op->reattach ();	1572	op->reattach ();
1548	}	1573	}
1549		1574
1550	NV floor (NV x)	1575	NV floor (NV x)
1551		1576
1552	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
1553		1590
1554	void server_tick ()	1591	void server_tick ()
1555	CODE:	1592	CODE:
1556	runtime = SvNVx (sv_runtime);	1593	runtime = SvNVx (sv_runtime);
1557	server_tick ();	1594	server_tick ();
…		…
1604	}	1641	}
1605	OUTPUT: RETVAL	1642	OUTPUT: RETVAL
1606		1643
1607	void abort ()	1644	void abort ()
1608		1645
		1646	void fork_abort (char *cause = "cf::fork_abort")
		1647
		1648	void cleanup (const char *cause, bool make_core = false)
		1649
1609	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
1610		1657
1611	void _exit (int status = 0)	1658	void _exit (int status = 0)
1612		1659
1613	#if _POSIX_MEMLOCK	1660	#if _POSIX_MEMLOCK
1614		1661
…		…
1671	CODE:	1718	CODE:
1672	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1719	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1673	OUTPUT:	1720	OUTPUT:
1674	RETVAL	1721	RETVAL
1675		1722
1676	#bool	1723	int mortals_size ()
1677	#destroyed (attachable *at)	1724	CODE:
1678	#	1725	RETVAL = attachable::mortals.size ();
1679	#void	1726	OUTPUT: RETVAL
1680	#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 \|
1681		1734
1682	MODULE = cf PACKAGE = cf::global	1735	MODULE = cf PACKAGE = cf::global
1683		1736
1684	int invoke (SV *klass, int event, ...)	1737	int invoke (SV *klass, int event, ...)
1685	CODE:	1738	CODE:
…		…
1701	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1754	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1702	OUTPUT: RETVAL	1755	OUTPUT: RETVAL
1703		1756
1704	SV registry (object op)	1757	SV registry (object op)
1705		1758
1706	void mortals ()	1759	int objects_size ()
1707	PPCODE:	1760	CODE:
1708	EXTEND (SP, object::mortals.size ());
1709	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1710	PUSHs (to_sv (*i));
1711
1712	object *first ()
1713	CODE:
1714	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;
1715	OUTPUT: RETVAL	1777	OUTPUT: RETVAL
1716		1778
1717	# missing properties	1779	# missing properties
1718		1780
1719	object head (object op)	1781	object head (object op)
1720	PROTOTYPE: $	1782	PROTOTYPE: $
1721	CODE:	1783	CODE:
1722	RETVAL = op->head ? op->head : op;	1784	RETVAL = op->head_ ();
1723	OUTPUT: RETVAL	1785	OUTPUT: RETVAL
1724		1786
1725	int is_head (object *op)	1787	int is_head (object *op)
1726	PROTOTYPE: $	1788	PROTOTYPE: $
1727	CODE:	1789	CODE:
1728	RETVAL = !op->head;	1790	RETVAL = op->head_ () == op;
1729	OUTPUT: RETVAL	1791	OUTPUT: RETVAL
1730		1792
1731	void	1793	void
1732	inv (object *obj)	1794	inv (object *obj)
1733	PROTOTYPE: $	1795	PROTOTYPE: $
…		…
1824		1886
1825	void drop (object who, object op)	1887	void drop (object who, object op)
1826		1888
1827	void pick_up (object who, object op)	1889	void pick_up (object who, object op)
1828		1890
1829	object cf_object_insert_object (object op, object *container)
1830
1831	object cf_object_insert_in_ob (object ob, object *where)
1832
1833	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)
1834		1892
1835	void update_object (object *op, int action)	1893	void update_object (object *op, int action)
1836		1894
1837	object cf_create_object_by_name (const char name)	1895	object cf_create_object_by_name (const char name)
…		…
1956	void esrv_update_item (object op, int what, object item)	2014	void esrv_update_item (object op, int what, object item)
1957	C_ARGS: what, op, item	2015	C_ARGS: what, op, item
1958		2016
1959	void clear_los (object *op)	2017	void clear_los (object *op)
1960		2018
1961	int command_teleport (object op, char params)
1962
1963	int command_summon (object op, char params)	2019	int command_summon (object op, char params)
1964		2020
1965	int command_arrest (object op, char params)	2021	int command_arrest (object op, char params)
1966		2022
1967	int command_kick (object op, char params)	2023	int command_kick (object op, char params)
…		…
1988	CODE:	2044	CODE:
1989	pl->ob->stats.hp = pl->ob->stats.maxhp;	2045	pl->ob->stats.hp = pl->ob->stats.maxhp;
1990	pl->ob->stats.sp = pl->ob->stats.maxsp;	2046	pl->ob->stats.sp = pl->ob->stats.maxsp;
1991	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2047	pl->ob->stats.grace = pl->ob->stats.maxgrace;
1992	pl->orig_stats = pl->ob->stats;	2048	pl->orig_stats = pl->ob->stats;
1993
1994	player cf_player_find (char name)
1995	PROTOTYPE: $
1996		2049
1997	void cf_player_move (player *pl, int dir)	2050	void cf_player_move (player *pl, int dir)
1998		2051
1999	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);
2000		2053
…		…
2046	if (y) sv_to (y, pl->bed_y);	2099	if (y) sv_to (y, pl->bed_y);
2047		2100
2048	void	2101	void
2049	list ()	2102	list ()
2050	PPCODE:	2103	PPCODE:
2051	for (player *pl = first_player; pl; pl = pl->next)	2104	for_all_players (pl)
2052	XPUSHs (sv_2mortal (to_sv (pl)));	2105	XPUSHs (sv_2mortal (to_sv (pl)));
2053
2054	bool
2055	peaceful (player *pl, bool new_setting = 0)
2056	PROTOTYPE: $;$
2057	CODE:
2058	RETVAL = pl->peaceful;
2059	if (items > 1)
2060	pl->peaceful = new_setting;
2061	OUTPUT:
2062	RETVAL
2063
2064	living *
2065	orig_stats (player *pl)
2066	CODE:
2067	RETVAL = &pl->orig_stats;
2068	OUTPUT: RETVAL
2069
2070	living *
2071	last_stats (player *pl)
2072	CODE:
2073	RETVAL = &pl->last_stats;
2074	OUTPUT: RETVAL
2075		2106
2076		2107
2077	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	2108	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2078		2109
2079	int invoke (maptile *map, int event, ...)	2110	int invoke (maptile *map, int event, ...)
…		…
2095	PROTOTYPE:	2126	PROTOTYPE:
2096	CODE:	2127	CODE:
2097	RETVAL = new maptile;	2128	RETVAL = new maptile;
2098	OUTPUT:	2129	OUTPUT:
2099	RETVAL	2130	RETVAL
2100
2101	void
2102	maptile::destroy ()
2103		2131
2104	void	2132	void
2105	maptile::players ()	2133	maptile::players ()
2106	PPCODE:	2134	PPCODE:
2107	if (GIMME_V == G_SCALAR)	2135	if (GIMME_V == G_SCALAR)
…		…
2137		2165
2138	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)
2139	C_ARGS: str, map, nx, ny	2167	C_ARGS: str, map, nx, ny
2140		2168
2141	void	2169	void
2142	cf_map_normalise (maptile *map, int x, int y)	2170	get_map_flags (maptile *map, int x, int y)
2143	PPCODE:	2171	PPCODE:
2144	{	2172	{
2145	maptile *nmap = 0;	2173	maptile *nmap = 0;
2146	I16 nx = 0, ny = 0;	2174	I16 nx = 0, ny = 0;
2147	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2175	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2209	CODE:	2237	CODE:
2210	RETVAL = get_name_of_region_for_map (m);	2238	RETVAL = get_name_of_region_for_map (m);
2211	OUTPUT: RETVAL	2239	OUTPUT: RETVAL
2212		2240
2213	# worst xs function of my life	2241	# worst xs function of my life
2214	maptile *	2242	bool
2215	_create_random_map (\	2243	_create_random_map (\
2216	char *path,\	2244	maptile *self,\
2217	char *wallstyle,\	2245	char *wallstyle,\
2218	char *wall_name,\	2246	char *wall_name,\
2219	char *floorstyle,\	2247	char *floorstyle,\
2220	char *monsterstyle,\	2248	char *monsterstyle,\
2221	char *treasurestyle,\	2249	char *treasurestyle,\
…		…
2225	char *origin_map,\	2253	char *origin_map,\
2226	char *final_map,\	2254	char *final_map,\
2227	char *exitstyle,\	2255	char *exitstyle,\
2228	char *this_map,\	2256	char *this_map,\
2229	char *exit_on_final_map,\	2257	char *exit_on_final_map,\
2230	int Xsize,\	2258	int xsize,\
2231	int Ysize,\	2259	int ysize,\
2232	int expand2x,\	2260	int expand2x,\
2233	int layoutoptions1,\	2261	int layoutoptions1,\
2234	int layoutoptions2,\	2262	int layoutoptions2,\
2235	int layoutoptions3,\	2263	int layoutoptions3,\
2236	int symmetry,\	2264	int symmetry,\
…		…
2241	int dungeon_depth,\	2269	int dungeon_depth,\
2242	int decoroptions,\	2270	int decoroptions,\
2243	int orientation,\	2271	int orientation,\
2244	int origin_y,\	2272	int origin_y,\
2245	int origin_x,\	2273	int origin_x,\
2246	int random_seed,\	2274	U32 random_seed,\
2247	val64 total_map_hp,\	2275	val64 total_map_hp,\
2248	int map_layout_style,\	2276	int map_layout_style,\
2249	int treasureoptions,\	2277	int treasureoptions,\
2250	int symmetry_used,\	2278	int symmetry_used,\
2251	region *region\	2279	region *region,\
		2280	char *custom\
2252	)	2281	)
2253	CODE:	2282	CODE:
2254	{	2283	{
2255	random_map_params rmp;	2284	random_map_params rmp;
2256		2285
…		…
2266	assign (rmp.exit_on_final_map, exit_on_final_map);	2295	assign (rmp.exit_on_final_map, exit_on_final_map);
2267		2296
2268	rmp.origin_map = origin_map;	2297	rmp.origin_map = origin_map;
2269	rmp.final_map = final_map;	2298	rmp.final_map = final_map;
2270	rmp.this_map = this_map;	2299	rmp.this_map = this_map;
2271	rmp.Xsize = Xsize;	2300	rmp.xsize = xsize;
2272	rmp.Ysize = Ysize;	2301	rmp.ysize = ysize;
2273	rmp.expand2x = expand2x;	2302	rmp.expand2x = expand2x;
2274	rmp.layoutoptions1 = layoutoptions1;	2303	rmp.layoutoptions1 = layoutoptions1;
2275	rmp.layoutoptions2 = layoutoptions2;	2304	rmp.layoutoptions2 = layoutoptions2;
2276	rmp.layoutoptions3 = layoutoptions3;	2305	rmp.layoutoptions3 = layoutoptions3;
2277	rmp.symmetry = symmetry;	2306	rmp.symmetry = symmetry;
…		…
2288	rmp.total_map_hp = total_map_hp;	2317	rmp.total_map_hp = total_map_hp;
2289	rmp.map_layout_style = map_layout_style;	2318	rmp.map_layout_style = map_layout_style;
2290	rmp.treasureoptions = treasureoptions;	2319	rmp.treasureoptions = treasureoptions;
2291	rmp.symmetry_used = symmetry_used;	2320	rmp.symmetry_used = symmetry_used;
2292	rmp.region = region;	2321	rmp.region = region;
		2322	rmp.custom = custom;
2293		2323
2294	RETVAL = generate_random_map (path, &rmp);	2324	RETVAL = self->generate_random_map (&rmp);
2295	}	2325	}
2296	OUTPUT:	2326	OUTPUT:
2297	RETVAL	2327	RETVAL
2298		2328
2299	MODULE = cf PACKAGE = cf::arch	2329	MODULE = cf PACKAGE = cf::arch
…		…
2375	char *buf = SvPVbyte (packet, len);	2405	char *buf = SvPVbyte (packet, len);
2376		2406
2377	THIS->send_packet (buf, len);	2407	THIS->send_packet (buf, len);
2378	}	2408	}
2379		2409
2380	void
2381	client::destroy ()
2382

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.125 by root, Thu Jan 4 00:53:54 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.125 by root, Thu Jan 4 00:53:54 2007 UTC vs.
Revision 1.154 by root, Fri Jan 26 21:44:11 2007 UTC