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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.160 by elmex, Wed Jan 31 14:11:02 2007 UTC

…		…
101		101
102	unordered_vector<attachable *> attachable::mortals;	102	unordered_vector<attachable *> attachable::mortals;
103		103
104	attachable::~attachable ()	104	attachable::~attachable ()
105	{	105	{
106	assert (!(flags & F_BORROWED));	106	assert (!self);
		107	assert (!cb);
107	}	108	}
108		109
109	int	110	int
110	attachable::refcnt_cnt () const	111	attachable::refcnt_cnt () const
111	{	112	{
112	return refcnt + (self ? SvREFCNT (self) : 0);	113	return refcnt + (self ? SvREFCNT (self) - 1 : 0);
		114	}
		115
		116	void
		117	attachable::sever_self ()
		118	{
		119	if (HV *self = this->self)
		120	{
		121	// keep a refcount because sv_unmagic might call attachable_free,
		122	// which might clear self, causing sv_unmagic to crash on a now
		123	// invalid object.
		124	SvREFCNT_inc (self);
		125	hv_clear (self);
		126	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
		127	SvREFCNT_dec (self);
		128
		129	// self must be null now because thats sv_unmagic's job.
		130	assert (!this->self);
		131	}
113	}	132	}
114		133
115	void	134	void
116	attachable::optimise ()	135	attachable::optimise ()
117	{	136	{
118	if (self	137	if (self
119	&& SvREFCNT (self) == 1	138	&& SvREFCNT (self) == 1
120	&& !HvTOTALKEYS (self))	139	&& !HvTOTALKEYS (self))
		140	sever_self ();
		141	}
		142
		143	// check wether the object really is dead
		144	void
		145	attachable::do_check ()
		146	{
		147	if (refcnt_cnt () > 0)
		148	return;
		149
		150	destroy ();
		151	}
		152
		153	void
		154	attachable::do_destroy ()
		155	{
		156	invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
		157
		158	if (cb)
121	{	159	{
122	flags &= ~F_BORROWED;
123	refcnt_inc ();
124	SvREFCNT_dec ((SV *)self);	160	SvREFCNT_dec (cb);
		161	cb = 0;
125	}	162	}
126	}
127
128	// check wether the object really is dead
129	void
130	attachable::do_check ()
131	{
132	if (refcnt > 0)
133	return;
134
135	optimise ();
136		163
137	if (self)	164	if (self)
138	{	165	sever_self ();
139	if (refcnt + SvREFCNT (self) > 0)
140	return;
141
142	assert (flags & F_BORROWED);
143
144	flags &= ~F_BORROWED;
145	refcnt_inc ();
146	SvREFCNT_dec (self);
147	self = 0;
148	}
149
150	if (refcnt > 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 (self)
162	hv_clear (self);
163		166
164	mortals.push_back (this);	167	mortals.push_back (this);
165	}	168	}
166		169
167	void	170	void
…		…
175	}	178	}
176		179
177	void	180	void
178	attachable::check_mortals ()	181	attachable::check_mortals ()
179	{	182	{
180	for (int i = 0; i < mortals.size (); )	183	static int i = 0;
		184
		185	for (;;)
181	{	186	{
		187	if (i >= mortals.size ())
		188	{
		189	i = 0;
		190
		191	if (mortals.size () > 1000)
		192	fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
		193
		194	break;
		195	}
		196
182	attachable *obj = mortals [i];	197	attachable *obj = mortals [i];
183		198
184	obj->refcnt_chk (); // unborrow from perl, if necessary	199	obj->refcnt_chk (); // unborrow from perl, if necessary
185		200
		201	//if (obj->refcnt > 0 \|\| obj->self)
186	if (obj->refcnt \|\| obj->self)	202	if (obj->refcnt \|\| obj->self)
187	{	203	{
188	#if 0	204	//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
189	if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
190	obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
191	#endif
192
193	++i; // further delay freeing	205	++i; // further delay freeing
		206
		207	if (!(i & 0x3ff))
		208	break;
194	}//D	209	}
195	else	210	else
196	{	211	{
197	//Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
198	mortals.erase (i);	212	mortals.erase (i);
199	delete obj;	213	delete obj;
200	}	214	}
201	}	215	}
202	}	216	}
…		…
227		241
228	static int	242	static int
229	attachable_free (pTHX_ SV sv, MAGIC mg)	243	attachable_free (pTHX_ SV sv, MAGIC mg)
230	{	244	{
231	attachable at = (attachable )mg->mg_ptr;	245	attachable at = (attachable )mg->mg_ptr;
232	assert (!(at->flags & attachable::F_BORROWED));	246
		247	//TODO: check if transaction behaviour is really required here
		248	if (SV self = (SV )at->self)
		249	{
233	at->self = 0;	250	at->self = 0;
		251	SvREFCNT_dec (self);
		252	}
		253
234	// next line makes sense, but most objects still have refcnt 0 by default	254	// next line makes sense, but most objects still have refcnt 0 by default
235	//at->refcnt_chk ();	255	//at->refcnt_chk ();
236	return 0;	256	return 0;
237	}	257	}
238		258
…		…
247	if (!obj->self)	267	if (!obj->self)
248	{	268	{
249	obj->self = newHV ();	269	obj->self = newHV ();
250	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);	270	sv_magicext ((SV )obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char )obj, 0);
251		271
252	// borrow the refcnt from the object
253	obj->flags \|= attachable::F_BORROWED;
254	obj->refcnt_dec ();
255
256	// now bless the object _once_	272	// now bless the object _once_
257	return sv_bless (newRV_inc ((SV *)obj->self), stash);	273	return sv_bless (newRV_inc ((SV *)obj->self), stash);
258	}	274	}
259	else	275	else
		276	{
260	return newRV_inc ((SV *)obj->self);	277	SV sv = newRV_inc ((SV )obj->self);
		278
		279	if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
		280	SvAMAGIC_on (sv);
		281
		282	return sv;
		283	}
