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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.324 by root, Mon Oct 12 04:02:17 2009 UTC

…		…
71	static int tick_pending;	71	static int tick_pending;
72		72
73	global gbl_ev;	73	global gbl_ev;
74	static AV cb_global, cb_attachable, cb_object, cb_player, cb_client, cb_type, *cb_map;	74	static AV cb_global, cb_attachable, cb_object, cb_player, cb_client, cb_type, *cb_map;
75	static SV sv_runtime, sv_tick_start, sv_next_tick, sv_now;	75	static SV sv_runtime, sv_tick_start, sv_next_tick, sv_now;
		76	static AV *av_reflect;
76		77
77	bitset<NUM_EVENT_TYPES> ev_want_event;	78	bitset<NUM_EVENT_TYPES> ev_want_event;
78	bitset<NUM_TYPES> ev_want_type;	79	bitset<NUM_TYPES> ev_want_type;
79		80
80	static HV	81	static HV
…		…
88	*stash_cf_arch_wrap,	89	*stash_cf_arch_wrap,
89	*stash_cf_party_wrap,	90	*stash_cf_party_wrap,
90	*stash_cf_region_wrap,	91	*stash_cf_region_wrap,
91	*stash_cf_living_wrap;	92	*stash_cf_living_wrap;
92		93
		94	static SV
		95	*cv_cf_do_invoke,
		96	*cv_cf__can_merge,
		97	*cv_cf_client_send_msg,
		98	*cv_cf_tick,
		99	*cv_cf_match_match;
		100
		101	#ifndef newSVpv_utf8
93	static inline SV *	102	static inline SV *
94	newSVpv_utf8 (const char *s)	103	newSVpv_utf8 (const char *s)
95	{	104	{
96	if (!s)	105	if (!s)
97	return newSV (0);	106	return newSV (0);
98		107
99	SV *sv = newSVpv (s, 0);	108	SV *sv = newSVpv (s, 0);
100	SvUTF8_on (sv);	109	SvUTF8_on (sv);
101	return sv;	110	return sv;
102	}	111	}
		112	#endif
103		113
		114	#ifndef newSVpvn_utf8
104	static inline SV *	115	static inline SV *
105	newSVpvn_utf8 (const char *s, STRLEN l)	116	newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106	{	117	{
107	if (!s)	118	if (!s)
108	return newSV (0);	119	return newSV (0);
109		120
110	SV *sv = newSVpvn (s, l);	121	SV *sv = newSVpvn (s, l);
		122
		123	if (utf8)
111	SvUTF8_on (sv);	124	SvUTF8_on (sv);
		125
112	return sv;	126	return sv;
113	}	127	}
		128	#endif
