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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.71 by root, Mon Dec 11 21:37:29 2006 UTC vs.
Revision 1.97 by root, Thu Dec 21 22:41:35 2006 UTC

…		…
59	static f_plug_api object_set_property = cfapi_object_set_property;	59	static f_plug_api object_set_property = cfapi_object_set_property;
60	static f_plug_api object_insert = cfapi_object_insert;	60	static f_plug_api object_insert = cfapi_object_insert;
61		61
62	static PerlInterpreter *perl;	62	static PerlInterpreter *perl;
63		63
64	static AV cb_global, cb_object, cb_player, cb_type, *cb_map;	64	static AV cb_global, cb_object, cb_player, cb_client, cb_type, cb_map;
65		65
66	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	66	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
67		67
68	static SV *	68	static SV *
69	newSVptr (void ptr, const char klass, HV *hv = newHV ())	69	newSVptr (void ptr, const char klass, HV *hv = newHV ())
…		…
136	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	136	inline SV *to_sv (unsigned long v) { return newSVuv (v); }
137	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	137	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
138	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	138	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
139	inline SV *to_sv (float v) { return newSVnv (v); }	139	inline SV *to_sv (float v) { return newSVnv (v); }
140	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"); }
141	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"); }
142	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"); }
143	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"); }
144	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"); }
145	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"); }
…		…
159	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);	160	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);
160	return newSVpv (buf, 0);	161	return newSVpv (buf, 0);
161	}	162	}
162		163
163	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; }
164	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; }
165	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	166	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
166	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); }
167	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); }
168	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); }
169	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); }
…		…
173	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); }
174	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); }
175	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); }
176	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }	177	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
177	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"); }
178	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"); }
179	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"); }
180	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"); }
181	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"); }
182	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"); }
…		…
239	break;	241	break;
240		242
241	case DT_MAP:	243	case DT_MAP:
242	// va_arg (object ) when void is passed is an XSI extension	244	// va_arg (object ) when void is passed is an XSI extension
243	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 *));
244	break;	250	break;
245		251
246	case DT_PLAYER:	252	case DT_PLAYER:
247	sv = to_sv (va_arg (ap, player *));	253	sv = to_sv (va_arg (ap, player *));
248	break;	254	break;
…		…
309	}	315	}
310		316
311	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	317	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
312		318
313	SV *	319	SV *
314	registry_of (attachable_base *ext)	320	registry (attachable_base *ext)
315	{	321	{
316	if (!ext->cb)	322	if (!ext->cb)
317	ext->cb = newAV ();	323	ext->cb = newAV ();
318		324
319	return newRV_inc ((SV *)ext->cb);	325	return newRV_inc ((SV *)ext->cb);
…		…
406		412
407	switch (type)	413	switch (type)
408	{	414	{
409	case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;	415	case DT_OBJECT: INVOKE_OBJECT (REATTACH, obj); break;
410	case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;	416	case DT_PLAYER: INVOKE_PLAYER (REATTACH, obj); break;
		417	case DT_CLIENT: INVOKE_CLIENT (REATTACH, obj); break;
411	case DT_MAP: INVOKE_MAP (REATTACH, obj); break;	418	case DT_MAP: INVOKE_MAP (REATTACH, obj); break;
412	}	419	}
413	}	420	}
414		421
415	template<class subclass>	422	template<class subclass>
…		…
771	static CommArray_s rtn_cmd;	778	static CommArray_s rtn_cmd;
772		779
773	static int	780	static int
774	runPluginCommand (object obj, char params)	781	runPluginCommand (object obj, char params)
775	{	782	{
776	dSP;	783	return -1;
777
778	ENTER;
779	SAVETMPS;
780
781	PUSHMARK (SP);
782
783	EXTEND (SP, 3);
784	PUSHs (sv_2mortal (newSVpv (rtn_cmd.name, 0)));
785	PUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, obj)));
786
787	if (params)
788	PUSHs (sv_2mortal (newSVpv (params, 0)));
789
790	PUTBACK;
791	int count = call_pv ("cf::inject_command", G_SCALAR \| G_EVAL);
792	SPAGAIN;
793
794	if (SvTRUE (ERRSV))
795	LOG (llevError, "command '%s' callback evaluation error: %s", rtn_cmd.name, SvPV_nolen (ERRSV));
796
797	int returnvalue = count > 0 ? POPi : -1;
798
799	PUTBACK;
800	FREETMPS;
801	LEAVE;
802
803	return returnvalue;
804	}	784	}
805		785
806	extern "C" void cfperl_getPluginProperty (int type, ...)	786	extern "C" void cfperl_getPluginProperty (int type, ...)
807	{	787	{
808	va_list args;	788	va_list args;
…		…
811	va_start (args, type);	791	va_start (args, type);
812	propname = va_arg (args, char *);	792	propname = va_arg (args, char *);
813	//printf ("Property name: %s\n", propname);	793	//printf ("Property name: %s\n", propname);
814		794
815	if (!strcmp (propname, "command?"))	795	if (!strcmp (propname, "command?"))
816	{
817	if (!perl)
818	return NULL;	796	return NULL;
819		797	else if (!strcmp (propname, "Identification"))
820	const char cmdname = va_arg (args, const char );	798	{
821	HV *hv = get_hv ("cf::COMMAND", 1);
822	SV **svp = hv_fetch (hv, cmdname, strlen (cmdname) + 1, 0);
823
824	va_end (args);	799	va_end (args);
825		800	return (void *)PLUGIN_NAME;
826	if (svp)
827	{
828	// this is totaly broken, should stash it into %COMMAND
829	rtn_cmd.name = cmdname;
830	rtn_cmd.time = SvNV (*svp);
831	rtn_cmd.func = runPluginCommand;
832
833	return &rtn_cmd;
834	}
835	}	801	}
836	else if (!strcmp (propname, "Identification"))	802	else if (!strcmp (propname, "FullName"))
837	{	803	{
838	va_end (args);	804	va_end (args);
839	return (void*) PLUGIN_NAME;
840	}
841	else if (!strcmp (propname, "FullName"))
842	{
843	va_end (args);
844	return (void*) PLUGIN_VERSION;	805	return (void *)PLUGIN_VERSION;
845	}	806	}
846	else	807	else
847	va_end (args);	808	va_end (args);
848		809
849	return NULL;	810	return NULL;
…		…
874	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;	835	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;
875		836
876	char *argv[] = {	837	char *argv[] = {
877	"",	838	"",
878	"-e"	839	"-e"
879	"cf->bootstrap;"	840	"use Event;" // required for bootstrap
		841	"cf->bootstrap;" // required for datadir :*>
880	"unshift @INC, cf::datadir ();"	842	"unshift @INC, cf::datadir ();"
881	"require cf;"	843	"require cf;"
882	};	844	};
883		845
884	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	846	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
…		…
945	AV *callbacks = 0;	907	AV *callbacks = 0;
946		908
947	object *op;	909	object *op;
948	player *pl;	910	player *pl;
949	maptile *map;	911	maptile *map;
		912	client *ns;
950		913
951	// callback call ordering is:	914	// callback call ordering is:
952	// 1. per-object callback (NYI)	915	// 1. per-object callback
953	// 2. per-class object	916	// 2. per-class object
954	// 2a. per-type callback	917	// 3. per-type callback
955	// 4. global callbacks	918	// 4. global callbacks
956		919
957	gather_callbacks (callbacks, cb_global, event);	920	gather_callbacks (callbacks, cb_global, event);
958		921
959	switch (KLASS_OF (event))	922	switch (KLASS_OF (event))
…		…
1012	gather_callbacks (callbacks, map->cb, event);	975	gather_callbacks (callbacks, map->cb, event);
1013		976
1014	gather_callbacks (callbacks, cb_map, event);	977	gather_callbacks (callbacks, cb_map, event);
1015	break;	978	break;
1016		979
		980	case KLASS_CLIENT:
		981	dt = (data_type) va_arg (ap, int);
		982	assert (("first argument must be of type client", dt == DT_CLIENT));
		983	ns = va_arg (ap, client *);
		984
		985	if (ns->cb)
		986	gather_callbacks (callbacks, ns->cb, event);
		987
		988	gather_callbacks (callbacks, cb_client, event);
		989	break;
		990
1017	default:	991	default:
1018	assert (("unsupported event klass in cfperl_invoke", 0));	992	assert (("unsupported event klass in cfperl_invoke", 0));
1019	}	993	}
1020		994
1021	// short-circuit processing if no callbacks found/defined	995	// short-circuit processing if no callbacks found/defined
…		…
1034		1008
1035	switch (KLASS_OF (event))	1009	switch (KLASS_OF (event))
1036	{	1010	{
1037	case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break;	1011	case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break;
1038	case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break;	1012	case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break;
		1013	case KLASS_CLIENT: PUSHs (sv_2mortal (newSVdt (DT_CLIENT, pl))); break;
1039	case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break;	1014	case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break;
1040	}	1015	}
1041		1016
1042	for (;;)	1017	for (;;)
1043	{	1018	{
…		…
1089	cfperl_result_INT (int idx)	1064	cfperl_result_INT (int idx)
1090	{	1065	{
1091	return SvIV (cfperl_result (idx));	1066	return SvIV (cfperl_result (idx));
1092	}	1067	}
1093		1068
		1069	double
		1070	cfperl_result_DOUBLE (int idx)
		1071	{
		1072	return SvNV (cfperl_result (idx));
		1073	}
		1074
		1075	/////////////////////////////////////////////////////////////////////////////
		1076
		1077	struct EventAPI *watcher_base::GEventAPI;
		1078
		1079	static void iw_dispatch (pe_event *ev)
		1080	{
		1081	iw w = (iw )ev->ext_data;
		1082	w->call (*w);
		1083	}
		1084
		1085	void
		1086	iw::alloc ()
		1087	{
		1088	pe = GEventAPI->new_idle (0, 0);
		1089
		1090	pe->base.callback = (void *)iw_dispatch;
		1091	pe->base.ext_data = (void *)this;
		1092	}
		1093
		1094	static void iow_dispatch (pe_event *ev)
		1095	{
		1096	iow w = (iow )ev->ext_data;
		1097	w->call (w, ((pe_ioevent )ev)->got);
		1098	}
		1099
		1100	void
		1101	iow::alloc ()
		1102	{
		1103	pe = GEventAPI->new_io (0, 0);
		1104
		1105	pe->base.callback = (void *)iow_dispatch;
		1106	pe->base.ext_data = (void *)this;
		1107
		1108	pe->fd = -1;
		1109	pe->poll = 0;
		1110	}
		1111
		1112	void
		1113	iow::fd (int fd)
		1114	{
		1115	pe->fd = fd;
		1116	}
		1117
		1118	int
		1119	iow::poll ()
		1120	{
		1121	return pe->poll;
		1122	}
		1123
		1124	void
		1125	iow::poll (int events)
		1126	{
		1127	if (pe->poll != events)
		1128	{
		1129	if (pe->poll) stop ();
		1130	pe->poll = events;
		1131	if (pe->poll) start ();
		1132	}
		1133	}
		1134
1094	MODULE = cf PACKAGE = cf PREFIX = cf_	1135	MODULE = cf PACKAGE = cf PREFIX = cf_
1095		1136
1096	BOOT:	1137	BOOT:
1097	{	1138	{
1098	HV *stash = gv_stashpv ("cf", 1);	1139	HV *stash = gv_stashpv ("cf", 1);
		1140
		1141	I_EVENT_API (PACKAGE);
		1142	watcher_base::GEventAPI = GEventAPI;
1099		1143
1100	newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));	1144	newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1101		1145
1102	static const struct {	1146	static const struct {
1103	const char *name;	1147	const char *name;
…		…
1117	const_iv (POTION)	1161	const_iv (POTION)
1118	const_iv (FOOD)	1162	const_iv (FOOD)
1119	const_iv (POISON)	1163	const_iv (POISON)
1120	const_iv (BOOK)	1164	const_iv (BOOK)
1121	const_iv (CLOCK)	1165	const_iv (CLOCK)
1122	const_iv (LIGHTNING)
1123	const_iv (ARROW)	1166	const_iv (ARROW)
1124	const_iv (BOW)	1167	const_iv (BOW)
1125	const_iv (WEAPON)	1168	const_iv (WEAPON)
1126	const_iv (ARMOUR)	1169	const_iv (ARMOUR)
1127	const_iv (PEDESTAL)	1170	const_iv (PEDESTAL)
…		…
1147	const_iv (AMULET)	1190	const_iv (AMULET)
1148	const_iv (PLAYERMOVER)	1191	const_iv (PLAYERMOVER)
1149	const_iv (TELEPORTER)	1192	const_iv (TELEPORTER)
1150	const_iv (CREATOR)	1193	const_iv (CREATOR)
1151	const_iv (SKILL)	1194	const_iv (SKILL)
1152	const_iv (EXPERIENCE)
1153	const_iv (EARTHWALL)	1195	const_iv (EARTHWALL)
1154	const_iv (GOLEM)	1196	const_iv (GOLEM)
1155	const_iv (THROWN_OBJ)	1197	const_iv (THROWN_OBJ)
1156	const_iv (BLINDNESS)	1198	const_iv (BLINDNESS)
1157	const_iv (GOD)	1199	const_iv (GOD)
…		…
1177	const_iv (FLOOR)	1219	const_iv (FLOOR)
1178	const_iv (FLESH)	1220	const_iv (FLESH)
1179	const_iv (INORGANIC)	1221	const_iv (INORGANIC)
1180	const_iv (SKILL_TOOL)	1222	const_iv (SKILL_TOOL)
1181	const_iv (LIGHTER)	1223	const_iv (LIGHTER)
1182	const_iv (TRAP_PART)
1183	const_iv (WALL)	1224	const_iv (BUILDABLE_WALL)
1184	const_iv (LIGHT_SOURCE)
1185	const_iv (MISC_OBJECT)	1225	const_iv (MISC_OBJECT)
1186	const_iv (MONSTER)
1187	const_iv (SPAWN_GENERATOR)
1188	const_iv (LAMP)	1226	const_iv (LAMP)
1189	const_iv (DUPLICATOR)	1227	const_iv (DUPLICATOR)
1190	const_iv (TOOL)
1191	const_iv (SPELLBOOK)	1228	const_iv (SPELLBOOK)
1192	const_iv (BUILDFAC)
1193	const_iv (CLOAK)	1229	const_iv (CLOAK)
1194	const_iv (SPINNER)	1230	const_iv (SPINNER)
1195	const_iv (GATE)	1231	const_iv (GATE)
1196	const_iv (BUTTON)	1232	const_iv (BUTTON)
1197	const_iv (CF_HANDLE)	1233	const_iv (CF_HANDLE)
…		…
1204	const_iv (SPELL_EFFECT)	1240	const_iv (SPELL_EFFECT)
1205	const_iv (CONVERTER)	1241	const_iv (CONVERTER)
1206	const_iv (BRACERS)	1242	const_iv (BRACERS)
1207	const_iv (POISONING)	1243	const_iv (POISONING)
1208	const_iv (SAVEBED)	1244	const_iv (SAVEBED)
1209	const_iv (POISONCLOUD)
1210	const_iv (FIREHOLES)
1211	const_iv (WAND)	1245	const_iv (WAND)
1212	const_iv (SCROLL)	1246	const_iv (SCROLL)
1213	const_iv (DIRECTOR)	1247	const_iv (DIRECTOR)
1214	const_iv (GIRDLE)	1248	const_iv (GIRDLE)
1215	const_iv (FORCE)	1249	const_iv (FORCE)
…		…
1230	const_iv (DISEASE)	1264	const_iv (DISEASE)
1231	const_iv (SYMPTOM)	1265	const_iv (SYMPTOM)
1232	const_iv (BUILDER)	1266	const_iv (BUILDER)
1233	const_iv (MATERIAL)	1267	const_iv (MATERIAL)
1234	const_iv (ITEM_TRANSFORMER)	1268	const_iv (ITEM_TRANSFORMER)
1235	const_iv (QUEST)
1236		1269
1237	const_iv (NUM_SUBTYPES)	1270	const_iv (NUM_SUBTYPES)
1238		1271
1239	const_iv (ST_BD_BUILD)	1272	const_iv (ST_BD_BUILD)
1240	const_iv (ST_BD_REMOVE)	1273	const_iv (ST_BD_REMOVE)
…		…
1293	const_iv (FLAG_MONSTER)	1326	const_iv (FLAG_MONSTER)
1294	const_iv (FLAG_FRIENDLY)	1327	const_iv (FLAG_FRIENDLY)
1295	const_iv (FLAG_GENERATOR)	1328	const_iv (FLAG_GENERATOR)
1296	const_iv (FLAG_IS_THROWN)	1329	const_iv (FLAG_IS_THROWN)
1297	const_iv (FLAG_AUTO_APPLY)	1330	const_iv (FLAG_AUTO_APPLY)
1298	const_iv (FLAG_TREASURE)
1299	const_iv (FLAG_PLAYER_SOLD)	1331	const_iv (FLAG_PLAYER_SOLD)
1300	const_iv (FLAG_SEE_INVISIBLE)	1332	const_iv (FLAG_SEE_INVISIBLE)
1301	const_iv (FLAG_CAN_ROLL)	1333	const_iv (FLAG_CAN_ROLL)
1302	const_iv (FLAG_OVERLAY_FLOOR)	1334	const_iv (FLAG_OVERLAY_FLOOR)
1303	const_iv (FLAG_IS_TURNABLE)	1335	const_iv (FLAG_IS_TURNABLE)
…		…
1426	const_iv (F_BUY)	1458	const_iv (F_BUY)
1427	const_iv (F_SHOP)	1459	const_iv (F_SHOP)
1428	const_iv (F_SELL)	1460	const_iv (F_SELL)
1429		1461
1430	const_iv (P_BLOCKSVIEW)	1462	const_iv (P_BLOCKSVIEW)
		1463	const_iv (P_PLAYER)
1431	const_iv (P_NO_MAGIC)	1464	const_iv (P_NO_MAGIC)
1432	const_iv (P_IS_ALIVE)	1465	const_iv (P_IS_ALIVE)
1433	const_iv (P_NO_CLERIC)	1466	const_iv (P_NO_CLERIC)
1434	const_iv (P_NEED_UPDATE)	1467	const_iv (P_NEED_UPDATE)
1435	const_iv (P_NO_ERROR)
1436	const_iv (P_OUT_OF_MAP)	1468	const_iv (P_OUT_OF_MAP)
1437	const_iv (P_NEW_MAP)	1469	const_iv (P_NEW_MAP)
1438		1470
1439	const_iv (UP_OBJ_INSERT)	1471	const_iv (UP_OBJ_INSERT)
1440	const_iv (UP_OBJ_REMOVE)	1472	const_iv (UP_OBJ_REMOVE)
…		…
1586	const_iv (MAP_LOADING)	1618	const_iv (MAP_LOADING)
1587	const_iv (MAP_SAVING)	1619	const_iv (MAP_SAVING)
1588		1620
1589	const_iv (KLASS_GLOBAL)	1621	const_iv (KLASS_GLOBAL)
1590	const_iv (KLASS_OBJECT)	1622	const_iv (KLASS_OBJECT)
		1623	const_iv (KLASS_CLIENT)
1591	const_iv (KLASS_PLAYER)	1624	const_iv (KLASS_PLAYER)
1592	const_iv (KLASS_MAP)	1625	const_iv (KLASS_MAP)
1593	};	1626	};
1594		1627
1595	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1628	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
…		…
1614	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));	1647	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1615	av_push (event, newSViv (eiv->klass));	1648	av_push (event, newSViv (eiv->klass));
1616	av_store (av, eiv->iv, newRV_noinc ((SV *)event));	1649	av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1617	newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));	1650	newCONSTSUB (stash, (char *)eiv->name, newSViv (eiv->iv));
1618	}	1651	}
1619
1620	//I_EVENT_API (PACKAGE);
1621	}	1652	}
1622		1653
1623	void _init_vars ()	1654	void _init_vars ()
1624	CODE:	1655	CODE:
1625	cb_global = get_av ("cf::CB_GLOBAL", 1);	1656	cb_global = get_av ("cf::CB_GLOBAL", 1);
1626	cb_object = get_av ("cf::CB_OBJECT", 1);	1657	cb_object = get_av ("cf::CB_OBJECT", 1);
1627	cb_player = get_av ("cf::CB_PLAYER", 1);	1658	cb_player = get_av ("cf::CB_PLAYER", 1);
		1659	cb_client = get_av ("cf::CB_CLIENT", 1);
