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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.292 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.314 by root, Thu Jan 1 20:49:48 2009 UTC

…		…
81	*stash_cf,	81	*stash_cf,
82	*stash_cf_object_wrap,	82	*stash_cf_object_wrap,
83	*stash_cf_object_player_wrap,	83	*stash_cf_object_player_wrap,
84	*stash_cf_player_wrap,	84	*stash_cf_player_wrap,
85	*stash_cf_map_wrap,	85	*stash_cf_map_wrap,
		86	*stash_cf_mapspace_wrap,
86	*stash_cf_client_wrap,	87	*stash_cf_client_wrap,
87	*stash_cf_arch_wrap,	88	*stash_cf_arch_wrap,
88	*stash_cf_party_wrap,	89	*stash_cf_party_wrap,
89	*stash_cf_region_wrap,	90	*stash_cf_region_wrap,
90	*stash_cf_living_wrap;	91	*stash_cf_living_wrap;
91		92
		93	#ifndef newSVpv_utf8
92	static inline SV *	94	static inline SV *
93	newSVpv_utf8 (const char *s)	95	newSVpv_utf8 (const char *s)
94	{	96	{
95	if (!s)	97	if (!s)
96	return newSV (0);	98	return newSV (0);
97		99
98	SV *sv = newSVpv (s, 0);	100	SV *sv = newSVpv (s, 0);
99	SvUTF8_on (sv);	101	SvUTF8_on (sv);
100	return sv;	102	return sv;
101	}	103	}
		104	#endif
102		105
		106	#ifndef newSVpvn_utf8
103	static inline SV *	107	static inline SV *
104	newSVpvn_utf8 (const char *s, STRLEN l)	108	newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
105	{	109	{
106	if (!s)	110	if (!s)
107	return newSV (0);	111	return newSV (0);
108		112
109	SV *sv = newSVpvn (s, l);	113	SV *sv = newSVpvn (s, l);
		114
		115	if (utf8)
110	SvUTF8_on (sv);	116	SvUTF8_on (sv);
		117
111	return sv;	118	return sv;
112	}	119	}
		120	#endif
113		121
114	// helper cast function, returns super class * or 0	122	// helper cast function, returns super class * or 0
115	template<class super>	123	template<class super>
116	static super *	124	static super *
117	is_a (attachable *at)	125	is_a (attachable *at)
…		…
150	SvREFCNT_inc (self);	158	SvREFCNT_inc (self);
151	hv_clear (self);	159	hv_clear (self);
152	sv_unmagic ((SV *)self, PERL_MAGIC_ext);	160	sv_unmagic ((SV *)self, PERL_MAGIC_ext);
153	SvREFCNT_dec (self);	161	SvREFCNT_dec (self);
154		162
155	// self must be null now because thats sv_unmagic's job.	163	// self must be null now because that's sv_unmagic's job.
156	assert (!this->self);	164	assert (!this->self);
157	}	165	}
158	}	166	}
159		167
160	void	168	void
…		…
397	croak ("perl code used %s object, but C object is already destroyed, caught", klass);	405	croak ("perl code used %s object, but C object is already destroyed, caught", klass);
398		406
399	return (long)mg->mg_ptr;	407	return (long)mg->mg_ptr;
400	}	408	}
401		409
402	static long	410	static long noinline
403	SvPTR_ornull (SV sv, const char klass)	411	SvPTR_ornull (SV sv, const char klass)
404	{	412	{
405	if (SvOK (sv))	413	if (SvOK (sv))
406	return SvPTR (sv, klass);	414	return SvPTR (sv, klass);
407	else	415	else
408	return 0;	416	return 0;
409	}	417	}
410		418
411	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length ()); }	419	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }
412	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }	420	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }
413	inline SV *to_sv (bool v) { return newSViv (v); }	421	inline SV *to_sv (bool v) { return newSViv (v); }
414	inline SV *to_sv ( signed char v) { return newSViv (v); }	422	inline SV *to_sv ( signed char v) { return newSViv (v); }
415	inline SV *to_sv (unsigned char v) { return newSViv (v); }	423	inline SV *to_sv (unsigned char v) { return newSViv (v); }
416	inline SV *to_sv ( signed short v) { return newSViv (v); }	424	inline SV *to_sv ( signed short v) { return newSViv (v); }
…		…
429	inline SV to_sv (maptile v) { return newSVattachable (v, stash_cf_map_wrap); }	437	inline SV to_sv (maptile v) { return newSVattachable (v, stash_cf_map_wrap); }
430	inline SV to_sv (archetype v) { return newSVattachable (v, stash_cf_arch_wrap); }	438	inline SV to_sv (archetype v) { return newSVattachable (v, stash_cf_arch_wrap); }
431	inline SV to_sv (region v) { return newSVattachable (v, stash_cf_region_wrap); }	439	inline SV to_sv (region v) { return newSVattachable (v, stash_cf_region_wrap); }
432	inline SV to_sv (partylist v) { return newSVptr (v, stash_cf_party_wrap); }	440	inline SV to_sv (partylist v) { return newSVptr (v, stash_cf_party_wrap); }
433	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	441	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
		442	inline SV to_sv (mapspace v) { return newSVptr (v, stash_cf_mapspace_wrap); }
