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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.37 by root, Fri Mar 17 01:23:48 2006 UTC vs.
Revision 1.44 by root, Fri Mar 31 20:21:53 2006 UTC

…		…
42	#else	42	#else
43	#define MODULEAPI	43	#define MODULEAPI
44	#endif	44	#endif
45		45
46	#include <plugin_common.h>	46	#include <plugin_common.h>
		47	#include <sounds.h>
47		48
48	#include <stdarg.h>	49	#include <stdarg.h>
49		50
50	#include "perlxsi.c"	51	#include "perlxsi.c"
51		52
…		…
64	typedef struct	65	typedef struct
65	{	66	{
66	object* who;	67	object* who;
67	object* activator;	68	object* activator;
68	object* third;	69	object* third;
		70	object* event;
69	mapstruct* map;	71	mapstruct* map;
70	char message[1024];	72	char message[1024];
71	int fix; // seems to be python-only, and should not be part of the API	73	int fix; // seems to be python-only, and should not be part of the API
72	int event_code;	74	int event_code;
73	char extension[1024]; // name field, should invoke specific perl extension	75	char extension[1024]; // name field, should invoke specific perl extension
…		…
75	int returnvalue;	77	int returnvalue;
76	} CFPContext;	78	} CFPContext;
77		79
78	static HV *obj_cache;	80	static HV *obj_cache;
79	static PerlInterpreter *perl;	81	static PerlInterpreter *perl;
		82
		83	#define PUSHcfapi(type,ctype) PUSHs (sv_2mortal (newSVcfapi ((type), va_arg (args, ctype))))
		84	#define PUSH_OB PUSHcfapi(CFAPI_POBJECT, object *)
		85	#define PUSH_PL PUSHcfapi(CFAPI_PPLAYER, player *)
		86	#define PUSH_MAP PUSHcfapi(CFAPI_PMAP, mapstruct *)
		87	#define PUSH_PV PUSHcfapi(CFAPI_STRING, const char *)
		88	#define PUSH_IV PUSHcfapi(CFAPI_INT, int)
80		89
81	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	90	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
82		91
83	// garbage collect some perl objects, if possible	92	// garbage collect some perl objects, if possible
84	// all objects no longer referenced and empty are	93	// all objects no longer referenced and empty are
…		…
216	case CFAPI_INT:	225	case CFAPI_INT:
217	sv = newSViv (va_arg (args, int ));	226	sv = newSViv (va_arg (args, int ));
218	break;	227	break;
219		228
220	case CFAPI_LONG:	229	case CFAPI_LONG:
221	sv = newSViv (va_arg (args, long ));	230	sv = newSVnv ((double)va_arg (args, sint64 )); /* oh, the humanity! */
222	break;	231	break;
223		232
224	case CFAPI_DOUBLE:	233	case CFAPI_DOUBLE:
225	sv = newSViv (va_arg (args, double ));	234	sv = newSViv (va_arg (args, double ));
226	break;	235	break;
…		…
295	ENTER;	304	ENTER;
296	SAVETMPS;	305	SAVETMPS;
297		306
298	PUSHMARK (SP);	307	PUSHMARK (SP);
299		308
		309	EXTEND (SP, 10);
		310
300	HV *hv = newHV ();	311	HV *hv = newHV ();
301	#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)	312	#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
302	hv_context (CFAPI_POBJECT, ,who);	313	hv_context (CFAPI_POBJECT, ,who);
303	hv_context (CFAPI_POBJECT, ,activator);	314	hv_context (CFAPI_POBJECT, ,activator);
304	hv_context (CFAPI_POBJECT, ,third);	315	hv_context (CFAPI_POBJECT, ,third);
		316	hv_context (CFAPI_POBJECT, ,event);