1628	cb_type = get_av ("cf::CB_TYPE" , 1);	1660	cb_type = get_av ("cf::CB_TYPE" , 1);
1629	cb_map = get_av ("cf::CB_MAP" , 1);	1661	cb_map = get_av ("cf::CB_MAP" , 1);
1630		1662
1631	void _global_reattach ()	1663	void _global_reattach ()
1632	CODE:	1664	CODE:
1633	{	1665	{
1634	// reattach to all attachable objects in the game.	1666	// reattach to all attachable objects in the game.
		1667	for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
		1668	reattach (*i);
		1669
1635	for (player *pl = first_player; pl; pl = pl->next)	1670	for (player *pl = first_player; pl; pl = pl->next)
1636	reattach (pl);	1671	reattach (pl);
1637		1672
1638	for (maptile *map = first_map; map; map = map->next)	1673	for (maptile *map = first_map; map; map = map->next)
1639	reattach (map);	1674	reattach (map);
…		…
1696	}	1731	}
1697	OUTPUT: RETVAL	1732	OUTPUT: RETVAL
1698		1733
1699	void _exit (int status = 0)	1734	void _exit (int status = 0)
1700		1735
1701	int cf_find_animation (char *text)	1736	int find_animation (char *text)
1702	PROTOTYPE: $	1737	PROTOTYPE: $
1703		1738
1704	int random_roll(int min, int max, object *op, int goodbad);	1739	int random_roll (int min, int max, object *op, int goodbad);
1705		1740
1706	const char *cost_string_from_value(uint64 cost, int approx = 0)	1741	const char *cost_string_from_value(uint64 cost, int approx = 0)
1707		1742
1708	int invoke (int event, ...)	1743	int invoke (int event, ...)
1709	CODE:	1744	CODE:
…		…
1750	RETVAL = newSVpv (resist_plus[atnr], 0);	1785	RETVAL = newSVpv (resist_plus[atnr], 0);
1751	else	1786	else
1752	XSRETURN_UNDEF;	1787	XSRETURN_UNDEF;
1753	OUTPUT: RETVAL	1788	OUTPUT: RETVAL
1754		1789
		1790	MODULE = cf PACKAGE = cf::attachable
		1791