114		129
115	// helper cast function, returns super class * or 0	130	// helper cast function, returns super class * or 0
116	template<class super>	131	template<class super>
117	static super *	132	static super *
118	is_a (attachable *at)	133	is_a (attachable *at)
…		…
151	SvREFCNT_inc (self);	166	SvREFCNT_inc (self);
152	hv_clear (self);	167	hv_clear (self);
153	sv_unmagic ((SV *)self, PERL_MAGIC_ext);	168	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154	SvREFCNT_dec (self);	169	SvREFCNT_dec (self);
155		170
156	// self must be null now because thats sv_unmagic's job.	171	// self must be null now because that's sv_unmagic's job.
157	assert (!this->self);	172	assert (!this->self);
158	}	173	}
159	}	174	}
160		175
161	void	176	void
…		…
310	fprintf (stderr, "P %p\n", pl);	325	fprintf (stderr, "P %p\n", pl);
311		326
312	for_all_clients (ns)	327	for_all_clients (ns)
313	if (find_backref (ptr, ns))	328	if (find_backref (ptr, ns))
314	fprintf (stderr, "C %p\n", ns);	329	fprintf (stderr, "C %p\n", ns);
315
316	}	330	}
317		331
318	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	332	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319		333
320	static SV *	334	static SV *
…		…
398	croak ("perl code used %s object, but C object is already destroyed, caught", klass);	412	croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399		413
400	return (long)mg->mg_ptr;	414	return (long)mg->mg_ptr;
401	}	415	}
402		416
403	static long	417	static long noinline
404	SvPTR_ornull (SV sv, const char klass)	418	SvPTR_ornull (SV sv, const char klass)
405	{	419	{
406	if (SvOK (sv))	420	if (SvOK (sv))
407	return SvPTR (sv, klass);	421	return SvPTR (sv, klass);
408	else	422	else
409	return 0;	423	return 0;
410	}	424	}
411		425
412	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length ()); }	426	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }
413	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }	427	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }
414	inline SV *to_sv (bool v) { return newSViv (v); }	428	inline SV *to_sv (bool v) { return newSViv (v); }
415	inline SV *to_sv ( signed char v) { return newSViv (v); }	429	inline SV *to_sv ( signed char v) { return newSViv (v); }
416	inline SV *to_sv (unsigned char v) { return newSViv (v); }	430	inline SV *to_sv (unsigned char v) { return newSViv (v); }
417	inline SV *to_sv ( signed short v) { return newSViv (v); }	431	inline SV *to_sv ( signed short v) { return newSViv (v); }
…		…
600	va_end (ap);	614	va_end (ap);
601		615
602	return sv;	616	return sv;
603	}	617	}
604		618
		619	// typemap support, mostly to avoid excessive inlining
		620	template<class type>
		621	static void noinline
		622	cf_obj_to (SV *arg, type &var)
		623	{
		624	sv_to (arg, var);
		625	if (!var)
		626	croak ("must not pass invalid/null cf_obj here");
		627	}
		628
		629	template<class object>
		630	static void noinline
		631	cf_obj_ornull_to (SV arg, object &var)
		632	{
		633	if (SvOK (arg))
		634	{
		635	sv_to (arg, var);
		636	if (!var)
		637	croak ("unable to convert perl object to C++ object");
		638	}
		639	else
		640	var = 0;
		641	}
		642
605	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	643	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606		644
607	SV *	645	SV *
608	registry (attachable *ext)	646	registry (attachable *ext)
609	{	647	{
…		…
626		664
627	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;	665	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;
628		666
629	const char *argv[] = {	667	const char *argv[] = {
630	settings.argv [0],	668	settings.argv [0],
631	"-e"	669	"-e0"
632	"use EV; use Coro;" // required for bootstrap
633	"cf->bootstrap;" // required for datadir :*>
634	"unshift @INC, cf::datadir ();"
635	"require cf;"
636	};	670	};
637		671
638	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)	672	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639	\|\| perl_run (perl))	673	\|\| perl_run (perl))
640	{	674	{
641	printf ("unable to initialize perl-interpreter, aborting.\n");	675	printf ("unable to initialize perl-interpreter, aborting.\n");
642	exit (EXIT_FAILURE);	676	exit (EXIT_FAILURE);
643	}	677	}
644		678
		679	eval_pv (
		680	"#line 1 'cfperl init'\n"
		681	"use EV ();\n"
		682	"use Coro ();\n"
		683	"cf->bootstrap;\n"
		684	"unshift @INC, cf::datadir ();\n"
		685	"require cf;\n",
		686	0
		687	);
		688
		689	if (SvTRUE (ERRSV))
645	{	690	{
646	dSP;	691	printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647		692	exit (EXIT_FAILURE);
648	PUSHMARK (SP);
649	PUTBACK;
650	call_pv ("cf::init", G_DISCARD \| G_VOID);
651	}	693	}
652	}	694	}
653		695
		696	void
