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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.144 by root, Fri Jan 19 15:55:27 2007 UTC vs.
Revision 1.165 by root, Tue Feb 13 16:23:32 2007 UTC

…		…
29	#include <plugin_common.h>	29	#include <plugin_common.h>
30	#include <sounds.h>	30	#include <sounds.h>
31	#include <cstdarg>	31	#include <cstdarg>
32	#include <sproto.h>	32	#include <sproto.h>
33		33
		34	#include "loader.h"
34	#include "cfperl.h"	35	#include "cfperl.h"
35	#include "shstr.h"	36	#include "shstr.h"
36		37
37	#include <unistd.h>	38	#include <unistd.h>
38	#if _POSIX_MEMLOCK	39	#if _POSIX_MEMLOCK
…		…
102	unordered_vector<attachable *> attachable::mortals;	103	unordered_vector<attachable *> attachable::mortals;
103		104
104	attachable::~attachable ()	105	attachable::~attachable ()
105	{	106	{
106	assert (!self);	107	assert (!self);
		108	assert (!cb);
107	}	109	}
108		110
109	int	111	int
110	attachable::refcnt_cnt () const	112	attachable::refcnt_cnt () const
111	{	113	{
112	return refcnt + (self ? SvREFCNT (self) : 0);	114	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		115	}
		116
		117	void
		118	attachable::sever_self ()
		119	{
		120	if (HV *self = this->self)
		121	{
		122	// keep a refcount because sv_unmagic might call attachable_free,
		123	// which might clear self, causing sv_unmagic to crash on a now
		124	// invalid object.
		125	SvREFCNT_inc (self);
		126	hv_clear (self);
		127	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		128	SvREFCNT_dec (self);
		129
		130	// self must be null now because thats sv_unmagic's job.
		131	assert (!this->self);
		132	flags \|= 0x80; // severed //D
		133	}
113	}	134	}
114		135
115	void	136	void
116	attachable::optimise ()	137	attachable::optimise ()
117	{	138	{
118	if (self	139	if (self
119	&& SvREFCNT (self) == 1	140	&& SvREFCNT (self) == 1
120	&& !HvTOTALKEYS (self))	141	&& !HvTOTALKEYS (self))
		142	flags \|= 0x40,//D
		143	sever_self ();
		144	}
		145
		146	// check wether the object really is dead
		147	void
		148	attachable::do_check ()
		149	{
		150	if (refcnt_cnt () > 0)
		151	return;
		152
		153	destroy ();
		154	}
		155
		156	void
		157	attachable::do_destroy ()
		158	{
		159	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		160
		161	if (cb)
121	{	162	{
122	refcnt_inc ();
123	SvREFCNT_dec ((SV *)self);	163	SvREFCNT_dec (cb);
		164	cb = 0;
124	}	165	}
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		166
136	if (self)	167	if (self)
137	{	168	sever_self ();
138	hv_clear (self);
139	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140	SvREFCNT_dec (self);
141	self = 0;
142	}
143	}
144		169
145	void	170	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);	171	mortals.push_back (this);
154	}	172	}
155		173
156	void	174	void
157	attachable::destroy ()	175	attachable::destroy ()
…		…
164	}	182	}
165		183
166	void	184	void
167	attachable::check_mortals ()	185	attachable::check_mortals ()
168	{	186	{
169	for (int i = 0; i < mortals.size (); )	187	static int i = 0;
		188
		189	for (;;)
170	{	190	{
		191	if (i >= mortals.size ())
		192	{
		193	i = 0;
		194
		195	if (mortals.size () > 1000)
		196	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		197
		198	break;
		199	}
		200
171	attachable *obj = mortals [i];	201	attachable *obj = mortals [i];
172		202
173	obj->refcnt_chk (); // unborrow from perl, if necessary	203	obj->refcnt_chk (); // unborrow from perl, if necessary
174		204
		205	//if (obj->refcnt > 0 \|\| obj->self)
175	if (obj->refcnt \|\| obj->self)	206	if (obj->refcnt \|\| obj->self)
176	{	207	{
177	#if 0	208	//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	209	++i; // further delay freeing
		210
		211	if (!(i & 0x3ff))
		212	break;
183	}//D	213	}
184	else	214	else
185	{	215	{
186	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187	mortals.erase (i);	216	mortals.erase (i);
188	delete obj;	217	delete obj;
189	}	218	}
190	}	219	}
191	}	220	}
…		…
216		245
217	static int	246	static int
218	attachable_free (pTHX_ SV sv, MAGIC mg)	247	attachable_free (pTHX_ SV sv, MAGIC mg)
219	{	248	{
220	attachable at = (attachable )mg->mg_ptr;	249	attachable at = (attachable )mg->mg_ptr;
		250
		251	//TODO: check if transaction behaviour is really required here
		252	if (SV self = (SV )at->self)
		253	{
221	at->self = 0;	254	at->self = 0;
		255	SvREFCNT_dec (self);
		256	}
		257
222	// next line makes sense, but most objects still have refcnt 0 by default	258	// next line makes sense, but most objects still have refcnt 0 by default
223	//at->refcnt_chk ();	259	//at->refcnt_chk ();
224	return 0;	260	return 0;
225	}	261	}
226		262
…		…
234		270
235	if (!obj->self)	271	if (!obj->self)
236	{	272	{
237	obj->self = newHV ();	273	obj->self = newHV ();
238	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	274	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
239		275	obj->flags &= ~0xc0;//D
240	// borrow the refcnt from the object	276	obj->flags \|= 0x10;//D
241	// it is important thta no refcnt_chk is being executed here
242	obj->refcnt_dec ();
243		277
244	// now bless the object _once_	278	// now bless the object _once_
245	return sv_bless (newRV_inc ((SV *)obj->self), stash);	279	return sv_bless (newRV_inc ((SV *)obj->self), stash);
246	}	280	}
247	else	281	else
…		…
313	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	347	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
314		348
315	inline SV *to_sv (object & v) { return to_sv (&v); }	349	inline SV *to_sv (object & v) { return to_sv (&v); }
316	inline SV *to_sv (living & v) { return to_sv (&v); }	350	inline SV *to_sv (living & v) { return to_sv (&v); }
317		351
318	inline SV to_sv (New_Face v) { return to_sv (v->name); }	352	inline SV to_sv (facetile v) { return to_sv (v->name); }
319	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	353	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
320		354
321	inline SV *to_sv (UUID v)	355	inline SV *to_sv (UUID v)
322	{	356	{
323	char buf[128];	357	char buf[128];
324	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	358	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
325	return newSVpv (buf, 0);	359	return newSVpv (buf, 0);
326	}	360	}
327		361
328	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	362	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
329	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	363	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
348	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	382	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
349	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	383	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
350	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	384	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
351	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	385	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
352		386
353	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }	387	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
354	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }	388	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
355		389
356	template<class T>	390	template<class T>
357	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	391	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
358		392
…		…
576	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	610	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
577	{	611	{
578	printf ("unable to initialize perl-interpreter, aborting.\n");	612	printf ("unable to initialize perl-interpreter, aborting.\n");
579	exit (EXIT_FAILURE);	613	exit (EXIT_FAILURE);
580	}	614	}
		615
		616	{
		617	dSP;
		618
		619	PUSHMARK (SP);
		620	PUTBACK;
		621	call_pv ("cf::init", G_DISCARD \| G_VOID);
		622	}