1755	int	1792	int
1756	_valid (SV *obj)	1793	valid (SV *obj)
1757	CODE:	1794	CODE:
1758	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);	1795	RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1759	OUTPUT:	1796	OUTPUT:
1760	RETVAL	1797	RETVAL
1761		1798
…		…
1770	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	1807	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1771	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));	1808	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
1772	OUTPUT: RETVAL	1809	OUTPUT: RETVAL
1773		1810
1774	SV registry (object op)	1811	SV registry (object op)
1775	CODE:
1776	RETVAL = registry_of (op);
1777	OUTPUT:
1778	RETVAL
1779		1812
1780	void mortals ()	1813	void mortals ()
1781	PPCODE:	1814	PPCODE:
1782	EXTEND (SP, object::mortals.size ());	1815	EXTEND (SP, object::mortals.size ());
1783	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)	1816	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
…		…
1825		1858
1826	object find_best_object_match (object op, const char *match)	1859	object find_best_object_match (object op, const char *match)
1827		1860
1828	object find_marked_object (object op)	1861	object find_marked_object (object op)
1829		1862
1830	int cf_object_get_resistance (object *op, int rtype)	1863	int resistance (object *op, int rtype, int newval = 0)
1831	ALIAS: resistance = 0	1864	CODE:
		1865	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1866	croak ("resistance out of bounds");
		1867	RETVAL = op->resist [rtype];
		1868	if (items >= 3)
		1869	op->resist [rtype] = newval;
		1870	OUTPUT: RETVAL
		1871
		1872	void set_resistance (object *op, int rtype, int val)
		1873	CODE:
		1874	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1875	op->resist[rtype] = val;