654	void cfperl_main ()	697	cfperl_main ()
655	{	698	{
656	dSP;	699	dSP;
657		700
658	PUSHMARK (SP);	701	PUSHMARK (SP);
659	PUTBACK;	702	PUTBACK;
…		…
684	# undef def	727	# undef def
685	};	728	};
686		729
687	#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)	730	#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688		731
689	static void	732	static void noinline
690	gather_callbacks (AV &callbacks, AV registry, event_type event)	733	gather_callbacks (AV &callbacks, AV registry, event_type event)
691	{	734	{
692	// event must be in array	735	// event must be in array
693	if (event >= 0 && event <= AvFILLp (registry))	736	if (event >= 0 && event <= AvFILLp (registry))
694	{	737	{
…		…
780	{	823	{
781	attachable::gather_callbacks (callbacks, event);	824	attachable::gather_callbacks (callbacks, event);
782	::gather_callbacks (callbacks, cb_map, event);	825	::gather_callbacks (callbacks, cb_map, event);
783	}	826	}
784		827
785	void	828	static void noinline
786	_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)	829	_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787	{	830	{
788	for (int event = 0; event <= AvFILLp (registry); ++event)	831	for (int event = 0; event <= AvFILLp (registry); ++event)
789	{	832	{
790	SV *cbs_ = AvARRAY (registry)[event];	833	SV *cbs_ = AvARRAY (registry)[event];
…		…
800	}	843	}
801	}	844	}
802	}	845	}
803		846
804	// very slow and inefficient way to recalculate the global want bitsets	847	// very slow and inefficient way to recalculate the global want bitsets
805	void	848	static void
806	_recalc_want ()	849	_recalc_want ()
807	{	850	{
808	ev_want_event.reset ();	851	ev_want_event.reset ();
809		852
810	_recalc_want (ev_want_event, cb_global);	853	_recalc_want (ev_want_event, cb_global);
…		…
883	XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));	926	XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
884	}	927	}
885		928
886	va_end (ap);	929	va_end (ap);
887		930
888	CALL_CALL ("cf::do_invoke", G_SCALAR);	931	CALL_CALL (cv_cf_do_invoke, G_SCALAR);
889	count = count > 0 ? POPi : 0;	932	count = count > 0 ? POPi : 0;
890		933
891	CALL_END;	934	CALL_END;
892		935
893	return count;	936	return count;
…		…
920	}	963	}
921		964
922	/////////////////////////////////////////////////////////////////////////////	965	/////////////////////////////////////////////////////////////////////////////
923	// various c++ => perl glue functions	966	// various c++ => perl glue functions
924		967
		968	void