261	}	284	}
262		285
263	static void	286	static void
264	clearSVptr (SV *sv)	287	clearSVptr (SV *sv)
265	{	288	{
…		…
318	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	341	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
319		342
320	inline SV *to_sv (object & v) { return to_sv (&v); }	343	inline SV *to_sv (object & v) { return to_sv (&v); }
321	inline SV *to_sv (living & v) { return to_sv (&v); }	344	inline SV *to_sv (living & v) { return to_sv (&v); }
322		345
323	//TODO:
324	inline SV to_sv (New_Face v) { return to_sv (v->name); }	346	inline SV to_sv (facetile v) { return to_sv (v->name); }
325	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	347	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
326		348
327	inline SV *to_sv (UUID v)	349	inline SV *to_sv (UUID v)
328	{	350	{
329	char buf[128];	351	char buf[128];
330	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	352	snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
331	return newSVpv (buf, 0);	353	return newSVpv (buf, 0);
332	}	354	}
333		355
334	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	356	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
335	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	357	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
…		…
354	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	376	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
355	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	377	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
356	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }	378	inline void sv_to (SV sv, region &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
357	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	379	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
358		380
359	inline void sv_to (SV sv, New_Face &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO	381	inline void sv_to (SV sv, facetile &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
360	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO	382	inline void sv_to (SV sv, treasurelist &v) { v = find_treasurelist (SvPV_nolen (sv)); }
361		383
362	template<class T>	384	template<class T>
363	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	385	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
364		386
365	template<int N>	387	template<int N>
…		…
501	if (!ext->cb)	523	if (!ext->cb)
502	ext->cb = newAV ();	524	ext->cb = newAV ();
503		525
504	return newRV_inc ((SV *)ext->cb);	526	return newRV_inc ((SV *)ext->cb);
505	}	527	}
506
507	#if 0
508	void attachable::clear ()
509	{
510	if (self)
511	{
512	// disconnect Perl from C, to avoid crashes
513	sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
514
515	// clear the perl hash, might or might not be a good idea
516	hv_clear ((HV )SvRV ((SV )self));
517
518	SvREFCNT_dec (self);
519	self = 0;
520	}
521
522	if (cb)
523	{
524	SvREFCNT_dec (cb);
525	cb = 0;
526	}
527
528	attach = 0;
529	}
530	#endif
531		528
532	/////////////////////////////////////////////////////////////////////////////	529	/////////////////////////////////////////////////////////////////////////////
533		530
534	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)	531	extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
535	{	532	{
…		…
830	}	827	}
831		828
832	/////////////////////////////////////////////////////////////////////////////	829	/////////////////////////////////////////////////////////////////////////////
833		830
834	void	831	void
835	maptile::emergency_save ()	832	cfperl_emergency_save ()
836	{	833	{
837	CALL_BEGIN (0);	834	CALL_BEGIN (0);
838	CALL_CALL ("cf::map::emergency_save", G_VOID);	835	CALL_CALL ("cf::emergency_save", G_VOID);
839	CALL_END;	836	CALL_END;
840	}	837	}
841		838
842	maptile *	839	maptile *
843	maptile::find_sync (const char path, maptile origin)	840	maptile::find_sync (const char path, maptile origin)
844	{	841	{
845	CALL_BEGIN (2);	842	CALL_BEGIN (2);
846	CALL_ARG (path);	843	CALL_ARG (path);
847	CALL_ARG (origin);	844	CALL_ARG (origin);
848	CALL_CALL ("cf::map::find_sync", G_SCALAR);	845	CALL_CALL ("cf::map::find_sync", G_SCALAR);
		846
		847	maptile *retval;
		848
		849	if (count)
		850	sv_to (POPs, retval);
		851	else
		852	retval = 0;
		853
		854	CALL_END;
		855
		856	return retval;
		857	}
		858
		859	maptile *
		860	maptile::find_async (const char path, maptile origin)
		861	{
		862	CALL_BEGIN (2);
		863	CALL_ARG (path);
		864	CALL_ARG (origin);
		865	CALL_CALL ("cf::map::find_async", G_SCALAR);
849		866
850	maptile *retval;	867	maptile *retval;
851		868
852	if (count)	869	if (count)
853	sv_to (POPs, retval);	870	sv_to (POPs, retval);
…		…
906	void	923	void
907	iw::alloc ()	924	iw::alloc ()
908	{	925	{
909	pe = GEventAPI->new_idle (0, 0);	926	pe = GEventAPI->new_idle (0, 0);
910		927
		928	WaREENTRANT_off (pe);
911	pe->base.callback = (void *)iw_dispatch;	929	pe->base.callback = (void *)iw_dispatch;
912	pe->base.ext_data = (void *)this;	930	pe->base.ext_data = (void *)this;
913	}	931	}
914		932
915	static void iow_dispatch (pe_event *ev)	933	static void iow_dispatch (pe_event *ev)
…		…
921	void	939	void
922	iow::alloc ()	940	iow::alloc ()
923	{	941	{
924	pe = GEventAPI->new_io (0, 0);	942	pe = GEventAPI->new_io (0, 0);
925		943
		944	WaREENTRANT_off (pe);
926	pe->base.callback = (void *)iow_dispatch;	945	pe->base.callback = (void *)iow_dispatch;
927	pe->base.ext_data = (void *)this;	946	pe->base.ext_data = (void *)this;
928		947
929	pe->fd = -1;	948	pe->fd = -1;
930	pe->poll = 0;	949	pe->poll = 0;
…		…
1258	const_iv (FLAG_ACTIVATE_ON_RELEASE)	1277	const_iv (FLAG_ACTIVATE_ON_RELEASE)
1259	const_iv (FLAG_IS_WATER)	1278	const_iv (FLAG_IS_WATER)
1260	const_iv (FLAG_CONTENT_ON_GEN)	1279	const_iv (FLAG_CONTENT_ON_GEN)
1261	const_iv (FLAG_IS_A_TEMPLATE)	1280	const_iv (FLAG_IS_A_TEMPLATE)
1262	const_iv (FLAG_IS_BUILDABLE)	1281	const_iv (FLAG_IS_BUILDABLE)
		1282	const_iv (FLAG_DESTROY_ON_DEATH)
		1283	const_iv (FLAG_NO_MAP_SAVE)
1263		1284
1264	const_iv (NDI_BLACK)	1285	const_iv (NDI_BLACK)
1265	const_iv (NDI_WHITE)	1286	const_iv (NDI_WHITE)
1266	const_iv (NDI_NAVY)	1287	const_iv (NDI_NAVY)
1267	const_iv (NDI_RED)	1288	const_iv (NDI_RED)
…		…
1452	const_iv (ATNR_BLIND)	1473	const_iv (ATNR_BLIND)
1453	const_iv (ATNR_INTERNAL)	1474	const_iv (ATNR_INTERNAL)
1454	const_iv (ATNR_LIFE_STEALING)	1475	const_iv (ATNR_LIFE_STEALING)
1455	const_iv (ATNR_DISEASE)	1476	const_iv (ATNR_DISEASE)
1456		1477
1457	const_iv (MAP_FLUSH)
1458	const_iv (MAP_PLAYER_UNIQUE)
1459	const_iv (MAP_BLOCK)
1460	const_iv (MAP_STYLE)
1461	const_iv (MAP_OVERLAY)
1462
1463	const_iv (MAP_IN_MEMORY)	1478	const_iv (MAP_IN_MEMORY)
1464	const_iv (MAP_SWAPPED)	1479	const_iv (MAP_SWAPPED)
1465	const_iv (MAP_LOADING)	1480	const_iv (MAP_LOADING)
1466	const_iv (MAP_SAVING)	1481	const_iv (MAP_SAVING)
1467		1482
…		…
1560	}	1575	}
1561		1576
1562	NV floor (NV x)	1577	NV floor (NV x)
1563		1578
1564	NV ceil (NV x)	1579	NV ceil (NV x)
		1580
		1581	NV rndm (...)
		1582	CODE:
		1583	switch (items)
		1584	{
		1585	case 0: RETVAL = rndm (); break;
		1586	case 1: RETVAL = rndm (SvUV (ST (0))); break;
		1587	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
		1588	default: croak ("cf::rndm requires none, one or two parameters."); break;
		1589	}
		1590	OUTPUT:
		1591	RETVAL
1565		1592
1566	void server_tick ()	1593	void server_tick ()
1567	CODE:	1594	CODE:
1568	runtime = SvNVx (sv_runtime);	1595	runtime = SvNVx (sv_runtime);
1569	server_tick ();	1596	server_tick ();
…		…
1616	}	1643	}
1617	OUTPUT: RETVAL	1644	OUTPUT: RETVAL
1618		1645
1619	void abort ()	1646	void abort ()
1620		1647
		1648	void fork_abort (char *cause = "cf::fork_abort")
		1649
		1650	void cleanup (const char *cause, bool make_core = false)
		1651
1621	void emergency_save ()	1652	void emergency_save ()
1622		1653
1623	void _exit (int status = 0)	1654	void _exit (int status = EXIT_SUCCESS)
		1655
		1656	UV sv_2watcher (SV *w)
		1657	CODE:
		1658	RETVAL = (UV)GEventAPI->sv_2watcher (w);
		1659	OUTPUT:
		1660	RETVAL
1624		1661
1625	#if _POSIX_MEMLOCK	1662	#if _POSIX_MEMLOCK
1626		1663
1627	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1664	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1628		1665
…		…
1683	CODE:	1720	CODE:
1684	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1721	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685	OUTPUT:	1722	OUTPUT:
1686	RETVAL	1723	RETVAL
1687		1724
		1725	int mortals_size ()
		1726	CODE:
		1727	RETVAL = attachable::mortals.size ();
		1728	OUTPUT: RETVAL
		1729
		1730	#object *mortals (U32 index)
		1731	# CODE:
		1732	# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
		1733	# OUTPUT: RETVAL
		1734
1688	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|	1735	INCLUDE: $PERL genacc attachable ../include/cfperl.h \|
1689		1736
1690	MODULE = cf PACKAGE = cf::global	1737	MODULE = cf PACKAGE = cf::global
1691		1738
1692	int invoke (SV *klass, int event, ...)	1739	int invoke (SV *klass, int event, ...)
…		…
1709	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);	1756	RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1710	OUTPUT: RETVAL	1757	OUTPUT: RETVAL
1711		1758
1712	SV registry (object op)	1759	SV registry (object op)
1713		1760
1714	void mortals ()	1761	int objects_size ()
1715	PPCODE:	1762	CODE:
1716	EXTEND (SP, object::mortals.size ());
1717	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1718	PUSHs (to_sv (*i));
1719
1720	object *first ()
1721	CODE:
1722	RETVAL = object::first;	1763	RETVAL = objects.size ();
		1764	OUTPUT: RETVAL
		1765
		1766	object *objects (U32 index)
		1767	CODE:
		1768	RETVAL = index < objects.size () ? objects [index] : 0;
		1769	OUTPUT: RETVAL
		1770
		1771	int actives_size ()
		1772	CODE:
		1773	RETVAL = actives.size ();
		1774	OUTPUT: RETVAL
		1775
		1776	object *actives (U32 index)
		1777	CODE:
		1778	RETVAL = index < actives.size () ? actives [index] : 0;