1832		1876
1833	int need_identify (const object *obj);	1877	int need_identify (const object *obj);
1834		1878
1835	int apply_shop_mat (object shop_mat, object op);	1879	int apply_shop_mat (object shop_mat, object op);
1836		1880
…		…
1838	CODE:	1882	CODE:
1839	RETVAL = move_ob (op, dir, originator);	1883	RETVAL = move_ob (op, dir, originator);
1840	OUTPUT:	1884	OUTPUT:
1841	RETVAL	1885	RETVAL
1842		1886
1843	void cf_object_apply (object op, object author, int flags = 0)	1887	void apply (object applier, object applied, int flags = 0)
		1888	CODE:
		1889	manual_apply (applied, applier, flags);
1844		1890
1845	void cf_object_apply_below (object *op)	1891	void apply_below (object *op)
		1892	CODE:
		1893	player_apply_below (op);
1846		1894
1847	void cf_object_remove (object *op)	1895	void remove (object *op)
		1896	CODE:
		1897	op->remove ();
1848		1898
1849	void cf_object_free (object *op)	1899	void
		1900	object::destroy (int recursive = 0)
1850		1901
1851	object cf_object_present_archname_inside (object op, char *whatstr)	1902	object cf_object_present_archname_inside (object op, char *whatstr)
1852		1903
1853	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)	1904	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)
1854		1905
1855	int cf_object_change_map (object op, int x, int y, maptile map)	1906	int cf_object_change_map (object op, int x, int y, maptile map)
1856		1907
1857	object cf_object_clone (object op, int clonetype = 0)	1908	object clone (object op, int recursive = 0)
		1909	CODE:
		1910	if (recursive)
		1911	RETVAL = object_create_clone (op);
		1912	else
		1913	{
		1914	RETVAL = object::create ();
		1915	op->copy_to (RETVAL);
		1916	}
		1917	OUTPUT: RETVAL
