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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.64 by root, Tue Nov 7 14:58:35 2006 UTC vs.
Revision 1.91 by root, Wed Dec 20 11:36:39 2006 UTC

…		…
43	extern sint64 *levels; // the experience table	43	extern sint64 *levels; // the experience table
44		44
45	typedef object object_ornull;	45	typedef object object_ornull;
46	typedef maptile maptile_ornull;	46	typedef maptile maptile_ornull;
47		47
		48	#if IVSIZE >= 8
		49	typedef IV val64;
		50	# define newSVval64 newSViv
		51	# define SvVAL64 SvIV
		52	#else
48	typedef double val64;	53	typedef double val64;
49	#define newSVval64 newSVnv	54	# define newSVval64 newSVnv
50	#define SvVAL64 SvNV	55	# define SvVAL64 SvNV
		56	#endif
51		57
52	static f_plug_api gethook = cfapi_get_hooks;	58	static f_plug_api gethook = cfapi_get_hooks;
53	static f_plug_api object_set_property = cfapi_object_set_property;	59	static f_plug_api object_set_property = cfapi_object_set_property;
54	static f_plug_api object_insert = cfapi_object_insert;	60	static f_plug_api object_insert = cfapi_object_insert;
55		61
56	static HV *obj_cache;
57	static PerlInterpreter *perl;	62	static PerlInterpreter *perl;
58		63
59	static AV cb_global, cb_object, cb_player, cb_type, *cb_map;	64	static AV cb_global, cb_object, cb_player, cb_type, *cb_map;
60		65
61	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	66	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
…		…
81		86
82	if (!obj->self)	87	if (!obj->self)
83	obj->self = newSVptr (obj, klass);	88	obj->self = newSVptr (obj, klass);
84		89
85	return newSVsv (obj->self);	90	return newSVsv (obj->self);
86	}
87
88	static void
89	SVptr_cache_set (void ptr, SV sv)
90	{
91	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
92	}
93
94	static SV *
95	SVptr_cache_get (void *ptr)
96	{
97	SV *he = hv_fetch (obj_cache, (char )&ptr, sizeof (ptr), 0);
98
99	return he ? *he : 0;
100	}
101
102	static SV *
103	newSVptr_cached (void ptr, const char klass)
104	{
105	SV *sv;
106
107	if (!ptr)
108	return &PL_sv_undef;
109
110	sv = SVptr_cache_get (ptr);
111
112	if (!sv)
113	{
114	HV *hv = newHV ();
115	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
116	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
117
118	SVptr_cache_set (ptr, sv);
119	}
120
121	return newSVsv (sv);
122	}	91	}
123		92
124	static void	93	static void
125	clearSVptr (SV *sv)	94	clearSVptr (SV *sv)
126	{	95	{
…		…
167	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	136	inline SV *to_sv (unsigned long v) { return newSVuv (v); }
168	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	137	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
169	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	138	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
170	inline SV *to_sv (float v) { return newSVnv (v); }	139	inline SV *to_sv (float v) { return newSVnv (v); }
171	inline SV *to_sv (double v) { return newSVnv (v); }	140	inline SV *to_sv (double v) { return newSVnv (v); }
		141	inline SV to_sv (client v) { return newSVattachable (v, "cf::client::wrap"); }
172	inline SV to_sv (player v) { return newSVattachable (v, "cf::player::wrap"); }	142	inline SV to_sv (player v) { return newSVattachable (v, "cf::player::wrap"); }
173	inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }	143	inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }
174	inline SV to_sv (maptile v) { return newSVattachable (v, "cf::map::wrap"); }	144	inline SV to_sv (maptile v) { return newSVattachable (v, "cf::map::wrap"); }
175	inline SV to_sv (archetype v) { return newSVptr (v, "cf::arch::wrap"); }	145	inline SV to_sv (archetype v) { return newSVptr (v, "cf::arch::wrap"); }
176	inline SV to_sv (partylist v) { return newSVptr (v, "cf::party::wrap"); }	146	inline SV to_sv (partylist v) { return newSVptr (v, "cf::party::wrap"); }
…		…
182		152
183	//TODO:	153	//TODO:
184	inline SV to_sv (New_Face v) { return to_sv (v->name); }	154	inline SV to_sv (New_Face v) { return to_sv (v->name); }
185	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	155	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
186		156
		157	inline SV *to_sv (UUID v)
		158	{
		159	char buf[128];
		160	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);
		161	return newSVpv (buf, 0);
		162	}
		163
187	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	164	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
188	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } //TODO: verify that all simple pointers are strdup-managed	165	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
189	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	166	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
190	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }	167	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
191	inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }	168	inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
192	inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }	169	inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
193	inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }	170	inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
…		…
197	inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }	174	inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
198	inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }	175	inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
199	inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }	176	inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
200	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }	177	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
201	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }	178	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
		179	inline void sv_to (SV sv, client &v) { v = (client *)SvPTR_ornull (sv, "cf::client"); }
