[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.170 by root, Fri Feb 16 19:43:41 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
…		…
1548	}	1600	}
1549		1601
1550	NV floor (NV x)	1602	NV floor (NV x)
1551		1603
1552	NV ceil (NV x)	1604	NV ceil (NV x)
		1605
		1606	NV rndm (...)
		1607	CODE:
		1608	switch (items)
		1609	{
		1610	case 0: RETVAL = rndm (); break;
		1611	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1612	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1613	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1614	}
		1615	OUTPUT:
		1616	RETVAL
1553		1617
1554	void server_tick ()	1618	void server_tick ()
1555	CODE:	1619	CODE:
1556	runtime = SvNVx (sv_runtime);	1620	runtime = SvNVx (sv_runtime);
1557	server_tick ();	1621	server_tick ();
…		…
1604	}	1668	}
1605	OUTPUT: RETVAL	1669	OUTPUT: RETVAL
1606		1670
1607	void abort ()	1671	void abort ()
1608		1672
		1673	void fork_abort (char *cause = "cf::fork_abort")
		1674
1609	void cleanup (const char *cause, bool make_core = false)	1675	void cleanup (const char *cause, bool make_core = false)
1610		1676
1611	void emergency_save ()	1677	void emergency_save ()
1612		1678
1613	void _exit (int status = 0)	1679	void _exit (int status = EXIT_SUCCESS)
		1680
		1681	UV sv_2watcher (SV *w)
		1682	CODE:
		1683	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1684	OUTPUT:
		1685	RETVAL
1614		1686
1615	#if _POSIX_MEMLOCK	1687	#if _POSIX_MEMLOCK
1616		1688
1617	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1689	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1618		1690
…		…
1664	RETVAL = newSVpv (resist_plus[atnr], 0);	1736	RETVAL = newSVpv (resist_plus[atnr], 0);
1665	else	1737	else
1666	XSRETURN_UNDEF;	1738	XSRETURN_UNDEF;
1667	OUTPUT: RETVAL	1739	OUTPUT: RETVAL
1668		1740
		1741	bool
		1742	load_resource_file (const char *filename)
		1743
1669	MODULE = cf PACKAGE = cf::attachable	1744	MODULE = cf PACKAGE = cf::attachable
1670		1745
1671	int	1746	int
1672	valid (SV *obj)	1747	valid (SV *obj)
1673	CODE:	1748	CODE:
1674	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1749	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1675	OUTPUT:	1750	OUTPUT:
1676	RETVAL	1751	RETVAL
		1752
		1753	void
		1754	debug_trace (attachable *obj, bool on = true)
		1755	CODE:
		1756	obj->flags &= ~attachable::F_DEBUG_TRACE;
		1757	if (on)
		1758	obj->flags \|= attachable::F_DEBUG_TRACE;
		1759
		1760	int mortals_size ()
		1761	CODE:
		1762	RETVAL = attachable::mortals.size ();
		1763	OUTPUT: RETVAL
		1764
		1765	#object *mortals (U32 index)
		1766	# CODE:
		1767	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1768	# OUTPUT: RETVAL
1677		1769
1678	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1770	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1679		1771
1680	MODULE = cf PACKAGE = cf::global	1772	MODULE = cf PACKAGE = cf::global
1681		1773
…		…
1699	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1791	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1700	OUTPUT: RETVAL	1792	OUTPUT: RETVAL
1701		1793
1702	SV registry (object op)	1794	SV registry (object op)
1703		1795
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 ()	1796	int objects_size ()
1711	CODE:	1797	CODE:
1712	RETVAL = objects.size ();	1798	RETVAL = objects.size ();
1713	OUTPUT: RETVAL	1799	OUTPUT: RETVAL
1714		1800
…		…
1754	void	1840	void
1755	set_animation (object *op, int idx)	1841	set_animation (object *op, int idx)
1756	CODE:	1842	CODE:
1757	SET_ANIMATION (op, idx);	1843	SET_ANIMATION (op, idx);
1758		1844
		1845	int
		1846	num_animations (object *op)
		1847	CODE:
		1848	RETVAL = NUM_ANIMATIONS (op);
		1849	OUTPUT: RETVAL
		1850