1858		1918
1859	int cf_object_pay_item (object op, object buyer)	1919	int pay_item (object op, object buyer)
		1920	CODE:
		1921	RETVAL = pay_for_item (op, buyer);
		1922	OUTPUT: RETVAL
1860		1923
1861	int cf_object_pay_amount (object *op, uint64 amount)	1924	int pay_amount (object *op, uint64 amount)
		1925	CODE:
		1926	RETVAL = pay_for_amount (amount, op);
		1927	OUTPUT: RETVAL
1862		1928
1863	void pay_player (object *op, uint64 amount)	1929	void pay_player (object *op, uint64 amount)
1864		1930
1865	val64 pay_player_arch (object op, const char arch, uint64 amount)	1931	val64 pay_player_arch (object op, const char arch, uint64 amount)
1866		1932
1867	int cf_object_cast_spell (object caster, object ctoo, int dir, object spell_ob, char stringarg = 0)	1933	int cast_spell (object op, object caster, int dir, object spell_ob, char stringarg = 0)
1868		1934
1869	int cf_object_cast_ability (object caster, object ctoo, int dir, object sp_, char stringarg = 0)	1935	void learn_spell (object op, object sp, int special_prayer = 0)
		1936	CODE:
		1937	do_learn_spell (op, sp, special_prayer);