434		443
435	inline SV *to_sv (object & v) { return to_sv (&v); }	444	inline SV *to_sv (object & v) { return to_sv (&v); }
436	inline SV *to_sv (living & v) { return to_sv (&v); }	445	inline SV *to_sv (living & v) { return to_sv (&v); }
437		446
438	inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }	447	inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
439	inline SV to_sv (const treasurelist v) { return to_sv (v->name); }	448	inline SV to_sv (const treasurelist v) { return to_sv (v->name); }
440		449
441	inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }	450	inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
		451
		452	inline SV to_sv (dynbuf v)
		453	{
		454	SV *sv = newSV (0);
		455
		456	sv_upgrade (sv, SVt_PV);
		457	SvGROW (sv, v->size () + 1);
		458	SvPOK_only (sv);
		459	v->linearise (SvPVX (sv));
		460	SvCUR_set (sv, v->size ());
		461	*SvEND (sv) = 0;
		462
		463	return sv;
		464	}
		465
		466	inline SV to_sv (dynbuf_text v)
		467	{
		468	SV sv = to_sv (static_cast<dynbuf > (v));
		469	SvUTF8_on (sv);
		470	return sv;
		471	}
442		472
443	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }	473	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
444	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	474	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
445	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	475	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
446	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }	476	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
…		…
462	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }	492	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }
463	inline void sv_to (SV sv, region &v) { v = (region )(attachable )SvPTR_ornull (sv, "cf::region"); }	493	inline void sv_to (SV sv, region &v) { v = (region )(attachable )SvPTR_ornull (sv, "cf::region"); }
464	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	494	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
465	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	495	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
466	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	496	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
		497	inline void sv_to (SV sv, mapspace &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
467	inline void sv_to (SV sv, object_freezer &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }	498	inline void sv_to (SV sv, object_freezer &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
468	inline void sv_to (SV sv, object_thawer &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }	499	inline void sv_to (SV sv, object_thawer &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
469		500
470	//inline void sv_to (SV sv, faceinfo &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }	501	//inline void sv_to (SV sv, faceinfo &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
471	inline void sv_to (SV sv, treasurelist &v) { v = treasurelist::find (SvPV_nolen (sv)); }	502	inline void sv_to (SV sv, treasurelist &v) { v = treasurelist::find (SvPV_nolen (sv)); }
…		…
576	va_end (ap);	607	va_end (ap);
577		608
578	return sv;	609	return sv;
579	}	610	}
580		611
		612	// typemap support, mostly to avoid excessive inlining
		613	template<class type>
		614	static void noinline
		615	cf_obj_to (SV *arg, type &var)
		616	{
		617	sv_to (arg, var);
		618	if (!var)
		619	croak ("must not pass invalid/null cf_obj here");
		620	}
		621
		622	template<class object>
		623	static void noinline
		624	cf_obj_ornull_to (SV arg, object &var)
		625	{
		626	if (SvOK (arg))
		627	{
		628	sv_to (arg, var);
		629	if (!var)
		630	croak ("unable to convert perl object to C++ object");
		631	}
		632	else
		633	var = 0;
		634	}
		635
581	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	636	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
582		637
583	SV *	638	SV *
584	registry (attachable *ext)	639	registry (attachable *ext)
585	{	640	{
…		…
602		657
603	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;	658	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;
604		659
605	const char *argv[] = {	660	const char *argv[] = {
606	settings.argv [0],	661	settings.argv [0],
607	"-e"	662	"-e0"
608	"use EV; use Coro;" // required for bootstrap
609	"cf->bootstrap;" // required for datadir :*>
610	"unshift @INC, cf::datadir ();"
611	"require cf;"
612	};	663	};
613		664
614	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)	665	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
615	\|\| perl_run (perl))	666	\|\| perl_run (perl))
616	{	667	{
617	printf ("unable to initialize perl-interpreter, aborting.\n");	668	printf ("unable to initialize perl-interpreter, aborting.\n");
618	exit (EXIT_FAILURE);	669	exit (EXIT_FAILURE);
619	}	670	}
620		671
		672	eval_pv (
		673	"#line 1 'cfperl init'\n"
		674	"use EV ();\n"
		675	"use Coro ();\n"
		676	"cf->bootstrap;\n"
		677	"unshift @INC, cf::datadir ();\n"
		678	"require cf;\n",
		679	0
		680	);
		681
		682	if (SvTRUE (ERRSV))
