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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.332 by root, Fri Nov 6 13:21:20 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
6	*	5	*
7	* Deliantra is free software: you can redistribute it and/or modify it under	6	* Deliantra is free software: you can redistribute it and/or modify it under
8	* the terms of the Affero GNU General Public License as published by the	7	* the terms of the Affero GNU General Public License as published by the
9	* Free Software Foundation, either version 3 of the License, or (at your	8	* Free Software Foundation, either version 3 of the License, or (at your
10	* option) any later version.	9	* option) any later version.
29		28
30	#include <cstdarg>	29	#include <cstdarg>
31	#include <typeinfo>	30	#include <typeinfo>
32		31
33	#include "global.h"	32	#include "global.h"
34	#include "loader.h"
35	#include "../random_maps/random_map.h"	33	#include "../random_maps/random_map.h"
36	#include "evthread.h"	34	#include "evthread.h"
37	#include "sproto.h"	35	#include "sproto.h"
38		36
39	#include <unistd.h>	37	#include <unistd.h>
…		…
97	*cv_cf_client_send_msg,	95	*cv_cf_client_send_msg,
98	*cv_cf_tick,	96	*cv_cf_tick,
99	*cv_cf_match_match;	97	*cv_cf_match_match;
100		98
101	#ifndef newSVpv_utf8	99	#ifndef newSVpv_utf8
102	static inline SV *	100	static SV *
103	newSVpv_utf8 (const char *s)	101	newSVpv_utf8 (const char *s)
104	{	102	{
105	if (!s)	103	if (!s)
106	return newSV (0);	104	return newSV (0);
107		105
…		…
110	return sv;	108	return sv;
111	}	109	}
112	#endif	110	#endif
113		111
114	#ifndef newSVpvn_utf8	112	#ifndef newSVpvn_utf8
115	static inline SV *	113	static SV *
116	newSVpvn_utf8 (const char *s, STRLEN l, int utf8)	114	newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117	{	115	{
118	if (!s)	116	if (!s)
119	return newSV (0);	117	return newSV (0);
120		118
…		…
124	SvUTF8_on (sv);	122	SvUTF8_on (sv);
125		123
126	return sv;	124	return sv;
127	}	125	}
128	#endif	126	#endif
		127
		128	static noinline utf8_string
		129	cfSvPVutf8_nolen (SV *sv)
		130	{
		131	SvGETMAGIC (sv);
		132
		133	if (SvPOK (sv))
		134	{
		135	if (!SvUTF8 (sv))
		136	sv_utf8_upgrade_nomg (sv);
		137
		138	return SvPVX (sv);
		139	}
		140
		141	return SvPV_nolen (sv);
		142	}
129		143
130	// helper cast function, returns super class * or 0	144	// helper cast function, returns super class * or 0
131	template<class super>	145	template<class super>
132	static super *	146	static super *
133	is_a (attachable *at)	147	is_a (attachable *at)
…		…
210	attachable::destroy ()	224	attachable::destroy ()
211	{	225	{
212	if (destroyed ())	226	if (destroyed ())
213	return;	227	return;
214		228
215	flags \|= F_DESTROYED;	229	attachable_flags \|= F_DESTROYED;
216	do_destroy ();	230	do_destroy ();
217	sever_self ();	231	sever_self ();
218	}	232	}
219		233
220	void	234	void
…		…
294		308
295	attach = src.attach;	309	attach = src.attach;
296	return *this;	310	return *this;
297	}	311	}
298		312
		313	#if 0
299	template<typename T>	314	template<typename T>
300	static bool	315	static bool
301	find_backref (void ptr, T obj)	316	find_backref (void ptr, T obj)
302	{	317	{
303	char s = (char )obj;	318	char s = (char )obj;
…		…
311		326
312	return false;	327	return false;
313	}	328	}
314		329
315	// for debugging, find "live" objects containing this ptr	330	// for debugging, find "live" objects containing this ptr
316	void	331	static void
317	find_backref (void *ptr)	332	find_backref (void *ptr)
318	{	333	{
319	for_all_objects (op)	334	for_all_objects (op)
320	if (find_backref (ptr, op))	335	if (find_backref (ptr, op))
321	fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);	336	fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
…		…
326		341
327	for_all_clients (ns)	342	for_all_clients (ns)
328	if (find_backref (ptr, ns))	343	if (find_backref (ptr, ns))
329	fprintf (stderr, "C %p\n", ns);	344	fprintf (stderr, "C %p\n", ns);
330	}	345	}
		346	#endif