1870		1938
1871	void cf_object_learn_spell (object op, object sp)
1872
1873	void cf_object_forget_spell (object op, object sp)	1939	void forget_spell (object op, object sp)
		1940	CODE:
		1941	do_forget_spell (op, query_name (sp));
1874		1942
1875	object cf_object_check_for_spell (object op, char *spellname)	1943	object check_for_spell (object op, char *spellname)
		1944	CODE:
		1945	RETVAL = check_spell_known (op, spellname);
		1946	OUTPUT: RETVAL
1876		1947
1877	int cf_object_query_money (object *op)	1948	int query_money (object *op)
1878	ALIAS: money = 0	1949	ALIAS: money = 0
1879		1950
1880	int cf_object_query_cost (object op, object who, int flags)	1951	int query_cost (object op, object who, int flags)
1881	ALIAS: cost = 0	1952	ALIAS: cost = 0
1882		1953
1883	void cf_object_activate_rune (object op , object victim)	1954	void spring_trap (object op, object victim)
1884		1955
1885	int cf_object_check_trigger (object op, object cause)	1956	int check_trigger (object op, object cause)
1886		1957
1887	int cf_object_out_of_map (object *op, int x, int y)
1888
1889	void cf_object_drop (object op, object author)	1958	void drop (object who, object op)
1890		1959
1891	void cf_object_take (object op, object author)	1960	void pick_up (object who, object op)
1892		1961
1893	object cf_object_insert_object (object op, object *container)	1962	object cf_object_insert_object (object op, object *container)
1894		1963
1895	object cf_object_insert_in_ob (object ob, object *where)	1964	object cf_object_insert_in_ob (object ob, object *where)
1896		1965
1897	int cf_object_teleport (object op, maptile map, int x, int y)	1966	int cf_object_teleport (object op, maptile map, int x, int y)
1898		1967
1899	void cf_object_update (object *op, int flags)	1968	void update (object *op, int action)
1900		1969	CODE:
1901	void cf_object_pickup (object op, object what)	1970	update_object (op, action);
1902		1971
1903	object cf_create_object_by_name (const char name)	1972	object cf_create_object_by_name (const char name)
1904		1973
1905	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)	1974	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)
1906		1975
…		…
1915	void use_trigger (object *op);	1984	void use_trigger (object *op);
1916		1985
1917	void add_button_link (object button, maptile map, int connected);	1986	void add_button_link (object button, maptile map, int connected);
1918		1987
1919	void remove_button_link (object *op);	1988	void remove_button_link (object *op);
1920
1921	void
1922	cf_object_set_resistance (object *op, int rtype, int val)
1923	CODE:
1924	if (rtype >= 0 && rtype < NROFATTACKS)
1925	op->resist[rtype] = val;
1926		1989
1927		1990
1928	MODULE = cf PACKAGE = cf::object PREFIX = cf_	1991	MODULE = cf PACKAGE = cf::object PREFIX = cf_
1929		1992
1930	void cf_fix_object (object *pl)	1993	void cf_fix_object (object *pl)
…		…
1994	base_name (object *op, int plural = op->nrof > 1)	2057	base_name (object *op, int plural = op->nrof > 1)
1995	CODE:	2058	CODE:
1996	RETVAL = query_base_name (op, plural);	2059	RETVAL = query_base_name (op, plural);
1997	OUTPUT: RETVAL	2060	OUTPUT: RETVAL
1998		2061
		2062	object decrease_ob_nr (object op, unsigned long i)
		2063