925	void cfperl_tick ()	969	cfperl_tick ()
926	{	970	{
927	tick_pending = 1;	971	tick_pending = 1;
928		972
929	if (tick_inhibit)	973	if (tick_inhibit)
930	return;	974	return;
…		…
933		977
934	dSP;	978	dSP;
935		979
936	PUSHMARK (SP);	980	PUSHMARK (SP);
937	PUTBACK;	981	PUTBACK;
938	call_pv ("cf::tick", G_DISCARD \| G_VOID);	982	call_pvsv (cv_cf_tick, G_DISCARD \| G_VOID);
939		983
940	SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);	984	SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
941	}	985	}
942		986
943	void	987	void
…		…
973	CALL_BEGIN (4);	1017	CALL_BEGIN (4);
974	CALL_ARG (ns);	1018	CALL_ARG (ns);
975	CALL_ARG (type);	1019	CALL_ARG (type);
976	CALL_ARG_SV (newSVpv_utf8 (msg));	1020	CALL_ARG_SV (newSVpv_utf8 (msg));
977	CALL_ARG (color);	1021	CALL_ARG (color);
978	CALL_CALL ("cf::client::send_msg", G_VOID);	1022	CALL_CALL (cv_cf_client_send_msg, G_VOID);
979	CALL_END;	1023	CALL_END;
980	}	1024	}
981		1025
982	int	1026	int
983	cfperl_can_merge (object ob1, object ob2)	1027	cfperl_can_merge (object ob1, object ob2)
…		…
985	int can;	1029	int can;
986		1030
987	CALL_BEGIN (2);	1031	CALL_BEGIN (2);
988	CALL_ARG (ob1);	1032	CALL_ARG (ob1);
989	CALL_ARG (ob2);	1033	CALL_ARG (ob2);
990	CALL_CALL ("cf::_can_merge", G_SCALAR);	1034	CALL_CALL (cv_cf__can_merge, G_SCALAR);
991	can = count && SvTRUE (TOPs);	1035	can = count && SvTRUE (TOPs);
992	CALL_END;	1036	CALL_END;
993		1037
994	return can;	1038	return can;
		1039	}
		1040
		1041	void
		1042	cfperl_mapscript_activate (object ob, int state, object activator, object *originator)
		1043	{
		1044	CALL_BEGIN (4);
		1045	CALL_ARG (ob);
		1046	CALL_ARG (state);
		1047	CALL_ARG (activator);
		1048	CALL_ARG (originator);
		1049	CALL_CALL ("cf::mapscript::activate", G_VOID);
		1050	CALL_END;
995	}	1051	}
996		1052
997	player *	1053	player *
998	player::find (const char *name)	1054	player::find (const char *name)
999	{	1055	{
…		…
1063	maptile::do_load_sync ()	1119	maptile::do_load_sync ()
1064	{	1120	{
1065	CALL_BEGIN (1);	1121	CALL_BEGIN (1);
1066	CALL_ARG (this);	1122	CALL_ARG (this);
1067	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);	1123	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068	CALL_END;
1069	}
1070
1071	void
1072	maptile::change_all_map_light (int change)
1073	{
1074	CALL_BEGIN (1);
1075	CALL_ARG (change);
1076	CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077	CALL_END;	1124	CALL_END;
1078	}	1125	}
1079		1126
1080	void	1127	void
1081	object::enter_exit (object *exit)	1128	object::enter_exit (object *exit)
…		…
1148	CALL_CALL ("cf::_log_backtrace", G_VOID);	1195	CALL_CALL ("cf::_log_backtrace", G_VOID);
1149	CALL_END;	1196	CALL_END;
1150	#endif	1197	#endif
1151	}	1198	}
1152		1199
		1200	bool
		1201	is_match_expr (const char *expr)
		1202	{
		1203	return !strncmp (expr, "match ", sizeof ("match ") - 1);
		1204	}
		1205
		1206	bool
		1207	match (const char expr, object ob, object self, object source, object *originator)
		1208	{
		1209	if (!strncmp (expr, "match ", sizeof ("match ") - 1))
		1210	expr += sizeof ("match ") - 1;
		1211
		1212	CALL_BEGIN (5);
		1213	CALL_ARG (expr);
		1214	CALL_ARG (ob);
		1215	CALL_ARG (self);
		1216	CALL_ARG (source);
		1217	CALL_ARG (originator);
		1218	CALL_CALL (cv_cf_match_match, G_SCALAR);
		1219
		1220	bool matched = count && SvTRUE (TOPs);
		1221
		1222	CALL_END;
		1223
		1224	return matched;
		1225	}
		1226
1153	/////////////////////////////////////////////////////////////////////////////	1227	/////////////////////////////////////////////////////////////////////////////
1154		1228
1155	struct EVAPI *evapi::GEVAPI;	1229	struct EVAPI *evapi::GEVAPI;
1156	struct CoroAPI *coroapi::GCoroAPI;	1230	struct CoroAPI *coroapi::GCoroAPI;
1157		1231
		1232	void
1158	void coroapi::do_cede_to_tick ()	1233	coroapi::do_cede_to_tick ()
1159	{	1234	{
1160	cede_pending = 0;	1235	cede_pending = 0;
1161	cede ();	1236	cede ();
1162	}	1237	}
1163		1238
…		…
1187	ev_io_set ((ev_io *)this, fd, events);	1262	ev_io_set ((ev_io *)this, fd, events);
1188	if (active) start ();	1263	if (active) start ();
1189	}	1264	}
1190	}	1265	}
1191		1266
1192	void	1267	static void
1193	_connect_to_perl ()	1268	_connect_to_perl_1 ()
1194	{	1269	{
1195	stash_cf = gv_stashpv ("cf", 1);	1270	stash_cf = gv_stashpv ("cf", 1);
1196		1271
1197	stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);	1272	stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1198	stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);	1273	stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
…		…
1217	cb_client = get_av ("cf::CB_CLIENT", 1);	1292	cb_client = get_av ("cf::CB_CLIENT", 1);
1218	cb_type = get_av ("cf::CB_TYPE" , 1);	1293	cb_type = get_av ("cf::CB_TYPE" , 1);
1219	cb_map = get_av ("cf::CB_MAP" , 1);	1294	cb_map = get_av ("cf::CB_MAP" , 1);
1220	}	1295	}
1221		1296
		1297	static void
		1298	_connect_to_perl_2 ()
		1299	{
		1300	cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
		1301	cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
		1302	cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
		1303	cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
		1304	cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
		1305	}
		1306
