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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.16 by root, Wed Feb 8 04:32:19 2006 UTC vs.
Revision 1.24 by root, Fri Feb 17 21:10:18 2006 UTC

…		…
29	#include <XSUB.h>	29	#include <XSUB.h>
30		30
31	#undef save_long // clashes with libproto.h	31	#undef save_long // clashes with libproto.h
32		32
33	#define PLUGIN_NAME "perl"	33	#define PLUGIN_NAME "perl"
34	#define PLUGIN_VERSION "cfperl 0.0"	34	#define PLUGIN_VERSION "cfperl 0.1"
35		35
36	#ifndef __CEXTRACT__	36	#ifndef __CEXTRACT__
37	#include <plugin.h>	37	#include <plugin.h>
38	#endif	38	#endif
39		39
…		…
46	#include <plugin_common.h>	46	#include <plugin_common.h>
47		47
48	#include <stdarg.h>	48	#include <stdarg.h>
49		49
50	#include "perlxsi.c"	50	#include "perlxsi.c"
		51
		52	typedef object object_ornull;
		53	typedef mapstruct mapstruct_ornull;
51		54
52	static f_plug_api gethook;	55	static f_plug_api gethook;
53	static f_plug_api registerGlobalEvent;	56	static f_plug_api registerGlobalEvent;
54	static f_plug_api unregisterGlobalEvent;	57	static f_plug_api unregisterGlobalEvent;
55	static f_plug_api systemDirectory;	58	static f_plug_api systemDirectory;
56	static f_plug_api object_set_property;	59	static f_plug_api object_set_property;
57	static f_plug_api map_get_map;	60	static f_plug_api map_get_map;
		61	static f_plug_api object_insert;