1759	object find_best_object_match (object op, const char *match)	1851	object find_best_object_match (object op, const char *match)
1760		1852
1761	object find_marked_object (object op)	1853	object find_marked_object (object op)
1762		1854
1763	int need_identify (object *obj);	1855	int need_identify (object *obj);
…		…
1775	manual_apply (applied, applier, flags);	1867	manual_apply (applied, applier, flags);
1776		1868
1777	void apply_below (object *op)	1869	void apply_below (object *op)
1778	CODE:	1870	CODE:
1779	player_apply_below (op);	1871	player_apply_below (op);
		1872
		1873	int cast_heal (object op, object caster, object *spell, int dir = 0)
1780		1874
1781	object cf_object_present_archname_inside (object op, char *whatstr)	1875	object cf_object_present_archname_inside (object op, char *whatstr)
1782		1876
1783	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)	1877	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)
1784		1878
…		…
1837		1931
1838	void drop (object who, object op)	1932	void drop (object who, object op)
1839		1933
1840	void pick_up (object who, object op)	1934	void pick_up (object who, object op)
1841		1935
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)	1936	int cf_object_teleport (object op, maptile map, int x, int y)
1847		1937
1848	void update_object (object *op, int action)	1938	void update_object (object *op, int action)
1849		1939
1850	object cf_create_object_by_name (const char name)	1940	object cf_create_object_by_name (const char name)
…		…
1969	void esrv_update_item (object op, int what, object item)	2059	void esrv_update_item (object op, int what, object item)
1970	C_ARGS: what, op, item	2060	C_ARGS: what, op, item
1971		2061
1972	void clear_los (object *op)	2062	void clear_los (object *op)
1973		2063
1974	int command_teleport (object op, char params)
1975
1976	int command_summon (object op, char params)	2064	int command_summon (object op, char params)
1977		2065
1978	int command_arrest (object op, char params)	2066	int command_arrest (object op, char params)
1979		2067
1980	int command_kick (object op, char params)	2068	int command_kick (object op, char params)
…		…
2005	pl->orig_stats = pl->ob->stats;	2093	pl->orig_stats = pl->ob->stats;
2006		2094
2007	void cf_player_move (player *pl, int dir)	2095	void cf_player_move (player *pl, int dir)
2008		2096
2009	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);	2097	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		2098
2016	bool	2099	bool
2017	cell_visible (player *pl, int dx, int dy)	2100	cell_visible (player *pl, int dx, int dy)
2018	CODE:	2101	CODE:
2019	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2102	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
…		…
2097	for_all_players (pl)	2180	for_all_players (pl)
2098	if (pl->ob && pl->ob->map == THIS)	2181	if (pl->ob && pl->ob->map == THIS)
2099	PUSHs (sv_2mortal (to_sv (pl->ob)));	2182	PUSHs (sv_2mortal (to_sv (pl->ob)));
2100	}	2183	}
2101		2184
		2185	void
		2186	maptile::add_underlay (SV data, int offset, int stride, SV palette)
		2187	CODE:
		2188	{
		2189	if (!SvROK (palette) \|\| SvTYPE (SvRV (palette)) != SVt_PVAV)
		2190	croak ("maptile::add_underlay: palette must be arrayref");
		2191
		2192	palette = SvRV (palette);
		2193
		2194	STRLEN idxlen;
		2195	const uint8_t idx = (const uint8_t )SvPVbyte (data, idxlen);
		2196
		2197	for (int x = 0; x < THIS->width; ++x)
		2198	for (int y = 0; y < THIS->height; ++y)
		2199	{
		2200	for (object *op = THIS->at (x, y).bot; op; op = op->above)
		2201	if (op->flag [FLAG_IS_FLOOR])
		2202	goto skip_space;
		2203
		2204	{
		2205	int offs = offset + y * stride + x;
		2206	if (IN_RANGE_EXC (offs, 0, idxlen))
		2207	{
		2208	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))
		2209	{
		2210	object ob = get_archetype (SvPVutf8_nolen (elem));
		2211	ob->flag [FLAG_NO_MAP_SAVE] = true;
		2212	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
		2213	}
		2214	}
		2215	}
		2216
		2217	skip_space: ;
		2218	}
		2219	}
		2220
		2221	void
		2222	maptile::set_regiondata (SV data, int offset, int stride, SV palette)
		2223	CODE:
		2224	{
		2225	if (!SvROK (palette) \|\| SvTYPE (SvRV (palette)) != SVt_PVAV)
		2226	croak ("maptile::set_regiondata: palette must be arrayref");
		2227
		2228	palette = SvRV (palette);
		2229
		2230	STRLEN idxlen;
		2231	const uint8_t idx = (const uint8_t )SvPVbyte (data, idxlen);
		2232
		2233	region regionmap = (region )malloc (
		2234	(av_len ((AV )palette) + 1) sizeof (region *));
		2235	uint8_t *regions = salloc<uint8_t> (THIS->size ());
		2236
		2237	for (int i = av_len ((AV *)palette) + 1; i--; )
		2238	regionmap [i] = region::find (
		2239	SvPVutf8_nolen (av_fetch ((AV )palette, i, 1)));
		2240
		2241	for (int y = 0; y < THIS->height; ++y)
		2242	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
		2243
		2244	sfree (THIS->regions, THIS->size ());
		2245	free (THIS->regionmap);
		2246
		2247	THIS->regions = regions;
		2248	THIS->regionmap = regionmap;
		2249	}
		2250