621	{	683	{
622	dSP;	684	printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
623		685	exit (EXIT_FAILURE);
624	PUSHMARK (SP);
625	PUTBACK;
626	call_pv ("cf::init", G_DISCARD \| G_VOID);
627	}	686	}
628	}	687	}
629		688
		689	void
630	void cfperl_main ()	690	cfperl_main ()
631	{	691	{
632	dSP;	692	dSP;
633		693
634	PUSHMARK (SP);	694	PUSHMARK (SP);
635	PUTBACK;	695	PUTBACK;
…		…
660	# undef def	720	# undef def
661	};	721	};
662		722
663	#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)	723	#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
664		724
665	static void	725	static void noinline
666	gather_callbacks (AV &callbacks, AV registry, event_type event)	726	gather_callbacks (AV &callbacks, AV registry, event_type event)
667	{	727	{
668	// event must be in array	728	// event must be in array
669	if (event >= 0 && event <= AvFILLp (registry))	729	if (event >= 0 && event <= AvFILLp (registry))
670	{	730	{
…		…
756	{	816	{
757	attachable::gather_callbacks (callbacks, event);	817	attachable::gather_callbacks (callbacks, event);
758	::gather_callbacks (callbacks, cb_map, event);	818	::gather_callbacks (callbacks, cb_map, event);
759	}	819	}
760		820
761	void	821	static void noinline
762	_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)	822	_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
763	{	823	{
764	for (int event = 0; event <= AvFILLp (registry); ++event)	824	for (int event = 0; event <= AvFILLp (registry); ++event)
765	{	825	{
766	SV *cbs_ = AvARRAY (registry)[event];	826	SV *cbs_ = AvARRAY (registry)[event];
…		…
776	}	836	}
777	}	837	}
778	}	838	}
779		839
780	// very slow and inefficient way to recalculate the global want bitsets	840	// very slow and inefficient way to recalculate the global want bitsets
781	void	841	static void
782	_recalc_want ()	842	_recalc_want ()
783	{	843	{
784	ev_want_event.reset ();	844	ev_want_event.reset ();
785		845
786	_recalc_want (ev_want_event, cb_global);	846	_recalc_want (ev_want_event, cb_global);
…		…
896	}	956	}
897		957
898	/////////////////////////////////////////////////////////////////////////////	958	/////////////////////////////////////////////////////////////////////////////
899	// various c++ => perl glue functions	959	// various c++ => perl glue functions
900		960
		961	void
901	void cfperl_tick ()	962	cfperl_tick ()
902	{	963	{
903	tick_pending = 1;	964	tick_pending = 1;
904		965
905	if (tick_inhibit)	966	if (tick_inhibit)
906	return;	967	return;
…		…
938	{	999	{
939	CALL_BEGIN (2);	1000	CALL_BEGIN (2);
940	CALL_ARG (book);	1001	CALL_ARG (book);
941	CALL_ARG (level);	1002	CALL_ARG (level);
942	CALL_CALL ("ext::books::make_book", G_VOID);	1003	CALL_CALL ("ext::books::make_book", G_VOID);
943	CALL_END;
944	}
945
946	void
947	cfperl_expand_cfpod (player *pl, std::string &msg)
948	{
949	CALL_BEGIN (2);
950	CALL_ARG (pl);
951	CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
952	CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
953
954	if (count)
955	{
956	STRLEN len;
957	char *data = SvPVutf8 (TOPs, len);
958	msg.assign (data, len);
959	}
960
961	CALL_END;	1004	CALL_END;
962	}	1005	}
963		1006
964	void	1007	void
965	cfperl_send_msg (client ns, int color, const char type, const char *msg)	1008	cfperl_send_msg (client ns, int color, const char type, const char *msg)
…		…
1061	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);	1104	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1062	CALL_END;	1105	CALL_END;
1063	}	1106	}
1064		1107
1065	void	1108	void
1066	maptile::change_all_map_light (int change)
1067	{
1068	CALL_BEGIN (1);
1069	CALL_ARG (change);
1070	CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1071	CALL_END;
1072	}
1073
1074	void
1075	object::enter_exit (object *exit)	1109	object::enter_exit (object *exit)
1076	{	1110	{
1077	if (type != PLAYER)	1111	if (type != PLAYER)
1078	return;	1112	return;
1079		1113
…		…
1147	/////////////////////////////////////////////////////////////////////////////	1181	/////////////////////////////////////////////////////////////////////////////
1148		1182
1149	struct EVAPI *evapi::GEVAPI;	1183	struct EVAPI *evapi::GEVAPI;
1150	struct CoroAPI *coroapi::GCoroAPI;	1184	struct CoroAPI *coroapi::GCoroAPI;
1151		1185
		1186	void
1152	void coroapi::do_cede_to_tick ()	1187	coroapi::do_cede_to_tick ()
1153	{	1188	{
1154	cede_pending = 0;	1189	cede_pending = 0;
1155	cede ();	1190	cede ();
1156	}	1191	}
1157		1192
…		…
1181	ev_io_set ((ev_io *)this, fd, events);	1216	ev_io_set ((ev_io *)this, fd, events);
1182	if (active) start ();	1217	if (active) start ();
1183	}	1218	}
1184	}	1219	}
1185		1220
1186	void	1221	static void
1187	_connect_to_perl ()	1222	_connect_to_perl ()
1188	{	1223	{
1189	stash_cf = gv_stashpv ("cf", 1);	1224	stash_cf = gv_stashpv ("cf", 1);
1190		1225
1191	stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);	1226	stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1192	stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);	1227	stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1193	stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);	1228	stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1194	stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);	1229	stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
		1230	stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1195	stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);	1231	stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1196	stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);	1232	stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1197	stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);	1233	stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1198	stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);	1234	stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1199	stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);	1235	stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
