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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.27 by root, Sun Mar 5 18:48:50 2006 UTC vs.
Revision 1.33 by root, Thu Mar 16 21:08:20 2006 UTC

…		…
58	static f_plug_api systemDirectory;	58	static f_plug_api systemDirectory;
59	static f_plug_api object_set_property;	59	static f_plug_api object_set_property;
60	static f_plug_api map_get_map;	60	static f_plug_api map_get_map;
61	static f_plug_api object_insert;	61	static f_plug_api object_insert;
62		62
		63	/* this is a stupid way to do things, and awkward to use for plug-in authors */
63	typedef struct	64	typedef struct
64	{	65	{
65	object* who;	66	object* who;
66	object* activator;	67	object* activator;
67	object* third;	68	object* third;
		69	mapstruct* map;
68	char message[1024];	70	char message[1024];
69	int fix; // seems to be python-only, and should not be part of the API	71	int fix; // seems to be python-only, and should not be part of the API
70	int event_code;	72	int event_code;
71	char extension[1024]; // name field, should invoke specific perl extension	73	char extension[1024]; // name field, should invoke specific perl extension
72	char options[1024]; // slaying field of event_connectors	74	char options[1024]; // slaying field of event_connectors
…		…
124	sv = newSV (0);	126	sv = newSV (0);
125	sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);	127	sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
126	return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));	128	return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
127	}	129	}
128		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
		137	static SV *
		138	SVptr_cache_get (void *ptr)
		139	{
		140	SV *he = hv_fetch (obj_cache, (char )&ptr, sizeof (ptr), 0);
		141
		142	return he ? *he : 0;
		143	}
		144
129	static SV *	145	static SV *
130	newSVptr_cached (void ptr, const char klass)	146	newSVptr_cached (void ptr, const char klass)
131	{	147	{
132	SV sv, *he;	148	SV *sv;
133		149
134	if (!ptr)	150	if (!ptr)
135	return &PL_sv_undef;	151	return &PL_sv_undef;
136		152
137	he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);	153	sv = SVptr_cache_get (ptr);
138		154
139	if (he)	155	if (!sv)
140	sv = *he;
141	else
142	{	156	{
143	HV *hv = newHV ();	157	HV *hv = newHV ();
144	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	158	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
145	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	159	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
146	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);	160
		161	SVptr_cache_set (ptr, sv);
147	}	162	}
148		163
149	return newSVsv (sv);	164	return newSVsv (sv);
150	}	165	}
151		166
…		…
285	HV *hv = newHV ();	300	HV *hv = newHV ();
286	#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)	301	#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
287	hv_context (CFAPI_POBJECT, ,who);	302	hv_context (CFAPI_POBJECT, ,who);
288	hv_context (CFAPI_POBJECT, ,activator);	303	hv_context (CFAPI_POBJECT, ,activator);
289	hv_context (CFAPI_POBJECT, ,third);	304	hv_context (CFAPI_POBJECT, ,third);
		305	hv_context (CFAPI_PMAP, ,map);
290	hv_context (CFAPI_STRING , ,message);	306	hv_context (CFAPI_STRING , ,message);
291	hv_context (CFAPI_INT ,&,fix);	307	hv_context (CFAPI_INT ,&,fix);
292	hv_context (CFAPI_INT ,&,event_code);	308	hv_context (CFAPI_INT ,&,event_code);
293	hv_context (CFAPI_STRING , ,options);	309	hv_context (CFAPI_STRING , ,options);
294	hv_context (CFAPI_STRING , ,extension);	310	hv_context (CFAPI_STRING , ,extension);
…		…
430	registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);	446	registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
431	registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);	447	registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
432	registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);	448	registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
433	registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);	449	registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
434	registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);	450	registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);
		451	registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);
		452	registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);
		453	registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);
		454	registerGlobalEvent (NULL, EVENT_MAPCLEAN, PLUGIN_NAME, globalEventListener);
