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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.28 by root, Mon Mar 6 22:59:26 2006 UTC vs.
Revision 1.34 by root, Thu Mar 16 23:43:58 2006 UTC

…		…
126	sv = newSV (0);	126	sv = newSV (0);
127	sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);	127	sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
128	return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));	128	return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
129	}	129	}
130		130
		131	static void
		132	SVptr_cache_set (void ptr, SV sv)
		133	{
		134	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
		135	}
		136
131	static SV *	137	static SV *
132	SVptr_cached (void *ptr)	138	SVptr_cache_get (void *ptr)
133	{	139	{
134	SV *he = hv_fetch (obj_cache, (char )&ptr, sizeof (ptr), 0);	140	SV *he = hv_fetch (obj_cache, (char )&ptr, sizeof (ptr), 0);
135		141
136	return he ? *he : 0;	142	return he ? *he : 0;
137	}	143	}
…		…
142	SV *sv;	148	SV *sv;
143		149
144	if (!ptr)	150	if (!ptr)
145	return &PL_sv_undef;	151	return &PL_sv_undef;
146		152
147	sv = SVptr_cached (ptr);	153	sv = SVptr_cache_get (ptr);
148		154
149	if (!sv)	155	if (!sv)
150	{	156	{
151	HV *hv = newHV ();	157	HV *hv = newHV ();
152	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	158	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
153	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	159	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
154	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);	160
		161	SVptr_cache_set (ptr, sv);
155	}	162	}
156		163
157	return newSVsv (sv);	164	return newSVsv (sv);
158	}	165	}
159		166
…		…
442	registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);	449	registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
443	registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);	450	registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);
444	registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);	451	registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);
445	registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);	452	registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);
446	registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);	453	registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);
		454	registerGlobalEvent (NULL, EVENT_MAPCLEAN, PLUGIN_NAME, globalEventListener);
447	registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);	455	registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
448	registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);	456	registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
449	registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);	457	registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
450	registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);	458	registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
451	registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);	459	registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
452	registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);	460	registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);
		461	registerGlobalEvent (NULL, EVENT_PLAYER_LOAD, PLUGIN_NAME, globalEventListener);
		462	registerGlobalEvent (NULL, EVENT_PLAYER_SAVE, PLUGIN_NAME, globalEventListener);
453		463
454	char *argv[] = {	464	char *argv[] = {
455	"",	465	"",
456	"-e"	466	"-e"
457	"BEGIN {"	467	"BEGIN {"
…		…
503	{	513	{
504	case EVENT_CRASH:	514	case EVENT_CRASH:
505	printf ("Unimplemented for now\n");	515	printf ("Unimplemented for now\n");
506	break;	516	break;
507		517
		518	case EVENT_PLAYER_LOAD:
		519	case EVENT_PLAYER_SAVE:
		520	context.who = va_arg (args, object *);
		521	buf = va_arg (args, char *);
		522	if (buf != 0)
		523	strncpy (context.message, buf, sizeof (context.message));
		524	break;
		525
508	case EVENT_MAPLOAD:	526	case EVENT_MAPLOAD:
509	case EVENT_MAPOUT:	527	case EVENT_MAPOUT:
510	case EVENT_MAPIN:	528	case EVENT_MAPIN:
		529	case EVENT_MAPCLEAN:
511	context.map = va_arg (args, mapstruct *);	530	context.map = va_arg (args, mapstruct *);
512	break;	531	break;
513		532
514	case EVENT_MAPENTER:	533	case EVENT_MAPENTER:
515	case EVENT_MAPLEAVE:	534	case EVENT_MAPLEAVE:
…		…
644	const_iv (llevInfo)	663	const_iv (llevInfo)
645	const_iv (llevDebug)	664	const_iv (llevDebug)
646	const_iv (llevMonster)	665	const_iv (llevMonster)
647		666
648	const_iv (PLAYER)	667	const_iv (PLAYER)
		668	const_iv (TRANSPORT)
649	const_iv (ROD)	669	const_iv (ROD)
650	const_iv (TREASURE)	670	const_iv (TREASURE)
651	const_iv (POTION)	671	const_iv (POTION)
652	const_iv (FOOD)	672	const_iv (FOOD)
653	const_iv (POISON)	673	const_iv (POISON)
…		…
658	const_iv (BOW)	678	const_iv (BOW)
659	const_iv (WEAPON)	679	const_iv (WEAPON)
660	const_iv (ARMOUR)	680	const_iv (ARMOUR)
661	const_iv (PEDESTAL)	681	const_iv (PEDESTAL)
662	const_iv (ALTAR)	682	const_iv (ALTAR)
663	const_iv (CONFUSION)
664	const_iv (LOCKED_DOOR)	683	const_iv (LOCKED_DOOR)
665	const_iv (SPECIAL_KEY)	684	const_iv (SPECIAL_KEY)
666	const_iv (MAP)	685	const_iv (MAP)
667	const_iv (DOOR)	686	const_iv (DOOR)
668	const_iv (KEY)	687	const_iv (KEY)
…		…
769	const_iv (ITEM_TRANSFORMER)	788	const_iv (ITEM_TRANSFORMER)
770	const_iv (QUEST)	789	const_iv (QUEST)
771		790
772	const_iv (ST_BD_BUILD)	791	const_iv (ST_BD_BUILD)
773	const_iv (ST_BD_REMOVE)	792	const_iv (ST_BD_REMOVE)
		793
774	const_iv (ST_MAT_FLOOR)	794	const_iv (ST_MAT_FLOOR)
775	const_iv (ST_MAT_WALL)	795	const_iv (ST_MAT_WALL)
776	const_iv (ST_MAT_ITEM)	796	const_iv (ST_MAT_ITEM)
777		797
778	const_iv (AT_PHYSICAL)	798	const_iv (AT_PHYSICAL)
…		…
976	const_iv (WILL_APPLY_HANDLE)	996	const_iv (WILL_APPLY_HANDLE)
977	const_iv (WILL_APPLY_TREASURE)	997	const_iv (WILL_APPLY_TREASURE)
978	const_iv (WILL_APPLY_EARTHWALL)	998	const_iv (WILL_APPLY_EARTHWALL)
979	const_iv (WILL_APPLY_DOOR)	999	const_iv (WILL_APPLY_DOOR)
980	const_iv (WILL_APPLY_FOOD)	1000	const_iv (WILL_APPLY_FOOD)
		1001
		1002	const_iv (SAVE_MODE)
		1003	const_iv (SAVE_DIR_MODE)
		1004
		1005	const_iv (M_PAPER)
		1006	const_iv (M_IRON)
		1007	const_iv (M_GLASS)
		1008	const_iv (M_LEATHER)
		1009	const_iv (M_WOOD)
		1010	const_iv (M_ORGANIC)
		1011	const_iv (M_STONE)
		1012	const_iv (M_CLOTH)
		1013	const_iv (M_ADAMANT)
		1014	const_iv (M_LIQUID)
		1015	const_iv (M_SOFT_METAL)
		1016	const_iv (M_BONE)
		1017	const_iv (M_ICE)
		1018	const_iv (M_SPECIAL)
981	};	1019	};
982		1020
983	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1021	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
984	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1022	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
985		1023
…		…
1005		1043
1006	const_event (BORN)	1044	const_event (BORN)
1007	const_event (CLOCK)	1045	const_event (CLOCK)
1008	const_event (CRASH)	1046	const_event (CRASH)
1009	const_event (PLAYER_DEATH)	1047	const_event (PLAYER_DEATH)
		1048	const_event (PLAYER_LOAD)
		1049	const_event (PLAYER_SAVE)
1010	const_event (GKILL)	1050	const_event (GKILL)
1011	const_event (LOGIN)	1051	const_event (LOGIN)
1012	const_event (LOGOUT)	1052	const_event (LOGOUT)
1013	const_event (MAPENTER)	1053	const_event (MAPENTER)
1014	const_event (MAPLEAVE)	1054	const_event (MAPLEAVE)
1015	const_event (MAPRESET)	1055	const_event (MAPRESET)
1016	const_event (MAPLOAD)	1056	const_event (MAPLOAD)
1017	const_event (MAPOUT)	1057	const_event (MAPOUT)
1018	const_event (MAPIN)	1058	const_event (MAPIN)
		1059	const_event (MAPCLEAN)
1019	const_event (REMOVE)	1060	const_event (REMOVE)
1020	const_event (SHOUT)	1061	const_event (SHOUT)
1021	const_event (TELL)	1062	const_event (TELL)
1022	const_event (MUZZLE)	1063	const_event (MUZZLE)
1023	const_event (KICK)	1064	const_event (KICK)
…		…
1250	attacktype = 0	1291	attacktype = 0
1251	CODE:	1292	CODE:
1252	RETVAL = obj->attacktype;	1293	RETVAL = obj->attacktype;
1253	OUTPUT: RETVAL	1294	OUTPUT: RETVAL
1254		1295
		1296	# missing in plug-in api, of course
1255	void	1297	void
1256	set_food (object *obj, int food)	1298	set_food (object *obj, int food)
1257	CODE:	1299	CODE:
1258	obj->stats.food = food;	1300	obj->stats.food = food;
1259		1301
…		…
1408	base_name (object *ob, int plural)	1450	base_name (object *ob, int plural)
1409	CODE:	1451	CODE:
1410	RETVAL = cf_query_base_name (ob, plural);	1452	RETVAL = cf_query_base_name (ob, plural);
1411	OUTPUT: RETVAL	1453	OUTPUT: RETVAL
1412		1454
		1455	living *
		1456	stats (object *ob)
		1457	CODE:
		1458	RETVAL = &ob->stats;
		1459	OUTPUT: RETVAL
		1460
1413		1461
1414	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_	1462	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1415		1463
1416	player player (object op)	1464	player player (object op)
1417	CODE:	1465	CODE:
…		…
1465		1513
1466	player next (player pl)	1514	player next (player pl)
1467	CODE:	1515	CODE:
1468	RETVAL = pl->next;	1516	RETVAL = pl->next;
1469	OUTPUT: RETVAL	1517	OUTPUT: RETVAL
		1518
		1519	void get_savebed (player *pl)
		1520	ALIAS:
		1521	savebed = 0
		1522	PPCODE:
		1523	EXTEND (SP, 3);
		1524	PUSHs (sv_2mortal (newSVpv (pl->savebed_map, 0)));
		1525	PUSHs (sv_2mortal (newSViv (pl->bed_x)));
		1526	PUSHs (sv_2mortal (newSViv (pl->bed_y)));
		1527
		1528	void set_savebed (player pl, char map_path, int x, int y)
		1529	CODE:
		1530	strcpy (pl->savebed_map, map_path);
		1531	pl->bed_x = x;
		1532	pl->bed_y = y;
1470		1533
1471	void	1534	void
1472	list ()	1535	list ()
1473	PPCODE:	1536	PPCODE:
1474	{	1537	{
1475	player *pl;	1538	player *pl;
1476	for (pl = first_player; pl; pl = pl->next)	1539	for (pl = first_player; pl; pl = pl->next)
1477	XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));	1540	XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
1478	}	1541	}
		1542
		1543	living *
		1544	orig_stats (player *pl)
		1545	CODE:
		1546	RETVAL = &pl->orig_stats;
		1547	OUTPUT: RETVAL
		1548
		1549	living *
		1550	last_stats (player *pl)
		1551	CODE:
		1552	RETVAL = &pl->last_stats;
		1553	OUTPUT: RETVAL
1479		1554
1480		1555
1481	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_	1556	MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
1482		1557
1483	SV *	1558	SV *
…		…
1564	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	1639	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1565	}	1640	}
1566	OUTPUT:	1641	OUTPUT:
1567	RETVAL	1642	RETVAL
1568		1643
		1644	# "serialise" map perl data into a ref
1569	void	1645	void
1570	_get_obs (mapstruct *map)	1646	_get_obs (mapstruct *map)
1571	PPCODE:	1647	PPCODE:
1572	{	1648	{
1573	object *o;	1649	object *o;
…		…
1580	{	1656	{
1581	AV *av = newAV ();	1657	AV *av = newAV ();
1582		1658
1583	for (o = GET_MAP_OB (map, x, y); o; o = o->above)	1659	for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1584	{	1660	{
1585	SV *sv = SVptr_cached (o);	1661	SV *sv = SVptr_cache_get (o);
1586		1662
1587	if (sv && HvFILL (SvRV (sv)))	1663	if (sv && HvFILL (SvRV (sv)))
1588	{	1664	{
1589	nonnull = 1;	1665	nonnull = 1;
1590	sv = newSVsv (sv);	1666	sv = newSVsv (sv);
…		…
1602	XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));	1678	XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
1603	else	1679	else
1604	SvREFCNT_dec (obs);	1680	SvREFCNT_dec (obs);
1605	}	1681	}
1606		1682
		1683	# "deserialise" perl map data into the map
		1684	void
		1685	_set_obs (mapstruct map, SV sv)
		1686	CODE:
		1687	{
		1688	object *o;
		1689	AV *av;
		1690	int x, y;
		1691	AV obs = (AV )SvRV (sv);
		1692
		1693	for (y = 0; y < MAP_HEIGHT (map); y++)
		1694	for (x = 0; x < MAP_WIDTH (map); x++)
		1695	{
		1696	sv = av_fetch (obs, x + y MAP_HEIGHT (map), 1);
		1697
		1698	if (!SvROK (sv))
		1699	continue;
		1700
		1701	av = (AV *)SvRV (sv);
		1702
		1703	for (o = GET_MAP_OB (map, x, y); o; o = o->above)
		1704	{
		1705	sv = av_shift (av);
		1706
		1707	if (SvROK (sv))
		1708	{
		1709	sv_magic ((SV )SvRV (sv), 0, PERL_MAGIC_ext, (char )o, 0);
		1710	SVptr_cache_set (o, sv);
		1711	}
		1712	}
		1713	}
		1714	}
		1715
1607	MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_	1716	MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1608		1717
1609	archetype *cf_archetype_get_first()	1718	archetype *cf_archetype_get_first()
1610	PROTOTYPE:	1719	PROTOTYPE:
1611	ALIAS: first = 0	1720	ALIAS: first = 0
…		…
1663		1772
1664	const char cf_region_get_message (region reg)	1773	const char cf_region_get_message (region reg)
1665	ALIAS: message = 0	1774	ALIAS: message = 0
1666		1775
1667		1776
		1777	MODULE = cf PACKAGE = cf::living PREFIX = cf_living_
		1778
		1779	double
		1780	exp (living *liv, double new_val = 0.)
		1781	PROTOTYPE: $;$
		1782	ALIAS:
		1783	Str = 1
		1784	Dex = 2
		1785	Con = 3
		1786	Wis = 4
		1787	Cha = 5
		1788	Int = 6
		1789	Pow = 7
		1790	wc = 8
		1791	ac = 9
		1792	hp = 10
		1793	maxhp = 11
		1794	sp = 12
		1795	maxsp = 13
		1796	grace = 14
		1797	maxgrace = 15
		1798	food = 16
		1799	dam = 17
		1800	luck = 18
		1801	CODE:
		1802	# define LIVING_ACC(acc,idx) case idx: RETVAL = liv->acc; if (ix > 1) liv->acc = new_val; break
		1803	switch (ix)
		1804	{
		1805	LIVING_ACC (exp , 0);
		1806	LIVING_ACC (Str , 1);
		1807	LIVING_ACC (Dex , 2);
		1808	LIVING_ACC (Con , 3);
		1809	LIVING_ACC (Wis , 4);
		1810	LIVING_ACC (Cha , 5);
		1811	LIVING_ACC (Int , 6);
		1812	LIVING_ACC (Pow , 7);
		1813	LIVING_ACC (wc , 8);
		1814	LIVING_ACC (ac , 9);
		1815	LIVING_ACC (hp , 10);
		1816	LIVING_ACC (maxhp , 11);
		1817	LIVING_ACC (sp , 12);
		1818	LIVING_ACC (maxsp , 13);
		1819	LIVING_ACC (grace , 14);
		1820	LIVING_ACC (maxgrace, 15);
		1821	LIVING_ACC (food , 16);
		1822	LIVING_ACC (dam , 17);
		1823	LIVING_ACC (luck , 18);
		1824	}
		1825	# undef LIVING_ACC
		1826	OUTPUT:
		1827	RETVAL
		1828

Diff Legend

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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents): Revision 1.28 by root, Mon Mar 6 22:59:26 2006 UTC vs. Revision 1.34 by root, Thu Mar 16 23:43:58 2006 UTC

Diff Legend

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.28 by root, Mon Mar 6 22:59:26 2006 UTC vs.
Revision 1.34 by root, Thu Mar 16 23:43:58 2006 UTC