…		…
1319	const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)	1355	const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1320	const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)	1356	const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1321	const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)	1357	const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1322	const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)	1358	const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1323	const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)	1359	const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1324	const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK)	1360	const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1325	const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)	1361	const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1326	const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)	1362	const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1327	const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)	1363	const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1328	const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)	1364	const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329		1365
1330	const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)	1366	const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1331	const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)	1367	const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1332	const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)	1368	const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1333	const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)	1369	const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1334	const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)	1370	const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1335	const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR)	1371	const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1336		1372
1337	const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)	1373	const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1338	const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)	1374	const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1339		1375
1340	const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)	1376	const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
…		…
1392	const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)	1428	const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1393	const_iv (F_LOCKED)	1429	const_iv (F_LOCKED)
1394		1430
1395	const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)	1431	const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1396		1432
1397	const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)	1433	const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1398	const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)	1434	const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1399		1435
1400	const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)	1436	const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1401		1437
1402	const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)	1438	const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
…		…
1500	av_store (av, eiv->iv, newRV_noinc ((SV *)event));	1536	av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501	newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));	1537	newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502	}	1538	}
1503	}	1539	}
1504		1540
		1541	void _gv_clear (SV *gv)
		1542	CODE:
		1543	assert (SvTYPE (gv) == SVt_PVGV);
		1544	# define f(sv) { SV sv_ = (SV )(sv); sv = 0; SvREFCNT_dec (sv_); }
		1545	f (GvGP (gv)->gp_form);
		1546	f (GvGP (gv)->gp_io);
		1547	f (GvGP (gv)->gp_sv);
		1548	f (GvGP (gv)->gp_av);
		1549	f (GvGP (gv)->gp_hv);
		1550	f (GvGP (gv)->gp_cv);
		1551	GvCVGEN (gv) = 0;
		1552	GvMULTI_off (gv);
		1553	# undef f
		1554