1222	MODULE = cf PACKAGE = cf PREFIX = cf_	1307	MODULE = cf PACKAGE = cf PREFIX = cf_
1223		1308
1224	BOOT:	1309	BOOT:
1225	{	1310	{
1226	I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;	1311	I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1227	I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;	1312	I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1228		1313
1229	_connect_to_perl ();	1314	_connect_to_perl_1 ();
1230		1315
1231	newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));	1316	newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1232		1317
1233	//{	1318	//{
1234	// require_pv ("Time::HiRes");	1319	// require_pv ("Time::HiRes");
…		…
1287	const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)	1372	const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1288	const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)	1373	const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1289	const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)	1374	const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1290	const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)	1375	const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1291	const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)	1376	const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
		1377	const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1292		1378
1293	const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)	1379	const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1294		1380
1295	const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)	1381	const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1296	const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)	1382	const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
…		…
1328	const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)	1414	const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1329	const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)	1415	const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1330	const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)	1416	const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1331	const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)	1417	const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1332	const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)	1418	const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1333	const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)	1419	const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1334	const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)	1420	const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1335	const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)	1421	const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336		1422
1337	const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)	1423	const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1338	const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)	1424	const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
…		…
1505	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));	1591	av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1506	av_push (event, newSViv (eiv->klass));	1592	av_push (event, newSViv (eiv->klass));
1507	av_store (av, eiv->iv, newRV_noinc ((SV *)event));	1593	av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1508	newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));	1594	newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1509	}	1595	}
		1596
		1597	// used by autogenerated BOOT sections from genacc
		1598	av_reflect = get_av ("cf::REFLECT", 1);
1510	}	1599	}
1511		1600
1512	void _gv_clear (SV *gv)	1601	void _gv_clear (SV *gv)
1513	CODE:	1602	CODE:
1514	assert (SvTYPE (gv) == SVt_PVGV);	1603	assert (SvTYPE (gv) == SVt_PVGV);
…		…
1521	f (GvGP (gv)->gp_cv);	1610	f (GvGP (gv)->gp_cv);
1522	GvCVGEN (gv) = 0;	1611	GvCVGEN (gv) = 0;
1523	GvMULTI_off (gv);	1612	GvMULTI_off (gv);
1524	# undef f	1613	# undef f
1525		1614
1526
1527	void _connect_to_perl ()	1615	void _connect_to_perl_1 ()
		1616
		1617	void _connect_to_perl_2 ()
1528		1618
1529	void _recalc_want ()	1619	void _recalc_want ()
1530		1620
		1621	# not used by default anymore
1531	void _global_reattach ()	1622	void _global_reattach ()
1532	CODE:	1623	CODE:
1533	{	1624	{
1534	// reattach to all attachable objects in the game.	1625	// reattach to all attachable objects in the game.
1535	for_all_clients (ns)	1626	for_all_clients (ns)
…		…
1578	len -= 3;	1669	len -= 3;
1579	}	1670	}
1580		1671
1581	SvCUR_set (data_sv, dst - SvPVX (data_sv));	1672	SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582	}	1673	}
		1674
		1675	void init_anim ()
		1676
		1677	void init_globals ()
		1678
		1679	void init_experience ()
		1680
		1681	void init_attackmess ()
		1682
		1683	void init_dynamic ()
		1684
		1685	void load_settings ()
		1686
		1687	void load_materials ()
		1688
		1689	void init_uuid ()
		1690	CODE:
		1691	UUID::init ();
		1692
		1693	void init_signals ()
		1694
		1695	void init_commands ()
		1696
		1697	void init_skills ()
		1698
		1699	void init_beforeplay ()
