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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.175 by root, Tue Mar 6 19:02:36 2007 UTC

…		…
4		4
5	/*	5	/*
6	* This code is placed under the GNU General Public Licence (GPL)	6	* This code is placed under the GNU General Public Licence (GPL)
7	*	7	*
8	* Copyright (C) 2001-2005 by Chachkoff Yann	8	* Copyright (C) 2001-2005 by Chachkoff Yann
9	* Copyright (C) 2006 by Marc Lehmann <cf@schmorp.de>	9	* Copyright (C) 2006,2007 by Marc Lehmann <cf@schmorp.de>
10	*	10	*
11	* This program is free software; you can redistribute it and/or modify	11	* This program is free software; you can redistribute it and/or modify
12	* it under the terms of the GNU General Public License as published by	12	* it under the terms of the GNU General Public License as published by
13	* the Free Software Foundation; either version 2 of the License, or	13	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	14	* (at your option) any later version.
…		…
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"
36		37
37	#include <unistd.h>	38	#include <unistd.h>
38	#if _POSIX_MEMLOCK	39	#if _POSIX_MEMLOCK
…		…
101		102
102	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
103		104
104	attachable::~attachable ()	105	attachable::~attachable ()
105	{	106	{
		107	flags \|=0x3300;//D
106	assert (!self);	108	assert (!self);
		109	assert (!cb);
107	}	110	}
108		111
109	int	112	int
110	attachable::refcnt_cnt () const	113	attachable::refcnt_cnt () const
111	{	114	{
112	return refcnt + (self ? SvREFCNT (self) : 0);	115	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		116	}
		117
		118	void
		119	attachable::sever_self ()
		120	{
		121	if (HV *self = this->self)
		122	{
		123	// keep a refcount because sv_unmagic might call attachable_free,
		124	// which might clear self, causing sv_unmagic to crash on a now
		125	// invalid object.
		126	SvREFCNT_inc (self);
		127	hv_clear (self);
		128	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		129	SvREFCNT_dec (self);
		130
		131	// self must be null now because thats sv_unmagic's job.
		132	assert (!this->self);
		133	flags \|= 0x80; // severed //D
		134	}
113	}	135	}
114		136
115	void	137	void
116	attachable::optimise ()	138	attachable::optimise ()
117	{	139	{
118	if (self	140	if (self
119	&& SvREFCNT (self) == 1	141	&& SvREFCNT (self) == 1
120	&& !HvTOTALKEYS (self))	142	&& !HvTOTALKEYS (self))
		143	flags \|= 0x40,//D
		144	sever_self ();
		145	}
		146
		147	// check wether the object really is dead
		148	void
		149	attachable::do_check ()
		150	{
		151	if (refcnt_cnt () > 0)
		152	return;
		153
		154	destroy ();
		155	}
		156
		157	void
		158	attachable::do_destroy ()
		159	{
		160	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		161
		162	if (cb)
121	{	163	{
122	refcnt_inc ();
123	SvREFCNT_dec ((SV *)self);	164	SvREFCNT_dec (cb);
		165	cb = 0;
124	}	166	}
125	}
126
127	// check wether the object really is dead
128	void
129	attachable::do_check ()
130	{
131	if (refcnt > 0 \|\| refcnt_cnt () > 0)
132	return;
133
134	destroy ();
135		167
136	if (self)	168	if (self)
137	{	169	sever_self ();
138	hv_clear (self);
139	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140	SvREFCNT_dec (self);
141	self = 0;
142	}
143	}
144		170
145	void	171	flags \|= 0x20; //D
146	attachable::do_destroy ()
147	{
148	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150	if (self)
151	hv_clear (self);
152
153	mortals.push_back (this);	172	mortals.push_back (this);
154	}	173	}
155		174
156	void	175	void
157	attachable::destroy ()	176	attachable::destroy ()
…		…
164	}	183	}
165		184
166	void	185	void
167	attachable::check_mortals ()	186	attachable::check_mortals ()
168	{	187	{
169	for (int i = 0; i < mortals.size (); )	188	static int i = 0;
		189
		190	for (;;)
170	{	191	{
		192	if (i >= mortals.size ())
		193	{
		194	i = 0;
		195
		196	if (mortals.size () > 1000)
		197	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		198
		199	break;
		200	}
		201
171	attachable *obj = mortals [i];	202	attachable *obj = mortals [i];
172		203
173	obj->refcnt_chk (); // unborrow from perl, if necessary	204	obj->refcnt_chk (); // unborrow from perl, if necessary
174		205
		206	//if (obj->refcnt > 0 \|\| obj->self)
175	if (obj->refcnt \|\| obj->self)	207	if (obj->refcnt \|\| obj->self)
176	{	208	{
177	#if 0	209	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
178	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
179	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
180	#endif
181
182	++i; // further delay freeing	210	++i; // further delay freeing
		211
		212	if (!(i & 0x3ff))
		213	break;
183	}//D	214	}
184	else	215	else
185	{	216	{
186	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187	mortals.erase (i);	217	mortals.erase (i);
188	delete obj;	218	delete obj;
189	}	219	}
190	}	220	}
191	}	221	}
…		…
216		246
217	static int	247	static int
218	attachable_free (pTHX_ SV sv, MAGIC mg)	248	attachable_free (pTHX_ SV sv, MAGIC mg)
219	{	249	{
220	attachable at = (attachable )mg->mg_ptr;	250	attachable at = (attachable )mg->mg_ptr;
		251
		252	//TODO: check if transaction behaviour is really required here
		253	if (SV self = (SV )at->self)
		254	{
221	at->self = 0;	255	at->self = 0;
		256	SvREFCNT_dec (self);
		257	}
		258
222	// next line makes sense, but most objects still have refcnt 0 by default	259	// next line makes sense, but most objects still have refcnt 0 by default
223	//at->refcnt_chk ();	260	//at->refcnt_chk ();
224	return 0;	261	return 0;
225	}	262	}
226		263
…		…
234		271
235	if (!obj->self)	272	if (!obj->self)
236	{	273	{
237	obj->self = newHV ();	274	obj->self = newHV ();
238	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	275	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
239		276	obj->flags \|= (obj->flags & 0xc0) << 8;
240	// borrow the refcnt from the object	277	obj->flags &= ~0xc0;//D
241	// it is important thta no refcnt_chk is being executed here	278	obj->flags \|= 0x10;//D
242	obj->refcnt_dec ();
243		279
244	// now bless the object _once_	280	// now bless the object _once_
245	return sv_bless (newRV_inc ((SV *)obj->self), stash);	281	return sv_bless (newRV_inc ((SV *)obj->self), stash);
246	}	282	}
247	else	283	else
		284	{
248	return newRV_inc ((SV *)obj->self);	285	SV sv = newRV_inc ((SV )obj->self);
		286
		287	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		288	SvAMAGIC_on (sv);
		289
		290	return sv;
		291	}
249	}	292	}
250		293
251	static void	294	static void
252	clearSVptr (SV *sv)	295	clearSVptr (SV *sv)
253	{	296	{
…		…
306	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	349	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
307		350
308	inline SV *to_sv (object & v) { return to_sv (&v); }	351	inline SV *to_sv (object & v) { return to_sv (&v); }
309	inline SV *to_sv (living & v) { return to_sv (&v); }	352	inline SV *to_sv (living & v) { return to_sv (&v); }
310		353
311	//TODO:
312	inline SV to_sv (New_Face v) { return to_sv (v->name); }	354	inline SV to_sv (facetile v) { return to_sv (v->name); }
313	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	355	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
314		356
315	inline SV *to_sv (UUID v)	357	inline SV *to_sv (UUID v)
316	{	358	{
317	char buf[128];	359	char buf[128];
318	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	360	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
319	return newSVpv (buf, 0);	361	return newSVpv (buf, 0);
320	}	362	}
321		363
322	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	364	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
323	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	365	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
342	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	384	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
343	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	385	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
344	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	386	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
345	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	387	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
346		388
347	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	389	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
348	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	390	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
349		391
350	template<class T>	392	template<class T>
351	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	393	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
352		394
353	template<int N>	395	template<int N>
…		…
489	if (!ext->cb)	531	if (!ext->cb)
490	ext->cb = newAV ();	532	ext->cb = newAV ();
491		533
492	return newRV_inc ((SV *)ext->cb);	534	return newRV_inc ((SV *)ext->cb);
493	}	535	}
494
495	#if 0
496	void attachable::clear ()
497	{
498	if (self)
499	{
500	// disconnect Perl from C, to avoid crashes
501	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
502
503	// clear the perl hash, might or might not be a good idea
504	hv_clear ((HV )SvRV ((SV )self));
505
506	SvREFCNT_dec (self);
507	self = 0;
508	}
509
510	if (cb)
511	{
512	SvREFCNT_dec (cb);
513	cb = 0;
514	}
515
516	attach = 0;
517	}
518	#endif
519		536
520	/////////////////////////////////////////////////////////////////////////////	537	/////////////////////////////////////////////////////////////////////////////
521		538
522	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	539	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
523	{	540	{
…		…
595	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	612	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
596	{	613	{
597	printf ("unable to initialize perl-interpreter, aborting.\n");	614	printf ("unable to initialize perl-interpreter, aborting.\n");
598	exit (EXIT_FAILURE);	615	exit (EXIT_FAILURE);
599	}	616	}
		617
		618	{
		619	dSP;
		620
		621	PUSHMARK (SP);
		622	PUTBACK;
		623	call_pv ("cf::init", G_DISCARD \| G_VOID);
		624	}
600	}	625	}
601		626
602	void cfperl_main ()	627	void cfperl_main ()
603	{	628	{
604	dSP;	629	dSP;
…		…
825	CALL_BEGIN (0);	850	CALL_BEGIN (0);
826	CALL_CALL ("cf::emergency_save", G_VOID);	851	CALL_CALL ("cf::emergency_save", G_VOID);
827	CALL_END;	852	CALL_END;
828	}	853	}
829		854
		855	void
		856	cfperl_cleanup (int make_core)
		857	{
		858	CALL_BEGIN (1);
		859	CALL_ARG (make_core);
		860	CALL_CALL ("cf::post_cleanup", G_VOID);
		861	CALL_END;
		862	}
		863
830	maptile *	864	maptile *
831	maptile::find_sync (const char path, maptile origin)	865	maptile::find_sync (const char path, maptile origin)
832	{	866	{
833	CALL_BEGIN (2);	867	CALL_BEGIN (2);
834	CALL_ARG (path);	868	CALL_ARG (path);
835	CALL_ARG (origin);	869	CALL_ARG (origin);
836	CALL_CALL ("cf::map::find_sync", G_SCALAR);	870	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		871
		872	maptile *retval;
		873
		874	if (count)
		875	sv_to (POPs, retval);
		876	else
		877	retval = 0;
		878
		879	CALL_END;
		880
		881	return retval;
		882	}
		883
		884	maptile *
		885	maptile::find_async (const char path, maptile origin)
		886	{
		887	CALL_BEGIN (2);
		888	CALL_ARG (path);
		889	CALL_ARG (origin);
		890	CALL_CALL ("cf::map::find_async", G_SCALAR);
837		891
838	maptile *retval;	892	maptile *retval;
839		893
840	if (count)	894	if (count)
841	sv_to (POPs, retval);	895	sv_to (POPs, retval);
…		…
894	void	948	void
895	iw::alloc ()	949	iw::alloc ()
896	{	950	{
897	pe = GEventAPI->new_idle (0, 0);	951	pe = GEventAPI->new_idle (0, 0);
898		952
		953	WaREENTRANT_off (pe);
899	pe->base.callback = (void *)iw_dispatch;	954	pe->base.callback = (void *)iw_dispatch;
900	pe->base.ext_data = (void *)this;	955	pe->base.ext_data = (void *)this;
901	}	956	}
902		957
903	static void iow_dispatch (pe_event *ev)	958	static void iow_dispatch (pe_event *ev)
…		…
909	void	964	void
910	iow::alloc ()	965	iow::alloc ()
911	{	966	{
912	pe = GEventAPI->new_io (0, 0);	967	pe = GEventAPI->new_io (0, 0);
913		968
		969	WaREENTRANT_off (pe);
914	pe->base.callback = (void *)iow_dispatch;	970	pe->base.callback = (void *)iow_dispatch;
915	pe->base.ext_data = (void *)this;	971	pe->base.ext_data = (void *)this;
916		972
917	pe->fd = -1;	973	pe->fd = -1;
918	pe->poll = 0;	974	pe->poll = 0;
…		…
1246	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1302	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1247	const_iv (FLAG_IS_WATER)	1303	const_iv (FLAG_IS_WATER)
1248	const_iv (FLAG_CONTENT_ON_GEN)	1304	const_iv (FLAG_CONTENT_ON_GEN)
1249	const_iv (FLAG_IS_A_TEMPLATE)	1305	const_iv (FLAG_IS_A_TEMPLATE)
1250	const_iv (FLAG_IS_BUILDABLE)	1306	const_iv (FLAG_IS_BUILDABLE)
		1307	const_iv (FLAG_DESTROY_ON_DEATH)
		1308	const_iv (FLAG_NO_MAP_SAVE)
1251		1309
1252	const_iv (NDI_BLACK)	1310	const_iv (NDI_BLACK)
1253	const_iv (NDI_WHITE)	1311	const_iv (NDI_WHITE)
1254	const_iv (NDI_NAVY)	1312	const_iv (NDI_NAVY)
1255	const_iv (NDI_RED)	1313	const_iv (NDI_RED)
…		…
1440	const_iv (ATNR_BLIND)	1498	const_iv (ATNR_BLIND)
1441	const_iv (ATNR_INTERNAL)	1499	const_iv (ATNR_INTERNAL)
1442	const_iv (ATNR_LIFE_STEALING)	1500	const_iv (ATNR_LIFE_STEALING)
1443	const_iv (ATNR_DISEASE)	1501	const_iv (ATNR_DISEASE)
1444		1502
1445	const_iv (MAP_FLUSH)
1446	const_iv (MAP_PLAYER_UNIQUE)
1447	const_iv (MAP_BLOCK)
1448	const_iv (MAP_STYLE)
1449	const_iv (MAP_OVERLAY)
1450
1451	const_iv (MAP_IN_MEMORY)	1503	const_iv (MAP_IN_MEMORY)
1452	const_iv (MAP_SWAPPED)	1504	const_iv (MAP_SWAPPED)
1453	const_iv (MAP_LOADING)	1505	const_iv (MAP_LOADING)
1454	const_iv (MAP_SAVING)	1506	const_iv (MAP_SAVING)
1455		1507
…		…
1534	{	1586	{
1535	// reattach to all attachable objects in the game.	1587	// reattach to all attachable objects in the game.
1536	for_all_clients (ns)	1588	for_all_clients (ns)
1537	ns->reattach ();	1589	ns->reattach ();
1538		1590
1539	for_all_players (pl)
1540	pl->reattach ();
1541
1542	//TODO
1543	//for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1544	// i->second->reattach ();
1545
1546	for_all_objects (op)	1591	for_all_objects (op)
1547	op->reattach ();	1592	op->reattach ();
1548	}	1593	}
1549		1594
1550	NV floor (NV x)	1595	NV floor (NV x)
1551		1596
1552	NV ceil (NV x)	1597	NV ceil (NV x)
		1598
		1599	NV rndm (...)
		1600	CODE:
		1601	switch (items)
		1602	{
		1603	case 0: RETVAL = rndm (); break;
		1604	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1605	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1606	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1607	}
		1608	OUTPUT:
		1609	RETVAL
1553		1610
1554	void server_tick ()	1611	void server_tick ()
1555	CODE:	1612	CODE:
1556	runtime = SvNVx (sv_runtime);	1613	runtime = SvNVx (sv_runtime);
1557	server_tick ();	1614	server_tick ();
…		…
1604	}	1661	}
1605	OUTPUT: RETVAL	1662	OUTPUT: RETVAL
1606		1663
1607	void abort ()	1664	void abort ()
1608		1665
		1666	void fork_abort (char *cause = "cf::fork_abort")
		1667
1609	void cleanup (const char *cause, bool make_core = false)	1668	void cleanup (const char *cause, bool make_core = false)
1610		1669
1611	void emergency_save ()	1670	void emergency_save ()
1612		1671
1613	void _exit (int status = 0)	1672	void _exit (int status = EXIT_SUCCESS)
		1673
		1674	UV sv_2watcher (SV *w)
		1675	CODE:
		1676	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1677	OUTPUT:
		1678	RETVAL
1614		1679
1615	#if _POSIX_MEMLOCK	1680	#if _POSIX_MEMLOCK
1616		1681
1617	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1682	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1618		1683
…		…
1664	RETVAL = newSVpv (resist_plus[atnr], 0);	1729	RETVAL = newSVpv (resist_plus[atnr], 0);
1665	else	1730	else
1666	XSRETURN_UNDEF;	1731	XSRETURN_UNDEF;
1667	OUTPUT: RETVAL	1732	OUTPUT: RETVAL
1668		1733
		1734	bool
		1735	load_resource_file (const char *filename)
		1736
1669	MODULE = cf PACKAGE = cf::attachable	1737	MODULE = cf PACKAGE = cf::attachable
1670		1738
1671	int	1739	int
1672	valid (SV *obj)	1740	valid (SV *obj)
1673	CODE:	1741	CODE:
1674	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1742	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1675	OUTPUT:	1743	OUTPUT:
1676	RETVAL	1744	RETVAL
1677		1745
		1746	void
		1747	debug_trace (attachable *obj, bool on = true)
		1748	CODE:
		1749	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1750	if (on)
		1751	obj->flags \|= attachable::F_DEBUG_TRACE;
		1752
		1753	int mortals_size ()
		1754	CODE:
		1755	RETVAL = attachable::mortals.size ();
		1756	OUTPUT: RETVAL
		1757
		1758	#object *mortals (U32 index)
		1759	# CODE:
		1760	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1761	# OUTPUT: RETVAL
		1762
1678	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1763	INCLUDE: $PERL $srcdir/genacc attachable ../include/cfperl.h \|
1679		1764
1680	MODULE = cf PACKAGE = cf::global	1765	MODULE = cf PACKAGE = cf::global
1681		1766
1682	int invoke (SV *klass, int event, ...)	1767	int invoke (SV *klass, int event, ...)
1683	CODE:	1768	CODE:
…		…
1687	RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);	1772	RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1688	OUTPUT: RETVAL	1773	OUTPUT: RETVAL
1689		1774
1690	MODULE = cf PACKAGE = cf::object PREFIX = cf_object_	1775	MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1691		1776
1692	INCLUDE: $PERL genacc object ../include/object.h \|	1777	INCLUDE: $PERL $srcdir/genacc object ../include/object.h \|
1693		1778
1694	int invoke (object *op, int event, ...)	1779	int invoke (object *op, int event, ...)
1695	CODE:	1780	CODE:
1696	if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");	1781	if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1697	AV av = (AV )sv_2mortal ((SV *)newAV ());	1782	AV av = (AV )sv_2mortal ((SV *)newAV ());
…		…
1699	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1784	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1700	OUTPUT: RETVAL	1785	OUTPUT: RETVAL
1701		1786
1702	SV registry (object op)	1787	SV registry (object op)
1703		1788
1704	void mortals ()
1705	PPCODE:
1706	EXTEND (SP, object::mortals.size ());
1707	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1708	PUSHs (to_sv (*i));
1709
1710	int objects_size ()	1789	int objects_size ()
1711	CODE:	1790	CODE:
1712	RETVAL = objects.size ();	1791	RETVAL = objects.size ();
1713	OUTPUT: RETVAL	1792	OUTPUT: RETVAL
1714		1793
…		…
1754	void	1833	void
1755	set_animation (object *op, int idx)	1834	set_animation (object *op, int idx)
1756	CODE:	1835	CODE:
1757	SET_ANIMATION (op, idx);	1836	SET_ANIMATION (op, idx);
1758		1837
		1838	int
		1839	num_animations (object *op)
		1840	CODE:
		1841	RETVAL = NUM_ANIMATIONS (op);
		1842	OUTPUT: RETVAL
		1843
1759	object find_best_object_match (object op, const char *match)	1844	object find_best_object_match (object op, const char *match)
1760		1845
1761	object find_marked_object (object op)	1846	object find_marked_object (object op)
1762		1847
1763	int need_identify (object *obj);	1848	int need_identify (object *obj);
1764		1849
1765	int apply_shop_mat (object shop_mat, object op);	1850	int apply_shop_mat (object shop_mat, object op);
		1851
		1852	int move_player (object *op, int dir)
		1853	CODE:
		1854	RETVAL = move_player (op, dir);
		1855	OUTPUT:
		1856	RETVAL
1766		1857
1767	int move (object op, int dir, object originator = op)	1858	int move (object op, int dir, object originator = op)
1768	CODE:	1859	CODE:
1769	RETVAL = move_ob (op, dir, originator);	1860	RETVAL = move_ob (op, dir, originator);
1770	OUTPUT:	1861	OUTPUT:
…		…
1775	manual_apply (applied, applier, flags);	1866	manual_apply (applied, applier, flags);
1776		1867
1777	void apply_below (object *op)	1868	void apply_below (object *op)
1778	CODE:	1869	CODE:
1779	player_apply_below (op);	1870	player_apply_below (op);
		1871
		1872	int cast_heal (object op, object caster, object *spell, int dir = 0)
1780		1873
1781	object cf_object_present_archname_inside (object op, char *whatstr)	1874	object cf_object_present_archname_inside (object op, char *whatstr)
1782		1875
1783	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)	1876	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)
1784		1877
…		…
1837		1930
1838	void drop (object who, object op)	1931	void drop (object who, object op)
1839		1932
1840	void pick_up (object who, object op)	1933	void pick_up (object who, object op)
1841		1934
1842	object cf_object_insert_object (object op, object *container)
1843
1844	object cf_object_insert_in_ob (object ob, object *where)
1845
1846	int cf_object_teleport (object op, maptile map, int x, int y)	1935	int cf_object_teleport (object op, maptile map, int x, int y)
1847		1936
1848	void update_object (object *op, int action)	1937	void update_object (object *op, int action)
1849		1938
1850	object cf_create_object_by_name (const char name)	1939	object cf_create_object_by_name (const char name)
…		…
1969	void esrv_update_item (object op, int what, object item)	2058	void esrv_update_item (object op, int what, object item)
1970	C_ARGS: what, op, item	2059	C_ARGS: what, op, item
1971		2060
1972	void clear_los (object *op)	2061	void clear_los (object *op)
1973		2062
1974	int command_teleport (object op, char params)
1975
1976	int command_summon (object op, char params)	2063	int command_summon (object op, char params)
1977		2064
1978	int command_arrest (object op, char params)	2065	int command_arrest (object op, char params)
1979		2066
1980	int command_kick (object op, char params)
1981
1982	int command_banish (object op, char params)
1983
1984		2067
1985	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_	2068	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
1986		2069
1987	INCLUDE: $PERL genacc player ../include/player.h \|	2070	INCLUDE: $PERL $srcdir/genacc player ../include/player.h \|
1988		2071
1989	int invoke (player *pl, int event, ...)	2072	int invoke (player *pl, int event, ...)
1990	CODE:	2073	CODE:
1991	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");	2074	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
1992	AV av = (AV )sv_2mortal ((SV *)newAV ());	2075	AV av = (AV )sv_2mortal ((SV *)newAV ());
…		…
2005	pl->orig_stats = pl->ob->stats;	2088	pl->orig_stats = pl->ob->stats;
2006		2089
2007	void cf_player_move (player *pl, int dir)	2090	void cf_player_move (player *pl, int dir)
2008		2091
2009	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2092	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2010
2011	player *first ()
2012	CODE:
2013	RETVAL = first_player;
2014	OUTPUT: RETVAL
2015		2093
2016	bool	2094	bool
2017	cell_visible (player *pl, int dx, int dy)	2095	cell_visible (player *pl, int dx, int dy)
2018	CODE:	2096	CODE:
2019	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2097	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2072	RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);	2150	RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);
2073	OUTPUT: RETVAL	2151	OUTPUT: RETVAL
2074		2152
2075	SV registry (maptile map)	2153	SV registry (maptile map)
2076		2154
2077	INCLUDE: $PERL genacc maptile ../include/map.h \|	2155	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|
2078		2156
2079	void	2157	void
2080	maptile::instantiate ()	2158	maptile::instantiate ()
2081		2159
2082	maptile *new ()	2160	maptile *new ()
…		…
2097	for_all_players (pl)	2175	for_all_players (pl)
2098	if (pl->ob && pl->ob->map == THIS)	2176	if (pl->ob && pl->ob->map == THIS)
2099	PUSHs (sv_2mortal (to_sv (pl->ob)));	2177	PUSHs (sv_2mortal (to_sv (pl->ob)));
2100	}	2178	}
2101		2179
		2180	void
		2181	maptile::add_underlay (SV data, int offset, int stride, SV palette)
		2182	CODE:
		2183	{
		2184	if (!SvROK (palette) \|\| SvTYPE (SvRV (palette)) != SVt_PVAV)
		2185	croak ("maptile::add_underlay: palette must be arrayref");
		2186
		2187	palette = SvRV (palette);
		2188
		2189	STRLEN idxlen;
		2190	const uint8_t idx = (const uint8_t )SvPVbyte (data, idxlen);
		2191
		2192	for (int x = 0; x < THIS->width; ++x)
		2193	for (int y = 0; y < THIS->height; ++y)
		2194	{
		2195	for (object *op = THIS->at (x, y).bot; op; op = op->above)
		2196	if (op->flag [FLAG_IS_FLOOR])
		2197	goto skip_space;
		2198
		2199	{
		2200	int offs = offset + y * stride + x;
		2201	if (IN_RANGE_EXC (offs, 0, idxlen))
		2202	{
		2203	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))
		2204	{
		2205	object ob = get_archetype (SvPVutf8_nolen (elem));
		2206	ob->flag [FLAG_NO_MAP_SAVE] = true;
		2207	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
		2208	}
		2209	}
		2210	}
		2211
		2212	skip_space: ;
		2213	}
		2214	}
		2215
		2216	void
		2217	maptile::set_regiondata (SV data, int offset, int stride, SV palette)
		2218	CODE:
		2219	{
		2220	if (!SvROK (palette) \|\| SvTYPE (SvRV (palette)) != SVt_PVAV)
		2221	croak ("maptile::set_regiondata: palette must be arrayref");
		2222
		2223	palette = SvRV (palette);
		2224
		2225	STRLEN idxlen;
		2226	const uint8_t idx = (const uint8_t )SvPVbyte (data, idxlen);
		2227
		2228	region regionmap = (region )malloc (
		2229	(av_len ((AV )palette) + 1) sizeof (region *));
		2230	uint8_t *regions = salloc<uint8_t> (THIS->size ());
		2231
		2232	for (int i = av_len ((AV *)palette) + 1; i--; )
		2233	regionmap [i] = region::find (
		2234	SvPVutf8_nolen (av_fetch ((AV )palette, i, 1)));
		2235
		2236	for (int y = 0; y < THIS->height; ++y)
		2237	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
		2238
		2239	sfree (THIS->regions, THIS->size ());
		2240	free (THIS->regionmap);
		2241
		2242	THIS->regions = regions;
		2243	THIS->regionmap = regionmap;
		2244	}
		2245
2102	void play_sound_map (maptile *map, int x, int y, int sound_num)	2246	void play_sound_map (maptile *map, int x, int y, int sound_num)
2103		2247
2104	int out_of_map (maptile *map, int x, int y)	2248	int out_of_map (maptile *map, int x, int y)
2105		2249
2106	void	2250	void
…		…
2122		2266
2123	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2267	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2124	C_ARGS: str, map, nx, ny	2268	C_ARGS: str, map, nx, ny
2125		2269
2126	void	2270	void
2127	cf_map_normalise (maptile *map, int x, int y)	2271	get_map_flags (maptile *map, int x, int y)
2128	PPCODE:	2272	PPCODE:
2129	{	2273	{
2130	maptile *nmap = 0;	2274	maptile *nmap = 0;
2131	I16 nx = 0, ny = 0;	2275	I16 nx = 0, ny = 0;
2132	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2276	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2187		2331
2188	void fix_walls (maptile *map, int x, int y)	2332	void fix_walls (maptile *map, int x, int y)
2189		2333
2190	void fix_walls_around (maptile *map, int x, int y)	2334	void fix_walls_around (maptile *map, int x, int y)
2191		2335
2192	const char *
2193	region_name (maptile *m)
2194	CODE:
2195	RETVAL = get_name_of_region_for_map (m);
2196	OUTPUT: RETVAL
2197
2198	# worst xs function of my life	2336	# worst xs function of my life
2199	maptile *	2337	bool
2200	_create_random_map (\	2338	_create_random_map (\
2201	char *path,\	2339	maptile *self,\
2202	char *wallstyle,\	2340	char *wallstyle,\
2203	char *wall_name,\	2341	char *wall_name,\
2204	char *floorstyle,\	2342	char *floorstyle,\
2205	char *monsterstyle,\	2343	char *monsterstyle,\
2206	char *treasurestyle,\	2344	char *treasurestyle,\
…		…
2210	char *origin_map,\	2348	char *origin_map,\
2211	char *final_map,\	2349	char *final_map,\
2212	char *exitstyle,\	2350	char *exitstyle,\
2213	char *this_map,\	2351	char *this_map,\
2214	char *exit_on_final_map,\	2352	char *exit_on_final_map,\
2215	int Xsize,\	2353	int xsize,\
2216	int Ysize,\	2354	int ysize,\
2217	int expand2x,\	2355	int expand2x,\
2218	int layoutoptions1,\	2356	int layoutoptions1,\
2219	int layoutoptions2,\	2357	int layoutoptions2,\
2220	int layoutoptions3,\	2358	int layoutoptions3,\
2221	int symmetry,\	2359	int symmetry,\
…		…
2226	int dungeon_depth,\	2364	int dungeon_depth,\
2227	int decoroptions,\	2365	int decoroptions,\
2228	int orientation,\	2366	int orientation,\
2229	int origin_y,\	2367	int origin_y,\
2230	int origin_x,\	2368	int origin_x,\
2231	int random_seed,\	2369	U32 random_seed,\
2232	val64 total_map_hp,\	2370	val64 total_map_hp,\
2233	int map_layout_style,\	2371	int map_layout_style,\
2234	int treasureoptions,\	2372	int treasureoptions,\
2235	int symmetry_used,\	2373	int symmetry_used,\
2236	region *region\	2374	region *region,\
		2375	char *custom\
2237	)	2376	)
2238	CODE:	2377	CODE:
2239	{	2378	{
2240	random_map_params rmp;	2379	random_map_params rmp;
2241		2380
…		…
2251	assign (rmp.exit_on_final_map, exit_on_final_map);	2390	assign (rmp.exit_on_final_map, exit_on_final_map);
2252		2391
2253	rmp.origin_map = origin_map;	2392	rmp.origin_map = origin_map;
2254	rmp.final_map = final_map;	2393	rmp.final_map = final_map;
2255	rmp.this_map = this_map;	2394	rmp.this_map = this_map;
2256	rmp.Xsize = Xsize;	2395	rmp.xsize = xsize;
2257	rmp.Ysize = Ysize;	2396	rmp.ysize = ysize;
2258	rmp.expand2x = expand2x;	2397	rmp.expand2x = expand2x;
2259	rmp.layoutoptions1 = layoutoptions1;	2398	rmp.layoutoptions1 = layoutoptions1;
2260	rmp.layoutoptions2 = layoutoptions2;	2399	rmp.layoutoptions2 = layoutoptions2;
2261	rmp.layoutoptions3 = layoutoptions3;	2400	rmp.layoutoptions3 = layoutoptions3;
2262	rmp.symmetry = symmetry;	2401	rmp.symmetry = symmetry;
…		…
2273	rmp.total_map_hp = total_map_hp;	2412	rmp.total_map_hp = total_map_hp;
2274	rmp.map_layout_style = map_layout_style;	2413	rmp.map_layout_style = map_layout_style;
2275	rmp.treasureoptions = treasureoptions;	2414	rmp.treasureoptions = treasureoptions;
2276	rmp.symmetry_used = symmetry_used;	2415	rmp.symmetry_used = symmetry_used;
2277	rmp.region = region;	2416	rmp.region = region;
		2417	rmp.custom = custom;
2278		2418
2279	RETVAL = generate_random_map (path, &rmp);	2419	RETVAL = self->generate_random_map (&rmp);
2280	}	2420	}
2281	OUTPUT:	2421	OUTPUT:
2282	RETVAL	2422	RETVAL
2283		2423
2284	MODULE = cf PACKAGE = cf::arch	2424	MODULE = cf PACKAGE = cf::arch
…		…
2293	PROTOTYPE:	2433	PROTOTYPE:
2294	CODE:	2434	CODE:
2295	RETVAL = first_archetype;	2435	RETVAL = first_archetype;
2296	OUTPUT: RETVAL	2436	OUTPUT: RETVAL
2297		2437
2298	INCLUDE: $PERL genacc archetype ../include/object.h \|	2438	INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h \|
2299		2439
2300	MODULE = cf PACKAGE = cf::party	2440	MODULE = cf PACKAGE = cf::party
2301		2441
2302	partylist *first ()	2442	partylist *first ()
2303	PROTOTYPE:	2443	PROTOTYPE:
2304	CODE:	2444	CODE:
2305	RETVAL = get_firstparty ();	2445	RETVAL = get_firstparty ();
2306	OUTPUT: RETVAL	2446	OUTPUT: RETVAL
2307		2447
2308	INCLUDE: $PERL genacc partylist ../include/player.h \|	2448	INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h \|
2309		2449
2310	MODULE = cf PACKAGE = cf::region	2450	MODULE = cf PACKAGE = cf::region
2311		2451
2312	region *first ()	2452	void
2313	PROTOTYPE:	2453	list ()
2314	CODE:	2454	PPCODE:
2315	RETVAL = first_region;	2455	for_all_regions (rgn)
2316	OUTPUT: RETVAL	2456	XPUSHs (sv_2mortal (to_sv (rgn)));
2317		2457
2318	region find (char name)	2458	region find (char name)
2319	PROTOTYPE: $	2459	PROTOTYPE: $
2320	CODE:	2460	CODE:
2321	RETVAL = get_region_by_name (name);	2461	RETVAL = region::find (name);
2322	OUTPUT: RETVAL	2462	OUTPUT: RETVAL
2323		2463
		2464	region find_fuzzy (char name)
		2465	PROTOTYPE: $
		2466	CODE:
		2467	RETVAL = region::find_fuzzy (name);
		2468	OUTPUT: RETVAL
		2469
2324	INCLUDE: $PERL genacc region ../include/map.h \|	2470	INCLUDE: $PERL $srcdir/genacc region ../include/map.h \|
2325		2471
2326	MODULE = cf PACKAGE = cf::living	2472	MODULE = cf PACKAGE = cf::living
2327		2473
2328	INCLUDE: $PERL genacc living ../include/living.h \|	2474	INCLUDE: $PERL $srcdir/genacc living ../include/living.h \|
2329		2475
2330	MODULE = cf PACKAGE = cf::settings	2476	MODULE = cf PACKAGE = cf::settings
2331		2477
2332	INCLUDE: $PERL genacc Settings ../include/global.h \|	2478	INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h \|
2333		2479
2334	MODULE = cf PACKAGE = cf::client	2480	MODULE = cf PACKAGE = cf::client
2335		2481
2336	INCLUDE: $PERL genacc client ../include/client.h \|	2482	INCLUDE: $PERL $srcdir/genacc client ../include/client.h \|
2337		2483
2338	int invoke (client *ns, int event, ...)	2484	int invoke (client *ns, int event, ...)
2339	CODE:	2485	CODE:
2340	if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");	2486	if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2341	AV av = (AV )sv_2mortal ((SV *)newAV ());	2487	AV av = (AV )sv_2mortal ((SV *)newAV ());

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs. Revision 1.175 by root, Tue Mar 6 19:02:36 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.175 by root, Tue Mar 6 19:02:36 2007 UTC