1505	void _connect_to_perl ()	1555	void _connect_to_perl ()
1506		1556
1507	void _recalc_want ()	1557	void _recalc_want ()
1508		1558
		1559	# not used by default anymore
1509	void _global_reattach ()	1560	void _global_reattach ()
1510	CODE:	1561	CODE:
1511	{	1562	{
1512	// reattach to all attachable objects in the game.	1563	// reattach to all attachable objects in the game.
1513	for_all_clients (ns)	1564	for_all_clients (ns)
…		…
1556	len -= 3;	1607	len -= 3;
1557	}	1608	}
1558		1609
1559	SvCUR_set (data_sv, dst - SvPVX (data_sv));	1610	SvCUR_set (data_sv, dst - SvPVX (data_sv));
1560	}	1611	}
		1612
		1613	void init_anim ()
		1614
		1615	void init_globals ()
		1616
		1617	void init_experience ()
		1618
		1619	void init_attackmess ()
		1620
		1621	void init_dynamic ()
		1622
		1623	void load_settings ()
		1624
		1625	void load_materials ()
		1626
		1627	void init_uuid ()
		1628	CODE:
		1629	UUID::init ();
		1630
		1631	void init_signals ()
		1632
		1633	void init_commands ()
		1634
		1635	void init_skills ()
		1636
		1637	void init_beforeplay ()
1561		1638
1562	void evthread_start (int aiofd)	1639	void evthread_start (int aiofd)
1563		1640
1564	void cede_to_tick ()	1641	void cede_to_tick ()
1565	CODE:	1642	CODE:
…		…
1703	#if _POSIX_MEMLOCK	1780	#if _POSIX_MEMLOCK
1704		1781
1705	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)	1782	int mlockall (int flags = MCL_CURRENT \| MCL_FUTURE)
1706	INIT:	1783	INIT:
1707	#if __GLIBC__	1784	#if __GLIBC__
		1785	mallopt (M_TOP_PAD, 1024 * 1024);
		1786	mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
		1787	mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1708	mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc	1788	mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1709	#endif	1789	#endif
1710		1790
1711	int munlockall ()	1791	int munlockall ()
1712		1792
…		…
1731	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));	1811	PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1732	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));	1812	PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1733	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));	1813	PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1734	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));	1814	PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1735	#endif	1815	#endif
1736	EXTEND (SP, 2*2);	1816	EXTEND (SP, 5*2);
1737	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));	1817	PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1738	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));	1818	PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1739	PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));	1819	PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
		1820	PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
		1821	PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1740	}	1822	}
1741		1823
1742	int find_animation (utf8_string text)	1824	int find_animation (utf8_string text)
1743	PROTOTYPE: $	1825	PROTOTYPE: $
1744		1826
…		…
2184	pl->ob->stats.hp = pl->ob->stats.maxhp;	2266	pl->ob->stats.hp = pl->ob->stats.maxhp;
2185	pl->ob->stats.sp = pl->ob->stats.maxsp;	2267	pl->ob->stats.sp = pl->ob->stats.maxsp;
2186	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2268	pl->ob->stats.grace = pl->ob->stats.maxgrace;
2187	pl->orig_stats = pl->ob->stats;	2269	pl->orig_stats = pl->ob->stats;
2188		2270
2189	void clear_los (player *pl)	2271	# should only be temporary
		2272	void esrv_new_player (player *pl)
2190		2273
		2274	#d# TODO: replace by blocked_los accessor, fix code using this