305	hv_context (CFAPI_PMAP, ,map);	317	hv_context (CFAPI_PMAP, ,map);
306	hv_context (CFAPI_STRING , ,message);	318	hv_context (CFAPI_STRING , ,message);
307	hv_context (CFAPI_INT ,&,fix);	319	hv_context (CFAPI_INT ,&,fix);
308	hv_context (CFAPI_INT ,&,event_code);	320	hv_context (CFAPI_INT ,&,event_code);
309	hv_context (CFAPI_STRING , ,options);	321	hv_context (CFAPI_STRING , ,options);
310	hv_context (CFAPI_STRING , ,extension);	322	hv_context (CFAPI_STRING , ,extension);
311		323
312	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	324	PUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
313		325
314	PUTBACK;	326	PUTBACK;
315	int count = call_pv (func, G_SCALAR \| G_EVAL);	327	int count = call_pv (func, G_SCALAR \| G_EVAL);
316	SPAGAIN;	328	SPAGAIN;
317		329
…		…
493		505
494	void *	506	void *
495	globalEventListener (int *type, ...)	507	globalEventListener (int *type, ...)
496	{	508	{
497	va_list args;	509	va_list args;
498	static int rv = 0;	510	static int rv;
499	CFPContext context;	511	int event_code;
500	char *buf;
501	player *pl;
502	object *op;
503		512
504	if (!perl)	513	if (!perl)
505	return;	514	return;
506		515
507	memset (&context, 0, sizeof (context));
508
509	va_start (args, type);	516	va_start (args, type);
510	context.event_code = va_arg (args, int);	517	event_code = va_arg (args, int);
511		518
512	switch (context.event_code)	519	if (event_code == EVENT_FREE_OB)
513	{	520	{
514	case EVENT_CRASH:	521	player *pl;
515	printf ("Unimplemented for now\n");	522	object *op;
516	break;	523	SV *sv;
517		524
518	case EVENT_PLAYER_LOAD:
519	case EVENT_PLAYER_SAVE:
520	context.who = va_arg (args, object *);	525	op = 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
533	case EVENT_MAPENTER:
534	case EVENT_MAPLEAVE:
535	case EVENT_FREE_OB:
536	case EVENT_BORN:
537	case EVENT_REMOVE:
538	context.activator = va_arg (args, object *);
539	break;
540
541	case EVENT_PLAYER_DEATH:
542	context.who = va_arg (args, object *);
543	break;
544
545	case EVENT_GKILL:
546	context.who = va_arg (args, object *);
547	context.activator = va_arg (args, object *);
548	break;
549
550	case EVENT_LOGIN:
551	case EVENT_LOGOUT:
552	pl = va_arg (args, player *);
553	context.activator = pl->ob;
554	buf = va_arg (args, char *);
555	if (buf != 0)
556	strncpy (context.message, buf, sizeof (context.message));
557	break;
558
559	case EVENT_SHOUT:
560	case EVENT_MUZZLE:
561	case EVENT_KICK:
562	context.activator = va_arg (args, object *);
563	buf = va_arg (args, char *);
564	if (buf != 0)
565	strncpy (context.message, buf, sizeof (context.message));
566	break;
567
568	case EVENT_CLOCK:
569	clean_obj_cache ();
570	break;
571
572	case EVENT_TELL:
573	break;
574
575	case EVENT_MAPRESET:
576	/* stupid, should be the map itself, not "message"??? */
577	buf = va_arg (args, char *);
578	if (buf != 0)
579	strncpy (context.message, buf, sizeof (context.message));
580	break;
581	}
582
583	va_end (args);
584
585	if (context.event_code == EVENT_FREE_OB)
586	{
587	SV sv = hv_delete (obj_cache, (char )&context.activator, sizeof (void *), 0);	526	sv = hv_delete (obj_cache, (char )&op, sizeof (void ), 0);
588		527
589	if (sv)	528	if (sv)
590	clearSVptr (sv);	529	clearSVptr (sv);
		530
		531	rv = 0;
591	}	532	}
592	else	533	else
593	inject_event ("cf::inject_global_event", &context);	534	{
594		535	dSP;
595	rv = context.returnvalue;	536
		537	ENTER;
		538	SAVETMPS;
		539
		540	PUSHMARK (SP);
		541
		542	EXTEND (SP, 10);
		543	PUSHs (sv_2mortal (newSViv (event_code)));
		544
		545	switch (event_code)
		546	{
		547	case EVENT_CRASH:
		548	break;
		549
		550	case EVENT_PLAYER_LOAD:
		551	case EVENT_PLAYER_SAVE:
		552	PUSH_OB;
		553	PUSH_PV;
		554	break;
		555
		556	case EVENT_MAPLOAD:
		557	case EVENT_MAPOUT:
		558	case EVENT_MAPIN:
		559	case EVENT_MAPCLEAN:
		560	case EVENT_MAPRESET:
		561	PUSH_MAP;
		562	break;
		563
		564	case EVENT_MAPENTER:
		565	case EVENT_MAPLEAVE:
		566	case EVENT_BORN:
		567	case EVENT_REMOVE:
		568	case EVENT_PLAYER_DEATH:
		569	PUSH_OB;
		570	break;
		571
		572	case EVENT_GKILL:
		573	PUSH_OB;
		574	PUSH_OB;
		575	break;
		576
		577	case EVENT_LOGIN:
		578	case EVENT_LOGOUT:
		579	PUSH_PL;
		580	PUSH_PV;
		581	break;
		582
		583	case EVENT_SHOUT:
		584	case EVENT_MUZZLE:
		585	case EVENT_KICK:
		586	PUSH_OB;
		587	PUSH_PV;
		588	break;
		589
		590	case EVENT_CLOCK:
		591	clean_obj_cache ();
		592	break;
		593
		594	case EVENT_TELL:
		595	break;
		596	}
		597
		598	va_end (args);
		599
		600	PUTBACK;
		601	int count = call_pv ("cf::inject_global_event", G_SCALAR \| G_EVAL);
		602	SPAGAIN;
		603
		604	if (SvTRUE (ERRSV))
		605	LOG (llevError, "event '%d' callback evaluation error: %s", event_code, SvPV_nolen (ERRSV));
		606
		607	rv = count > 0 ? POPi : 0;
		608
		609	PUTBACK;
		610	FREETMPS;
		611	LEAVE;
		612	}
596		613
597	return &rv;	614	return &rv;
598	}	615	}
599		616
600	void *	617	void *
…		…
622	strncpy (context.message, buf, sizeof (context.message));	639	strncpy (context.message, buf, sizeof (context.message));
623		640
624	context.fix = va_arg (args, int);	641	context.fix = va_arg (args, int);
625	strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));	642	strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
626	strncpy (context.options, va_arg (args, char *), sizeof (context.options));	643	strncpy (context.options, va_arg (args, char *), sizeof (context.options));
		644	context.event = va_arg (args, object *);
		645	va_end (args);
		646