202	inline void sv_to (SV sv, player &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }	180	inline void sv_to (SV sv, player &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }
203	inline void sv_to (SV sv, object &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }	181	inline void sv_to (SV sv, object &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }
204	inline void sv_to (SV sv, archetype &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }	182	inline void sv_to (SV sv, archetype &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }
205	inline void sv_to (SV sv, maptile &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }	183	inline void sv_to (SV sv, maptile &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }
206	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	184	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
…		…
214	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	192	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
215		193
216	template<int N>	194	template<int N>
217	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }	195	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
218		196
		197	inline void sv_to (SV *sv, UUID &v)
		198	{
		199	unsigned int version;
		200
		201	if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) \|\| 1 != version)
		202	croak ("unparsable uuid: %s", SvPV_nolen (sv));
		203	}
		204
219	static SV *	205	static SV *
220	newSVdt_va (va_list &ap, data_type type)	206	newSVdt_va (va_list &ap, data_type type)
221	{	207	{
222	SV *sv;	208	SV *sv;
223		209
…		…
255	break;	241	break;
256		242
257	case DT_MAP:	243	case DT_MAP:
258	// va_arg (object ) when void is passed is an XSI extension	244	// va_arg (object ) when void is passed is an XSI extension
259	sv = to_sv (va_arg (ap, maptile *));	245	sv = to_sv (va_arg (ap, maptile *));
		246	break;
		247
		248	case DT_CLIENT:
		249	sv = to_sv (va_arg (ap, client *));
260	break;	250	break;
261		251
262	case DT_PLAYER:	252	case DT_PLAYER:
263	sv = to_sv (va_arg (ap, player *));	253	sv = to_sv (va_arg (ap, player *));
264	break;	254	break;
…		…
325	}	315	}
326		316
327	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	317	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
328		318
329	SV *	319	SV *
330	registry_of (attachable_base *ext)	320	registry (attachable_base *ext)
331	{	321	{
332	if (!ext->cb)	322	if (!ext->cb)
333	ext->cb = newAV ();	323	ext->cb = newAV ();
334		324
335	return newRV_inc ((SV *)ext->cb);	325	return newRV_inc ((SV *)ext->cb);
…		…
479	call_pv ("cf::object_freezer_save", G_VOID \| G_DISCARD \| G_EVAL);	469	call_pv ("cf::object_freezer_save", G_VOID \| G_DISCARD \| G_EVAL);
480	FREETMPS;	470	FREETMPS;
481	LEAVE;	471	LEAVE;
482	}	472	}
483		473
		474	char *object_freezer::as_string ()
		475	{
		476	dSP;
		477	ENTER;
		478	SAVETMPS;
		479	PUSHMARK (SP);
		480	EXTEND (SP, 3);
		481	PUSHs (sv_2mortal (newRV_noinc (newSVpvn ((char *)linearise (), size ()))));
		482	PUSHs (sv_2mortal (newRV_inc ((SV *)av)));
		483	PUTBACK;
		484
		485	char *res = call_pv ("cf::object_freezer_as_string", G_SCALAR \| G_EVAL) > 0
		486	? strdup (SvPVbyte_nolen (POPs))
		487	: strdup ("[fatal error]");
		488
		489	FREETMPS;
		490	LEAVE;
		491
		492	return res;
		493	}
		494