331		347
332	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	348	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333		349
334	static SV *	350	static SV *
335	newSVptr (void ptr, HV stash, HV *hv = newHV ())	351	newSVptr (void ptr, HV stash, HV *hv = newHV ())
…		…
401	sv_unmagic (sv, PERL_MAGIC_ext);	417	sv_unmagic (sv, PERL_MAGIC_ext);
402	}	418	}
403	#endif	419	#endif
404		420
405	static long	421	static long
		422	SvPTR_nc (SV *sv)
		423	{
		424	sv = SvRV (sv);
		425
		426	// very important shortcut
		427	if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
		428	return (long)SvMAGIC (sv)->mg_ptr;
		429
		430	if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
		431	return (long)mg->mg_ptr;
		432
		433	croak ("perl code used object, but C object is already destroyed, caught");
		434	}
		435
		436	static long
406	SvPTR (SV sv, const char klass)	437	SvPTR (SV sv, const char klass)
407	{	438	{
408	if (!sv_derived_from (sv, klass))	439	if (!sv_derived_from (sv, klass))
409	croak ("object of type %s expected", klass);	440	croak ("object of type %s expected", klass);
410		441
411	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	442	return SvPTR_nc (sv);
412
413	if (!mg)
414	croak ("perl code used %s object, but C object is already destroyed, caught", klass);
415
416	return (long)mg->mg_ptr;
417	}	443	}
418		444
419	static long noinline	445	static long noinline
420	SvPTR_ornull (SV sv, const char klass)	446	SvPTR_ornull (SV sv, const char klass)
421	{	447	{
422	if (SvOK (sv))	448	if (expect_false (!SvOK (sv))) return 0;
		449
423	return SvPTR (sv, klass);	450	return SvPTR (sv, klass);
424	else
425	return 0;
426	}	451	}
427		452
		453	static long noinline
		454	SvPTR_ornull_client (SV *sv)
		455	{
		456	if (expect_false (!SvOK (sv))) return 0;
		457
		458	if (!SvROK (sv)
		459	\|\| (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
		460	&& !sv_derived_from (sv, "cf::client")))
		461	croak ("object of type cf::client expected");
		462
		463	return SvPTR_nc (sv);
		464	}
		465
		466	static long noinline
		467	SvPTR_ornull_object (SV *sv)
		468	{
		469	if (expect_false (!SvOK (sv))) return 0;
		470
		471	if (!SvROK (sv)
		472	\|\| (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
		473	&& SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
		474	&& SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
		475	&& !sv_derived_from (sv, "cf::object")))
		476	croak ("object of type cf::object expected");
		477
		478	return SvPTR_nc (sv);
		479	}
		480
		481	static long noinline
		482	SvPTR_ornull_player (SV *sv)
		483	{
		484	if (expect_false (!SvOK (sv))) return 0;
		485
		486	if (!SvROK (sv)
		487	\|\| (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
		488	&& !sv_derived_from (sv, "cf::player")))
		489	croak ("object of type cf::player expected");
		490
		491	return SvPTR_nc (sv);
		492	}
		493