2191	bool	2275	bool
2192	cell_visible (player *pl, int dx, int dy)	2276	cell_visible (player *pl, int dx, int dy)
2193	CODE:	2277	CODE:
2194	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2278	RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2195	&& !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2196	OUTPUT:	2279	OUTPUT:
2197	RETVAL	2280	RETVAL
2198		2281
2199	void	2282	void
2200	send (player pl, SV packet)	2283	send (player pl, SV packet)
…		…
2206	if (len > MAXSOCKBUF)	2289	if (len > MAXSOCKBUF)
2207	pl->failmsg ("[packet too long for client]");	2290	pl->failmsg ("[packet too long for client]");
2208	else if (pl->ns)	2291	else if (pl->ns)
2209	pl->ns->send_packet (buf, len);	2292	pl->ns->send_packet (buf, len);
2210	}	2293	}
2211
2212	int
2213	listening (player *pl, int new_value = -1)
2214	CODE:
2215	RETVAL = pl->listening;
2216	if (new_value >= 0)
2217	pl->listening = new_value;
2218	OUTPUT:
2219	RETVAL
2220		2294
2221	void savebed (player pl, SV map_path = 0, SV x = 0, SV y = 0)	2295	void savebed (player pl, SV map_path = 0, SV x = 0, SV y = 0)
2222	PROTOTYPE: $;$$$	2296	PROTOTYPE: $;$$$
2223	PPCODE:	2297	PPCODE:
2224	if (GIMME_V != G_VOID)	2298	if (GIMME_V != G_VOID)
…		…
2277	}	2351	}
2278		2352
2279	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|	2353	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|
2280		2354
2281	void	2355	void
		2356	adjust_daylight ()
		2357	CODE:
		2358	maptile::adjust_daylight ();
		2359
		2360	void
2282	maptile::instantiate ()	2361	maptile::instantiate ()
2283		2362
2284	maptile *new ()	2363	maptile *new ()
2285	PROTOTYPE:	2364	PROTOTYPE:
2286	CODE:	2365	CODE:
…		…
2379	}	2458	}
2380		2459
2381	void	2460	void
2382	maptile::create_region_treasure ()	2461	maptile::create_region_treasure ()
2383	CODE:	2462	CODE:
2384	{
2385	object *op = object::create ();
2386	op->type = FLOOR;
2387	op->map = THIS;
2388
2389	for (int x = 0; x < THIS->width; ++x)	2463	for (int x = 0; x < THIS->width; ++x)
2390	for (int y = 0; y < THIS->height; ++y)	2464	for (int y = 0; y < THIS->height; ++y)
2391	{	2465	{
2392	region *rgn = THIS->region (x, y);	2466	region *rgn = THIS->region (x, y);
2393		2467
2394	//fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D	2468	//fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
		2469	if (object *op = THIS->at (x, y).top)
2395	if (rgn->treasure && rndm () < rgn->treasure_density)	2470	if (rgn->treasure && rndm () < rgn->treasure_density)
2396	{
2397	op->x = x;
2398	op->y = y;
2399	create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);	2471	create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2400	}
2401	}	2472	}
2402
2403	op->destroy ();
2404	}
2405		2473
2406	int out_of_map (maptile *map, int x, int y)	2474	int out_of_map (maptile *map, int x, int y)
2407		2475
2408	void	2476	void
2409	trigger (maptile *map, long connection, bool state = true)	2477	trigger (maptile *map, long connection, bool state = true)
…		…
2438	PUSHs (sv_2mortal (newSViv (nx)));	2506	PUSHs (sv_2mortal (newSViv (nx)));
2439	PUSHs (sv_2mortal (newSViv (ny)));	2507	PUSHs (sv_2mortal (newSViv (ny)));
2440	}	2508	}
2441	}	2509	}
2442		2510
		2511	mapspace *
		2512	ms (maptile *map, unsigned int x, unsigned int y)
		2513	PROTOTYPE: $$$
		2514	CODE:
		2515	{
		2516	maptile *nmap = 0;
		2517	I16 nx, ny;
		2518
		2519	PUTBACK;
		2520	get_map_flags (map, &nmap, x, y, &nx, &ny);
		2521	SPAGAIN;
		2522
		2523	if (!nmap)
		2524	XSRETURN_UNDEF;
		2525
		2526	RETVAL = &nmap->at (nx, ny);
		2527	}
		2528	OUTPUT:
		2529	RETVAL
		2530