581	}	623	}
582		624
583	void cfperl_main ()	625	void cfperl_main ()
584	{	626	{
585	dSP;	627	dSP;
…		…
806	CALL_BEGIN (0);	848	CALL_BEGIN (0);
807	CALL_CALL ("cf::emergency_save", G_VOID);	849	CALL_CALL ("cf::emergency_save", G_VOID);
808	CALL_END;	850	CALL_END;
809	}	851	}
810		852
		853	void
		854	cfperl_cleanup (int make_core)
		855	{
		856	CALL_BEGIN (1);
		857	CALL_ARG (make_core);
		858	CALL_CALL ("cf::post_cleanup", G_VOID);
		859	CALL_END;
		860	}
		861
811	maptile *	862	maptile *
812	maptile::find_sync (const char path, maptile origin)	863	maptile::find_sync (const char path, maptile origin)
813	{	864	{
814	CALL_BEGIN (2);	865	CALL_BEGIN (2);
815	CALL_ARG (path);	866	CALL_ARG (path);
…		…
895	void	946	void
896	iw::alloc ()	947	iw::alloc ()
897	{	948	{
898	pe = GEventAPI->new_idle (0, 0);	949	pe = GEventAPI->new_idle (0, 0);
899		950
		951	WaREENTRANT_off (pe);
900	pe->base.callback = (void *)iw_dispatch;	952	pe->base.callback = (void *)iw_dispatch;
901	pe->base.ext_data = (void *)this;	953	pe->base.ext_data = (void *)this;
902	}	954	}
903		955
904	static void iow_dispatch (pe_event *ev)	956	static void iow_dispatch (pe_event *ev)
…		…
910	void	962	void
911	iow::alloc ()	963	iow::alloc ()
912	{	964	{
913	pe = GEventAPI->new_io (0, 0);	965	pe = GEventAPI->new_io (0, 0);
914		966
		967	WaREENTRANT_off (pe);
915	pe->base.callback = (void *)iow_dispatch;	968	pe->base.callback = (void *)iow_dispatch;
916	pe->base.ext_data = (void *)this;	969	pe->base.ext_data = (void *)this;
917		970
918	pe->fd = -1;	971	pe->fd = -1;
919	pe->poll = 0;	972	pe->poll = 0;
…		…
1248	const_iv (FLAG_IS_WATER)	1301	const_iv (FLAG_IS_WATER)
1249	const_iv (FLAG_CONTENT_ON_GEN)	1302	const_iv (FLAG_CONTENT_ON_GEN)
1250	const_iv (FLAG_IS_A_TEMPLATE)	1303	const_iv (FLAG_IS_A_TEMPLATE)
1251	const_iv (FLAG_IS_BUILDABLE)	1304	const_iv (FLAG_IS_BUILDABLE)
1252	const_iv (FLAG_DESTROY_ON_DEATH)	1305	const_iv (FLAG_DESTROY_ON_DEATH)
1253	const_iv (FLAG_NO_SAVE)	1306	const_iv (FLAG_NO_MAP_SAVE)
1254		1307
1255	const_iv (NDI_BLACK)	1308	const_iv (NDI_BLACK)
1256	const_iv (NDI_WHITE)	1309	const_iv (NDI_WHITE)
1257	const_iv (NDI_NAVY)	1310	const_iv (NDI_NAVY)
1258	const_iv (NDI_RED)	1311	const_iv (NDI_RED)
…		…
1443	const_iv (ATNR_BLIND)	1496	const_iv (ATNR_BLIND)
1444	const_iv (ATNR_INTERNAL)	1497	const_iv (ATNR_INTERNAL)
1445	const_iv (ATNR_LIFE_STEALING)	1498	const_iv (ATNR_LIFE_STEALING)
1446	const_iv (ATNR_DISEASE)	1499	const_iv (ATNR_DISEASE)
1447		1500
1448	const_iv (MAP_FLUSH)
1449	const_iv (MAP_PLAYER_UNIQUE)
1450	const_iv (MAP_BLOCK)
1451	const_iv (MAP_STYLE)
1452	const_iv (MAP_OVERLAY)
1453
1454	const_iv (MAP_IN_MEMORY)	1501	const_iv (MAP_IN_MEMORY)
1455	const_iv (MAP_SWAPPED)	1502	const_iv (MAP_SWAPPED)
1456	const_iv (MAP_LOADING)	1503	const_iv (MAP_LOADING)
1457	const_iv (MAP_SAVING)	1504	const_iv (MAP_SAVING)
1458		1505
…		…
1625		1672
1626	void cleanup (const char *cause, bool make_core = false)	1673	void cleanup (const char *cause, bool make_core = false)
1627		1674
1628	void emergency_save ()	1675	void emergency_save ()
1629		1676
1630	void _exit (int status = 0)	1677	void _exit (int status = EXIT_SUCCESS)
		1678
		1679	UV sv_2watcher (SV *w)
		1680	CODE:
		1681	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1682	OUTPUT:
		1683	RETVAL
1631		1684
1632	#if _POSIX_MEMLOCK	1685	#if _POSIX_MEMLOCK
1633		1686
1634	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1687	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1635		1688
…		…
1681	RETVAL = newSVpv (resist_plus[atnr], 0);	1734	RETVAL = newSVpv (resist_plus[atnr], 0);
1682	else	1735	else
1683	XSRETURN_UNDEF;	1736	XSRETURN_UNDEF;
1684	OUTPUT: RETVAL	1737	OUTPUT: RETVAL
1685		1738
		1739	bool
		1740	load_regions (const char *filename)
		1741	CODE:
		1742	RETVAL = loader_region ().load (filename);
		1743	OUTPUT: RETVAL
		1744
1686	MODULE = cf PACKAGE = cf::attachable	1745	MODULE = cf PACKAGE = cf::attachable
1687		1746
1688	int	1747	int
1689	valid (SV *obj)	1748	valid (SV *obj)
1690	CODE:	1749	CODE:
1691	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1750	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1692	OUTPUT:	1751	OUTPUT:
1693	RETVAL	1752	RETVAL
		1753
		1754	void
		1755	debug_trace (attachable *obj, bool on = true)
		1756	CODE:
		1757	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1758	if (on)
		1759	obj->flags \|= attachable::F_DEBUG_TRACE;
		1760
		1761	int mortals_size ()
		1762	CODE:
		1763	RETVAL = attachable::mortals.size ();
		1764	OUTPUT: RETVAL
		1765
		1766	#object *mortals (U32 index)
		1767	# CODE:
		1768	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1769	# OUTPUT: RETVAL
1694		1770
1695	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1771	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1696		1772
1697	MODULE = cf PACKAGE = cf::global	1773	MODULE = cf PACKAGE = cf::global
1698		1774
…		…
1716	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1792	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1717	OUTPUT: RETVAL	1793	OUTPUT: RETVAL
1718		1794
1719	SV registry (object op)	1795	SV registry (object op)
1720		1796
1721	void mortals ()
1722	PPCODE:
1723	EXTEND (SP, object::mortals.size ());
1724	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1725	PUSHs (to_sv (*i));
1726
1727	int objects_size ()	1797	int objects_size ()
1728	CODE:	1798	CODE:
1729	RETVAL = objects.size ();	1799	RETVAL = objects.size ();
1730	OUTPUT: RETVAL	1800	OUTPUT: RETVAL
1731		1801
…		…
1770		1840
1771	void	1841	void
1772	set_animation (object *op, int idx)	1842	set_animation (object *op, int idx)
1773	CODE:	1843	CODE:
1774	SET_ANIMATION (op, idx);	1844	SET_ANIMATION (op, idx);
		1845
		1846	int
		1847	num_animations (object *op)
		1848	CODE:
		1849	RETVAL = NUM_ANIMATIONS (op);
		1850	OUTPUT: RETVAL
1775		1851
1776	object find_best_object_match (object op, const char *match)	1852	object find_best_object_match (object op, const char *match)
1777		1853
1778	object find_marked_object (object op)	1854	object find_marked_object (object op)
1779		1855
…		…
2016	pl->orig_stats = pl->ob->stats;	2092	pl->orig_stats = pl->ob->stats;
2017		2093
2018	void cf_player_move (player *pl, int dir)	2094	void cf_player_move (player *pl, int dir)
2019		2095
2020	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2096	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2021
2022	player *first ()
2023	CODE:
2024	RETVAL = first_player;
2025	OUTPUT: RETVAL
2026		2097
2027	bool	2098	bool
2028	cell_visible (player *pl, int dx, int dy)	2099	cell_visible (player *pl, int dx, int dy)
2029	CODE:	2100	CODE:
2030	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2101	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2107	EXTEND (SP, THIS->players);	2178	EXTEND (SP, THIS->players);
2108	for_all_players (pl)	2179	for_all_players (pl)
2109	if (pl->ob && pl->ob->map == THIS)	2180	if (pl->ob && pl->ob->map == THIS)
2110	PUSHs (sv_2mortal (to_sv (pl->ob)));	2181	PUSHs (sv_2mortal (to_sv (pl->ob)));
2111	}	2182	}
		2183
		2184	void
		2185	maptile::set_regiondata (SV data, SV plt)
		2186	CODE:
		2187	{
		2188	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2189	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2190
		2191	AV av = (AV )SvRV (plt);
		2192
		2193	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2194
		2195	for (int i = av_len (av) + 1; i--; )
		2196	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2197
		2198	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2199	THIS->regionmap = regionmap;
		2200	}
2112		2201
2113	void play_sound_map (maptile *map, int x, int y, int sound_num)	2202	void play_sound_map (maptile *map, int x, int y, int sound_num)
2114		2203
2115	int out_of_map (maptile *map, int x, int y)	2204	int out_of_map (maptile *map, int x, int y)
2116		2205
…		…
2198		2287
2199	void fix_walls (maptile *map, int x, int y)	2288	void fix_walls (maptile *map, int x, int y)
2200		2289
2201	void fix_walls_around (maptile *map, int x, int y)	2290	void fix_walls_around (maptile *map, int x, int y)
2202		2291
2203	const char *
2204	region_name (maptile *m)
2205	CODE:
2206	RETVAL = get_name_of_region_for_map (m);
2207	OUTPUT: RETVAL
2208
2209	# worst xs function of my life	2292	# worst xs function of my life
2210	bool	2293	bool
2211	_create_random_map (\	2294	_create_random_map (\
2212	maptile *self,\	2295	maptile *self,\
2213	char *wallstyle,\	2296	char *wallstyle,\
…		…
2221	char *origin_map,\	2304	char *origin_map,\
2222	char *final_map,\	2305	char *final_map,\
2223	char *exitstyle,\	2306	char *exitstyle,\
2224	char *this_map,\	2307	char *this_map,\
2225	char *exit_on_final_map,\	2308	char *exit_on_final_map,\
2226	int Xsize,\	2309	int xsize,\
2227	int Ysize,\	2310	int ysize,\
2228	int expand2x,\	2311	int expand2x,\
2229	int layoutoptions1,\	2312	int layoutoptions1,\
2230	int layoutoptions2,\	2313	int layoutoptions2,\
2231	int layoutoptions3,\	2314	int layoutoptions3,\
2232	int symmetry,\	2315	int symmetry,\
…		…
2237	int dungeon_depth,\	2320	int dungeon_depth,\
2238	int decoroptions,\	2321	int decoroptions,\
2239	int orientation,\	2322	int orientation,\
2240	int origin_y,\	2323	int origin_y,\
2241	int origin_x,\	2324	int origin_x,\
2242	int random_seed,\	2325	U32 random_seed,\
2243	val64 total_map_hp,\	2326	val64 total_map_hp,\
2244	int map_layout_style,\	2327	int map_layout_style,\
2245	int treasureoptions,\	2328	int treasureoptions,\
2246	int symmetry_used,\	2329	int symmetry_used,\
2247	region *region,\	2330	region *region,\
…		…
2263	assign (rmp.exit_on_final_map, exit_on_final_map);	2346	assign (rmp.exit_on_final_map, exit_on_final_map);
2264		2347
2265	rmp.origin_map = origin_map;	2348	rmp.origin_map = origin_map;
2266	rmp.final_map = final_map;	2349	rmp.final_map = final_map;
2267	rmp.this_map = this_map;	2350	rmp.this_map = this_map;
2268	rmp.Xsize = Xsize;	2351	rmp.xsize = xsize;
2269	rmp.Ysize = Ysize;	2352	rmp.ysize = ysize;
2270	rmp.expand2x = expand2x;	2353	rmp.expand2x = expand2x;
2271	rmp.layoutoptions1 = layoutoptions1;	2354	rmp.layoutoptions1 = layoutoptions1;
2272	rmp.layoutoptions2 = layoutoptions2;	2355	rmp.layoutoptions2 = layoutoptions2;
2273	rmp.layoutoptions3 = layoutoptions3;	2356	rmp.layoutoptions3 = layoutoptions3;
2274	rmp.symmetry = symmetry;	2357	rmp.symmetry = symmetry;
…		…
2320		2403
2321	INCLUDE: $PERL genacc partylist ../include/player.h \|	2404	INCLUDE: $PERL genacc partylist ../include/player.h \|
2322		2405
2323	MODULE = cf PACKAGE = cf::region	2406	MODULE = cf PACKAGE = cf::region
2324		2407
2325	region *first ()	2408	void
2326	PROTOTYPE:	2409	list ()
2327	CODE:	2410	PPCODE:
2328	RETVAL = first_region;	2411	for_all_regions (rgn)
2329	OUTPUT: RETVAL	2412	XPUSHs (sv_2mortal (to_sv (rgn)));
2330		2413
2331	region find (char name)	2414	region find (char name)
2332	PROTOTYPE: $	2415	PROTOTYPE: $
2333	CODE:	2416	CODE:
2334	RETVAL = get_region_by_name (name);	2417	RETVAL = region::find (name);
		2418	OUTPUT: RETVAL
		2419
		2420	region find_fuzzy (char name)
		2421	PROTOTYPE: $
		2422	CODE:
		2423	RETVAL = region::find_fuzzy (name);
2335	OUTPUT: RETVAL	2424	OUTPUT: RETVAL
2336		2425
2337	INCLUDE: $PERL genacc region ../include/map.h \|	2426	INCLUDE: $PERL genacc region ../include/map.h \|
2338		2427
2339	MODULE = cf PACKAGE = cf::living	2428	MODULE = cf PACKAGE = cf::living

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.144 by root, Fri Jan 19 15:55:27 2007 UTC vs. Revision 1.165 by root, Tue Feb 13 16:23:32 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.144 by root, Fri Jan 19 15:55:27 2007 UTC vs.
Revision 1.165 by root, Tue Feb 13 16:23:32 2007 UTC