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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.62 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.79 by root, Thu Dec 14 05:09:32 2006 UTC

…		…
43	extern sint64 *levels; // the experience table	43	extern sint64 *levels; // the experience table
44		44
45	typedef object object_ornull;	45	typedef object object_ornull;
46	typedef maptile maptile_ornull;	46	typedef maptile maptile_ornull;
47		47
		48	#if IVSIZE >= 8
		49	typedef IV val64;
		50	# define newSVval64 newSViv
		51	# define SvVAL64 SvIV
		52	#else
48	typedef double val64;	53	typedef double val64;
49	#define newSVval64 newSVnv	54	# define newSVval64 newSVnv
50	#define SvVAL64 SvNV	55	# define SvVAL64 SvNV
		56	#endif
51		57
52	static f_plug_api gethook = cfapi_get_hooks;	58	static f_plug_api gethook = cfapi_get_hooks;
53	static f_plug_api object_set_property = cfapi_object_set_property;	59	static f_plug_api object_set_property = cfapi_object_set_property;
54	static f_plug_api object_insert = cfapi_object_insert;	60	static f_plug_api object_insert = cfapi_object_insert;
55		61
56	static HV *obj_cache;
57	static PerlInterpreter *perl;	62	static PerlInterpreter *perl;
58		63
59	static AV cb_global, cb_object, cb_player, cb_type, *cb_map;	64	static AV cb_global, cb_object, cb_player, cb_type, *cb_map;
60		65
61	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	66	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
…		…
81		86
82	if (!obj->self)	87	if (!obj->self)
83	obj->self = newSVptr (obj, klass);	88	obj->self = newSVptr (obj, klass);
84		89
85	return newSVsv (obj->self);	90	return newSVsv (obj->self);
86	}
87
88	static void
89	SVptr_cache_set (void ptr, SV sv)
90	{
91	hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
92	}
93
94	static SV *
95	SVptr_cache_get (void *ptr)
96	{
97	SV *he = hv_fetch (obj_cache, (char )&ptr, sizeof (ptr), 0);
98
99	return he ? *he : 0;
100	}
101
102	static SV *
103	newSVptr_cached (void ptr, const char klass)
104	{
105	SV *sv;
106
107	if (!ptr)
108	return &PL_sv_undef;
109
110	sv = SVptr_cache_get (ptr);
111
112	if (!sv)
113	{
114	HV *hv = newHV ();
115	sv_magic ((SV )hv, 0, PERL_MAGIC_ext, (char )ptr, 0);
116	sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
117
118	SVptr_cache_set (ptr, sv);
119	}
120
121	return newSVsv (sv);
122	}	91	}
123		92
124	static void	93	static void
125	clearSVptr (SV *sv)	94	clearSVptr (SV *sv)
126	{	95	{
…		…
167	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	136	inline SV *to_sv (unsigned long v) { return newSVuv (v); }
168	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	137	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
169	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	138	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
170	inline SV *to_sv (float v) { return newSVnv (v); }	139	inline SV *to_sv (float v) { return newSVnv (v); }
171	inline SV *to_sv (double v) { return newSVnv (v); }	140	inline SV *to_sv (double v) { return newSVnv (v); }
		141	inline SV to_sv (client_socket v) { return newSVattachable (v, "cf::client_socket::wrap"); }
172	inline SV to_sv (player v) { return newSVattachable (v, "cf::player::wrap"); }	142	inline SV to_sv (player v) { return newSVattachable (v, "cf::player::wrap"); }
173	inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }	143	inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); }
174	inline SV to_sv (maptile v) { return newSVattachable (v, "cf::map::wrap"); }	144	inline SV to_sv (maptile v) { return newSVattachable (v, "cf::map::wrap"); }
175	inline SV to_sv (archetype v) { return newSVptr (v, "cf::arch::wrap"); }	145	inline SV to_sv (archetype v) { return newSVptr (v, "cf::arch::wrap"); }
176	inline SV to_sv (partylist v) { return newSVptr (v, "cf::party::wrap"); }	146	inline SV to_sv (partylist v) { return newSVptr (v, "cf::party::wrap"); }
…		…
182		152
183	//TODO:	153	//TODO:
184	inline SV to_sv (New_Face v) { return to_sv (v->name); }	154	inline SV to_sv (New_Face v) { return to_sv (v->name); }
185	inline SV to_sv (treasurelist v) { return to_sv (v->name); }	155	inline SV to_sv (treasurelist v) { return to_sv (v->name); }
186		156
		157	inline SV *to_sv (UUID v)
		158	{
		159	char buf[128];
		160	snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq);
		161	return newSVpv (buf, 0);
		162	}
		163