627	context.returnvalue = 0;	647	context.returnvalue = 0;
628	va_end (args);
629		648
630	inject_event ("cf::inject_event", &context);	649	inject_event ("cf::inject_event", &context);
631		650
632	rv = context.returnvalue;	651	rv = context.returnvalue;
633	return &rv;	652	return &rv;
…		…
1014	const_iv (M_LIQUID)	1033	const_iv (M_LIQUID)
1015	const_iv (M_SOFT_METAL)	1034	const_iv (M_SOFT_METAL)
1016	const_iv (M_BONE)	1035	const_iv (M_BONE)
1017	const_iv (M_ICE)	1036	const_iv (M_ICE)
1018	const_iv (M_SPECIAL)	1037	const_iv (M_SPECIAL)
		1038
		1039	const_iv (SK_EXP_ADD_SKILL)
		1040	const_iv (SK_EXP_TOTAL)
		1041	const_iv (SK_EXP_NONE)
		1042	const_iv (SK_SUBTRACT_SKILL_EXP)
		1043
		1044	const_iv (SK_LOCKPICKING)
		1045	const_iv (SK_HIDING)
		1046	const_iv (SK_SMITHERY)
		1047	const_iv (SK_BOWYER)
		1048	const_iv (SK_JEWELER)
		1049	const_iv (SK_ALCHEMY)
		1050	const_iv (SK_STEALING)
		1051	const_iv (SK_LITERACY)
		1052	const_iv (SK_BARGAINING)
		1053	const_iv (SK_JUMPING)
		1054	const_iv (SK_DET_MAGIC)
		1055	const_iv (SK_ORATORY)
		1056	const_iv (SK_SINGING)
		1057	const_iv (SK_DET_CURSE)
		1058	const_iv (SK_FIND_TRAPS)
		1059	const_iv (SK_MEDITATION)
		1060	const_iv (SK_PUNCHING)
		1061	const_iv (SK_FLAME_TOUCH)
		1062	const_iv (SK_KARATE)
		1063	const_iv (SK_CLIMBING)
		1064	const_iv (SK_WOODSMAN)
		1065	const_iv (SK_INSCRIPTION)
		1066	const_iv (SK_ONE_HANDED_WEAPON)
		1067	const_iv (SK_MISSILE_WEAPON)
		1068	const_iv (SK_THROWING)
		1069	const_iv (SK_USE_MAGIC_ITEM)
		1070	const_iv (SK_DISARM_TRAPS)
		1071	const_iv (SK_SET_TRAP)
		1072	const_iv (SK_THAUMATURGY)
		1073	const_iv (SK_PRAYING)
		1074	const_iv (SK_CLAWING)
		1075	const_iv (SK_LEVITATION)
		1076	const_iv (SK_SUMMONING)
		1077	const_iv (SK_PYROMANCY)
		1078	const_iv (SK_EVOCATION)
		1079	const_iv (SK_SORCERY)
		1080	const_iv (SK_TWO_HANDED_WEAPON)
		1081
		1082	const_iv (SOUND_NEW_PLAYER)
		1083	const_iv (SOUND_FIRE_ARROW)
		1084	const_iv (SOUND_LEARN_SPELL)
		1085	const_iv (SOUND_FUMBLE_SPELL)
		1086	const_iv (SOUND_WAND_POOF)
		1087	const_iv (SOUND_OPEN_DOOR)
		1088	const_iv (SOUND_PUSH_PLAYER)
		1089	const_iv (SOUND_PLAYER_HITS1)
		1090	const_iv (SOUND_PLAYER_HITS2)
		1091	const_iv (SOUND_PLAYER_HITS3)
		1092	const_iv (SOUND_PLAYER_HITS4)
		1093	const_iv (SOUND_PLAYER_IS_HIT1)
		1094	const_iv (SOUND_PLAYER_IS_HIT2)
		1095	const_iv (SOUND_PLAYER_IS_HIT3)
		1096	const_iv (SOUND_PLAYER_KILLS)
		1097	const_iv (SOUND_PET_IS_KILLED)
		1098	const_iv (SOUND_PLAYER_DIES)
		1099	const_iv (SOUND_OB_EVAPORATE)
		1100	const_iv (SOUND_OB_EXPLODE)
		1101	const_iv (SOUND_CLOCK)
		1102	const_iv (SOUND_TURN_HANDLE)
		1103	const_iv (SOUND_FALL_HOLE)
		1104	const_iv (SOUND_DRINK_POISON)
		1105	const_iv (SOUND_CAST_SPELL_0)
1019	};	1106	};
1020		1107
1021	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1108	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1022	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1109	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1023		1110
…		…
1167	prop (CFAPI_INT, OBJECT_PROP_ANIM_SPEED)	1254	prop (CFAPI_INT, OBJECT_PROP_ANIM_SPEED)
1168	prop (CFAPI_INT, OBJECT_PROP_FRIENDLY)	1255	prop (CFAPI_INT, OBJECT_PROP_FRIENDLY)
1169	prop (CFAPI_STRING, OBJECT_PROP_SHORT_NAME)	1256	prop (CFAPI_STRING, OBJECT_PROP_SHORT_NAME)
1170	prop (CFAPI_INT, OBJECT_PROP_MAGICAL)	1257	prop (CFAPI_INT, OBJECT_PROP_MAGICAL)
1171	prop (CFAPI_INT, OBJECT_PROP_LUCK)	1258	prop (CFAPI_INT, OBJECT_PROP_LUCK)
1172	prop (CFAPI_LONG, OBJECT_PROP_EXP)
1173	prop (CFAPI_POBJECT, OBJECT_PROP_OWNER)	1259	prop (CFAPI_POBJECT, OBJECT_PROP_OWNER)
1174	prop (CFAPI_POBJECT, OBJECT_PROP_PRESENT)	1260	prop (CFAPI_POBJECT, OBJECT_PROP_PRESENT)
1175	prop (CFAPI_INT, OBJECT_PROP_CHEATER)	1261	prop (CFAPI_INT, OBJECT_PROP_CHEATER)
1176	prop (CFAPI_INT, OBJECT_PROP_MERGEABLE)	1262	prop (CFAPI_INT, OBJECT_PROP_MERGEABLE)
1177	prop (CFAPI_INT, OBJECT_PROP_PICKABLE)	1263	prop (CFAPI_INT, OBJECT_PROP_PICKABLE)
…		…
1395		1481
1396	void cf_object_set_key (object op, char keyname, char *value)	1482	void cf_object_set_key (object op, char keyname, char *value)
1397		1483
1398	object cf_create_object_by_name (const char name)	1484	object cf_create_object_by_name (const char name)
1399		1485
		1486	void change_exp (object op, double exp, const char skill_name = 0, int flag = 0)
		1487
		1488	void player_lvl_adj (object who, object skill = 0)
		1489
		1490
1400	MODULE = cf PACKAGE = cf::object PREFIX = cf_	1491	MODULE = cf PACKAGE = cf::object PREFIX = cf_
1401		1492
1402	void cf_fix_object (object *pl)	1493	void cf_fix_object (object *pl)
1403	ALIAS: fix = 0	1494	ALIAS: fix = 0
1404		1495
…		…
1419	CODE:	1510	CODE:
1420	{	1511	{
1421	int unused_type;	1512	int unused_type;
1422	RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);	1513	RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1423	}	1514	}
		1515
		1516	const char get_ob_key_value (object op, const char *key)
		1517
		1518	bool set_ob_key_value (object op, const char key, const char *value = 0, int add_key = 1)
1424		1519
1425	object get_nearest_player (object ob)	1520	object get_nearest_player (object ob)
1426	ALIAS: nearest_player = 0	1521	ALIAS: nearest_player = 0
1427	PREINIT:	1522	PREINIT:
1428	extern object get_nearest_player (object );	1523	extern object get_nearest_player (object );
…		…
1486	partylist cf_player_get_party (object op)	1581	partylist cf_player_get_party (object op)
1487	ALIAS: party = 0	1582	ALIAS: party = 0
1488		1583
1489	void cf_player_set_party (object op, partylist party)	1584	void cf_player_set_party (object op, partylist party)
1490		1585
		1586	void change_skill (object op, double exp, char skill_name = 0, int flag = 0)
1491		1587
1492	MODULE = cf PACKAGE = cf::object::map PREFIX = cf_	1588	MODULE = cf PACKAGE = cf::object::map PREFIX = cf_
1493		1589
1494	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_	1590	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
1495		1591
…		…
1497	PROTOTYPE: $	1593	PROTOTYPE: $
1498		1594
1499	void cf_player_move (player *pl, int dir)	1595	void cf_player_move (player *pl, int dir)
1500		1596
1501	void MapNewmapCmd (player *pl)	1597	void MapNewmapCmd (player *pl)
		1598
		1599	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1502		1600
1503	# nonstandard	1601	# nonstandard
1504	object ob (player pl)	1602	object ob (player pl)
1505	CODE:	1603	CODE:
1506	RETVAL = pl->ob;	1604	RETVAL = pl->ob;
…		…
1538	player *pl;	1636	player *pl;
1539	for (pl = first_player; pl; pl = pl->next)	1637	for (pl = first_player; pl; pl = pl->next)
1540	XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));	1638	XPUSHs (newSVcfapi (CFAPI_PPLAYER, pl));
1541	}	1639	}
1542		1640
		1641	bool
		1642	peaceful (player *pl, bool new_setting = 0)
		1643	PROTOTYPE: $;$
		1644	CODE:
		1645	RETVAL = pl->peaceful;
		1646	if (items > 1)
		1647	pl->peaceful = new_setting;
		1648	OUTPUT:
		1649	RETVAL
		1650
1543	living *	1651	living *
1544	orig_stats (player *pl)	1652	orig_stats (player *pl)
1545	CODE:	1653	CODE:
1546	RETVAL = &pl->orig_stats;	1654	RETVAL = &pl->orig_stats;
1547	OUTPUT: RETVAL	1655	OUTPUT: RETVAL
…		…
1580	int unused_type;	1688	int unused_type;
1581	RETVAL = map_get_map (&unused_type, 0, width, height);	1689	RETVAL = map_get_map (&unused_type, 0, width, height);
1582	}	1690	}
1583	OUTPUT:	1691	OUTPUT:
1584	RETVAL	1692	RETVAL
		1693
		1694	void delete_map (mapstruct *map)
		1695
		1696	void clean_tmp_map (mapstruct *map)
		1697
		1698	void play_sound_map (mapstruct *map, int x, int y, int sound_num)
1585		1699
1586	mapstruct cf_map_get_map (char name)	1700	mapstruct cf_map_get_map (char name)
1587	PROTOTYPE: $	1701	PROTOTYPE: $
1588	ALIAS: map = 0	1702	ALIAS: map = 0
1589		1703

Diff Legend

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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents): Revision 1.37 by root, Fri Mar 17 01:23:48 2006 UTC vs. Revision 1.44 by root, Fri Mar 31 20:21:53 2006 UTC

Diff Legend

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.37 by root, Fri Mar 17 01:23:48 2006 UTC vs.
Revision 1.44 by root, Fri Mar 31 20:21:53 2006 UTC