484	int fprintf (object_freezer &freezer, const char *format, ...)	495	int fprintf (object_freezer &freezer, const char *format, ...)
485	{	496	{
486	va_list ap;	497	va_list ap;
487		498
488	va_start (ap, format);	499	va_start (ap, format);
…		…
766	static CommArray_s rtn_cmd;	777	static CommArray_s rtn_cmd;
767		778
768	static int	779	static int
769	runPluginCommand (object obj, char params)	780	runPluginCommand (object obj, char params)
770	{	781	{
771	dSP;	782	return -1;
772
773	ENTER;
774	SAVETMPS;
775
776	PUSHMARK (SP);
777
778	EXTEND (SP, 3);
779	PUSHs (sv_2mortal (newSVpv (rtn_cmd.name, 0)));
780	PUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, obj)));
781
782	if (params)
783	PUSHs (sv_2mortal (newSVpv (params, 0)));
784
785	PUTBACK;
786	int count = call_pv ("cf::inject_command", G_SCALAR \| G_EVAL);
787	SPAGAIN;
788
789	if (SvTRUE (ERRSV))
790	LOG (llevError, "command '%s' callback evaluation error: %s", rtn_cmd.name, SvPV_nolen (ERRSV));
791
792	int returnvalue = count > 0 ? POPi : -1;
793
794	PUTBACK;
795	FREETMPS;
796	LEAVE;
797
798	return returnvalue;
799	}	783	}
800		784
801	extern "C" void cfperl_getPluginProperty (int type, ...)	785	extern "C" void cfperl_getPluginProperty (int type, ...)
802	{	786	{
803	va_list args;	787	va_list args;
…		…
806	va_start (args, type);	790	va_start (args, type);
807	propname = va_arg (args, char *);	791	propname = va_arg (args, char *);
808	//printf ("Property name: %s\n", propname);	792	//printf ("Property name: %s\n", propname);
809		793
810	if (!strcmp (propname, "command?"))	794	if (!strcmp (propname, "command?"))
811	{
812	if (!perl)
813	return NULL;	795	return NULL;
814		796	else if (!strcmp (propname, "Identification"))
815	const char cmdname = va_arg (args, const char );	797	{
816	HV *hv = get_hv ("cf::COMMAND", 1);
817	SV **svp = hv_fetch (hv, cmdname, strlen (cmdname) + 1, 0);
818
819	va_end (args);	798	va_end (args);
820		799	return (void *)PLUGIN_NAME;
821	if (svp)
822	{
823	// this is totaly broken, should stash it into %COMMAND
824	rtn_cmd.name = cmdname;
825	rtn_cmd.time = SvNV (*svp);
826	rtn_cmd.func = runPluginCommand;
827
828	return &rtn_cmd;
829	}
830	}	800	}
831	else if (!strcmp (propname, "Identification"))	801	else if (!strcmp (propname, "FullName"))
832	{	802	{
833	va_end (args);	803	va_end (args);
834	return (void*) PLUGIN_NAME;
835	}
836	else if (!strcmp (propname, "FullName"))
837	{
838	va_end (args);
839	return (void*) PLUGIN_VERSION;	804	return (void *)PLUGIN_VERSION;
840	}	805	}
841	else	806	else
842	va_end (args);	807	va_end (args);
843		808
844	return NULL;	809	return NULL;
…		…
869	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;	834	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;
870		835
871	char *argv[] = {	836	char *argv[] = {
872	"",	837	"",
873	"-e"	838	"-e"
874	"cf->bootstrap;"	839	"use Event;" // required for bootstrap
		840	"cf->bootstrap;" // required for datadir :*>
875	"unshift @INC, cf::datadir ();"	841	"unshift @INC, cf::datadir ();"
876	"require cf;"	842	"require cf;"
877	};	843	};
878		844
879	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	845	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
880	{	846	{
881	printf ("unable to initialize perl-interpreter, aborting.\n");	847	printf ("unable to initialize perl-interpreter, aborting.\n");
882	exit (EXIT_FAILURE);	848	exit (EXIT_FAILURE);
883	}	849	}
884
885	obj_cache = newHV ();
886	}	850	}
887		851
888	void cfperl_main ()	852	void cfperl_main ()
889	{	853	{
890	dSP;	854	dSP;
…		…
944	object *op;	908	object *op;
945	player *pl;	909	player *pl;
946	maptile *map;	910	maptile *map;
947		911
948	// callback call ordering is:	912	// callback call ordering is:
949	// 1. per-object callback (NYI)	913	// 1. per-object callback
950	// 2. per-class object	914	// 2. per-class object
951	// 2a. per-type callback	915	// 3. per-type callback
952	// 4. global callbacks	916	// 4. global callbacks
953		917
954	gather_callbacks (callbacks, cb_global, event);	918	gather_callbacks (callbacks, cb_global, event);
955		919
956	switch (KLASS_OF (event))	920	switch (KLASS_OF (event))
…		…
1086	cfperl_result_INT (int idx)	1050	cfperl_result_INT (int idx)
1087	{	1051	{
1088	return SvIV (cfperl_result (idx));	1052	return SvIV (cfperl_result (idx));
1089	}	1053	}
1090		1054
		1055	double
		1056	cfperl_result_DOUBLE (int idx)
		1057	{
		1058	return SvNV (cfperl_result (idx));
		1059	}
		1060
		1061	/////////////////////////////////////////////////////////////////////////////
		1062
		1063	struct EventAPI *watcher_base::GEventAPI;
		1064
		1065	static void iw_dispatch (pe_event *ev)
		1066	{
		1067	iw w = (iw )ev->ext_data;
		1068	w->call (*w);
		1069	}
		1070
		1071	void
		1072	iw::alloc ()
		1073	{
		1074	pe = GEventAPI->new_idle (0, 0);
		1075
		1076	pe->base.callback = (void *)iw_dispatch;
		1077	pe->base.ext_data = (void *)this;
		1078	}
		1079
		1080	static void iow_dispatch (pe_event *ev)
		1081	{
		1082	iow w = (iow )ev->ext_data;
		1083	w->call (w, ((pe_ioevent )ev)->got);
		1084	}
		1085
		1086	void
		1087	iow::alloc ()
		1088	{
		1089	pe = GEventAPI->new_io (0, 0);
		1090
		1091	pe->base.callback = (void *)iow_dispatch;
		1092	pe->base.ext_data = (void *)this;
		1093
		1094	pe->fd = -1;
		1095	pe->poll = 0;
		1096	}
		1097
		1098	void
		1099	iow::fd (int fd)
		1100	{
		1101	pe->fd = fd;
		1102	}
		1103
		1104	int
		1105	iow::poll ()
		1106	{
		1107	return pe->poll;
		1108	}
		1109
		1110	void
		1111	iow::poll (int events)
		1112	{
		1113	if (pe->poll != events)
		1114	{
		1115	if (pe->poll) stop ();
		1116	pe->poll = events;
		1117	if (pe->poll) start ();
		1118	}
		1119	}
		1120
1091	MODULE = cf PACKAGE = cf PREFIX = cf_	1121	MODULE = cf PACKAGE = cf PREFIX = cf_
1092		1122
1093	BOOT:	1123	BOOT:
1094	{	1124	{
1095	HV *stash = gv_stashpv ("cf", 1);	1125	HV *stash = gv_stashpv ("cf", 1);
		1126
		1127	I_EVENT_API (PACKAGE);
		1128	watcher_base::GEventAPI = GEventAPI;
1096		1129
1097	newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));	1130	newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1098		1131
1099	static const struct {	1132	static const struct {
1100	const char *name;	1133	const char *name;
…		…
1114	const_iv (POTION)	1147	const_iv (POTION)
1115	const_iv (FOOD)	1148	const_iv (FOOD)
1116	const_iv (POISON)	1149	const_iv (POISON)
1117	const_iv (BOOK)	1150	const_iv (BOOK)
1118	const_iv (CLOCK)	1151	const_iv (CLOCK)
1119	const_iv (LIGHTNING)
1120	const_iv (ARROW)	1152	const_iv (ARROW)
1121	const_iv (BOW)	1153	const_iv (BOW)
1122	const_iv (WEAPON)	1154	const_iv (WEAPON)
1123	const_iv (ARMOUR)	1155	const_iv (ARMOUR)
1124	const_iv (PEDESTAL)	1156	const_iv (PEDESTAL)
…		…
1144	const_iv (AMULET)	1176	const_iv (AMULET)
1145	const_iv (PLAYERMOVER)	1177	const_iv (PLAYERMOVER)
1146	const_iv (TELEPORTER)	1178	const_iv (TELEPORTER)
1147	const_iv (CREATOR)	1179	const_iv (CREATOR)
1148	const_iv (SKILL)	1180	const_iv (SKILL)
1149	const_iv (EXPERIENCE)
1150	const_iv (EARTHWALL)	1181	const_iv (EARTHWALL)
1151	const_iv (GOLEM)	1182	const_iv (GOLEM)
1152	const_iv (THROWN_OBJ)	1183	const_iv (THROWN_OBJ)
1153	const_iv (BLINDNESS)	1184	const_iv (BLINDNESS)
1154	const_iv (GOD)	1185	const_iv (GOD)
…		…
1227	const_iv (DISEASE)	1258	const_iv (DISEASE)
1228	const_iv (SYMPTOM)	1259	const_iv (SYMPTOM)
1229	const_iv (BUILDER)	1260	const_iv (BUILDER)
1230	const_iv (MATERIAL)	1261	const_iv (MATERIAL)
1231	const_iv (ITEM_TRANSFORMER)	1262	const_iv (ITEM_TRANSFORMER)
1232	const_iv (QUEST)
1233		1263
1234	const_iv (NUM_SUBTYPES)	1264	const_iv (NUM_SUBTYPES)
1235		1265
1236	const_iv (ST_BD_BUILD)	1266	const_iv (ST_BD_BUILD)
1237	const_iv (ST_BD_REMOVE)	1267	const_iv (ST_BD_REMOVE)
…		…
1290	const_iv (FLAG_MONSTER)	1320	const_iv (FLAG_MONSTER)
1291	const_iv (FLAG_FRIENDLY)	1321	const_iv (FLAG_FRIENDLY)
1292	const_iv (FLAG_GENERATOR)	1322	const_iv (FLAG_GENERATOR)
1293	const_iv (FLAG_IS_THROWN)	1323	const_iv (FLAG_IS_THROWN)
1294	const_iv (FLAG_AUTO_APPLY)	1324	const_iv (FLAG_AUTO_APPLY)
1295	const_iv (FLAG_TREASURE)
1296	const_iv (FLAG_PLAYER_SOLD)	1325	const_iv (FLAG_PLAYER_SOLD)
1297	const_iv (FLAG_SEE_INVISIBLE)	1326	const_iv (FLAG_SEE_INVISIBLE)
1298	const_iv (FLAG_CAN_ROLL)	1327	const_iv (FLAG_CAN_ROLL)
1299	const_iv (FLAG_OVERLAY_FLOOR)	1328	const_iv (FLAG_OVERLAY_FLOOR)
1300	const_iv (FLAG_IS_TURNABLE)	1329	const_iv (FLAG_IS_TURNABLE)
…		…
1423	const_iv (F_BUY)	1452	const_iv (F_BUY)
1424	const_iv (F_SHOP)	1453	const_iv (F_SHOP)
1425	const_iv (F_SELL)	1454	const_iv (F_SELL)
1426		1455
1427	const_iv (P_BLOCKSVIEW)	1456	const_iv (P_BLOCKSVIEW)
		1457	const_iv (P_PLAYER)
1428	const_iv (P_NO_MAGIC)	1458	const_iv (P_NO_MAGIC)
1429	const_iv (P_IS_ALIVE)	1459	const_iv (P_IS_ALIVE)
1430	const_iv (P_NO_CLERIC)	1460	const_iv (P_NO_CLERIC)
1431	const_iv (P_NEED_UPDATE)	1461	const_iv (P_NEED_UPDATE)
1432	const_iv (P_NO_ERROR)
1433	const_iv (P_OUT_OF_MAP)	1462	const_iv (P_OUT_OF_MAP)
1434	const_iv (P_NEW_MAP)	1463	const_iv (P_NEW_MAP)
1435		1464
1436	const_iv (UP_OBJ_INSERT)	1465	const_iv (UP_OBJ_INSERT)
1437	const_iv (UP_OBJ_REMOVE)	1466	const_iv (UP_OBJ_REMOVE)
…		…
1611	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));	1640	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1612	av_push (event, newSViv (eiv->klass));	1641	av_push (event, newSViv (eiv->klass));
1613	av_store (av, eiv->iv, newRV_noinc ((SV *)event));	1642	av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1614	newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));	1643	newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));
1615	}	1644	}
1616
1617	//I_EVENT_API (PACKAGE);
1618	}	1645	}
1619		1646
1620	void _init_vars ()	1647	void _init_vars ()
1621	CODE:	1648	CODE:
1622	cb_global = get_av ("cf::CB_GLOBAL", 1);	1649	cb_global = get_av ("cf::CB_GLOBAL", 1);
1623	cb_object = get_av ("cf::CB_OBJECT", 1);	1650	cb_object = get_av ("cf::CB_OBJECT", 1);
1624	cb_player = get_av ("cf::CB_PLAYER", 1);	1651	cb_player = get_av ("cf::CB_PLAYER", 1);
1625	cb_type = get_av ("cf::CB_TYPE" , 1);	1652	cb_type = get_av ("cf::CB_TYPE" , 1);
1626	cb_map = get_av ("cf::CB_MAP" , 1);	1653	cb_map = get_av ("cf::CB_MAP" , 1);
1627		1654
1628	void _global_reattach ()	1655	void _global_reattach ()
1629	CODE:	1656	CODE:
1630	{	1657	{
1631	// reattach to all attachable objects in the game.	1658	// reattach to all attachable objects in the game.
…		…
1636	reattach (map);	1663	reattach (map);
1637		1664
1638	for (object *op = object::first; op; op = op->next)	1665	for (object *op = object::first; op; op = op->next)
1639	reattach (op);	1666	reattach (op);
1640	}	1667	}
		1668
		1669	bool
		1670	add_client (int fd, const char *peername)