58		62
59	typedef struct	63	typedef struct
60	{	64	{
61	object* who;	65	object* who;
62	object* activator;	66	object* activator;
…		…
80	// all objects no longer referenced and empty are	84	// all objects no longer referenced and empty are
81	// eligible for destruction.	85	// eligible for destruction.
82	void	86	void
83	clean_obj_cache ()	87	clean_obj_cache ()
84	{	88	{
85	return; // killing neko-san gives me an unreferenced scalar	89	static int count;
		90
		91	if (++count & 7)
		92	return;
		93
86	int todo = 10;	94	int todo = 1000;
87	do	95	do
88	{	96	{
89	I32 klen;	97	I32 klen;
90	char *key;	98	char *key;
91	HE *he = hv_iternext (obj_cache);	99	HE *he = hv_iternext (obj_cache);
92		100
93	if (he)	101	if (he)
94	{	102	{
95	SV *sv = hv_iterval (obj_cache, he);	103	SV *sv = hv_iterval (obj_cache, he);
96		104
97	// emopty and unreferened? nuke it	105	// empty and unreferenced? nuke it
98	if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv))))	106	if (SvREFCNT (sv) == 1 && SvREFCNT (SvRV (sv)) == 1 && !HvFILL ((HV *)(SvRV (sv))))
99	{	107	{
100	hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD);	108	hv_delete (obj_cache, HeKEY (he), HeKLEN (he), G_DISCARD);
101	todo++;	109	todo++;
102	}	110	}
…		…
108	}	116	}
109		117
110	static SV *	118	static SV *
111	newSVptr (void ptr, const char klass)	119	newSVptr (void ptr, const char klass)
112	{	120	{
		121	SV *sv;
		122
113	if (!ptr)	123	if (!ptr)
114	return &PL_sv_undef;	124	return &PL_sv_undef;
115		125
116	HV *hv = newHV ();	126	sv = newSV (0);
117	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);	127	sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
118	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	128	return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
119	}	129	}
120		130
121	static SV *	131	static SV *
122	newSVptr_cached (void ptr, const char klass)	132	newSVptr_cached (void ptr, const char klass)
123	{	133	{
…		…
130		140
131	if (he)	141	if (he)
132	sv = *he;	142	sv = *he;
133	else	143	else
134	{	144	{
135	sv = newSVptr (ptr, klass);	145	HV *hv = newHV ();
		146	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
		147	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
136	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);	148	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
137	}	149	}
138		150
139	return newSVsv (sv);	151	return newSVsv (sv);
140	}	152	}
…		…
159		171
160	if (!mg)	172	if (!mg)
161	croak ("perl code used %s object, but C object is already destroyed, caught", klass);	173	croak ("perl code used %s object, but C object is already destroyed, caught", klass);
162		174
163	return (long)mg->mg_ptr;	175	return (long)mg->mg_ptr;
		176	}
		177
		178	static long
		179	SvPTR_ornull (SV sv, const char klass)
		180	{
		181	if (SvOK (sv))
		182	return SvPTR (sv, klass);
		183	else
		184	return 0;
164	}	185	}
165		186
166	SV *	187	SV *
167	newSVcfapi (int type, ...)	188	newSVcfapi (int type, ...)
168	{	189	{
…		…
390	registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");	411	registerGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_register_global_event");
391	unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");	412	unregisterGlobalEvent = gethook (&rtype, hooktype, "cfapi_system_unregister_global_event");
392	systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");	413	systemDirectory = gethook (&rtype, hooktype, "cfapi_system_directory");
393	object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");	414	object_set_property = gethook (&rtype, hooktype, "cfapi_object_set_property");
394	map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");	415	map_get_map = gethook (&rtype, hooktype, "cfapi_map_get_map");
		416	object_insert = gethook (&rtype, hooktype, "cfapi_object_insert");
395		417
396	cf_init_plugin (gethook);	418	cf_init_plugin (gethook);
397		419
398	/* Pick the global events you want to monitor from this plugin */	420	/* Pick the global events you want to monitor from this plugin */
399	registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);	421	registerGlobalEvent (NULL, EVENT_BORN, PLUGIN_NAME, globalEventListener);
…		…
518		540
519	va_end (args);	541	va_end (args);
520		542
521	if (context.event_code == EVENT_FREE_OB)	543	if (context.event_code == EVENT_FREE_OB)
522	{	544	{
523	SV sv = hv_delete (obj_cache, (char )&context.activator, sizeof (object *), 0);	545	SV sv = hv_delete (obj_cache, (char )&context.activator, sizeof (void *), 0);
524		546
525	if (sv)	547	if (sv)
526	{
527	clearSVptr (sv);	548	clearSVptr (sv);
528	SvREFCNT_dec (sv);
529	}
530	}	549	}
531	else	550	else
532	inject_event ("cf::inject_global_event", &context);	551	inject_event ("cf::inject_global_event", &context);
533		552
534	rv = context.returnvalue;	553	rv = context.returnvalue;
…		…
730	const_iv (ST_BD_BUILD)	749	const_iv (ST_BD_BUILD)
731	const_iv (ST_BD_REMOVE)	750	const_iv (ST_BD_REMOVE)
732	const_iv (ST_MAT_FLOOR)	751	const_iv (ST_MAT_FLOOR)
733	const_iv (ST_MAT_WALL)	752	const_iv (ST_MAT_WALL)
734	const_iv (ST_MAT_ITEM)	753	const_iv (ST_MAT_ITEM)
		754
		755	const_iv (AT_PHYSICAL)
		756	const_iv (AT_MAGIC)
		757	const_iv (AT_FIRE)
		758	const_iv (AT_ELECTRICITY)
		759	const_iv (AT_COLD)
		760	const_iv (AT_CONFUSION)
		761	const_iv (AT_ACID)
		762	const_iv (AT_DRAIN)
		763	const_iv (AT_WEAPONMAGIC)
		764	const_iv (AT_GHOSTHIT)
		765	const_iv (AT_POISON)
		766	const_iv (AT_SLOW)
		767	const_iv (AT_PARALYZE)
		768	const_iv (AT_TURN_UNDEAD)
		769	const_iv (AT_FEAR)
		770	const_iv (AT_CANCELLATION)
		771	const_iv (AT_DEPLETE)
		772	const_iv (AT_DEATH)
		773	const_iv (AT_CHAOS)
		774	const_iv (AT_COUNTERSPELL)
		775	const_iv (AT_GODPOWER)
		776	const_iv (AT_HOLYWORD)
		777	const_iv (AT_BLIND)
		778	const_iv (AT_INTERNAL)
		779	const_iv (AT_LIFE_STEALING)
		780	const_iv (AT_DISEASE)
735		781
736	const_iv (QUEST_IN_PROGRESS)	782	const_iv (QUEST_IN_PROGRESS)
737	const_iv (QUEST_DONE_QUEST)	783	const_iv (QUEST_DONE_QUEST)
738	const_iv (QUEST_DONE_TASK)	784	const_iv (QUEST_DONE_TASK)
739	const_iv (QUEST_START_QUEST)	785	const_iv (QUEST_START_QUEST)
…		…
1151	int unused_type;	1197	int unused_type;
1152	object_set_property (&unused_type, obj, idx, (double)SvNV (newval));	1198	object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1153	}	1199	}
1154	break;	1200	break;
1155	case CFAPI_STRING:	1201	case CFAPI_STRING:
1156	cf_object_set_string_property (obj, idx, SvPV_nolen (newval));	1202	cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
		1203	break;
		1204	case CFAPI_POBJECT:
		1205	{
		1206	int unused_type;
		1207	object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
		1208	}