1723	OUTPUT: RETVAL	1779	OUTPUT: RETVAL
1724		1780
1725	# missing properties	1781	# missing properties
1726		1782
1727	object head (object op)	1783	object head (object op)
1728	PROTOTYPE: $	1784	PROTOTYPE: $
1729	CODE:	1785	CODE:
1730	RETVAL = op->head ? op->head : op;	1786	RETVAL = op->head_ ();
1731	OUTPUT: RETVAL	1787	OUTPUT: RETVAL
1732		1788
1733	int is_head (object *op)	1789	int is_head (object *op)
1734	PROTOTYPE: $	1790	PROTOTYPE: $
1735	CODE:	1791	CODE:
1736	RETVAL = !op->head;	1792	RETVAL = op->head_ () == op;
1737	OUTPUT: RETVAL	1793	OUTPUT: RETVAL
1738		1794
1739	void	1795	void
1740	inv (object *obj)	1796	inv (object *obj)
1741	PROTOTYPE: $	1797	PROTOTYPE: $
…		…
1748		1804
1749	void	1805	void
1750	set_animation (object *op, int idx)	1806	set_animation (object *op, int idx)
1751	CODE:	1807	CODE:
1752	SET_ANIMATION (op, idx);	1808	SET_ANIMATION (op, idx);
		1809
		1810	int
		1811	num_animations (object *op)
		1812	CODE:
		1813	RETVAL = NUM_ANIMATIONS (op);
		1814	OUTPUT: RETVAL