2102	void play_sound_map (maptile *map, int x, int y, int sound_num)	2251	void play_sound_map (maptile *map, int x, int y, int sound_num)
2103		2252
2104	int out_of_map (maptile *map, int x, int y)	2253	int out_of_map (maptile *map, int x, int y)
2105		2254
2106	void	2255	void
…		…
2122		2271
2123	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2272	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2124	C_ARGS: str, map, nx, ny	2273	C_ARGS: str, map, nx, ny
2125		2274
2126	void	2275	void
2127	cf_map_normalise (maptile *map, int x, int y)	2276	get_map_flags (maptile *map, int x, int y)
2128	PPCODE:	2277	PPCODE:
2129	{	2278	{
2130	maptile *nmap = 0;	2279	maptile *nmap = 0;
2131	I16 nx = 0, ny = 0;	2280	I16 nx = 0, ny = 0;
2132	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2281	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2187		2336
2188	void fix_walls (maptile *map, int x, int y)	2337	void fix_walls (maptile *map, int x, int y)
2189		2338
2190	void fix_walls_around (maptile *map, int x, int y)	2339	void fix_walls_around (maptile *map, int x, int y)
2191		2340
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	2341	# worst xs function of my life
2199	maptile *	2342	bool
2200	_create_random_map (\	2343	_create_random_map (\
2201	char *path,\	2344	maptile *self,\
2202	char *wallstyle,\	2345	char *wallstyle,\
2203	char *wall_name,\	2346	char *wall_name,\
2204	char *floorstyle,\	2347	char *floorstyle,\
2205	char *monsterstyle,\	2348	char *monsterstyle,\
2206	char *treasurestyle,\	2349	char *treasurestyle,\
…		…
2210	char *origin_map,\	2353	char *origin_map,\
2211	char *final_map,\	2354	char *final_map,\
2212	char *exitstyle,\	2355	char *exitstyle,\
2213	char *this_map,\	2356	char *this_map,\
2214	char *exit_on_final_map,\	2357	char *exit_on_final_map,\
2215	int Xsize,\	2358	int xsize,\
2216	int Ysize,\	2359	int ysize,\
2217	int expand2x,\	2360	int expand2x,\
2218	int layoutoptions1,\	2361	int layoutoptions1,\
2219	int layoutoptions2,\	2362	int layoutoptions2,\
2220	int layoutoptions3,\	2363	int layoutoptions3,\
2221	int symmetry,\	2364	int symmetry,\
…		…
2226	int dungeon_depth,\	2369	int dungeon_depth,\
2227	int decoroptions,\	2370	int decoroptions,\
2228	int orientation,\	2371	int orientation,\
2229	int origin_y,\	2372	int origin_y,\
2230	int origin_x,\	2373	int origin_x,\
2231	int random_seed,\	2374	U32 random_seed,\
2232	val64 total_map_hp,\	2375	val64 total_map_hp,\
2233	int map_layout_style,\	2376	int map_layout_style,\
2234	int treasureoptions,\	2377	int treasureoptions,\
2235	int symmetry_used,\	2378	int symmetry_used,\
2236	region *region\	2379	region *region,\
		2380	char *custom\
2237	)	2381	)
2238	CODE:	2382	CODE:
2239	{	2383	{
2240	random_map_params rmp;	2384	random_map_params rmp;
2241		2385
…		…
2251	assign (rmp.exit_on_final_map, exit_on_final_map);	2395	assign (rmp.exit_on_final_map, exit_on_final_map);
2252		2396
2253	rmp.origin_map = origin_map;	2397	rmp.origin_map = origin_map;
2254	rmp.final_map = final_map;	2398	rmp.final_map = final_map;
2255	rmp.this_map = this_map;	2399	rmp.this_map = this_map;
2256	rmp.Xsize = Xsize;	2400	rmp.xsize = xsize;
2257	rmp.Ysize = Ysize;	2401	rmp.ysize = ysize;
2258	rmp.expand2x = expand2x;	2402	rmp.expand2x = expand2x;
2259	rmp.layoutoptions1 = layoutoptions1;	2403	rmp.layoutoptions1 = layoutoptions1;
2260	rmp.layoutoptions2 = layoutoptions2;	2404	rmp.layoutoptions2 = layoutoptions2;
2261	rmp.layoutoptions3 = layoutoptions3;	2405	rmp.layoutoptions3 = layoutoptions3;
2262	rmp.symmetry = symmetry;	2406	rmp.symmetry = symmetry;
…		…
2273	rmp.total_map_hp = total_map_hp;	2417	rmp.total_map_hp = total_map_hp;
2274	rmp.map_layout_style = map_layout_style;	2418	rmp.map_layout_style = map_layout_style;
2275	rmp.treasureoptions = treasureoptions;	2419	rmp.treasureoptions = treasureoptions;
2276	rmp.symmetry_used = symmetry_used;	2420	rmp.symmetry_used = symmetry_used;
2277	rmp.region = region;	2421	rmp.region = region;
		2422	rmp.custom = custom;
2278		2423
2279	RETVAL = generate_random_map (path, &rmp);	2424	RETVAL = self->generate_random_map (&rmp);
2280	}	2425	}
2281	OUTPUT:	2426	OUTPUT:
2282	RETVAL	2427	RETVAL
2283		2428
2284	MODULE = cf PACKAGE = cf::arch	2429	MODULE = cf PACKAGE = cf::arch
…		…
2307		2452
2308	INCLUDE: $PERL genacc partylist ../include/player.h \|	2453	INCLUDE: $PERL genacc partylist ../include/player.h \|
2309		2454
2310	MODULE = cf PACKAGE = cf::region	2455	MODULE = cf PACKAGE = cf::region
2311		2456
2312	region *first ()	2457	void
2313	PROTOTYPE:	2458	list ()
2314	CODE:	2459	PPCODE:
2315	RETVAL = first_region;	2460	for_all_regions (rgn)
2316	OUTPUT: RETVAL	2461	XPUSHs (sv_2mortal (to_sv (rgn)));
2317		2462
2318	region find (char name)	2463	region find (char name)
2319	PROTOTYPE: $	2464	PROTOTYPE: $
2320	CODE:	2465	CODE:
2321	RETVAL = get_region_by_name (name);	2466	RETVAL = region::find (name);
		2467	OUTPUT: RETVAL
		2468
		2469	region find_fuzzy (char name)
		2470	PROTOTYPE: $
		2471	CODE:
		2472	RETVAL = region::find_fuzzy (name);
2322	OUTPUT: RETVAL	2473	OUTPUT: RETVAL
2323		2474
2324	INCLUDE: $PERL genacc region ../include/map.h \|	2475	INCLUDE: $PERL genacc region ../include/map.h \|
2325		2476
2326	MODULE = cf PACKAGE = cf::living	2477	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.134 by root, Tue Jan 9 21:32:42 2007 UTC vs. Revision 1.170 by root, Fri Feb 16 19:43:41 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.170 by root, Fri Feb 16 19:43:41 2007 UTC