1641		1671
1642	NV floor (NV x)	1672	NV floor (NV x)
1643		1673
1644	NV ceil (NV x)	1674	NV ceil (NV x)
1645		1675
…		…
1693	}	1723	}
1694	OUTPUT: RETVAL	1724	OUTPUT: RETVAL
1695		1725
1696	void _exit (int status = 0)	1726	void _exit (int status = 0)
1697		1727
1698	int cf_find_animation (char *text)	1728	int find_animation (char *text)
1699	PROTOTYPE: $	1729	PROTOTYPE: $
1700		1730
1701	int random_roll(int min, int max, object *op, int goodbad);	1731	int random_roll (int min, int max, object *op, int goodbad);
1702		1732
1703	const char *cost_string_from_value(uint64 cost, int approx = 0)	1733	const char *cost_string_from_value(uint64 cost, int approx = 0)
1704		1734
1705	int invoke (int event, ...)	1735	int invoke (int event, ...)
1706	CODE:	1736	CODE:
…		…
1767	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	1797	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1768	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));	1798	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
1769	OUTPUT: RETVAL	1799	OUTPUT: RETVAL
1770		1800
1771	SV registry (object op)	1801	SV registry (object op)
1772	CODE:
1773	RETVAL = registry_of (op);
1774	OUTPUT:
1775	RETVAL
1776		1802
1777	void mortals ()	1803	void mortals ()
1778	PPCODE:	1804	PPCODE:
1779	EXTEND (SP, object::mortals.size ());	1805	EXTEND (SP, object::mortals.size ());
1780	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)	1806	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
…		…
1822		1848
1823	object find_best_object_match (object op, const char *match)	1849	object find_best_object_match (object op, const char *match)
1824		1850
1825	object find_marked_object (object op)	1851	object find_marked_object (object op)
1826		1852
1827	int cf_object_get_resistance (object *op, int rtype)	1853	int resistance (object *op, int rtype, int newval = 0)
1828	ALIAS: resistance = 0	1854	CODE:
		1855	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1856	croak ("resistance out of bounds");
		1857	RETVAL = op->resist [rtype];
		1858	if (items >= 3)
		1859	op->resist [rtype] = newval;
		1860	OUTPUT: RETVAL
		1861
		1862	void set_resistance (object *op, int rtype, int val)
		1863	CODE:
		1864	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1865	op->resist[rtype] = val;