428	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }	494	static inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }
429	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }	495	static inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }
430	inline SV *to_sv (bool v) { return newSViv (v); }	496	static inline SV *to_sv (bool v) { return newSViv (v); }
431	inline SV *to_sv ( signed char v) { return newSViv (v); }	497	static inline SV *to_sv ( signed char v) { return newSViv (v); }
432	inline SV *to_sv (unsigned char v) { return newSViv (v); }	498	static inline SV *to_sv (unsigned char v) { return newSViv (v); }
433	inline SV *to_sv ( signed short v) { return newSViv (v); }	499	static inline SV *to_sv ( signed short v) { return newSViv (v); }
434	inline SV *to_sv (unsigned short v) { return newSVuv (v); }	500	static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
435	inline SV *to_sv ( signed int v) { return newSViv (v); }	501	static inline SV *to_sv ( signed int v) { return newSViv (v); }
436	inline SV *to_sv (unsigned int v) { return newSVuv (v); }	502	static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
437	inline SV *to_sv ( signed long v) { return newSViv (v); }	503	static inline SV *to_sv ( signed long v) { return newSViv (v); }
438	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	504	static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
439	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	505	static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
440	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	506	static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
441	inline SV *to_sv (float v) { return newSVnv (v); }	507	static inline SV *to_sv (float v) { return newSVnv (v); }
442	inline SV *to_sv (double v) { return newSVnv (v); }	508	static inline SV *to_sv (double v) { return newSVnv (v); }
443	inline SV to_sv (client v) { return newSVattachable (v, stash_cf_client_wrap); }	509	static inline SV to_sv (client v) { return newSVattachable (v, stash_cf_client_wrap); }
444	inline SV to_sv (player v) { return newSVattachable (v, stash_cf_player_wrap); }	510	static inline SV to_sv (player v) { return newSVattachable (v, stash_cf_player_wrap); }
445	inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }	511	static inline SV to_sv (object v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
446	inline SV to_sv (maptile v) { return newSVattachable (v, stash_cf_map_wrap); }	512	static inline SV to_sv (maptile v) { return newSVattachable (v, stash_cf_map_wrap); }
447	inline SV to_sv (archetype v) { return newSVattachable (v, stash_cf_arch_wrap); }	513	static inline SV to_sv (archetype v) { return newSVattachable (v, stash_cf_arch_wrap); }
448	inline SV to_sv (region v) { return newSVattachable (v, stash_cf_region_wrap); }	514	static inline SV to_sv (region v) { return newSVattachable (v, stash_cf_region_wrap); }
449	inline SV to_sv (partylist v) { return newSVptr (v, stash_cf_party_wrap); }	515	static inline SV to_sv (partylist v) { return newSVptr (v, stash_cf_party_wrap); }
450	inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }	516	static inline SV to_sv (living v) { return newSVptr (v, stash_cf_living_wrap); }
451	inline SV to_sv (mapspace v) { return newSVptr (v, stash_cf_mapspace_wrap); }	517	static inline SV to_sv (mapspace v) { return newSVptr (v, stash_cf_mapspace_wrap); }
452		518
453	inline SV *to_sv (object & v) { return to_sv (&v); }	519	static inline SV *to_sv (object & v) { return to_sv (&v); }
454	inline SV *to_sv (living & v) { return to_sv (&v); }	520	static inline SV *to_sv (living & v) { return to_sv (&v); }
455		521
456	inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }	522	static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
457	inline SV to_sv (const treasurelist v) { return to_sv (v->name); }	523	static inline SV to_sv (const treasurelist v) { return to_sv (v->name); }
458		524
459	inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }	525	static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
460		526
461	inline SV to_sv (dynbuf v)	527	static inline SV to_sv (dynbuf v)
462	{	528	{
463	SV *sv = newSV (0);	529	SV *sv = newSV (0);
464		530
465	sv_upgrade (sv, SVt_PV);	531	sv_upgrade (sv, SVt_PV);
466	SvGROW (sv, v->size () + 1);	532	SvGROW (sv, v->size () + 1);
…		…
470	*SvEND (sv) = 0;	536	*SvEND (sv) = 0;
471		537
472	return sv;	538	return sv;
473	}	539	}
474		540
475	inline SV to_sv (dynbuf_text v)	541	static inline SV to_sv (dynbuf_text v)
476	{	542	{
477	SV sv = to_sv (static_cast<dynbuf > (v));	543	SV sv = to_sv (static_cast<dynbuf > (v));
478	SvUTF8_on (sv);	544	SvUTF8_on (sv);
479	return sv;	545	return sv;
480	}	546	}
481		547
482	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }	548	static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
483	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	549	static inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
484	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	550	static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
485	inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }	551	static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
486	inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }	552	static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
487	inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }	553	static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
488	inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }	554	static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
489	inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }	555	static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
490	inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }	556	static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
491	inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }	557	static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
492	inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }	558	static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
493	inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }	559	static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
494	inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }	560	static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
495	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }	561	static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
496	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }	562	static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
497	inline void sv_to (SV sv, client &v) { v = (client )(attachable )SvPTR_ornull (sv, "cf::client"); }	563	static inline void sv_to (SV sv, client &v) { v = (client ) (attachable )SvPTR_ornull_client (sv); }
498	inline void sv_to (SV sv, player &v) { v = (player )(attachable )SvPTR_ornull (sv, "cf::player"); }	564	static inline void sv_to (SV sv, player &v) { v = (player ) (attachable )SvPTR_ornull_player (sv); }
499	inline void sv_to (SV sv, object &v) { v = (object )(attachable )SvPTR_ornull (sv, "cf::object"); }	565	static inline void sv_to (SV sv, object &v) { v = (object ) (attachable )SvPTR_ornull_object (sv); }
500	inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }	566	static inline void sv_to (SV sv, archetype &v) { v = (archetype )(attachable )SvPTR_ornull (sv, "cf::arch"); }
501	inline void sv_to (SV sv, maptile &v) { v = (maptile )(attachable )SvPTR_ornull (sv, "cf::map"); }	567	static inline void sv_to (SV sv, maptile &v) { v = (maptile ) (attachable )SvPTR_ornull (sv, "cf::map"); }
502	inline void sv_to (SV sv, region &v) { v = (region )(attachable )SvPTR_ornull (sv, "cf::region"); }	568	static inline void sv_to (SV sv, region &v) { v = (region ) (attachable )SvPTR_ornull (sv, "cf::region"); }
503	inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }	569	static inline void sv_to (SV sv, attachable &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
504	inline void sv_to (SV sv, partylist &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }	570	static inline void sv_to (SV sv, partylist &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
505	inline void sv_to (SV sv, living &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }	571	static inline void sv_to (SV sv, living &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
506	inline void sv_to (SV sv, mapspace &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }	572	static inline void sv_to (SV sv, mapspace &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
507	inline void sv_to (SV sv, object_freezer &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }	573	static inline void sv_to (SV sv, object_freezer &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
508	inline void sv_to (SV sv, object_thawer &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }	574	static inline void sv_to (SV sv, object_thawer &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
509		575
510	//inline void sv_to (SV sv, faceinfo &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }	576	//static inline void sv_to (SV sv, faceinfo &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
511	inline void sv_to (SV sv, treasurelist &v) { v = treasurelist::find (SvPV_nolen (sv)); }	577	static inline void sv_to (SV sv, treasurelist &v) { v = treasurelist::find (SvPV_nolen (sv)); }
512		578
513	template<class T>	579	template<class T>
514	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	580	static inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
515		581
516	template<int N>	582	template<int N>
517	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }	583	static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
518		584
519	inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }	585	static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
520	inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }	586	static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
521	inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }	587	static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
522	inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }	588	static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
523		589
524	inline void sv_to (SV *sv, std::string &v)	590	static inline void sv_to (SV *sv, std::string &v)
525	{	591	{
526	STRLEN len;	592	STRLEN len;
527	char *data = SvPVbyte (sv, len);	593	char *data = SvPVbyte (sv, len);
528	v.assign (data, len);	594	v.assign (data, len);
529	}	595	}
530		596
531	inline void sv_to (SV *sv, UUID &v)	597	static inline void sv_to (SV *sv, UUID &v)
532	{	598	{
533	if (!v.parse (SvPV_nolen (sv)))	599	if (!v.parse (SvPV_nolen (sv)))
534	croak ("unparsable uuid: %s", SvPV_nolen (sv));	600	croak ("unparsable uuid: %s", SvPV_nolen (sv));
535	}	601	}
536		602
537	inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }	603	static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
538		604
539	static SV *	605	static SV *
540	newSVdt_va (va_list &ap, data_type type)	606	newSVdt_va (va_list &ap, data_type type)
541	{	607	{
542	SV *sv;	608	SV *sv;
…		…
642	var = 0;	708	var = 0;
643	}	709	}
644		710
645	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	711	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
646		712
647	SV *	713	static SV *
648	registry (attachable *ext)	714	registry (attachable *ext)
649	{	715	{
650	if (!ext->cb)	716	if (!ext->cb)
651	ext->cb = newAV ();	717	ext->cb = newAV ();
652		718
…		…
936	CALL_END;	1002	CALL_END;
937		1003
938	return count;	1004	return count;
939	}	1005	}
940		1006
941	SV *	1007	static SV *
942	cfperl_result (int idx)	1008	cfperl_result (int idx)
943	{	1009	{
944	AV *av = get_av ("cf::INVOKE_RESULTS", 0);	1010	AV *av = get_av ("cf::INVOKE_RESULTS", 0);
945	if (!av)	1011	if (!av)
946	return &PL_sv_undef;	1012	return &PL_sv_undef;
…		…
1012	CALL_CALL ("ext::books::make_book", G_VOID);	1078	CALL_CALL ("ext::books::make_book", G_VOID);
1013	CALL_END;	1079	CALL_END;
1014	}	1080	}
1015		1081
1016	void	1082	void
1017	cfperl_send_msg (client ns, int color, const char type, const char *msg)	1083	cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1018	{	1084	{
1019	CALL_BEGIN (4);	1085	CALL_BEGIN (4);
1020	CALL_ARG (ns);	1086	CALL_ARG (ns);
1021	CALL_ARG (type);	1087	CALL_ARG (type);
1022	CALL_ARG_SV (newSVpv_utf8 (msg));	1088	CALL_ARG_SV (newSVpv_utf8 (msg));
…		…
1051	CALL_CALL ("cf::mapscript::activate", G_VOID);	1117	CALL_CALL ("cf::mapscript::activate", G_VOID);
1052	CALL_END;	1118	CALL_END;
1053	}	1119	}
1054		1120
1055	player *	1121	player *
1056	player::find (const char *name)	1122	player::find (const_utf8_string name)
1057	{	1123	{
1058	CALL_BEGIN (1);	1124	CALL_BEGIN (1);
1059	CALL_ARG (name);	1125	CALL_ARG (name);
1060	CALL_CALL ("cf::player::find", G_SCALAR);	1126	CALL_CALL ("cf::player::find", G_SCALAR);
1061		1127
…		…
1066		1132
1067	return retval;	1133	return retval;
1068	}	1134	}
1069		1135
1070	maptile *	1136	maptile *
1071	find_style (const char dirname, const char stylename, int difficulty)	1137	find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1072	{	1138	{
1073	CALL_BEGIN (3);	1139	CALL_BEGIN (3);
1074	CALL_ARG (dirname);	1140	CALL_ARG (dirname);
1075	CALL_ARG (stylename);	1141	CALL_ARG (stylename);
1076	CALL_ARG (difficulty);	1142	CALL_ARG (difficulty);
…		…
1083		1149
1084	return retval;	1150	return retval;
1085	}	1151	}
1086		1152
1087	maptile *	1153	maptile *
1088	maptile::find_sync (const char path, maptile origin)	1154	maptile::find_sync (const_utf8_string path, maptile *origin)
1089	{	1155	{
1090	CALL_BEGIN (2);	1156	CALL_BEGIN (2);
1091	CALL_ARG (path);	1157	CALL_ARG (path);
1092	CALL_ARG (origin);	1158	CALL_ARG (origin);
1093	CALL_CALL ("cf::map::find_sync", G_SCALAR);	1159	CALL_CALL ("cf::map::find_sync", G_SCALAR);
…		…
1099		1165
1100	return retval;	1166	return retval;
1101	}	1167	}
1102		1168
1103	maptile *	1169	maptile *
1104	maptile::find_async (const char path, maptile origin, bool load)	1170	maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1105	{	1171	{
1106	CALL_BEGIN (3);	1172	CALL_BEGIN (3);
1107	CALL_ARG (path);	1173	CALL_ARG (path);
1108	CALL_ARG (origin);	1174	CALL_ARG (origin);
1109	CALL_ARG (load);	1175	CALL_ARG (load);
…		…
1138	CALL_CALL ("cf::object::player::enter_exit", G_VOID);	1204	CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1139	CALL_END;	1205	CALL_END;
1140	}	1206	}
1141		1207
1142	void	1208	void
1143	object::player_goto (const char *path, int x, int y)	1209	object::player_goto (const_utf8_string path, int x, int y)
1144	{	1210	{
1145	if (type != PLAYER)	1211	if (type != PLAYER)
1146	return;	1212	return;
1147		1213
1148	CALL_BEGIN (4);	1214	CALL_BEGIN (4);
…		…
1152	CALL_ARG (y);	1218	CALL_ARG (y);
1153	CALL_CALL ("cf::object::player::goto", G_VOID);	1219	CALL_CALL ("cf::object::player::goto", G_VOID);
1154	CALL_END;	1220	CALL_END;
1155	}	1221	}
1156		1222
1157	const char *	1223	const_utf8_string
1158	object::ref () const	1224	object::ref () const
1159	{	1225	{
1160	if (type == PLAYER)	1226	if (type == PLAYER)
1161	return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);	1227	return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1162	else	1228	else
1163	return 0;	1229	return 0;
1164	}	1230	}
1165		1231
1166	object *	1232	object *
1167	object::deref (const char *ref)	1233	object::deref (const_utf8_string ref)
1168	{	1234	{
1169	object *retval = 0;	1235	object *retval = 0;
1170		1236
1171	if (ref)	1237	if (ref)
1172	{	1238	{
…		…
1182		1248
1183	return retval;	1249	return retval;
1184	}	1250	}
1185		1251
1186	void	1252	void
1187	log_backtrace (const char *msg)	1253	log_backtrace (const_utf8_string msg)
1188	{	1254	{
1189	#if HAVE_BACKTRACE	1255	#if HAVE_BACKTRACE
1190	void *addr [20];	1256	void *addr [20];
1191	int size = backtrace (addr, 20);	1257	int size = backtrace (addr, 20);
1192		1258
…		…
1198	CALL_END;	1264	CALL_END;
1199	#endif	1265	#endif
1200	}	1266	}
1201		1267
1202	bool	1268	bool
1203	is_match_expr (const char *expr)	1269	is_match_expr (const_utf8_string expr)
1204	{	1270	{
1205	return !strncmp (expr, "match ", sizeof ("match ") - 1);	1271	return !strncmp (expr, "match ", sizeof ("match ") - 1);
1206	}	1272	}
1207		1273
1208	bool	1274	bool
1209	match (const char expr, object ob, object self, object source, object *originator)	1275	match (const_utf8_string expr, object ob, object self, object source, object originator)
1210	{	1276	{
1211	if (!strncmp (expr, "match ", sizeof ("match ") - 1))	1277	if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1212	expr += sizeof ("match ") - 1;	1278	expr += sizeof ("match ") - 1;
1213		1279
1214	CALL_BEGIN (5);	1280	CALL_BEGIN (5);
…		…
1225		1291
1226	return matched;	1292	return matched;
1227	}	1293	}
1228		1294
1229	object *	1295	object *
1230	match_one (const char expr, object ob, object self, object source, object *originator)	1296	match_one (const_utf8_string expr, object ob, object self, object source, object originator)
1231	{	1297	{
1232	if (!strncmp (expr, "match ", sizeof ("match ") - 1))	1298	if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1233	expr += sizeof ("match ") - 1;	1299	expr += sizeof ("match ") - 1;
1234		1300
1235	CALL_BEGIN (5);	1301	CALL_BEGIN (5);
…		…
1425	const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)	1491	const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1426	const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)	1492	const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1427	const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)	1493	const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1428	const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)	1494	const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1429	const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)	1495	const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1430	const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)	1496	const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1431	const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)	1497	const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1432	const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)	1498	const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1433	const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)	1499	const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1434	const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)	1500	const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1435	const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)	1501	const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
…		…
2013	RETVAL	2079	RETVAL
2014		2080
2015	void	2081	void
2016	debug_trace (attachable *obj, bool on = true)	2082	debug_trace (attachable *obj, bool on = true)
2017	CODE:	2083	CODE:
2018	obj->flags &= ~attachable::F_DEBUG_TRACE;	2084	obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2019	if (on)	2085	if (on)
2020	obj->flags \|= attachable::F_DEBUG_TRACE;	2086	obj->attachable_flags \|= attachable::F_DEBUG_TRACE;
2021		2087
2022	int mortals_size ()	2088	int mortals_size ()
2023	CODE:	2089	CODE:
2024	RETVAL = attachable::mortals.size ();	2090	RETVAL = attachable::mortals.size ();
2025	OUTPUT: RETVAL	2091	OUTPUT: RETVAL
…		…
2078	int mortals_size ()	2144	int mortals_size ()
2079	CODE:	2145	CODE:
2080	RETVAL = attachable::mortals.size ();	2146	RETVAL = attachable::mortals.size ();
2081	OUTPUT: RETVAL	2147	OUTPUT: RETVAL
2082		2148
2083	const char *slot_use_name (U32 slot)	2149	const_utf8_string slot_use_name (U32 slot)
2084	ALIAS:	2150	ALIAS:
2085	slot_nonuse_name = 1	2151	slot_nonuse_name = 1
2086	CODE:	2152	CODE:
2087	{	2153	{
2088	if (slot >= NUM_BODY_LOCATIONS)	2154	if (slot >= NUM_BODY_LOCATIONS)
…		…
2219		2285
2220	void player_lvl_adj (object who, object skill = 0)	2286	void player_lvl_adj (object who, object skill = 0)
2221		2287
2222	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)	2288	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)
2223		2289
2224	int calc_skill_exp (object who, object op, object *skill);	2290	int calc_skill_exp (object who, object op, object *skill)
2225		2291
2226	void push_button (object op, object originator);	2292	void push_button (object op, object originator)
2227		2293
2228	void use_trigger (object op, object originator);	2294	void use_trigger (object op, object originator)
2229		2295
2230	void handle_apply_yield (object *op);	2296	void handle_apply_yield (object *op)
2231		2297
2232	int convert_item (object item, object converter);	2298	int convert_item (object item, object converter)
2233		2299
2234		2300
2235	MODULE = cf PACKAGE = cf::object PREFIX = cf_	2301	MODULE = cf PACKAGE = cf::object PREFIX = cf_
2236		2302
2237	# no clean way to get an object from an archetype - stupid idiotic	2303	# no clean way to get an object from an archetype - stupid idiotic
…		…
2495	for (int x = 0; x < THIS->width; ++x)	2561	for (int x = 0; x < THIS->width; ++x)
2496	for (int y = 0; y < THIS->height; ++y)	2562	for (int y = 0; y < THIS->height; ++y)
2497	{	2563	{
2498	for (object *op = THIS->at (x, y).bot; op; op = op->above)	2564	for (object *op = THIS->at (x, y).bot; op; op = op->above)
2499	if (op->flag [FLAG_IS_FLOOR])	2565	if (op->flag [FLAG_IS_FLOOR])
2500	goto skip_space;	2566	goto skip;
2501		2567
2502	{	2568	{
2503	int offs = offset + y * stride + x;	2569	int offs = offset + y * stride + x;
		2570
2504	if (IN_RANGE_EXC (offs, 0, idxlen))	2571	if (IN_RANGE_EXC (offs, 0, idxlen))
2505	{	2572	{
2506	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))	2573	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))
2507	{	2574	{
2508	object ob = get_archetype (SvPVutf8_nolen (elem));	2575	object ob = get_archetype (cfSvPVutf8_nolen (elem));
2509	ob->flag [FLAG_NO_MAP_SAVE] = true;	2576	ob->flag [FLAG_NO_MAP_SAVE] = true;
2510	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);	2577	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2511		2578
2512	if (ob->randomitems)	2579	if (ob->randomitems && !ob->above)
2513	{	2580	{
2514	if (!ob->above)
2515	{
2516	ob->create_treasure (ob->randomitems);	2581	ob->create_treasure (ob->randomitems);
2517		2582
2518	for (object *op = ob->above; op; op = op->above)	2583	for (object *op = ob->above; op; op = op->above)
2519	op->flag [FLAG_NO_MAP_SAVE] = true;	2584	op->flag [FLAG_NO_MAP_SAVE] = true;
2520	}	2585	// TODO: if this is a pickable object, then the item
2521		2586	// will at a bit weird - saving inside the player
2522	ob->randomitems = 0;	2587	// will clear the flag, but when the player drops
		2588	// it without logging out, it keeps the flag.
		2589	// nobody ahs reported this, but this can be rather
		2590	// annoying on persistent maps.
2523	}	2591	}
2524	}	2592	}
2525	}	2593	}
2526	}	2594	}
2527		2595
2528	skip_space: ;	2596	skip: ;
2529	}	2597	}
2530	}	2598	}
2531		2599
2532	void	2600	void
2533	maptile::set_regiondata (SV data, int offset, int stride, SV palette)	2601	maptile::set_regiondata (SV data, int offset, int stride, SV palette)
…		…
2543		2611
2544	region_ptr regionmap = new region_ptr [av_len ((AV )palette) + 1];	2612	region_ptr regionmap = new region_ptr [av_len ((AV )palette) + 1];
2545	uint8_t *regions = salloc<uint8_t> (THIS->size ());	2613	uint8_t *regions = salloc<uint8_t> (THIS->size ());
2546		2614
2547	for (int i = av_len ((AV *)palette) + 1; i--; )	2615	for (int i = av_len ((AV *)palette) + 1; i--; )
2548	regionmap [i] = region::find (SvPVutf8_nolen (av_fetch ((AV )palette, i, 1)));	2616	regionmap [i] = region::find (cfSvPVutf8_nolen (av_fetch ((AV )palette, i, 1)));
2549		2617
2550	for (int y = 0; y < THIS->height; ++y)	2618	for (int y = 0; y < THIS->height; ++y)
2551	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);	2619	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2552		2620
2553	sfree (THIS->regions, THIS->size ());	2621	sfree (THIS->regions, THIS->size ());
…		…
2778	archetype *archetypes (U32 index)	2846	archetype *archetypes (U32 index)
2779	CODE:	2847	CODE:
2780	RETVAL = index < archetypes.size () ? archetypes [index] : 0;	2848	RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2781	OUTPUT: RETVAL	2849	OUTPUT: RETVAL
2782		2850
2783	object instantiate (archetype arch)
2784	CODE:
2785	RETVAL = arch_to_object (arch);
2786	OUTPUT:
2787	RETVAL
2788
2789	INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h \|	2851	INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h \|
2790		2852
2791	MODULE = cf PACKAGE = cf::party	2853	MODULE = cf PACKAGE = cf::party
2792		2854
2793	partylist *first ()	2855	partylist *first ()
…		…
2953	faceinfo *f = face_info (idx); assert (f);	3015	faceinfo *f = face_info (idx); assert (f);
2954	facedata *d = &(faceset ? f->data64 : f->data32);	3016	facedata *d = &(faceset ? f->data64 : f->data32);
2955	sv_to (data, d->data);	3017	sv_to (data, d->data);
2956	STRLEN clen;	3018	STRLEN clen;
2957	char *cdata = SvPVbyte (chksum, clen);	3019	char *cdata = SvPVbyte (chksum, clen);
2958	clen = min (CHKSUM_SIZE, clen);	3020	clen = min (CHKSUM_MAXLEN, clen);
2959		3021
		3022	assert (("cf::face::set_data must be called with a non-empty checksum", clen));
		3023