1753		1815
1754	object find_best_object_match (object op, const char *match)	1816	object find_best_object_match (object op, const char *match)
1755		1817
1756	object find_marked_object (object op)	1818	object find_marked_object (object op)
1757		1819
…		…
1832		1894
1833	void drop (object who, object op)	1895	void drop (object who, object op)
1834		1896
1835	void pick_up (object who, object op)	1897	void pick_up (object who, object op)
1836		1898
1837	object cf_object_insert_object (object op, object *container)
1838
1839	object cf_object_insert_in_ob (object ob, object *where)
1840
1841	int cf_object_teleport (object op, maptile map, int x, int y)	1899	int cf_object_teleport (object op, maptile map, int x, int y)
1842		1900
1843	void update_object (object *op, int action)	1901	void update_object (object *op, int action)
1844		1902
1845	object cf_create_object_by_name (const char name)	1903	object cf_create_object_by_name (const char name)
…		…
1963		2021
1964	void esrv_update_item (object op, int what, object item)	2022	void esrv_update_item (object op, int what, object item)
1965	C_ARGS: what, op, item	2023	C_ARGS: what, op, item
1966		2024
1967	void clear_los (object *op)	2025	void clear_los (object *op)
1968
1969	int command_teleport (object op, char params)
1970		2026
1971	int command_summon (object op, char params)	2027	int command_summon (object op, char params)
1972		2028
1973	int command_arrest (object op, char params)	2029	int command_arrest (object op, char params)
1974		2030
…		…
2092	for_all_players (pl)	2148	for_all_players (pl)
2093	if (pl->ob && pl->ob->map == THIS)	2149	if (pl->ob && pl->ob->map == THIS)
2094	PUSHs (sv_2mortal (to_sv (pl->ob)));	2150	PUSHs (sv_2mortal (to_sv (pl->ob)));
2095	}	2151	}
2096		2152
		2153	void
		2154	maptile::set_regiondata (SV data, SV plt)
		2155	CODE:
		2156	{
		2157	if (!SvROK (plt) \|\| SvTYPE (SvRV (plt)) != SVt_PVAV)
		2158	croak ("maptile::set_regiondata needs arrayref as plt arg");
		2159
		2160	AV av = (AV )SvRV (plt);
		2161
		2162	region regionmap = (region )malloc ((av_len (av) + 1) * sizeof (region *));
		2163
		2164	for (int i = av_len (av) + 1; i--; )
		2165	regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
		2166
		2167	THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
		2168	THIS->regionmap = regionmap;
		2169	}
		2170
2097	void play_sound_map (maptile *map, int x, int y, int sound_num)	2171	void play_sound_map (maptile *map, int x, int y, int sound_num)
2098		2172
2099	int out_of_map (maptile *map, int x, int y)	2173	int out_of_map (maptile *map, int x, int y)
2100		2174
2101	void	2175	void
…		…
2117		2191
2118	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)	2192	object* cf_map_present_arch_by_name (maptile map, const char str, int nx, int ny)
2119	C_ARGS: str, map, nx, ny	2193	C_ARGS: str, map, nx, ny
2120		2194
2121	void	2195	void
2122	cf_map_normalise (maptile *map, int x, int y)	2196	get_map_flags (maptile *map, int x, int y)
2123	PPCODE:	2197	PPCODE:
2124	{	2198	{
2125	maptile *nmap = 0;	2199	maptile *nmap = 0;
2126	I16 nx = 0, ny = 0;	2200	I16 nx = 0, ny = 0;
2127	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);	2201	int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
…		…
2182		2256
2183	void fix_walls (maptile *map, int x, int y)	2257	void fix_walls (maptile *map, int x, int y)
2184		2258
2185	void fix_walls_around (maptile *map, int x, int y)	2259	void fix_walls_around (maptile *map, int x, int y)
2186		2260
2187	const char *
2188	region_name (maptile *m)
2189	CODE:
2190	RETVAL = get_name_of_region_for_map (m);
2191	OUTPUT: RETVAL
2192
2193	# worst xs function of my life	2261	# worst xs function of my life
2194	maptile *	2262	bool
2195	_create_random_map (\	2263	_create_random_map (\
2196	char *path,\	2264	maptile *self,\
2197	char *wallstyle,\	2265	char *wallstyle,\
2198	char *wall_name,\	2266	char *wall_name,\
2199	char *floorstyle,\	2267	char *floorstyle,\
2200	char *monsterstyle,\	2268	char *monsterstyle,\
2201	char *treasurestyle,\	2269	char *treasurestyle,\
…		…
2205	char *origin_map,\	2273	char *origin_map,\
2206	char *final_map,\	2274	char *final_map,\
2207	char *exitstyle,\	2275	char *exitstyle,\
2208	char *this_map,\	2276	char *this_map,\
2209	char *exit_on_final_map,\	2277	char *exit_on_final_map,\
2210	int Xsize,\	2278	int xsize,\
2211	int Ysize,\	2279	int ysize,\
2212	int expand2x,\	2280	int expand2x,\
2213	int layoutoptions1,\	2281	int layoutoptions1,\
2214	int layoutoptions2,\	2282	int layoutoptions2,\
2215	int layoutoptions3,\	2283	int layoutoptions3,\
2216	int symmetry,\	2284	int symmetry,\
…		…
2221	int dungeon_depth,\	2289	int dungeon_depth,\
2222	int decoroptions,\	2290	int decoroptions,\
2223	int orientation,\	2291	int orientation,\
2224	int origin_y,\	2292	int origin_y,\
2225	int origin_x,\	2293	int origin_x,\
2226	int random_seed,\	2294	U32 random_seed,\
2227	val64 total_map_hp,\	2295	val64 total_map_hp,\
2228	int map_layout_style,\	2296	int map_layout_style,\
2229	int treasureoptions,\	2297	int treasureoptions,\
2230	int symmetry_used,\	2298	int symmetry_used,\
2231	region *region\	2299	region *region,\
		2300	char *custom\
2232	)	2301	)
2233	CODE:	2302	CODE:
2234	{	2303	{
2235	random_map_params rmp;	2304	random_map_params rmp;
2236		2305
…		…
2246	assign (rmp.exit_on_final_map, exit_on_final_map);	2315	assign (rmp.exit_on_final_map, exit_on_final_map);
2247		2316
2248	rmp.origin_map = origin_map;	2317	rmp.origin_map = origin_map;
2249	rmp.final_map = final_map;	2318	rmp.final_map = final_map;
2250	rmp.this_map = this_map;	2319	rmp.this_map = this_map;
2251	rmp.Xsize = Xsize;	2320	rmp.xsize = xsize;
2252	rmp.Ysize = Ysize;	2321	rmp.ysize = ysize;
2253	rmp.expand2x = expand2x;	2322	rmp.expand2x = expand2x;
2254	rmp.layoutoptions1 = layoutoptions1;	2323	rmp.layoutoptions1 = layoutoptions1;
2255	rmp.layoutoptions2 = layoutoptions2;	2324	rmp.layoutoptions2 = layoutoptions2;
2256	rmp.layoutoptions3 = layoutoptions3;	2325	rmp.layoutoptions3 = layoutoptions3;
2257	rmp.symmetry = symmetry;	2326	rmp.symmetry = symmetry;
…		…
2268	rmp.total_map_hp = total_map_hp;	2337	rmp.total_map_hp = total_map_hp;
2269	rmp.map_layout_style = map_layout_style;	2338	rmp.map_layout_style = map_layout_style;
2270	rmp.treasureoptions = treasureoptions;	2339	rmp.treasureoptions = treasureoptions;
2271	rmp.symmetry_used = symmetry_used;	2340	rmp.symmetry_used = symmetry_used;
2272	rmp.region = region;	2341	rmp.region = region;
		2342	rmp.custom = custom;
2273		2343
2274	RETVAL = generate_random_map (path, &rmp);	2344	RETVAL = self->generate_random_map (&rmp);
2275	}	2345	}
2276	OUTPUT:	2346	OUTPUT:
2277	RETVAL	2347	RETVAL
2278		2348
2279	MODULE = cf PACKAGE = cf::arch	2349	MODULE = cf PACKAGE = cf::arch
…		…
2311	OUTPUT: RETVAL	2381	OUTPUT: RETVAL
2312		2382
2313	region find (char name)	2383	region find (char name)
2314	PROTOTYPE: $	2384	PROTOTYPE: $
2315	CODE:	2385	CODE:
2316	RETVAL = get_region_by_name (name);	2386	RETVAL = region::find (name);
2317	OUTPUT: RETVAL	2387	OUTPUT: RETVAL
2318		2388
2319	INCLUDE: $PERL genacc region ../include/map.h \|	2389	INCLUDE: $PERL genacc region ../include/map.h \|
2320		2390
2321	MODULE = cf PACKAGE = cf::living	2391	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.131 by root, Mon Jan 8 18:18:35 2007 UTC vs. Revision 1.160 by elmex, Wed Jan 31 14:11:02 2007 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.160 by elmex, Wed Jan 31 14:11:02 2007 UTC