1829		1866
1830	int need_identify (const object *obj);	1867	int need_identify (const object *obj);
1831		1868
1832	int apply_shop_mat (object shop_mat, object op);	1869	int apply_shop_mat (object shop_mat, object op);
1833		1870
…		…
1835	CODE:	1872	CODE:
1836	RETVAL = move_ob (op, dir, originator);	1873	RETVAL = move_ob (op, dir, originator);
1837	OUTPUT:	1874	OUTPUT:
1838	RETVAL	1875	RETVAL
1839		1876
1840	void cf_object_apply (object op, object author, int flags = 0)	1877	void apply (object applier, object applied, int flags = 0)
		1878	CODE:
		1879	manual_apply (applied, applier, flags);
1841		1880
1842	void cf_object_apply_below (object *op)	1881	void apply_below (object *op)
		1882	CODE:
		1883	player_apply_below (op);
1843		1884
1844	void cf_object_remove (object *op)	1885	void remove (object *op)
		1886	CODE:
		1887	op->remove ();
1845		1888
1846	void cf_object_free (object *op)	1889	void
		1890	object::destroy (int recursive = 0)
1847		1891
1848	object cf_object_present_archname_inside (object op, char *whatstr)	1892	object cf_object_present_archname_inside (object op, char *whatstr)
1849		1893
1850	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)	1894	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)
1851		1895
1852	int cf_object_change_map (object op, int x, int y, maptile map)	1896	int cf_object_change_map (object op, int x, int y, maptile map)
1853		1897
1854	object cf_object_clone (object op, int clonetype = 0)	1898	object clone (object op, int recursive = 0)
		1899	CODE:
		1900	if (recursive)
		1901	RETVAL = object_create_clone (op);
		1902	else
		1903	{
		1904	RETVAL = object::create ();
		1905	op->copy_to (RETVAL);
		1906	}
		1907	OUTPUT: RETVAL