187	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }	164	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
188	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } //TODO: verify that all simple pointers are strdup-managed	165	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
189	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	166	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
190	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }	167	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
191	inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }	168	inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
192	inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }	169	inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
193	inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }	170	inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
…		…
197	inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }	174	inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
198	inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }	175	inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
199	inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }	176	inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
200	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }	177	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
201	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }	178	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
		179	inline void sv_to (SV sv, client_socket &v) { v = (client_socket *)SvPTR_ornull (sv, "cf::client_socket"); }
202	inline void sv_to (SV sv, player &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }	180	inline void sv_to (SV sv, player &v) { v = (player *)SvPTR_ornull (sv, "cf::player"); }
203	inline void sv_to (SV sv, object &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }	181	inline void sv_to (SV sv, object &v) { v = (object *)SvPTR_ornull (sv, "cf::object"); }
204	inline void sv_to (SV sv, archetype &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }	182	inline void sv_to (SV sv, archetype &v) { v = (archetype *)SvPTR_ornull (sv, "cf::arch"); }
205	inline void sv_to (SV sv, maptile &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }	183	inline void sv_to (SV sv, maptile &v) { v = (maptile *)SvPTR_ornull (sv, "cf::map"); }
206	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	184	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
…		…
214	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	192	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
215		193
216	template<int N>	194	template<int N>
217	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }	195	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
218		196
		197	inline void sv_to (SV *sv, UUID &v)
		198	{
		199	unsigned int version;
		200
		201	if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) \|\| 1 != version)
		202	croak ("unparsable uuid: %s", SvPV_nolen (sv));
		203	}
		204
219	static SV *	205	static SV *
220	newSVdt_va (va_list &ap, data_type type)	206	newSVdt_va (va_list &ap, data_type type)
221	{	207	{
222	SV *sv;	208	SV *sv;
223		209
…		…
255	break;	241	break;
256		242
257	case DT_MAP:	243	case DT_MAP:
258	// va_arg (object ) when void is passed is an XSI extension	244	// va_arg (object ) when void is passed is an XSI extension
259	sv = to_sv (va_arg (ap, maptile *));	245	sv = to_sv (va_arg (ap, maptile *));
		246	break;
		247
		248	case DT_SOCKET:
		249	sv = to_sv (va_arg (ap, client_socket *));
260	break;	250	break;
261		251
262	case DT_PLAYER:	252	case DT_PLAYER:
263	sv = to_sv (va_arg (ap, player *));	253	sv = to_sv (va_arg (ap, player *));
264	break;	254	break;
…		…
325	}	315	}
326		316
327	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	317	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
328		318
329	SV *	319	SV *
330	registry_of (attachable_base *ext)	320	registry (attachable_base *ext)
331	{	321	{
332	if (!ext->cb)	322	if (!ext->cb)
333	ext->cb = newAV ();	323	ext->cb = newAV ();
334		324
335	return newRV_inc ((SV *)ext->cb);	325	return newRV_inc ((SV *)ext->cb);
…		…
479	call_pv ("cf::object_freezer_save", G_VOID \| G_DISCARD \| G_EVAL);	469	call_pv ("cf::object_freezer_save", G_VOID \| G_DISCARD \| G_EVAL);
480	FREETMPS;	470	FREETMPS;
481	LEAVE;	471	LEAVE;
482	}	472	}
483		473
		474	char *object_freezer::as_string ()
		475	{
		476	dSP;
		477	ENTER;
		478	SAVETMPS;
		479	PUSHMARK (SP);
		480	EXTEND (SP, 3);
		481	PUSHs (sv_2mortal (newRV_noinc (newSVpvn ((char *)linearise (), size ()))));
		482	PUSHs (sv_2mortal (newRV_inc ((SV *)av)));
		483	PUTBACK;
		484
		485	char *res = call_pv ("cf::object_freezer_as_string", G_SCALAR \| G_EVAL) > 0
		486	? strdup (SvPVbyte_nolen (POPs))
		487	: strdup ("[fatal error]");
		488
		489	FREETMPS;
		490	LEAVE;
		491
		492	return res;
		493	}
		494