1583		1700
1584	void evthread_start (int aiofd)	1701	void evthread_start (int aiofd)
1585		1702
1586	void cede_to_tick ()	1703	void cede_to_tick ()
1587	CODE:	1704	CODE:
…		…
1756	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));	1873	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1757	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));	1874	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1758	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));	1875	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1759	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));	1876	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1760	#endif	1877	#endif
1761	EXTEND (SP, 2*2);	1878	EXTEND (SP, 5*2);
1762	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));	1879	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1763	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));	1880	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1764	PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));	1881	PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
		1882	PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
		1883	PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1765	}	1884	}
1766		1885
1767	int find_animation (utf8_string text)	1886	int find_animation (utf8_string text)
1768	PROTOTYPE: $	1887	PROTOTYPE: $
1769		1888
…		…
2074		2193
2075	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)	2194	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)
2076		2195
2077	int calc_skill_exp (object who, object op, object *skill);	2196	int calc_skill_exp (object who, object op, object *skill);
2078		2197
2079	void push_button (object *op);	2198	void push_button (object op, object originator);
2080		2199
2081	void use_trigger (object *op);	2200	void use_trigger (object op, object originator);
2082
2083	void add_button_link (object button, maptile map, int connected);
2084
2085	void remove_button_link (object *op);
2086		2201
2087	void handle_apply_yield (object *op);	2202	void handle_apply_yield (object *op);
		2203
		2204	int convert_item (object item, object converter);
2088		2205
2089		2206
2090	MODULE = cf PACKAGE = cf::object PREFIX = cf_	2207	MODULE = cf PACKAGE = cf::object PREFIX = cf_
2091		2208
2092	# no clean way to get an object from an archetype - stupid idiotic	2209	# no clean way to get an object from an archetype - stupid idiotic
…		…
2209	pl->ob->stats.hp = pl->ob->stats.maxhp;	2326	pl->ob->stats.hp = pl->ob->stats.maxhp;
2210	pl->ob->stats.sp = pl->ob->stats.maxsp;	2327	pl->ob->stats.sp = pl->ob->stats.maxsp;
2211	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2328	pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212	pl->orig_stats = pl->ob->stats;	2329	pl->orig_stats = pl->ob->stats;
2213		2330
2214	void clear_los (player *pl)	2331	# should only be temporary
		2332	void esrv_new_player (player *pl)
2215		2333
		2334	#d# TODO: replace by blocked_los accessor, fix code using this
2216	bool	2335	bool
2217	cell_visible (player *pl, int dx, int dy)	2336	cell_visible (player *pl, int dx, int dy)
2218	CODE:	2337	CODE:
2219	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2338	RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220	&& !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221	OUTPUT:	2339	OUTPUT:
2222	RETVAL	2340	RETVAL
2223		2341
2224	void	2342	void
2225	send (player pl, SV packet)	2343	send (player pl, SV packet)
…		…
2293	}	2411	}
2294		2412
2295	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|	2413	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|
2296		2414
2297	void	2415	void
		2416	adjust_daylight ()
		2417	CODE:
		2418	maptile::adjust_daylight ();
		2419
		2420	int
		2421	outdoor_darkness (int darkness = 0)
		2422	CODE:
		2423	RETVAL = maptile::outdoor_darkness;
		2424	if (items)
		2425	maptile::outdoor_darkness = darkness;
		2426	OUTPUT:
		2427	RETVAL
		2428
		2429	void