435	registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);	455	registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
436	registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);	456	registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
437	registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);	457	registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
438	registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);	458	registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
439	registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);	459	registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
440	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);
441		463
442	char *argv[] = {	464	char *argv[] = {
443	"",	465	"",
444	"-e"	466	"-e"
445	"BEGIN {"	467	"BEGIN {"
…		…
491	{	513	{
492	case EVENT_CRASH:	514	case EVENT_CRASH:
493	printf ("Unimplemented for now\n");	515	printf ("Unimplemented for now\n");
494	break;	516	break;
495		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
		526	case EVENT_MAPLOAD:
		527	case EVENT_MAPOUT:
		528	case EVENT_MAPIN:
		529	case EVENT_MAPCLEAN:
		530	context.map = va_arg (args, mapstruct *);
		531	break;
		532
496	case EVENT_MAPENTER:	533	case EVENT_MAPENTER:
497	case EVENT_MAPLEAVE:	534	case EVENT_MAPLEAVE:
498	case EVENT_FREE_OB:	535	case EVENT_FREE_OB:
499	case EVENT_BORN:	536	case EVENT_BORN:
500	case EVENT_REMOVE:	537	case EVENT_REMOVE:
…		…
534		571
535	case EVENT_TELL:	572	case EVENT_TELL:
536	break;	573	break;
537		574
538	case EVENT_MAPRESET:	575	case EVENT_MAPRESET:
		576	/* stupid, should be the map itself, not "message"??? */
539	buf = va_arg (args, char *);	577	buf = va_arg (args, char *);
540	if (buf != 0)	578	if (buf != 0)
541	strncpy (context.message, buf, sizeof (context.message));	579	strncpy (context.message, buf, sizeof (context.message));
542	break;	580	break;
543	}	581	}
…		…
625	const_iv (llevInfo)	663	const_iv (llevInfo)
626	const_iv (llevDebug)	664	const_iv (llevDebug)
627	const_iv (llevMonster)	665	const_iv (llevMonster)
628		666
629	const_iv (PLAYER)	667	const_iv (PLAYER)
		668	const_iv (TRANSPORT)
630	const_iv (ROD)	669	const_iv (ROD)
631	const_iv (TREASURE)	670	const_iv (TREASURE)
632	const_iv (POTION)	671	const_iv (POTION)
633	const_iv (FOOD)	672	const_iv (FOOD)
634	const_iv (POISON)	673	const_iv (POISON)
…		…
639	const_iv (BOW)	678	const_iv (BOW)
640	const_iv (WEAPON)	679	const_iv (WEAPON)
641	const_iv (ARMOUR)	680	const_iv (ARMOUR)
642	const_iv (PEDESTAL)	681	const_iv (PEDESTAL)
643	const_iv (ALTAR)	682	const_iv (ALTAR)
644	const_iv (CONFUSION)
645	const_iv (LOCKED_DOOR)	683	const_iv (LOCKED_DOOR)
646	const_iv (SPECIAL_KEY)	684	const_iv (SPECIAL_KEY)
647	const_iv (MAP)	685	const_iv (MAP)
648	const_iv (DOOR)	686	const_iv (DOOR)
649	const_iv (KEY)	687	const_iv (KEY)
…		…
750	const_iv (ITEM_TRANSFORMER)	788	const_iv (ITEM_TRANSFORMER)
751	const_iv (QUEST)	789	const_iv (QUEST)
752		790
753	const_iv (ST_BD_BUILD)	791	const_iv (ST_BD_BUILD)
754	const_iv (ST_BD_REMOVE)	792	const_iv (ST_BD_REMOVE)
		793
755	const_iv (ST_MAT_FLOOR)	794	const_iv (ST_MAT_FLOOR)
756	const_iv (ST_MAT_WALL)	795	const_iv (ST_MAT_WALL)
757	const_iv (ST_MAT_ITEM)	796	const_iv (ST_MAT_ITEM)
758		797
759	const_iv (AT_PHYSICAL)	798	const_iv (AT_PHYSICAL)
…		…
957	const_iv (WILL_APPLY_HANDLE)	996	const_iv (WILL_APPLY_HANDLE)
958	const_iv (WILL_APPLY_TREASURE)	997	const_iv (WILL_APPLY_TREASURE)
959	const_iv (WILL_APPLY_EARTHWALL)	998	const_iv (WILL_APPLY_EARTHWALL)
960	const_iv (WILL_APPLY_DOOR)	999	const_iv (WILL_APPLY_DOOR)
961	const_iv (WILL_APPLY_FOOD)	1000	const_iv (WILL_APPLY_FOOD)
		1001
		1002	const_iv (SAVE_MODE)
		1003	const_iv (SAVE_DIR_MODE)
962	};	1004	};
963		1005
964	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1006	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
965	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1007	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
966		1008
…		…
986		1028
987	const_event (BORN)	1029	const_event (BORN)
988	const_event (CLOCK)	1030	const_event (CLOCK)
989	const_event (CRASH)	1031	const_event (CRASH)
990	const_event (PLAYER_DEATH)	1032	const_event (PLAYER_DEATH)
		1033	const_event (PLAYER_LOAD)
		1034	const_event (PLAYER_SAVE)