1855		1908
1856	int cf_object_pay_item (object op, object buyer)	1909	int pay_item (object op, object buyer)
		1910	CODE:
		1911	RETVAL = pay_for_item (op, buyer);
		1912	OUTPUT: RETVAL
1857		1913
1858	int cf_object_pay_amount (object *op, uint64 amount)	1914	int pay_amount (object *op, uint64 amount)
		1915	CODE:
		1916	RETVAL = pay_for_amount (amount, op);
		1917	OUTPUT: RETVAL
1859		1918
1860	void pay_player (object *op, uint64 amount)	1919	void pay_player (object *op, uint64 amount)
1861		1920
1862	val64 pay_player_arch (object op, const char arch, uint64 amount)	1921	val64 pay_player_arch (object op, const char arch, uint64 amount)
1863		1922
1864	int cf_object_cast_spell (object caster, object ctoo, int dir, object spell_ob, char stringarg = 0)	1923	int cast_spell (object op, object caster, int dir, object spell_ob, char stringarg = 0)
1865		1924
1866	int cf_object_cast_ability (object caster, object ctoo, int dir, object sp_, char stringarg = 0)	1925	void learn_spell (object op, object sp, int special_prayer = 0)
		1926	CODE:
		1927	do_learn_spell (op, sp, special_prayer);
1867		1928
1868	void cf_object_learn_spell (object op, object sp)
1869
1870	void cf_object_forget_spell (object op, object sp)	1929	void forget_spell (object op, object sp)
		1930	CODE:
		1931	do_forget_spell (op, query_name (sp));
1871		1932
1872	object cf_object_check_for_spell (object op, char *spellname)	1933	object check_for_spell (object op, char *spellname)
		1934	CODE:
		1935	RETVAL = check_spell_known (op, spellname);
		1936	OUTPUT: RETVAL