1999	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_	2064	MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
2000		2065
2001	player player (object op)	2066	player player (object op)
2002	CODE:	2067	CODE:
2003	RETVAL = op->contr;	2068	RETVAL = op->contr;
…		…
2040	int command_banish (object op, char params)	2105	int command_banish (object op, char params)
2041		2106
2042		2107
2043	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_	2108	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2044		2109
2045	INCLUDE: $PERL genacc player ../include/newserver.h ../include/player.h \|	2110	INCLUDE: $PERL genacc player ../include/player.h \|
2046
2047	char *
2048	client (player *pl)
2049	CODE:
2050	RETVAL = pl->socket.client;
2051	OUTPUT:
2052	RETVAL
2053
2054	char *
2055	host (player *pl)
2056	CODE:
2057	RETVAL = pl->socket.host;
2058	OUTPUT:
2059	RETVAL
2060		2111
2061	int invoke (player *pl, int event, ...)	2112	int invoke (player *pl, int event, ...)
2062	CODE:	2113	CODE:
2063	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");	2114	if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2064	AV av = (AV )sv_2mortal ((SV *)newAV ());	2115	AV av = (AV )sv_2mortal ((SV *)newAV ());
2065	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2116	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2066	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));	2117	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
2067	OUTPUT: RETVAL	2118	OUTPUT: RETVAL
2068		2119
2069	SV registry (player pl)	2120	SV registry (player pl)
		2121
		2122	player cf_player_find (char name)
		2123	PROTOTYPE: $
		2124
		2125	void cf_player_move (player *pl, int dir)
		2126
		2127	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
		2128
		2129	player *first ()
2070	CODE:	2130	CODE:
2071	RETVAL = registry_of (pl);	2131	RETVAL = first_player;
		2132	OUTPUT: RETVAL
		2133
		2134	player next (player pl)
		2135	CODE:
		2136	RETVAL = pl->next;
		2137	OUTPUT: RETVAL
		2138
		2139	bool
		2140	cell_visible (player *pl, int dx, int dy)
		2141	CODE:
		2142	RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2
		2143	&& !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2];