991	const_event (GKILL)	1035	const_event (GKILL)
992	const_event (LOGIN)	1036	const_event (LOGIN)
993	const_event (LOGOUT)	1037	const_event (LOGOUT)
994	const_event (MAPENTER)	1038	const_event (MAPENTER)
995	const_event (MAPLEAVE)	1039	const_event (MAPLEAVE)
996	const_event (MAPRESET)	1040	const_event (MAPRESET)
		1041	const_event (MAPLOAD)
		1042	const_event (MAPOUT)
		1043	const_event (MAPIN)
		1044	const_event (MAPCLEAN)
997	const_event (REMOVE)	1045	const_event (REMOVE)
998	const_event (SHOUT)	1046	const_event (SHOUT)
999	const_event (TELL)	1047	const_event (TELL)
1000	const_event (MUZZLE)	1048	const_event (MUZZLE)
1001	const_event (KICK)	1049	const_event (KICK)
…		…
1509	INIT:	1557	INIT:
1510	if (x >= MAP_WIDTH (obj) \|\| y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;	1558	if (x >= MAP_WIDTH (obj) \|\| y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1511	PPCODE:	1559	PPCODE:
1512	{	1560	{
1513	object *o;	1561	object *o;
		1562
1514	for (o = GET_MAP_OB (obj, x, y); o; o = o->above)	1563	for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1515	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));	1564	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1516	}	1565	}
1517		1566
1518	SV *	1567	SV *
…		…
1541	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	1590	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1542	}	1591	}
1543	OUTPUT:	1592	OUTPUT:
1544	RETVAL	1593	RETVAL
1545		1594
		1595	# "serialise" map perl data into a ref
		1596	void
		1597	_get_obs (mapstruct *map)
		1598	PPCODE:
		1599	{
		1600	object *o;
		1601	int x, y;
		1602	AV *obs = newAV ();
		1603	int nonnull = 0;
		1604
		1605	for (y = 0; y < MAP_HEIGHT (map); y++)
		1606	for (x = 0; x < MAP_WIDTH (map); x++)
		1607	{
		1608	AV *av = newAV ();
		1609
		1610	for (o = GET_MAP_OB (map, x, y); o; o = o->above)
		1611	{
		1612	SV *sv = SVptr_cache_get (o);
		1613
		1614	if (sv && HvFILL (SvRV (sv)))
		1615	{
		1616	nonnull = 1;
		1617	sv = newSVsv (sv);
		1618	}
		1619	else
		1620	sv = &PL_sv_undef;
		1621
		1622	av_push (av, sv);
		1623	}
		1624
		1625	av_store (obs, x + y * MAP_HEIGHT (map), newRV_noinc ((SV *)av));
		1626	}
		1627
		1628	if (nonnull)
		1629	XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
		1630	else
		1631	SvREFCNT_dec (obs);
		1632	}
		1633
		1634	# "deserialise" perl map data into the map
		1635	void
		1636	_set_obs (mapstruct map, SV sv)
		1637	CODE:
		1638	{
		1639	object *o;
		1640	AV *av;
		1641	int x, y;
		1642	AV obs = (AV )SvRV (sv);
		1643
		1644	for (y = 0; y < MAP_HEIGHT (map); y++)
		1645	for (x = 0; x < MAP_WIDTH (map); x++)
		1646	{
		1647	sv = av_fetch (obs, x + y MAP_HEIGHT (map), 1);
		1648
		1649	if (!SvROK (sv))
		1650	continue;
		1651
		1652	av = (AV *)SvRV (sv);
		1653
		1654	for (o = GET_MAP_OB (map, x, y); o; o = o->above)
		1655	{
		1656	sv = av_shift (av);
		1657
		1658	if (SvROK (sv))
		1659	{
		1660	sv_magic ((SV )SvRV (sv), 0, PERL_MAGIC_ext, (char )o, 0);
		1661	SVptr_cache_set (o, sv);
		1662	}
		1663	}
		1664	}
		1665	}
1546		1666
1547	MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_	1667	MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1548		1668
1549	archetype *cf_archetype_get_first()	1669	archetype *cf_archetype_get_first()
1550	PROTOTYPE:	1670	PROTOTYPE:

Diff Legend

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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents): Revision 1.27 by root, Sun Mar 5 18:48:50 2006 UTC vs. Revision 1.33 by root, Thu Mar 16 21:08:20 2006 UTC

Diff Legend

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.27 by root, Sun Mar 5 18:48:50 2006 UTC vs.
Revision 1.33 by root, Thu Mar 16 21:08:20 2006 UTC