2443	void	2531	void
2444	at (maptile *map, unsigned int x, unsigned int y)	2532	at (maptile *map, unsigned int x, unsigned int y)
2445	PROTOTYPE: $$$	2533	PROTOTYPE: $$$
2446	PPCODE:	2534	PPCODE:
2447	{	2535	{
…		…
2456	for (object *o = nmap->at (nx, ny).bot; o; o = o->above)	2544	for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2457	XPUSHs (sv_2mortal (to_sv (o)));	2545	XPUSHs (sv_2mortal (to_sv (o)));
2458	}	2546	}
2459		2547
2460	SV *	2548	SV *
2461	bot_at (maptile *obj, unsigned int x, unsigned int y)	2549	bot_at (maptile *map, unsigned int x, unsigned int y)
2462	PROTOTYPE: $$$	2550	PROTOTYPE: $$$
2463	ALIAS:	2551	ALIAS:
2464	top_at = 1	2552	top_at = 1
2465	flags_at = 2	2553	flags_at = 2
2466	light_at = 3	2554	light_at = 3
2467	move_block_at = 4	2555	move_block_at = 4
2468	move_slow_at = 5	2556	move_slow_at = 5
2469	move_on_at = 6	2557	move_on_at = 6
2470	move_off_at = 7	2558	move_off_at = 7
2471	INIT:
2472	if (x >= obj->width \|\| y >= obj->height) XSRETURN_UNDEF;
2473	CODE:	2559	CODE:
		2560	{
		2561	sint16 nx = x;
		2562	sint16 ny = y;
		2563
		2564	if (!xy_normalise (map, nx, ny))
		2565	XSRETURN_UNDEF;
		2566
		2567	mapspace &ms = map->at (nx, ny);
		2568
		2569	ms.update ();
		2570
2474	switch (ix)	2571	switch (ix)
2475	{	2572	{
2476	case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;	2573	case 0: RETVAL = to_sv (ms.bot ); break;
2477	case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;	2574	case 1: RETVAL = to_sv (ms.top ); break;
2478	case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;	2575	case 2: RETVAL = newSVuv (ms.flags_ ); break;
2479	case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;	2576	case 3: RETVAL = newSViv (ms.light ); break;
2480	case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2577	case 4: RETVAL = newSVuv (ms.move_block); break;
2481	case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;	2578	case 5: RETVAL = newSVuv (ms.move_slow ); break;
2482	case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;	2579	case 6: RETVAL = newSVuv (ms.move_on ); break;
2483	case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;	2580	case 7: RETVAL = newSVuv (ms.move_off ); break;
2484	}	2581	}
		2582	}
2485	OUTPUT: RETVAL	2583	OUTPUT: RETVAL
2486		2584
2487	void fix_walls (maptile *map, int x, int y)	2585	void fix_walls (maptile *map, int x, int y)
2488		2586
2489	void fix_walls_around (maptile *map, int x, int y)	2587	void fix_walls_around (maptile *map, int x, int y)
…		…
2574	RETVAL = self->generate_random_map (&rmp);	2672	RETVAL = self->generate_random_map (&rmp);
2575	}	2673	}
2576	OUTPUT:	2674	OUTPUT:
2577	RETVAL	2675	RETVAL
2578		2676
		2677	MODULE = cf PACKAGE = cf::mapspace
		2678
		2679	INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h \|
		2680
2579	MODULE = cf PACKAGE = cf::arch	2681	MODULE = cf PACKAGE = cf::arch
2580		2682
2581	int archetypes_size ()	2683	int archetypes_size ()
2582	CODE:	2684	CODE:
2583	RETVAL = archetypes.size ();	2685	RETVAL = archetypes.size ();
…		…
2616		2718
2617	region *find (utf8_string name)	2719	region *find (utf8_string name)
2618	PROTOTYPE: $	2720	PROTOTYPE: $
2619	CODE:	2721	CODE:
2620	RETVAL = region::find (name);	2722	RETVAL = region::find (name);
2621	OUTPUT: RETVAL
2622
2623	region *find_fuzzy (utf8_string name)
2624	PROTOTYPE: $
2625	CODE:
2626	RETVAL = region::find_fuzzy (name);
2627	OUTPUT: RETVAL	2723	OUTPUT: RETVAL
2628		2724
2629	int specificity (region *rgn)	2725	int specificity (region *rgn)
2630	CODE:	2726	CODE:
2631	RETVAL = 0;	2727	RETVAL = 0;

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.292 by root, Tue Jul 29 02:00:55 2008 UTC vs. Revision 1.314 by root, Thu Jan 1 20:49:48 2009 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.292 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.314 by root, Thu Jan 1 20:49:48 2009 UTC