484	int fprintf (object_freezer &freezer, const char *format, ...)	495	int fprintf (object_freezer &freezer, const char *format, ...)
485	{	496	{
486	va_list ap;	497	va_list ap;
487		498
488	va_start (ap, format);	499	va_start (ap, format);
…		…
497		508
498	int fputs (const char *s, object_freezer &freezer)	509	int fputs (const char *s, object_freezer &freezer)
499	{	510	{
500	freezer.add (s);	511	freezer.add (s);
501	}	512	}
		513
		514	static const char thawer_eof[] = "\n\n\n\0\0\0";
502		515
503	object_thawer::object_thawer (const char *filename)	516	object_thawer::object_thawer (const char *filename)
504	{	517	{
505	static const char eof[] = "\n\n\n\0\0\0";	518	static const char eof[] = "\n\n\n\0\0\0";
506		519
…		…
544		557
545	PUTBACK;	558	PUTBACK;
546	FREETMPS;	559	FREETMPS;
547	LEAVE;	560	LEAVE;
548	}	561	}
		562	}
		563
		564	object_thawer::object_thawer (const char data, AV perlav)
		565	{
		566	av = perlav;
		567	text = newSVpv (data, 0);
		568	sv_catpv (text, thawer_eof);
		569	line = SvPVbyte_nolen (text);
549	}	570	}
550		571
551	void object_thawer::get (data_type type, void obj, attachable_base ext, int oid)	572	void object_thawer::get (data_type type, void obj, attachable_base ext, int oid)
552	{	573	{
553	if (!av \|\| oid < 0) // this is actually an error of sorts	574	if (!av \|\| oid < 0) // this is actually an error of sorts
…		…
756	static CommArray_s rtn_cmd;	777	static CommArray_s rtn_cmd;
757		778
758	static int	779	static int
759	runPluginCommand (object obj, char params)	780	runPluginCommand (object obj, char params)
760	{	781	{
761	dSP;	782	return -1;
762
763	ENTER;
764	SAVETMPS;
765
766	PUSHMARK (SP);
767
768	EXTEND (SP, 3);
769	PUSHs (sv_2mortal (newSVpv (rtn_cmd.name, 0)));
770	PUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, obj)));
771
772	if (params)
773	PUSHs (sv_2mortal (newSVpv (params, 0)));
774
775	PUTBACK;
776	int count = call_pv ("cf::inject_command", G_SCALAR \| G_EVAL);
777	SPAGAIN;
778
779	if (SvTRUE (ERRSV))
780	LOG (llevError, "command '%s' callback evaluation error: %s", rtn_cmd.name, SvPV_nolen (ERRSV));
781
782	int returnvalue = count > 0 ? POPi : -1;
783
784	PUTBACK;
785	FREETMPS;
786	LEAVE;
787
788	return returnvalue;
789	}	783	}
790		784
791	extern "C" void cfperl_getPluginProperty (int type, ...)	785	extern "C" void cfperl_getPluginProperty (int type, ...)
792	{	786	{
793	va_list args;	787	va_list args;
…		…
796	va_start (args, type);	790	va_start (args, type);
797	propname = va_arg (args, char *);	791	propname = va_arg (args, char *);
798	//printf ("Property name: %s\n", propname);	792	//printf ("Property name: %s\n", propname);
799		793
800	if (!strcmp (propname, "command?"))	794	if (!strcmp (propname, "command?"))
801	{
802	if (!perl)
803	return NULL;	795	return NULL;
804
805	const char cmdname = va_arg (args, const char );
806	HV *hv = get_hv ("cf::COMMAND", 1);
807	SV **svp = hv_fetch (hv, cmdname, strlen (cmdname) + 1, 0);
808
809	va_end (args);
810
811	if (svp)
812	{
813	// this is totaly broken, should stash it into %COMMAND
814	rtn_cmd.name = cmdname;
815	rtn_cmd.time = SvNV (*svp);
816	rtn_cmd.func = runPluginCommand;
817
818	return &rtn_cmd;
819	}
820	}
821	else if (!strcmp (propname, "Identification"))	796	else if (!strcmp (propname, "Identification"))
822	{	797	{
823	va_end (args);	798	va_end (args);
824	return (void*) PLUGIN_NAME;	799	return (void *)PLUGIN_NAME;
825	}	800	}
826	else if (!strcmp (propname, "FullName"))	801	else if (!strcmp (propname, "FullName"))
827	{	802	{
828	va_end (args);	803	va_end (args);
829	return (void*) PLUGIN_VERSION;	804	return (void *)PLUGIN_VERSION;
830	}	805	}
831	else	806	else
832	va_end (args);	807	va_end (args);
833		808
834	return NULL;	809	return NULL;
…		…
869	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))	844	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) \|\| perl_run (perl))
870	{	845	{
871	printf ("unable to initialize perl-interpreter, aborting.\n");	846	printf ("unable to initialize perl-interpreter, aborting.\n");
872	exit (EXIT_FAILURE);	847	exit (EXIT_FAILURE);
873	}	848	}
874
875	obj_cache = newHV ();
876	}	849	}
877		850
878	void cfperl_main ()	851	void cfperl_main ()
879	{	852	{
880	dSP;	853	dSP;
…		…
934	object *op;	907	object *op;
935	player *pl;	908	player *pl;
936	maptile *map;	909	maptile *map;
937		910
938	// callback call ordering is:	911	// callback call ordering is:
939	// 1. per-object callback (NYI)	912	// 1. per-object callback
940	// 2. per-class object	913	// 2. per-class object
941	// 2a. per-type callback	914	// 3. per-type callback
942	// 4. global callbacks	915	// 4. global callbacks
943		916
944	gather_callbacks (callbacks, cb_global, event);	917	gather_callbacks (callbacks, cb_global, event);
945		918
946	switch (KLASS_OF (event))	919	switch (KLASS_OF (event))
…		…
1076	cfperl_result_INT (int idx)	1049	cfperl_result_INT (int idx)
1077	{	1050	{
1078	return SvIV (cfperl_result (idx));	1051	return SvIV (cfperl_result (idx));
1079	}	1052	}
1080		1053
		1054	double
		1055	cfperl_result_DOUBLE (int idx)
		1056	{
		1057	return SvNV (cfperl_result (idx));
		1058	}
		1059
1081	MODULE = cf PACKAGE = cf PREFIX = cf_	1060	MODULE = cf PACKAGE = cf PREFIX = cf_
1082		1061
1083	BOOT:	1062	BOOT:
1084	{	1063	{
1085	HV *stash = gv_stashpv ("cf", 1);	1064	HV *stash = gv_stashpv ("cf", 1);
		1065
		1066	newCONSTSUB (stash, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1086		1067
1087	static const struct {	1068	static const struct {
1088	const char *name;	1069	const char *name;
1089	IV iv;	1070	IV iv;
1090	} *civ, const_iv[] = {	1071	} *civ, const_iv[] = {
…		…
1605	//I_EVENT_API (PACKAGE);	1586	//I_EVENT_API (PACKAGE);
1606	}	1587	}
1607		1588
1608	void _init_vars ()	1589	void _init_vars ()
1609	CODE:	1590	CODE:
1610	cb_global = get_av ("cf::CB_GLOBAL", 1);	1591	cb_global = get_av ("cf::CB_GLOBAL", 1);
1611	cb_object = get_av ("cf::CB_OBJECT", 1);	1592	cb_object = get_av ("cf::CB_OBJECT", 1);
1612	cb_player = get_av ("cf::CB_PLAYER", 1);	1593	cb_player = get_av ("cf::CB_PLAYER", 1);
1613	cb_type = get_av ("cf::CB_TYPE" , 1);	1594	cb_type = get_av ("cf::CB_TYPE" , 1);
1614	cb_map = get_av ("cf::CB_MAP" , 1);	1595	cb_map = get_av ("cf::CB_MAP" , 1);
1615		1596
1616	void _global_reattach ()	1597	void _global_reattach ()
1617	CODE:	1598	CODE:
1618	{	1599	{
1619	// reattach to all attachable objects in the game.	1600	// reattach to all attachable objects in the game.
…		…
1624	reattach (map);	1605	reattach (map);
1625		1606
1626	for (object *op = object::first; op; op = op->next)	1607	for (object *op = object::first; op; op = op->next)
1627	reattach (op);	1608	reattach (op);
1628	}	1609	}
		1610
		1611	bool
		1612	add_client_socket (int fd, const char *peername)
1629		1613
1630	NV floor (NV x)	1614	NV floor (NV x)
1631		1615
1632	NV ceil (NV x)	1616	NV ceil (NV x)
1633		1617
…		…
1681	}	1665	}
1682	OUTPUT: RETVAL	1666	OUTPUT: RETVAL
1683		1667
1684	void _exit (int status = 0)	1668	void _exit (int status = 0)
1685		1669
1686	int cf_find_animation (char *text)	1670	int find_animation (char *text)
1687	PROTOTYPE: $	1671	PROTOTYPE: $
1688		1672
1689	int random_roll(int min, int max, object *op, int goodbad);	1673	int random_roll (int min, int max, object *op, int goodbad);
1690		1674
1691	const char *cost_string_from_value(uint64 cost, int approx = 0)	1675	const char *cost_string_from_value(uint64 cost, int approx = 0)
1692		1676
1693	int invoke (int event, ...)	1677	int invoke (int event, ...)
1694	CODE:	1678	CODE:
…		…
1755	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	1739	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1756	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));	1740	RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
1757	OUTPUT: RETVAL	1741	OUTPUT: RETVAL
1758		1742
1759	SV registry (object op)	1743	SV registry (object op)
1760	CODE:
1761	RETVAL = registry_of (op);
1762	OUTPUT:
1763	RETVAL
1764		1744
1765	void mortals ()	1745	void mortals ()
1766	PPCODE:	1746	PPCODE:
1767	EXTEND (SP, object::mortals.size ());	1747	EXTEND (SP, object::mortals.size ());
1768	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)	1748	for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
…		…
1810		1790
1811	object find_best_object_match (object op, const char *match)	1791	object find_best_object_match (object op, const char *match)
1812		1792
1813	object find_marked_object (object op)	1793	object find_marked_object (object op)
1814		1794
1815	int cf_object_get_resistance (object *op, int rtype)	1795	int resistance (object *op, int rtype, int newval = 0)
1816	ALIAS: resistance = 0	1796	CODE:
		1797	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1798	croak ("resistance out of bounds");
		1799	RETVAL = op->resist [rtype];
		1800	if (items >= 3)
		1801	op->resist [rtype] = newval;
		1802	OUTPUT: RETVAL
		1803
		1804	void set_resistance (object *op, int rtype, int val)
		1805	CODE:
		1806	if (rtype < 0 \|\| rtype >= NROFATTACKS)
		1807	op->resist[rtype] = val;
1817		1808
1818	int need_identify (const object *obj);	1809	int need_identify (const object *obj);
1819		1810
1820	int apply_shop_mat (object shop_mat, object op);	1811	int apply_shop_mat (object shop_mat, object op);
1821		1812
…		…
1823	CODE:	1814	CODE:
1824	RETVAL = move_ob (op, dir, originator);	1815	RETVAL = move_ob (op, dir, originator);
1825	OUTPUT:	1816	OUTPUT:
1826	RETVAL	1817	RETVAL
1827		1818
1828	void cf_object_apply (object op, object author, int flags = 0)	1819	void apply (object applier, object applied, int flags = 0)
		1820	CODE:
		1821	manual_apply (applied, applier, flags);
1829		1822
1830	void cf_object_apply_below (object *op)	1823	void apply_below (object *op)
		1824	CODE:
		1825	player_apply_below (op);
1831		1826
1832	void cf_object_remove (object *op)	1827	void remove (object *op)
		1828	CODE:
		1829	op->remove ();
1833		1830
1834	void cf_object_free (object *op)	1831	void destroy (object *op, int recursive = 0)
		1832	CODE:
		1833	op->destroy (recursive);
1835		1834
1836	object cf_object_present_archname_inside (object op, char *whatstr)	1835	object cf_object_present_archname_inside (object op, char *whatstr)
1837		1836
1838	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)	1837	int cf_object_transfer (object op, int x, int y, int r = 0, object_ornull orig = 0)
1839		1838
1840	int cf_object_change_map (object op, int x, int y, maptile map)	1839	int cf_object_change_map (object op, int x, int y, maptile map)
1841		1840
1842	object cf_object_clone (object op, int clonetype = 0)	1841	object clone (object op, int recursive = 0)
		1842	CODE:
		1843	if (recursive)
		1844	RETVAL = object_create_clone (op);
		1845	else
		1846	{
		1847	RETVAL = object::create ();
		1848	op->copy_to (RETVAL);
		1849	}
		1850	OUTPUT: RETVAL
1843		1851
1844	int cf_object_pay_item (object op, object buyer)	1852	int pay_item (object op, object buyer)
		1853	CODE:
		1854	RETVAL = pay_for_item (op, buyer);
		1855	OUTPUT: RETVAL
1845		1856
1846	int cf_object_pay_amount (object *op, uint64 amount)	1857	int pay_amount (object *op, uint64 amount)
		1858	CODE:
		1859	RETVAL = pay_for_amount (amount, op);
		1860	OUTPUT: RETVAL
1847		1861
1848	void pay_player (object *op, uint64 amount)	1862	void pay_player (object *op, uint64 amount)
1849		1863
1850	val64 pay_player_arch (object op, const char arch, uint64 amount)	1864	val64 pay_player_arch (object op, const char arch, uint64 amount)
1851		1865
1852	int cf_object_cast_spell (object caster, object ctoo, int dir, object spell_ob, char stringarg = 0)	1866	int cast_spell (object op, object caster, int dir, object spell_ob, char stringarg = 0)
1853		1867
1854	int cf_object_cast_ability (object caster, object ctoo, int dir, object sp_, char stringarg = 0)	1868	void learn_spell (object op, object sp, int special_prayer = 0)
		1869	CODE:
		1870	do_learn_spell (op, sp, special_prayer);
1855		1871
1856	void cf_object_learn_spell (object op, object sp)
1857
1858	void cf_object_forget_spell (object op, object sp)	1872	void forget_spell (object op, object sp)
		1873	CODE:
		1874	do_forget_spell (op, query_name (sp));
1859		1875
1860	object cf_object_check_for_spell (object op, char *spellname)	1876	object check_for_spell (object op, char *spellname)
		1877	CODE:
		1878	RETVAL = check_spell_known (op, spellname);
		1879	OUTPUT: RETVAL
1861		1880
1862	int cf_object_query_money (object *op)	1881	int query_money (object *op)
1863	ALIAS: money = 0	1882	ALIAS: money = 0
1864		1883
1865	int cf_object_query_cost (object op, object who, int flags)	1884	int query_cost (object op, object who, int flags)
1866	ALIAS: cost = 0	1885	ALIAS: cost = 0
1867		1886
1868	void cf_object_activate_rune (object op , object victim)	1887	void spring_trap (object op, object victim)
1869		1888
1870	int cf_object_check_trigger (object op, object cause)	1889	int check_trigger (object op, object cause)
1871		1890
1872	int cf_object_out_of_map (object *op, int x, int y)
1873
1874	void cf_object_drop (object op, object author)	1891	void drop (object who, object op)
1875		1892
1876	void cf_object_take (object op, object author)	1893	void pick_up (object who, object op)
1877		1894
1878	object cf_object_insert_object (object op, object *container)	1895	object cf_object_insert_object (object op, object *container)
1879		1896
1880	object cf_object_insert_in_ob (object ob, object *where)	1897	object cf_object_insert_in_ob (object ob, object *where)
1881		1898
1882	int cf_object_teleport (object op, maptile map, int x, int y)	1899	int cf_object_teleport (object op, maptile map, int x, int y)
1883		1900
1884	void cf_object_update (object *op, int flags)	1901	void update (object *op, int action)
1885		1902	CODE:
1886	void cf_object_pickup (object op, object what)	1903	update_object (op, action);
1887		1904
1888	object cf_create_object_by_name (const char name)	1905	object cf_create_object_by_name (const char name)
1889		1906
1890	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)	1907	void change_exp (object op, uint64 exp, const char skill_name = 0, int flag = 0)
1891		1908
…		…
1900	void use_trigger (object *op);	1917	void use_trigger (object *op);
1901		1918
1902	void add_button_link (object button, maptile map, int connected);	1919	void add_button_link (object button, maptile map, int connected);
1903		1920
1904	void remove_button_link (object *op);	1921	void remove_button_link (object *op);
1905
1906	void
1907	cf_object_set_resistance (object *op, int rtype, int val)
1908	CODE:
1909	if (rtype >= 0 && rtype < NROFATTACKS)
1910	op->resist[rtype] = val;
1911		1922
1912		1923
1913	MODULE = cf PACKAGE = cf::object PREFIX = cf_	1924	MODULE = cf PACKAGE = cf::object PREFIX = cf_
1914		1925
1915	void cf_fix_object (object *pl)	1926	void cf_fix_object (object *pl)
…		…
2008	void kill_player (object *op)	2019	void kill_player (object *op)
2009		2020
2010	void esrv_update_item (object op, int what, object item)	2021	void esrv_update_item (object op, int what, object item)
2011	C_ARGS: what, op, item	2022	C_ARGS: what, op, item
2012		2023
		2024	void clear_los (object *op)
		2025
		2026	int command_reset (object op, char params)
		2027
		2028	int command_teleport (object op, char params)
		2029
		2030	int command_summon (object op, char params)
		2031
		2032	int command_arrest (object op, char params)
		2033
		2034	int command_kick (object op, char params)
		2035
		2036	int command_banish (object op, char params)
		2037
		2038
2013	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_	2039	MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2014		2040
2015	INCLUDE: $PERL genacc player ../include/newserver.h ../include/player.h \|	2041	INCLUDE: $PERL genacc player ../include/player.h \|
2016		2042
2017	char *	2043	char *
2018	client (player *pl)	2044	client (player *pl)
2019	CODE:	2045	CODE:
2020	RETVAL = pl->socket.client;	2046	RETVAL = pl->socket->client;
2021	OUTPUT:	2047	OUTPUT:
2022	RETVAL	2048	RETVAL
2023		2049
2024	char *	2050	char *
2025	host (player *pl)	2051	host (player *pl)
2026	CODE:	2052	CODE:
2027	RETVAL = pl->socket.host;	2053	RETVAL = pl->socket->host;
2028	OUTPUT:	2054	OUTPUT:
2029	RETVAL	2055	RETVAL
2030		2056
2031	int invoke (player *pl, int event, ...)	2057	int invoke (player *pl, int event, ...)
2032	CODE:	2058	CODE:
…		…
2035	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2061	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2036	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));	2062	RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
2037	OUTPUT: RETVAL	2063	OUTPUT: RETVAL
2038		2064
2039	SV registry (player pl)	2065	SV registry (player pl)
		2066
		2067	player cf_player_find (char name)
		2068	PROTOTYPE: $
		2069
		2070	void cf_player_move (player *pl, int dir)
		2071
		2072	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
		2073
		2074	player *first ()
2040	CODE:	2075	CODE:
2041	RETVAL = registry_of (pl);	2076	RETVAL = first_player;
		2077	OUTPUT: RETVAL
		2078
		2079	player next (player pl)
		2080	CODE:
		2081	RETVAL = pl->next;
		2082	OUTPUT: RETVAL
		2083
		2084	bool
		2085	cell_visible (player *pl, int dx, int dy)
		2086	CODE:
		2087	RETVAL = FABS (dx) <= pl->socket->mapx / 2 && FABS (dy) <= pl->socket->mapy / 2
		2088	&& !pl->blocked_los [dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2];
2042	OUTPUT:	2089	OUTPUT:
2043	RETVAL	2090	RETVAL
2044		2091
2045	player cf_player_find (char name)
2046	PROTOTYPE: $
2047
2048	void cf_player_move (player *pl, int dir)
2049
2050	void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2051
2052	player *first ()
2053	CODE:
2054	RETVAL = first_player;
2055	OUTPUT: RETVAL
2056
2057	player next (player pl)
2058	CODE:
2059	RETVAL = pl->next;
2060	OUTPUT: RETVAL
2061
2062	bool
2063	cell_visible (player *pl, int dx, int dy)
2064	CODE:
2065	RETVAL = FABS (dx) <= pl->socket.mapx / 2 && FABS (dy) <= pl->socket.mapy / 2
2066	&& !pl->blocked_los [dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2];
2067	OUTPUT:
2068	RETVAL
2069
2070	void	2092	void
2071	buggy_mapscroll (player *pl, int value = 1)	2093	buggy_mapscroll (player *pl, int value = 1)
2072	CODE:	2094	CODE:
2073	pl->socket.buggy_mapscroll = value;	2095	pl->socket->buggy_mapscroll = value;
2074		2096
2075	void	2097	void
2076	send (player pl, SV packet)	2098	send (player pl, SV packet)
2077	CODE:	2099	CODE:
2078	{	2100	{
2079	STRLEN len;	2101	STRLEN len;
2080	char *buf = SvPVbyte (packet, len);	2102	char *buf = SvPVbyte (packet, len);
2081		2103
2082	Write_String_To_Socket (&pl->socket, buf, len);	2104	pl->socket->send_packet (buf, len);
2083	}	2105	}
2084		2106
2085	int	2107	int
2086	listening (player *pl, int new_value = -1)	2108	listening (player *pl, int new_value = -1)
2087	CODE:	2109	CODE:
…		…
2152	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));	2174	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
2153	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));	2175	RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
2154	OUTPUT: RETVAL	2176	OUTPUT: RETVAL
2155		2177
2156	SV registry (maptile map)	2178	SV registry (maptile map)
2157	CODE:
2158	RETVAL = registry_of (map);
2159	OUTPUT:
2160	RETVAL
2161		2179
2162	INCLUDE: $PERL genacc maptile ../include/map.h \|	2180	INCLUDE: $PERL genacc maptile ../include/map.h \|
2163		2181
2164	maptile *new (int width, int height)	2182	maptile *new (int width, int height)
2165	PROTOTYPE:	2183	PROTOTYPE:
…		…
2173	void delete_map (maptile *map)	2191	void delete_map (maptile *map)
2174		2192
2175	void clean_tmp_map (maptile *map)	2193	void clean_tmp_map (maptile *map)
2176		2194
2177	void play_sound_map (maptile *map, int x, int y, int sound_num)	2195	void play_sound_map (maptile *map, int x, int y, int sound_num)
		2196
		2197	int out_of_map (maptile *map, int x, int y)
2178		2198
2179	maptile tile_map (maptile map, unsigned int dir)	2199	maptile tile_map (maptile map, unsigned int dir)
2180	CODE:	2200	CODE:
2181	RETVAL = dir < 4 ? map->tile_map [dir] : 0;	2201	RETVAL = dir < 4 ? map->tile_map [dir] : 0;
2182	OUTPUT:	2202	OUTPUT:
…		…
2214	get_connection (maptile *map, long connection)	2234	get_connection (maptile *map, long connection)
2215	PPCODE:	2235	PPCODE:
2216	oblinkpt *obp = get_connection_links (map, connection);	2236	oblinkpt *obp = get_connection_links (map, connection);
2217	if (obp)	2237	if (obp)
2218	for (objectlink *ol = obp->link; ol; ol = ol->next)	2238	for (objectlink *ol = obp->link; ol; ol = ol->next)
2219	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, ol->ob)));	2239	XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob)));
2220		2240
2221	object cf_map_insert_object_there (maptile where, object op, object originator, int flags)	2241	object cf_map_insert_object_there (maptile where, object op, object originator, int flags)
2222		2242
2223	object cf_map_insert_object (maptile where, object* op, int x, int y)	2243	object cf_map_insert_object (maptile where, object* op, int x, int y)
2224		2244
…		…
2286	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;	2306	case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2287	}	2307	}
2288	OUTPUT:	2308	OUTPUT:
2289	RETVAL	2309	RETVAL
2290		2310
		2311	void fix_walls (maptile *map, int x, int y)
		2312
		2313	void fix_walls_around (maptile *map, int x, int y)
2291		2314
2292	MODULE = cf PACKAGE = cf::arch	2315	MODULE = cf PACKAGE = cf::arch
2293		2316
2294	archetype find (const char name)	2317	archetype find (const char name)
2295	CODE:	2318	CODE:
…		…
2363		2386
2364	MODULE = cf PACKAGE = cf::living	2387	MODULE = cf PACKAGE = cf::living
2365		2388
2366	INCLUDE: $PERL genacc living ../include/living.h \|	2389	INCLUDE: $PERL genacc living ../include/living.h \|
2367		2390
		2391	MODULE = cf PACKAGE = cf::settings
		2392
		2393	INCLUDE: $PERL genacc Settings ../include/global.h \|
		2394
		2395	MODULE = cf PACKAGE = cf::client_socket
		2396
		2397	INCLUDE: $PERL genacc client_socket ../include/newserver.h \|
		2398
		2399	int invoke (client_socket *ns, int event, ...)
		2400	CODE:
		2401	if (KLASS_OF (event) != KLASS_SOCKET) croak ("event class must be SOCKET");
		2402	AV av = (AV )sv_2mortal ((SV *)newAV ());
		2403	for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
		2404	RETVAL = INVOKE_((event_type)event, ARG_SOCKET (ns), ARG_AV (av));
		2405	OUTPUT: RETVAL
		2406
		2407	SV registry (client_socket ns)
		2408

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.62 by root, Wed Sep 20 21:53:50 2006 UTC vs. Revision 1.79 by root, Thu Dec 14 05:09:32 2006 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.62 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.79 by root, Thu Dec 14 05:09:32 2006 UTC