2072	OUTPUT:	2144	OUTPUT:
2073	RETVAL	2145	RETVAL
2074		2146
2075	player cf_player_find (char name)
2076	PROTOTYPE: $
2077
2078	void cf_player_move (player *pl, int dir)
2079
2080	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2081
2082	player *first ()
2083	CODE:
2084	RETVAL = first_player;
2085	OUTPUT: RETVAL
2086
2087	player next (player pl)
2088	CODE:
2089	RETVAL = pl->next;
2090	OUTPUT: RETVAL
2091
2092	bool
2093	cell_visible (player *pl, int dx, int dy)
2094	CODE:
2095	RETVAL = FABS (dx) <= pl->socket.mapx / 2 && FABS (dy) <= pl->socket.mapy / 2
2096	&& !pl->blocked_los [dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2];
2097	OUTPUT:
2098	RETVAL
2099
2100	void
2101	buggy_mapscroll (player *pl, int value = 1)
2102	CODE:
2103	pl->socket.buggy_mapscroll = value;
2104
2105	void	2147	void
2106	send (player pl, SV packet)	2148	send (player pl, SV packet)
2107	CODE:	2149	CODE:
2108	{	2150	{
2109	STRLEN len;	2151	STRLEN len;
2110	char *buf = SvPVbyte (packet, len);	2152	char *buf = SvPVbyte (packet, len);
2111		2153
2112	Write_String_To_Socket (&pl->socket, buf, len);	2154	pl->socket->send_packet (buf, len);
2113	}	2155	}
2114		2156
2115	int	2157	int
2116	listening (player *pl, int new_value = -1)	2158	listening (player *pl, int new_value = -1)
2117	CODE:	2159	CODE:
…		…
2182	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2224	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2183	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));	2225	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
2184	OUTPUT: RETVAL	2226	OUTPUT: RETVAL
2185		2227
2186	SV registry (maptile map)	2228	SV registry (maptile map)
2187	CODE:
2188	RETVAL = registry_of (map);
2189	OUTPUT:
2190	RETVAL
2191		2229
2192	INCLUDE: $PERL genacc maptile ../include/map.h \|	2230	INCLUDE: $PERL genacc maptile ../include/map.h \|
2193		2231
2194	maptile *new (int width, int height)	2232	maptile *new (int width, int height)
2195	PROTOTYPE:	2233	PROTOTYPE:
…		…
2203	void delete_map (maptile *map)	2241	void delete_map (maptile *map)
2204		2242
2205	void clean_tmp_map (maptile *map)	2243	void clean_tmp_map (maptile *map)
2206		2244
2207	void play_sound_map (maptile *map, int x, int y, int sound_num)	2245	void play_sound_map (maptile *map, int x, int y, int sound_num)
		2246
		2247	int out_of_map (maptile *map, int x, int y)
2208		2248
2209	maptile tile_map (maptile map, unsigned int dir)	2249	maptile tile_map (maptile map, unsigned int dir)
2210	CODE:	2250	CODE:
2211	RETVAL = dir < 4 ? map->tile_map [dir] : 0;	2251	RETVAL = dir < 4 ? map->tile_map [dir] : 0;
2212	OUTPUT:	2252	OUTPUT:
…		…
2396		2436
2397	MODULE = cf PACKAGE = cf::living	2437	MODULE = cf PACKAGE = cf::living
2398		2438
2399	INCLUDE: $PERL genacc living ../include/living.h \|	2439	INCLUDE: $PERL genacc living ../include/living.h \|
2400		2440
		2441	MODULE = cf PACKAGE = cf::settings
		2442
		2443	INCLUDE: $PERL genacc Settings ../include/global.h \|
		2444
		2445	MODULE = cf PACKAGE = cf::client
		2446
		2447	INCLUDE: $PERL genacc client ../include/client.h \|
		2448
		2449	int invoke (client *ns, int event, ...)
		2450	CODE:
		2451	if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
		2452	AV av = (AV )sv_2mortal ((SV *)newAV ());
		2453	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
		2454	RETVAL = INVOKE_((event_type)event, ARG_CLIENT (ns), ARG_AV (av));
		2455	OUTPUT: RETVAL
		2456
		2457	SV registry (client ns)
		2458
		2459	client *
		2460	create (int fd, const char *peername)
		2461	CODE:
		2462	RETVAL = client::create (fd, peername);
		2463	OUTPUT:
		2464	RETVAL
		2465
		2466	void
		2467	client::destroy ()
		2468

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.71 by root, Mon Dec 11 21:37:29 2006 UTC vs. Revision 1.97 by root, Thu Dec 21 22:41:35 2006 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.71 by root, Mon Dec 11 21:37:29 2006 UTC vs.
Revision 1.97 by root, Thu Dec 21 22:41:35 2006 UTC