2960	if (memcmp (d->chksum, cdata, clen))	3024	if (clen != d->chksum_len \|\| memcmp (d->chksum, cdata, clen))
2961	{	3025	{
		3026	d->chksum_len = clen;
2962	memcpy (d->chksum, cdata, clen);	3027	memcpy (d->chksum, cdata, clen);
2963		3028
2964	// invalidate existing client face info	3029	// invalidate existing client face info
2965	for_all_clients (ns)	3030	for_all_clients (ns)
2966	if (ns->faceset == faceset)	3031	if (ns->faceset == faceset)
…		…
2981		3046
2982	SV *get_chksum (faceidx idx, int faceset = 0)	3047	SV *get_chksum (faceidx idx, int faceset = 0)
2983	CODE:	3048	CODE:
2984	facedata *d = face_data (idx, faceset);	3049	facedata *d = face_data (idx, faceset);
2985	if (!d) XSRETURN_UNDEF;	3050	if (!d) XSRETURN_UNDEF;
2986	RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);	3051	RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2987	OUTPUT:	3052	OUTPUT:
2988	RETVAL	3053	RETVAL
2989		3054
2990	SV *get_data (faceidx idx, int faceset = 0)	3055	SV *get_data (faceidx idx, int faceset = 0)
2991	CODE:	3056	CODE:
…		…
3036	}	3101	}
3037	else	3102	else
3038	anim = &animation::create (name, av_len (av) + 1, facings);	3103	anim = &animation::create (name, av_len (av) + 1, facings);
3039		3104
3040	for (int i = 0; i < anim->num_animations; ++i)	3105	for (int i = 0; i < anim->num_animations; ++i)
3041	anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1)));	3106	anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3042	}	3107	}
3043	OUTPUT: RETVAL	3108	OUTPUT: RETVAL
3044		3109
3045	void invalidate_all ()	3110	void invalidate_all ()
3046	CODE:	3111	CODE:

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.332 by root, Fri Nov 6 13:21:20 2009 UTC vs. Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.332 by root, Fri Nov 6 13:21:20 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC