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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.276 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.288 by root, Tue May 6 18:47:32 2008 UTC

…		…
43	# include <sys/mman.h>	43	# include <sys/mman.h>
44	#endif	44	#endif
45		45
46	#if HAVE_MALLOC_H	46	#if HAVE_MALLOC_H
47	# include <malloc.h>	47	# include <malloc.h>
		48	#endif
		49
		50	#if !__GLIBC__
		51	# define malloc_trim(pad) -1
48	#endif	52	#endif
49		53
50	#include <EXTERN.h>	54	#include <EXTERN.h>
51	#include <perl.h>	55	#include <perl.h>
52	#include <XSUB.h>	56	#include <XSUB.h>
…		…
973	{	977	{
974	CALL_BEGIN (1);	978	CALL_BEGIN (1);
975	CALL_ARG (name);	979	CALL_ARG (name);
976	CALL_CALL ("cf::player::find", G_SCALAR);	980	CALL_CALL ("cf::player::find", G_SCALAR);
977		981
978	player *retval;	982	player *retval = 0;
979
980	if (count)
981	sv_to (POPs, retval);	983	if (count) sv_to (POPs, retval);
982	else	984
983	retval = 0;	985	CALL_END;
		986
		987	return retval;
		988	}
		989
		990	maptile *
		991	find_style (const char dirname, const char stylename, int difficulty)
		992	{
		993	CALL_BEGIN (3);
		994	CALL_ARG (dirname);
		995	CALL_ARG (stylename);
		996	CALL_ARG (difficulty);
		997	CALL_CALL ("ext::map_random::find_style", G_SCALAR);
		998
		999	maptile *retval = 0;
		1000	if (count) sv_to (POPs, retval);
984		1001
985	CALL_END;	1002	CALL_END;
986		1003
987	return retval;	1004	return retval;
988	}	1005	}
…		…
993	CALL_BEGIN (2);	1010	CALL_BEGIN (2);
994	CALL_ARG (path);	1011	CALL_ARG (path);
995	CALL_ARG (origin);	1012	CALL_ARG (origin);
996	CALL_CALL ("cf::map::find_sync", G_SCALAR);	1013	CALL_CALL ("cf::map::find_sync", G_SCALAR);
997		1014
998	maptile *retval;	1015	maptile *retval = 0;
999
1000	if (count)
1001	sv_to (POPs, retval);	1016	if (count) sv_to (POPs, retval);
1002	else
1003	retval = 0;
1004		1017
1005	CALL_END;	1018	CALL_END;
1006		1019
1007	return retval;	1020	return retval;
1008	}	1021	}
…		…
1014	CALL_ARG (path);	1027	CALL_ARG (path);
1015	CALL_ARG (origin);	1028	CALL_ARG (origin);
1016	CALL_ARG (load);	1029	CALL_ARG (load);
1017	CALL_CALL ("cf::map::find_async", G_SCALAR);	1030	CALL_CALL ("cf::map::find_async", G_SCALAR);
1018		1031
1019	maptile *retval;	1032	maptile *retval = 0;
1020
1021	if (count)
1022	sv_to (POPs, retval);	1033	if (count) sv_to (POPs, retval);
1023	else
1024	retval = 0;
1025		1034
1026	CALL_END;	1035	CALL_END;
1027		1036
1028	return retval;	1037	return retval;
1029	}	1038	}
…		…
1054		1063
1055	CALL_BEGIN (2);	1064	CALL_BEGIN (2);
1056	CALL_ARG (this);	1065	CALL_ARG (this);
1057	CALL_ARG (exit);	1066	CALL_ARG (exit);
1058	CALL_CALL ("cf::object::player::enter_exit", G_VOID);	1067	CALL_CALL ("cf::object::player::enter_exit", G_VOID);
		1068	CALL_END;
		1069	}
		1070
		1071	void
		1072	object::player_goto (const char *path, int x, int y)
		1073	{
		1074	if (type != PLAYER)
		1075	return;
		1076
		1077	CALL_BEGIN (4);
		1078	CALL_ARG (this);
		1079	CALL_ARG (path);
		1080	CALL_ARG (x);
		1081	CALL_ARG (y);
		1082	CALL_CALL ("cf::object::player::goto", G_VOID);
1059	CALL_END;	1083	CALL_END;
1060	}	1084	}
1061		1085
1062	const char *	1086	const char *
1063	object::ref () const	1087	object::ref () const
…		…
1428		1452
1429	const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)	1453	const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1430	const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)	1454	const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1431		1455
1432	const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)	1456	const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1433	const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV)	1457	const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1434	const_iv (GT_MINIMAL)
1435		1458
1436	const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)	1459	const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1437	const_iv (FT_RSRC) const_iv (FT_NUM)	1460	const_iv (FT_RSRC) const_iv (FT_NUM)
1438	};	1461	};
1439		1462
…		…
1570	NV floor (NV x)	1593	NV floor (NV x)
1571		1594
1572	NV ceil (NV x)	1595	NV ceil (NV x)
1573		1596
1574	NV rndm (...)	1597	NV rndm (...)
		1598	ALIAS:
		1599	rmg_rndm = 1
1575	CODE:	1600	CODE:
		1601	{
		1602	rand_gen &gen = ix ? rmg_rndm : rndm;
1576	switch (items)	1603	switch (items)
1577	{	1604	{
1578	case 0: RETVAL = rndm (); break;	1605	case 0: RETVAL = gen (); break;
1579	case 1: RETVAL = rndm (SvUV (ST (0))); break;	1606	case 1: RETVAL = gen (SvUV (ST (0))); break;
1580	case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;	1607	case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1581	default: croak ("cf::rndm requires none, one or two parameters."); break;	1608	default: croak ("cf::rndm requires none, one or two parameters."); break;
1582	}	1609	}
		1610	}
1583	OUTPUT:	1611	OUTPUT:
1584	RETVAL	1612	RETVAL
1585		1613
1586	NV clamp (NV value, NV min_value, NV max_value)	1614	NV clamp (NV value, NV min_value, NV max_value)
1587	CODE:	1615	CODE:
…		…
1612	octet_string path_combine (octet_string base, octet_string path)	1640	octet_string path_combine (octet_string base, octet_string path)
1613	PROTOTYPE: $$	1641	PROTOTYPE: $$
1614		1642
1615	octet_string path_combine_and_normalize (octet_string base, octet_string path)	1643	octet_string path_combine_and_normalize (octet_string base, octet_string path)
1616	PROTOTYPE: $$	1644	PROTOTYPE: $$
1617
1618	void
1619	mallinfo ()
1620	PPCODE:
1621	{
1622	#if __GLIBC__
1623	struct mallinfo mai = mallinfo ();
1624	EXTEND (SP, 10*2);
1625	PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1626	PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1627	PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1628	PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1629	PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1630	PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1631	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1632	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1633	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1634	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1635	#endif
1636	EXTEND (SP, 2*2);
1637	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1638	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1639	}
1640		1645
1641	void	1646	void
1642	sub_generation_inc ()	1647	sub_generation_inc ()
1643	CODE:	1648	CODE:
1644	PL_sub_generation++;	1649	PL_sub_generation++;
…		…
1681		1686
1682	#if _POSIX_MEMLOCK	1687	#if _POSIX_MEMLOCK
1683		1688
1684	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1689	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1685	INIT:	1690	INIT:
		1691	#if __GLIBC__
1686	mallopt (M_PERTURB, 0xaa); // bug-workaround for linux glibc+mlockall+calloc	1692	mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
		1693	#endif
1687		1694
1688	int munlockall ()	1695	int munlockall ()
1689		1696
1690	#endif	1697	#endif
		1698
		1699	int
		1700	malloc_trim (IV pad = 0)
		1701
		1702	void
		1703	mallinfo ()
		1704	PPCODE:
		1705	{
		1706	#if __GLIBC__
		1707	struct mallinfo mai = mallinfo ();
		1708	EXTEND (SP, 10*2);
		1709	PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
		1710	PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
		1711	PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
		1712	PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
		1713	PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
		1714	PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
		1715	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
		1716	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
		1717	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
		1718	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
		1719	#endif
		1720	EXTEND (SP, 2*2);
		1721	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
		1722	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
		1723	PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
		1724	}
1691		1725
1692	int find_animation (utf8_string text)	1726	int find_animation (utf8_string text)
1693	PROTOTYPE: $	1727	PROTOTYPE: $
1694		1728
1695	int random_roll (int min, int max, object *op, int goodbad);	1729	int random_roll (int min, int max, object *op, int goodbad);
…		…
1776	EXTEND (SP, NUM_COINS);	1810	EXTEND (SP, NUM_COINS);
1777	for (int i = 0; i < NUM_COINS; ++i)	1811	for (int i = 0; i < NUM_COINS; ++i)
1778	PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));	1812	PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1779		1813
1780	bool	1814	bool
1781	load_resource_file (octet_string filename)	1815	load_resource_file_ (octet_string filename)
		1816
		1817	void
		1818	fix_weight ()
1782		1819
1783	MODULE = cf PACKAGE = cf::attachable	1820	MODULE = cf PACKAGE = cf::attachable
1784		1821
1785	int	1822	int
1786	valid (SV *obj)	1823	valid (SV *obj)
…		…
1850	object *actives (U32 index)	1887	object *actives (U32 index)
1851	CODE:	1888	CODE:
1852	RETVAL = index < actives.size () ? actives [index] : 0;	1889	RETVAL = index < actives.size () ? actives [index] : 0;
1853	OUTPUT: RETVAL	1890	OUTPUT: RETVAL
1854		1891
		1892	int mortals_size ()
		1893	CODE:
		1894	RETVAL = attachable::mortals.size ();
		1895	OUTPUT: RETVAL
		1896
1855	const char *slot_use_name (U32 slot)	1897	const char *slot_use_name (U32 slot)
1856	ALIAS:	1898	ALIAS:
1857	slot_nonuse_name = 1	1899	slot_nonuse_name = 1
1858	CODE:	1900	CODE:
1859	{	1901	{
…		…
1937	void apply_below (object *op)	1979	void apply_below (object *op)
1938	CODE:	1980	CODE:
1939	player_apply_below (op);	1981	player_apply_below (op);
1940		1982
1941	int cast_heal (object op, object caster, object *spell, int dir = 0)	1983	int cast_heal (object op, object caster, object *spell, int dir = 0)
1942
1943	#//TODO
1944	object clone_ (object op, int recursive = 0)
1945	CODE:
1946	if (recursive)
1947	RETVAL = object_create_clone (op);
1948	else
1949	{
1950	RETVAL = object::create ();
1951	op->copy_to (RETVAL);
1952	}
1953	OUTPUT: RETVAL
1954		1984
1955	int pay_item (object op, object buyer)	1985	int pay_item (object op, object buyer)
1956	CODE:	1986	CODE:
1957	RETVAL = pay_for_item (op, buyer);	1987	RETVAL = pay_for_item (op, buyer);
1958	OUTPUT: RETVAL	1988	OUTPUT: RETVAL
…		…
2036	CODE:	2066	CODE:
2037	{	2067	{
2038	RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);	2068	RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2039	}	2069	}
2040		2070
2041	const_utf8_string get_ob_key_value (object *op, utf8_string key)	2071	shstr
		2072	object::kv_get (shstr key)
2042		2073
2043	bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1)	2074	void
		2075	object::kv_del (shstr key)
		2076
		2077	void
		2078	object::kv_set (shstr key, shstr value)
2044		2079
2045	object get_nearest_player (object ob)	2080	object get_nearest_player (object ob)
2046	ALIAS: nearest_player = 0	2081	ALIAS: nearest_player = 0
2047	PREINIT:	2082	PREINIT:
2048	extern object get_nearest_player (object );	2083	extern object get_nearest_player (object );
…		…
2069	const_utf8_string	2104	const_utf8_string
2070	base_name (object *op, int plural = op->nrof > 1)	2105	base_name (object *op, int plural = op->nrof > 1)
2071	CODE:	2106	CODE:
2072	RETVAL = query_base_name (op, plural);	2107	RETVAL = query_base_name (op, plural);
2073	OUTPUT: RETVAL	2108	OUTPUT: RETVAL
2074
2075	object decrease_ob_nr (object op, unsigned long i)
2076		2109
2077	# return the tail of an object, excluding itself	2110	# return the tail of an object, excluding itself
2078	void	2111	void
2079	tail (object *op)	2112	tail (object *op)
2080	PPCODE:	2113	PPCODE:

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.276 by root, Tue Apr 15 14:21:04 2008 UTC vs. Revision 1.288 by root, Tue May 6 18:47:32 2008 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.276 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.288 by root, Tue May 6 18:47:32 2008 UTC