1157	break;	1209	break;
1158	default:	1210	default:
1159	croak ("unhandled type '%d' in set_property '%d'", type, idx);	1211	croak ("unhandled type '%d' in set_property '%d'", type, idx);
1160	}	1212	}
1161		1213
		1214	# missing properties
		1215
		1216	void
		1217	set_attacktype (object *obj, U32 attacktype)
		1218	CODE:
		1219	obj->attacktype = attacktype;
		1220
		1221	U32
		1222	get_attacktype (object *obj)
		1223	ALIAS:
		1224	attacktype = 0
		1225	CODE:
		1226	RETVAL = obj->attacktype;
		1227	OUTPUT: RETVAL
		1228
		1229	void
		1230	set_food (object *obj, int food)
		1231	CODE:
		1232	obj->stats.food = food;
		1233
		1234	int
		1235	get_food (object *obj)
		1236	ALIAS:
		1237	food = 0
		1238	CODE:
		1239	RETVAL = obj->stats.food;
		1240	OUTPUT: RETVAL
		1241
1162	void	1242	void
1163	inv (object *obj)	1243	inv (object *obj)
1164	PROTOTYPE: $	1244	PROTOTYPE: $
1165	PPCODE:	1245	PPCODE:
1166	{	1246	{
…		…
1175	int cf_object_get_flag (object *op, int flag)	1255	int cf_object_get_flag (object *op, int flag)
1176	ALIAS: flag = 0	1256	ALIAS: flag = 0
1177		1257
1178	void cf_object_set_flag (object *op, int flag, int value)	1258	void cf_object_set_flag (object *op, int flag, int value)
1179		1259
1180	void cf_object_move (object op, int dir, object originator)	1260	void cf_object_move (object op, int dir, object originator = op)
1181		1261
1182	void cf_object_apply (object op, object author, int flags = 0)	1262	void cf_object_apply (object op, object author, int flags = 0)
1183		1263
1184	void cf_object_apply_below (object *op)	1264	void cf_object_apply_below (object *op)
1185		1265
…		…
1191		1271
1192	int cf_object_transfer (object op, int x, int y, int r, object orig)	1272	int cf_object_transfer (object op, int x, int y, int r, object orig)
1193		1273
1194	int cf_object_change_map (object op, int x, int y, mapstruct map)	1274	int cf_object_change_map (object op, int x, int y, mapstruct map)
1195		1275
1196	object cf_object_clone (object op, int clonetype)	1276	object cf_object_clone (object op, int clonetype = 0)
1197		1277
1198	int cf_object_pay_item (object op, object buyer)	1278	int cf_object_pay_item (object op, object buyer)
1199		1279
1200	int cf_object_pay_amount (object *op, double amount)	1280	int cf_object_pay_amount (object *op, double amount)
1201		1281
1202	int cf_object_cast_spell (object caster, object ctoo, int dir, object sp_, char flags)	1282	int cf_object_cast_spell (object caster, object ctoo, int dir, object spell_ob, char stringarg = 0)
1203		1283
1204	int cf_object_cast_ability (object caster, object ctoo, int dir, object sp_, char flags)	1284	int cf_object_cast_ability (object caster, object ctoo, int dir, object sp_, char stringarg = 0)
1205		1285
1206	void cf_object_learn_spell (object op, object sp)	1286	void cf_object_learn_spell (object op, object sp)
1207		1287
1208	void cf_object_forget_spell (object op, object sp)	1288	void cf_object_forget_spell (object op, object sp)
1209		1289
…		…
1245	char cf_object_get_key (object op, char *keyname)	1325	char cf_object_get_key (object op, char *keyname)
1246	ALIAS: key = 0	1326	ALIAS: key = 0
1247		1327
1248	void cf_object_set_key (object op, char keyname, char *value)	1328	void cf_object_set_key (object op, char keyname, char *value)
1249		1329
1250	char *	1330	object cf_create_object_by_name (const char name)
1251	base_name (object *ob, int plural)	1331
		1332	MODULE = cf PACKAGE = cf::object PREFIX = cf_
		1333
		1334	void cf_fix_object (object *pl)
		1335	ALIAS: fix = 0
		1336
		1337	object cf_insert_ob_in_ob (object ob, object *where)
		1338
		1339	# no clean way to get an object from an archetype - stupid idiotic
		1340	# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
		1341
		1342	object new (const char archetype = 0)
		1343	PROTOTYPE: ;$
1252	CODE:	1344	CODE:
1253	RETVAL = cf_query_base_name (ob, plural);	1345	RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1254	OUTPUT: RETVAL
1255
1256	MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1257
1258	object cf_create_object_by_name (const char name = 0)
1259	PROTOTYPE: ;$
1260	ALIAS:
1261	create_object = 0
1262	new = 0
1263	CODE:
1264	RETVAL = name ? cf_create_object_by_name (name) : cf_create_object ();
1265	OUTPUT:	1346	OUTPUT:
1266	RETVAL	1347	RETVAL
1267		1348
1268	void cf_fix_object (object *pl)	1349	object insert_ob_in_map_at (object ob, mapstruct where, object_ornull orig, int flag, int x, int y)
1269	ALIAS: fix = 0	1350	PROTOTYPE: $$$$$$
1270		1351	CODE:
1271	object cf_insert_ob_in_ob (object ob, object *where)	1352	{
		1353	int unused_type;
		1354	RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
		1355	}
1272		1356
1273	object get_nearest_player (object ob)	1357	object get_nearest_player (object ob)
1274	ALIAS: nearest_player = 0	1358	ALIAS: nearest_player = 0
		1359	PREINIT:
		1360	extern object get_nearest_player (object );
1275		1361
1276	void rangevector (object ob, object other, int flags = 0)	1362	void rangevector (object ob, object other, int flags = 0)
1277	PROTOTYPE: $$;$	1363	PROTOTYPE: $$;$
1278	PPCODE:	1364	PPCODE:
1279	{	1365	{
…		…
1290	bool on_same_map_as (object ob, object other)	1376	bool on_same_map_as (object ob, object other)
1291	CODE:	1377	CODE:
1292	RETVAL = on_same_map (ob, other);	1378	RETVAL = on_same_map (ob, other);
1293	OUTPUT: RETVAL	1379	OUTPUT: RETVAL
1294		1380
		1381	char *
		1382	base_name (object *ob, int plural)
		1383	CODE:
		1384	RETVAL = cf_query_base_name (ob, plural);
		1385	OUTPUT: RETVAL
		1386
1295		1387
1296	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_	1388	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1297		1389
1298	player player (object op)	1390	player player (object op)
1299	CODE:	1391	CODE:
…		…
1302		1394
1303	void cf_player_message (object obj, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)	1395	void cf_player_message (object obj, char txt, int flags = NDI_ORANGE \| NDI_UNIQUE)
1304		1396
1305	object cf_player_send_inventory (object op)	1397	object cf_player_send_inventory (object op)
1306		1398
		1399	player contr (object op)
		1400	CODE:
		1401	RETVAL = op->contr;
		1402	OUTPUT: RETVAL
		1403
1307	char cf_player_get_ip (object op)	1404	char cf_player_get_ip (object op)
1308	ALIAS: ip = 0	1405	ALIAS: ip = 0
1309		1406
1310	object cf_player_get_marked_item (object op)	1407	object cf_player_get_marked_item (object op)
1311	ALIAS: marked_item = 0	1408	ALIAS: marked_item = 0
…		…
1324		1421
1325	player cf_player_find (char name)	1422	player cf_player_find (char name)
1326	PROTOTYPE: $	1423	PROTOTYPE: $
1327		1424
1328	void cf_player_move (player *pl, int dir)	1425	void cf_player_move (player *pl, int dir)
		1426
		1427	void MapNewmapCmd (player *pl)
1329		1428
1330	# nonstandard	1429	# nonstandard
1331	object ob (player pl)	1430	object ob (player pl)
1332	CODE:	1431	CODE:
1333	RETVAL = pl->ob;	1432	RETVAL = pl->ob;

Diff Legend

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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents): Revision 1.16 by root, Wed Feb 8 04:32:19 2006 UTC vs. Revision 1.24 by root, Fri Feb 17 21:10:18 2006 UTC

Diff Legend

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.16 by root, Wed Feb 8 04:32:19 2006 UTC vs.
Revision 1.24 by root, Fri Feb 17 21:10:18 2006 UTC