2298	maptile::instantiate ()	2430	maptile::instantiate ()
2299		2431
2300	maptile *new ()	2432	maptile *new ()
2301	PROTOTYPE:	2433	PROTOTYPE:
2302	CODE:	2434	CODE:
…		…
2409	}	2541	}
2410		2542
2411	int out_of_map (maptile *map, int x, int y)	2543	int out_of_map (maptile *map, int x, int y)
2412		2544
2413	void	2545	void
2414	trigger (maptile *map, long connection, bool state = true)	2546	find_link (maptile *map, shstr_tmp connection)
2415	CODE:
2416	activate_connection (map, connection, state);
2417
2418	void
2419	get_connection (maptile *map, long connection)
2420	PPCODE:	2547	PPCODE:
2421	oblinkpt *obp = get_connection_links (map, connection);	2548	if (oblinkpt *obp = map->find_link (connection))
2422	if (obp)
2423	for (objectlink *ol = obp->link; ol; ol = ol->next)	2549	for (objectlink *ol = obp->link; ol; ol = ol->next)
2424	XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));	2550	XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2425		2551
2426	void	2552	void
2427	get_map_flags (maptile *map, int x, int y)	2553	get_map_flags (maptile *map, int x, int y)
…		…
2481	for (object *o = nmap->at (nx, ny).bot; o; o = o->above)	2607	for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2482	XPUSHs (sv_2mortal (to_sv (o)));	2608	XPUSHs (sv_2mortal (to_sv (o)));
2483	}	2609	}
2484		2610
2485	SV *	2611	SV *
2486	bot_at (maptile *obj, unsigned int x, unsigned int y)	2612	bot_at (maptile *map, unsigned int x, unsigned int y)
2487	PROTOTYPE: $$$	2613	PROTOTYPE: $$$
2488	ALIAS:	2614	ALIAS:
2489	top_at = 1	2615	top_at = 1
2490	flags_at = 2	2616	flags_at = 2
2491	light_at = 3	2617	light_at = 3
2492	move_block_at = 4	2618	move_block_at = 4
2493	move_slow_at = 5	2619	move_slow_at = 5
2494	move_on_at = 6	2620	move_on_at = 6
2495	move_off_at = 7	2621	move_off_at = 7
2496	INIT:
2497	if (x >= obj->width \|\| y >= obj->height) XSRETURN_UNDEF;
2498	CODE:	2622	CODE:
		2623	{
		2624	sint16 nx = x;
		2625	sint16 ny = y;
		2626
		2627	if (!xy_normalise (map, nx, ny))
		2628	XSRETURN_UNDEF;
		2629
		2630	mapspace &ms = map->at (nx, ny);
		2631
		2632	ms.update ();
		2633
2499	switch (ix)	2634	switch (ix)
2500	{	2635	{
2501	case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;	2636	case 0: RETVAL = to_sv (ms.bot ); break;
2502	case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;	2637	case 1: RETVAL = to_sv (ms.top ); break;
2503	case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;	2638	case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504	case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;	2639	case 3: RETVAL = newSViv (ms.light ); break;
2505	case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2640	case 4: RETVAL = newSVuv (ms.move_block); break;
2506	case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;	2641	case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507	case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;	2642	case 6: RETVAL = newSVuv (ms.move_on ); break;
2508	case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;	2643	case 7: RETVAL = newSVuv (ms.move_off ); break;
2509	}	2644	}
		2645	}
2510	OUTPUT: RETVAL	2646	OUTPUT: RETVAL
2511		2647
2512	void fix_walls (maptile *map, int x, int y)	2648	void fix_walls (maptile *map, int x, int y)
2513		2649
2514	void fix_walls_around (maptile *map, int x, int y)	2650	void fix_walls_around (maptile *map, int x, int y)
…		…
2647	PROTOTYPE: $	2783	PROTOTYPE: $
2648	CODE:	2784	CODE:
2649	RETVAL = region::find (name);	2785	RETVAL = region::find (name);
2650	OUTPUT: RETVAL	2786	OUTPUT: RETVAL
2651		2787
2652	region *find_fuzzy (utf8_string name)
2653	PROTOTYPE: $
2654	CODE:
2655	RETVAL = region::find_fuzzy (name);
2656	OUTPUT: RETVAL
2657
2658	int specificity (region *rgn)	2788	int specificity (region *rgn)
2659	CODE:	2789	CODE:
2660	RETVAL = 0;	2790	RETVAL = 0;
2661	while (rgn = rgn->parent)	2791	while (rgn = rgn->parent)
2662	RETVAL++;	2792	RETVAL++;

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs. Revision 1.324 by root, Mon Oct 12 04:02:17 2009 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.324 by root, Mon Oct 12 04:02:17 2009 UTC