1873		1937
1874	int cf_object_query_money (object *op)	1938	int query_money (object *op)
1875	ALIAS: money = 0	1939	ALIAS: money = 0
1876		1940
1877	int cf_object_query_cost (object op, object who, int flags)	1941	int query_cost (object op, object who, int flags)
1878	ALIAS: cost = 0	1942	ALIAS: cost = 0
1879		1943
1880	void cf_object_activate_rune (object op , object victim)	1944	void spring_trap (object op, object victim)
1881		1945
1882	int cf_object_check_trigger (object op, object cause)	1946	int check_trigger (object op, object cause)
1883		1947
1884	int cf_object_out_of_map (object *op, int x, int y)
1885
1886	void cf_object_drop (object op, object author)	1948	void drop (object who, object op)
1887		1949
1888	void cf_object_take (object op, object author)	1950	void pick_up (object who, object op)
1889		1951
1890	object cf_object_insert_object (object op, object *container)	1952	object cf_object_insert_object (object op, object *container)
1891		1953
1892	object cf_object_insert_in_ob (object ob, object *where)	1954	object cf_object_insert_in_ob (object ob, object *where)
1893		1955
1894	int cf_object_teleport (object op, maptile map, int x, int y)	1956	int cf_object_teleport (object op, maptile map, int x, int y)
1895		1957
1896	void cf_object_update (object *op, int flags)	1958	void update (object *op, int action)
1897		1959	CODE:
1898	void cf_object_pickup (object op, object what)	1960	update_object (op, action);
1899		1961
1900	object cf_create_object_by_name (const char name)	1962	object cf_create_object_by_name (const char name)
1901		1963
1902	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)	1964	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)
1903		1965
…		…
1912	void use_trigger (object *op);	1974	void use_trigger (object *op);
1913		1975
1914	void add_button_link (object button, maptile map, int connected);	1976	void add_button_link (object button, maptile map, int connected);
1915		1977
1916	void remove_button_link (object *op);	1978	void remove_button_link (object *op);
1917
1918	void
1919	cf_object_set_resistance (object *op, int rtype, int val)
1920	CODE:
1921	if (rtype >= 0 && rtype < NROFATTACKS)
1922	op->resist[rtype] = val;
1923		1979
1924		1980
1925	MODULE = cf PACKAGE = cf::object PREFIX = cf_	1981	MODULE = cf PACKAGE = cf::object PREFIX = cf_
1926		1982
1927	void cf_fix_object (object *pl)	1983	void cf_fix_object (object *pl)
…		…
1991	base_name (object *op, int plural = op->nrof > 1)	2047	base_name (object *op, int plural = op->nrof > 1)
1992	CODE:	2048	CODE:
1993	RETVAL = query_base_name (op, plural);	2049	RETVAL = query_base_name (op, plural);
1994	OUTPUT: RETVAL	2050	OUTPUT: RETVAL
1995		2051
		2052	object decrease_ob_nr (object op, unsigned long i)
		2053
1996	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_	2054	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1997		2055
1998	player player (object op)	2056	player player (object op)
1999	CODE:	2057	CODE:
2000	RETVAL = op->contr;	2058	RETVAL = op->contr;
…		…
2020	void kill_player (object *op)	2078	void kill_player (object *op)
2021		2079
2022	void esrv_update_item (object op, int what, object item)	2080	void esrv_update_item (object op, int what, object item)
2023	C_ARGS: what, op, item	2081	C_ARGS: what, op, item
2024		2082
		2083	void clear_los (object *op)
		2084
		2085	int command_reset (object op, char params)
		2086
		2087	int command_teleport (object op, char params)
		2088
		2089	int command_summon (object op, char params)
		2090
		2091	int command_arrest (object op, char params)
		2092
		2093	int command_kick (object op, char params)
		2094
		2095	int command_banish (object op, char params)
		2096
		2097
2025	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_	2098	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2026		2099
2027	INCLUDE: $PERL genacc player ../include/newserver.h ../include/player.h \|	2100	INCLUDE: $PERL genacc player ../include/player.h \|
2028
2029	char *
2030	client (player *pl)
2031	CODE:
2032	RETVAL = pl->socket.client;
2033	OUTPUT:
2034	RETVAL
2035
2036	char *
2037	host (player *pl)
2038	CODE:
2039	RETVAL = pl->socket.host;
2040	OUTPUT:
2041	RETVAL
2042		2101
2043	int invoke (player *pl, int event, ...)	2102	int invoke (player *pl, int event, ...)
2044	CODE:	2103	CODE:
2045	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");	2104	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2046	AV av = (AV )sv_2mortal ((SV *)newAV ());	2105	AV av = (AV )sv_2mortal ((SV *)newAV ());
2047	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2106	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2048	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));	2107	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
2049	OUTPUT: RETVAL	2108	OUTPUT: RETVAL
2050		2109
2051	SV registry (player pl)	2110	SV registry (player pl)
		2111
		2112	player cf_player_find (char name)
		2113	PROTOTYPE: $
		2114
		2115	void cf_player_move (player *pl, int dir)
		2116
		2117	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
		2118
		2119	player *first ()
2052	CODE:	2120	CODE:
2053	RETVAL = registry_of (pl);	2121	RETVAL = first_player;
		2122	OUTPUT: RETVAL
		2123
		2124	player next (player pl)
		2125	CODE:
		2126	RETVAL = pl->next;
		2127	OUTPUT: RETVAL
		2128
		2129	bool
		2130	cell_visible (player *pl, int dx, int dy)
		2131	CODE:
		2132	RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2
		2133	&& !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2];
2054	OUTPUT:	2134	OUTPUT:
2055	RETVAL	2135	RETVAL
2056		2136
2057	player cf_player_find (char name)
2058	PROTOTYPE: $
2059
2060	void cf_player_move (player *pl, int dir)
2061
2062	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2063
2064	player *first ()
2065	CODE:
2066	RETVAL = first_player;
2067	OUTPUT: RETVAL
2068
2069	player next (player pl)
2070	CODE:
2071	RETVAL = pl->next;
2072	OUTPUT: RETVAL
2073
2074	bool
2075	cell_visible (player *pl, int dx, int dy)
2076	CODE:
2077	RETVAL = FABS (dx) <= pl->socket.mapx / 2 && FABS (dy) <= pl->socket.mapy / 2
2078	&& !pl->blocked_los [dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2];
2079	OUTPUT:
2080	RETVAL
2081
2082	void
2083	buggy_mapscroll (player *pl, int value = 1)
2084	CODE:
2085	pl->socket.buggy_mapscroll = value;
2086
2087	void	2137	void
2088	send (player pl, SV packet)	2138	send (player pl, SV packet)
2089	CODE:	2139	CODE:
2090	{	2140	{
2091	STRLEN len;	2141	STRLEN len;
2092	char *buf = SvPVbyte (packet, len);	2142	char *buf = SvPVbyte (packet, len);
2093		2143
2094	Write_String_To_Socket (&pl->socket, buf, len);	2144	pl->socket->send_packet (buf, len);
2095	}	2145	}
2096		2146
2097	int	2147	int
2098	listening (player *pl, int new_value = -1)	2148	listening (player *pl, int new_value = -1)
2099	CODE:	2149	CODE:
…		…
2164	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2214	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2165	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));	2215	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
2166	OUTPUT: RETVAL	2216	OUTPUT: RETVAL
2167		2217
2168	SV registry (maptile map)	2218	SV registry (maptile map)
2169	CODE:
2170	RETVAL = registry_of (map);
2171	OUTPUT:
2172	RETVAL
2173		2219
2174	INCLUDE: $PERL genacc maptile ../include/map.h \|	2220	INCLUDE: $PERL genacc maptile ../include/map.h \|
2175		2221
2176	maptile *new (int width, int height)	2222	maptile *new (int width, int height)
2177	PROTOTYPE:	2223	PROTOTYPE:
…		…
2185	void delete_map (maptile *map)	2231	void delete_map (maptile *map)
2186		2232
2187	void clean_tmp_map (maptile *map)	2233	void clean_tmp_map (maptile *map)
2188		2234
2189	void play_sound_map (maptile *map, int x, int y, int sound_num)	2235	void play_sound_map (maptile *map, int x, int y, int sound_num)
		2236
		2237	int out_of_map (maptile *map, int x, int y)
2190		2238
2191	maptile tile_map (maptile map, unsigned int dir)	2239	maptile tile_map (maptile map, unsigned int dir)
2192	CODE:	2240	CODE:
2193	RETVAL = dir < 4 ? map->tile_map [dir] : 0;	2241	RETVAL = dir < 4 ? map->tile_map [dir] : 0;
2194	OUTPUT:	2242	OUTPUT:
…		…
2226	get_connection (maptile *map, long connection)	2274	get_connection (maptile *map, long connection)
2227	PPCODE:	2275	PPCODE:
2228	oblinkpt *obp = get_connection_links (map, connection);	2276	oblinkpt *obp = get_connection_links (map, connection);
2229	if (obp)	2277	if (obp)
2230	for (objectlink *ol = obp->link; ol; ol = ol->next)	2278	for (objectlink *ol = obp->link; ol; ol = ol->next)
2231	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, ol->ob)));	2279	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob)));
2232		2280
2233	object cf_map_insert_object_there (maptile where, object op, object originator, int flags)	2281	object cf_map_insert_object_there (maptile where, object op, object originator, int flags)
2234		2282
2235	object cf_map_insert_object (maptile where, object* op, int x, int y)	2283	object cf_map_insert_object (maptile where, object* op, int x, int y)
2236		2284
…		…
2298	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	2346	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2299	}	2347	}
2300	OUTPUT:	2348	OUTPUT:
2301	RETVAL	2349	RETVAL
2302		2350
		2351	void fix_walls (maptile *map, int x, int y)
		2352
		2353	void fix_walls_around (maptile *map, int x, int y)
2303		2354
2304	MODULE = cf PACKAGE = cf::arch	2355	MODULE = cf PACKAGE = cf::arch
2305		2356
2306	archetype find (const char name)	2357	archetype find (const char name)
2307	CODE:	2358	CODE:
…		…
2375		2426
2376	MODULE = cf PACKAGE = cf::living	2427	MODULE = cf PACKAGE = cf::living
2377		2428
2378	INCLUDE: $PERL genacc living ../include/living.h \|	2429	INCLUDE: $PERL genacc living ../include/living.h \|
2379		2430
		2431	MODULE = cf PACKAGE = cf::settings
		2432
		2433	INCLUDE: $PERL genacc Settings ../include/global.h \|
		2434
		2435	MODULE = cf PACKAGE = cf::client
		2436
		2437	INCLUDE: $PERL genacc client ../include/client.h \|
		2438
		2439	int invoke (client *ns, int event, ...)
		2440	CODE:
		2441	if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
		2442	AV av = (AV )sv_2mortal ((SV *)newAV ());
		2443	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
		2444	RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
		2445	OUTPUT: RETVAL
		2446
		2447	SV registry (client ns)
		2448
		2449	void
		2450	client::destroy ()
		2451

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.64 by root, Tue Nov 7 14:58:35 2006 UTC vs. Revision 1.91 by root, Wed Dec 20 11:36:39 2006 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.64 by root, Tue Nov 7 14:58:35 2006 UTC vs.
Revision 1.91 by root, Wed Dec 20 11:36:39 2006 UTC