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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.328 by root, Tue Nov 3 22:57:06 2009 UTC vs.
Revision 1.348 by root, Sun Jan 31 03:46:20 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 ())
…		…
388		404
389	return sv;	405	return sv;
390	}	406	}
391	}	407	}
392		408
		409	#if 0 // unused
393	static void	410	static void
394	clearSVptr (SV *sv)	411	clearSVptr (SV *sv)
395	{	412	{
396	if (SvROK (sv))	413	if (SvROK (sv))
397	sv = SvRV (sv);	414	sv = SvRV (sv);
398		415
399	hv_clear ((HV *)sv);	416	hv_clear ((HV *)sv);
400	sv_unmagic (sv, PERL_MAGIC_ext);	417	sv_unmagic (sv, PERL_MAGIC_ext);
401	}	418	}
		419	#endif
		420
		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	}
402		435
403	static long	436	static long
404	SvPTR (SV sv, const char klass)	437	SvPTR (SV sv, const char klass)
405	{	438	{
406	if (!sv_derived_from (sv, klass))	439	if (!sv_derived_from (sv, klass))
407	croak ("object of type %s expected", klass);	440	croak ("object of type %s expected", klass);
408		441
409	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	442	return SvPTR_nc (sv);
410
411	if (!mg)
412	croak ("perl code used %s object, but C object is already destroyed, caught", klass);
413
414	return (long)mg->mg_ptr;
415	}	443	}
416		444
417	static long noinline	445	static long noinline
418	SvPTR_ornull (SV sv, const char klass)	446	SvPTR_ornull (SV sv, const char klass)
419	{	447	{
420	if (SvOK (sv))	448	if (expect_false (!SvOK (sv))) return 0;
		449
421	return SvPTR (sv, klass);	450	return SvPTR (sv, klass);
422	else
423	return 0;
424	}	451	}
425		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
426	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); }
427	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); }
428	inline SV *to_sv (bool v) { return newSViv (v); }	496	static inline SV *to_sv (bool v) { return newSViv (v); }
429	inline SV *to_sv ( signed char v) { return newSViv (v); }	497	static inline SV *to_sv ( signed char v) { return newSViv (v); }
430	inline SV *to_sv (unsigned char v) { return newSViv (v); }	498	static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431	inline SV *to_sv ( signed short v) { return newSViv (v); }	499	static inline SV *to_sv ( signed short v) { return newSViv (v); }
432	inline SV *to_sv (unsigned short v) { return newSVuv (v); }	500	static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433	inline SV *to_sv ( signed int v) { return newSViv (v); }	501	static inline SV *to_sv ( signed int v) { return newSViv (v); }
434	inline SV *to_sv (unsigned int v) { return newSVuv (v); }	502	static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435	inline SV *to_sv ( signed long v) { return newSViv (v); }	503	static inline SV *to_sv ( signed long v) { return newSViv (v); }
436	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	504	static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	505	static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	506	static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439	inline SV *to_sv (float v) { return newSVnv (v); }	507	static inline SV *to_sv (float v) { return newSVnv (v); }
440	inline SV *to_sv (double v) { return newSVnv (v); }	508	static inline SV *to_sv (double v) { return newSVnv (v); }
441	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); }
442	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); }
443	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); }
444	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); }
445	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); }
446	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); }
447	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); }
448	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); }
449	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); }
450		518
451	inline SV *to_sv (object & v) { return to_sv (&v); }	519	static inline SV *to_sv (object & v) { return to_sv (&v); }
452	inline SV *to_sv (living & v) { return to_sv (&v); }	520	static inline SV *to_sv (living & v) { return to_sv (&v); }
453		521
454	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 ()); }
455	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); }
456		524
457	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); }
458		526
459	inline SV to_sv (dynbuf v)	527	static inline SV to_sv (dynbuf v)
460	{	528	{
461	SV *sv = newSV (0);	529	SV *sv = newSV (0);
462		530
463	sv_upgrade (sv, SVt_PV);	531	sv_upgrade (sv, SVt_PV);
464	SvGROW (sv, v->size () + 1);	532	SvGROW (sv, v->size () + 1);
…		…
468	*SvEND (sv) = 0;	536	*SvEND (sv) = 0;
469		537
470	return sv;	538	return sv;
471	}	539	}
472		540
473	inline SV to_sv (dynbuf_text v)	541	static inline SV to_sv (dynbuf_text v)
474	{	542	{
475	SV sv = to_sv (static_cast<dynbuf > (v));	543	SV sv = to_sv (static_cast<dynbuf > (v));
476	SvUTF8_on (sv);	544	SvUTF8_on (sv);
477	return sv;	545	return sv;
478	}	546	}
479		547
480	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; }
481	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; }
482	inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }	550	static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483	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); }
484	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); }
485	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); }
486	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); }
487	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); }
488	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); }
489	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); }
490	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); }
491	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); }
492	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); }
493	inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }	561	static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }	562	static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
495	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); }
496	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); }
497	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); }
498	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"); }
499	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"); }
500	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"); }
501	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"); }
502	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"); }
503	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"); }
504	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"); }
505	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"); }
506	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" ); }
507		575
508	//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)]; }
509	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)); }
510		578
511	template<class T>	579	template<class T>
512	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; }
513		581
514	template<int N>	582	template<int N>
515	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)); }
516		584
517	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); }
518	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); }
519	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); }
520	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); }
521		589
522	inline void sv_to (SV *sv, std::string &v)	590	static inline void sv_to (SV *sv, std::string &v)
523	{	591	{
524	STRLEN len;	592	STRLEN len;
525	char *data = SvPVbyte (sv, len);	593	char *data = SvPVbyte (sv, len);
526	v.assign (data, len);	594	v.assign (data, len);
527	}	595	}
528		596
529	inline void sv_to (SV *sv, UUID &v)	597	static inline void sv_to (SV *sv, UUID &v)
530	{	598	{
531	if (!v.parse (SvPV_nolen (sv)))	599	if (!v.parse (SvPV_nolen (sv)))
532	croak ("unparsable uuid: %s", SvPV_nolen (sv));	600	croak ("unparsable uuid: %s", SvPV_nolen (sv));
533	}	601	}
534		602
535	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); }
536		604
537	static SV *	605	static SV *
538	newSVdt_va (va_list &ap, data_type type)	606	newSVdt_va (va_list &ap, data_type type)
539	{	607	{
540	SV *sv;	608	SV *sv;
…		…
640	var = 0;	708	var = 0;
641	}	709	}
642		710
643	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	711	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644		712
645	SV *	713	static SV *
646	registry (attachable *ext)	714	registry (attachable *ext)
647	{	715	{
648	if (!ext->cb)	716	if (!ext->cb)
649	ext->cb = newAV ();	717	ext->cb = newAV ();
650		718
…		…
934	CALL_END;	1002	CALL_END;
935		1003
936	return count;	1004	return count;
937	}	1005	}
938		1006
939	SV *	1007	static SV *
940	cfperl_result (int idx)	1008	cfperl_result (int idx)
941	{	1009	{
942	AV *av = get_av ("cf::INVOKE_RESULTS", 0);	1010	AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943	if (!av)	1011	if (!av)
944	return &PL_sv_undef;	1012	return &PL_sv_undef;
…		…
1010	CALL_CALL ("ext::books::make_book", G_VOID);	1078	CALL_CALL ("ext::books::make_book", G_VOID);
1011	CALL_END;	1079	CALL_END;
1012	}	1080	}
1013		1081
1014	void	1082	void
1015	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)
1016	{	1084	{
1017	CALL_BEGIN (4);	1085	CALL_BEGIN (4);
1018	CALL_ARG (ns);	1086	CALL_ARG (ns);
1019	CALL_ARG (type);	1087	CALL_ARG (type);
1020	CALL_ARG_SV (newSVpv_utf8 (msg));	1088	CALL_ARG_SV (newSVpv_utf8 (msg));
…		…
1049	CALL_CALL ("cf::mapscript::activate", G_VOID);	1117	CALL_CALL ("cf::mapscript::activate", G_VOID);
1050	CALL_END;	1118	CALL_END;
1051	}	1119	}
1052		1120
1053	player *	1121	player *
1054	player::find (const char *name)	1122	player::find (const_utf8_string name)
1055	{	1123	{
1056	CALL_BEGIN (1);	1124	CALL_BEGIN (1);
1057	CALL_ARG (name);	1125	CALL_ARG (name);
1058	CALL_CALL ("cf::player::find", G_SCALAR);	1126	CALL_CALL ("cf::player::find", G_SCALAR);
1059		1127
…		…
1064		1132
1065	return retval;	1133	return retval;
1066	}	1134	}
1067		1135
1068	maptile *	1136	maptile *
1069	find_style (const char dirname, const char stylename, int difficulty)	1137	find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1070	{	1138	{
1071	CALL_BEGIN (3);	1139	CALL_BEGIN (3);
1072	CALL_ARG (dirname);	1140	CALL_ARG (dirname);
1073	CALL_ARG (stylename);	1141	CALL_ARG (stylename);
1074	CALL_ARG (difficulty);	1142	CALL_ARG (difficulty);
…		…
1081		1149
1082	return retval;	1150	return retval;
1083	}	1151	}
1084		1152
1085	maptile *	1153	maptile *
1086	maptile::find_sync (const char path, maptile origin)	1154	maptile::find_sync (const_utf8_string path, maptile *origin)
1087	{	1155	{
1088	CALL_BEGIN (2);	1156	CALL_BEGIN (2);
1089	CALL_ARG (path);	1157	CALL_ARG (path);
1090	CALL_ARG (origin);	1158	CALL_ARG (origin);
1091	CALL_CALL ("cf::map::find_sync", G_SCALAR);	1159	CALL_CALL ("cf::map::find_sync", G_SCALAR);
…		…
1097		1165
1098	return retval;	1166	return retval;
1099	}	1167	}
1100		1168
1101	maptile *	1169	maptile *
1102	maptile::find_async (const char path, maptile origin, bool load)	1170	maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1103	{	1171	{
1104	CALL_BEGIN (3);	1172	CALL_BEGIN (3);
1105	CALL_ARG (path);	1173	CALL_ARG (path);
1106	CALL_ARG (origin);	1174	CALL_ARG (origin);
1107	CALL_ARG (load);	1175	CALL_ARG (load);
…		…
1136	CALL_CALL ("cf::object::player::enter_exit", G_VOID);	1204	CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1137	CALL_END;	1205	CALL_END;
1138	}	1206	}
1139		1207
1140	void	1208	void
1141	object::player_goto (const char *path, int x, int y)	1209	object::player_goto (const_utf8_string path, int x, int y)
1142	{	1210	{
1143	if (type != PLAYER)	1211	if (type != PLAYER)
1144	return;	1212	return;
1145		1213
1146	CALL_BEGIN (4);	1214	CALL_BEGIN (4);
…		…
1150	CALL_ARG (y);	1218	CALL_ARG (y);
1151	CALL_CALL ("cf::object::player::goto", G_VOID);	1219	CALL_CALL ("cf::object::player::goto", G_VOID);
1152	CALL_END;	1220	CALL_END;
1153	}	1221	}
1154		1222
1155	const char *	1223	const_utf8_string
1156	object::ref () const	1224	object::ref () const
1157	{	1225	{
1158	if (type == PLAYER)	1226	if (type == PLAYER)
1159	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);
1160	else	1228	else
1161	return 0;	1229	return 0;
1162	}	1230	}
1163		1231
1164	object *	1232	object *
1165	object::deref (const char *ref)	1233	object::deref (const_utf8_string ref)
1166	{	1234	{
1167	object *retval = 0;	1235	object *retval = 0;
1168		1236
1169	if (ref)	1237	if (ref)
1170	{	1238	{
…		…
1180		1248
1181	return retval;	1249	return retval;
1182	}	1250	}
1183		1251
1184	void	1252	void
1185	log_backtrace (const char *msg)	1253	log_backtrace (const_utf8_string msg)
1186	{	1254	{
1187	#if HAVE_BACKTRACE	1255	#if HAVE_BACKTRACE
1188	void *addr [20];	1256	void *addr [20];
1189	int size = backtrace (addr, 20);	1257	int size = backtrace (addr, 20);
1190		1258
…		…
1196	CALL_END;	1264	CALL_END;
1197	#endif	1265	#endif
1198	}	1266	}
1199		1267
1200	bool	1268	bool
1201	is_match_expr (const char *expr)	1269	is_match_expr (const_utf8_string expr)
1202	{	1270	{
1203	return !strncmp (expr, "match ", sizeof ("match ") - 1);	1271	return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204	}	1272	}
1205		1273
1206	bool	1274	bool
1207	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)
1208	{	1276	{
1209	if (!strncmp (expr, "match ", sizeof ("match ") - 1))	1277	if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210	expr += sizeof ("match ") - 1;	1278	expr += sizeof ("match ") - 1;
1211		1279
1212	CALL_BEGIN (5);	1280	CALL_BEGIN (5);
…		…
1220	bool matched = count && SvTRUE (TOPs);	1288	bool matched = count && SvTRUE (TOPs);
1221		1289
1222	CALL_END;	1290	CALL_END;
1223		1291
1224	return matched;	1292	return matched;
		1293	}
		1294
		1295	object *
		1296	match_one (const_utf8_string expr, object ob, object self, object source, object originator)
		1297	{
		1298	if (!strncmp (expr, "match ", sizeof ("match ") - 1))
		1299	expr += sizeof ("match ") - 1;
		1300
		1301	CALL_BEGIN (5);
		1302	CALL_ARG (expr);
		1303	CALL_ARG (ob);
		1304	CALL_ARG (self);
		1305	CALL_ARG (source);
		1306	CALL_ARG (originator);
		1307	CALL_CALL (cv_cf_match_match, G_ARRAY);
		1308
		1309	object *one = 0;
		1310
		1311	if (count)
		1312	sv_to (TOPs, one);
		1313
		1314	CALL_END;
		1315
		1316	return one;
1225	}	1317	}
1226		1318
1227	/////////////////////////////////////////////////////////////////////////////	1319	/////////////////////////////////////////////////////////////////////////////
1228		1320
1229	struct EVAPI *evapi::GEVAPI;	1321	struct EVAPI *evapi::GEVAPI;
…		…
1399	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)
1400	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)
1401	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)
1402	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)
1403	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)
1404	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)
1405	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)
1406	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)
1407	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)
1408	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)
1409	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)
…		…
1730	}	1822	}
1731		1823
1732	void server_tick ()	1824	void server_tick ()
1733	CODE:	1825	CODE:
1734	{	1826	{
		1827	ev_now_update (EV_DEFAULT);
1735	NOW = ev_now (EV_DEFAULT);	1828	NOW = ev_now (EV_DEFAULT);
1736	SvNV_set (sv_now, NOW); SvNOK_only (sv_now);	1829	SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1737	SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);	1830	SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1738	runtime = SvNVX (sv_runtime);	1831	runtime = SvNVX (sv_runtime);
1739		1832
1740	server_tick ();	1833	server_tick ();
1741		1834
1742	NOW = ev_time ();	1835	ev_now_update (EV_DEFAULT);
		1836	NOW = ev_now (EV_DEFAULT);
1743	SvNV_set (sv_now, NOW); SvNOK_only (sv_now);	1837	SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1744	runtime += TICK;	1838	runtime += TICK;
1745	SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);	1839	SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1746	}	1840	}
1747		1841
…		…
1987	RETVAL	2081	RETVAL
1988		2082
1989	void	2083	void
1990	debug_trace (attachable *obj, bool on = true)	2084	debug_trace (attachable *obj, bool on = true)
1991	CODE:	2085	CODE:
1992	obj->flags &= ~attachable::F_DEBUG_TRACE;	2086	obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1993	if (on)	2087	if (on)
1994	obj->flags \|= attachable::F_DEBUG_TRACE;	2088	obj->attachable_flags \|= attachable::F_DEBUG_TRACE;
1995		2089
1996	int mortals_size ()	2090	int mortals_size ()
1997	CODE:	2091	CODE:
1998	RETVAL = attachable::mortals.size ();	2092	RETVAL = attachable::mortals.size ();
1999	OUTPUT: RETVAL	2093	OUTPUT: RETVAL
…		…
2052	int mortals_size ()	2146	int mortals_size ()
2053	CODE:	2147	CODE:
2054	RETVAL = attachable::mortals.size ();	2148	RETVAL = attachable::mortals.size ();
2055	OUTPUT: RETVAL	2149	OUTPUT: RETVAL
2056		2150
2057	const char *slot_use_name (U32 slot)	2151	const_utf8_string slot_use_name (U32 slot)
2058	ALIAS:	2152	ALIAS:
2059	slot_nonuse_name = 1	2153	slot_nonuse_name = 1
2060	CODE:	2154	CODE:
2061	{	2155	{
2062	if (slot >= NUM_BODY_LOCATIONS)	2156	if (slot >= NUM_BODY_LOCATIONS)
…		…
2140	CODE:	2234	CODE:
2141	player_apply_below (op);	2235	player_apply_below (op);
2142		2236
2143	int cast_heal (object op, object caster, object *spell, int dir = 0)	2237	int cast_heal (object op, object caster, object *spell, int dir = 0)
2144		2238
		2239	int casting_level (object caster, object spell)
		2240
2145	int pay_item (object op, object buyer)	2241	int pay_item (object op, object buyer)
2146	CODE:	2242	CODE:
2147	RETVAL = pay_for_item (op, buyer);	2243	RETVAL = pay_for_item (op, buyer);
2148	OUTPUT: RETVAL	2244	OUTPUT: RETVAL
2149		2245
…		…
2191		2287
2192	void player_lvl_adj (object who, object skill = 0)	2288	void player_lvl_adj (object who, object skill = 0)
2193		2289
2194	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)	2290	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)
2195		2291
2196	int calc_skill_exp (object who, object op, object *skill);	2292	int calc_skill_exp (object who, object op, object *skill)
2197		2293
2198	void push_button (object op, object originator);	2294	void push_button (object op, object originator)
2199		2295
2200	void use_trigger (object op, object originator);	2296	void use_trigger (object op, object originator)
2201		2297
2202	void handle_apply_yield (object *op);	2298	void handle_apply_yield (object *op)
2203		2299
2204	int convert_item (object item, object converter);	2300	int convert_item (object item, object converter)
2205		2301
2206		2302
2207	MODULE = cf PACKAGE = cf::object PREFIX = cf_	2303	MODULE = cf PACKAGE = cf::object PREFIX = cf_
2208		2304
2209	# no clean way to get an object from an archetype - stupid idiotic	2305	# no clean way to get an object from an archetype - stupid idiotic
…		…
2222	object insert_ob_in_map_at (object ob, maptile where, object_ornull orig, int flag, int x, int y)	2318	object insert_ob_in_map_at (object ob, maptile where, object_ornull orig, int flag, int x, int y)
2223	PROTOTYPE: $$$$$$	2319	PROTOTYPE: $$$$$$
2224	CODE:	2320	CODE:
2225	{	2321	{
2226	RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);	2322	RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
		2323
		2324	if (RETVAL->destroyed ())
		2325	RETVAL = 0;
2227	}	2326	}
2228		2327
2229	shstr	2328	shstr
2230	object::kv_get (shstr key)	2329	object::kv_get (shstr key)
2231		2330
…		…
2282	CODE:	2381	CODE:
2283	RETVAL = op->contr;	2382	RETVAL = op->contr;
2284	OUTPUT: RETVAL	2383	OUTPUT: RETVAL
2285		2384
2286	bool move_player (object *op, int dir)	2385	bool move_player (object *op, int dir)
2287
2288	void check_score (object *op)
2289		2386
2290	void message (object *op, utf8_string txt, int flags = NDI_ORANGE \| NDI_UNIQUE)	2387	void message (object *op, utf8_string txt, int flags = NDI_ORANGE \| NDI_UNIQUE)
2291	CODE:	2388	CODE:
2292	new_draw_info (flags, 0, op, txt);	2389	new_draw_info (flags, 0, op, txt);
2293		2390
…		…
2464	for (int x = 0; x < THIS->width; ++x)	2561	for (int x = 0; x < THIS->width; ++x)
2465	for (int y = 0; y < THIS->height; ++y)	2562	for (int y = 0; y < THIS->height; ++y)
2466	{	2563	{
2467	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)
2468	if (op->flag [FLAG_IS_FLOOR])	2565	if (op->flag [FLAG_IS_FLOOR])
2469	goto skip_space;	2566	goto skip;
2470		2567
2471	{	2568	{
2472	int offs = offset + y * stride + x;	2569	int offs = offset + y * stride + x;
		2570
2473	if (IN_RANGE_EXC (offs, 0, idxlen))	2571	if (IN_RANGE_EXC (offs, 0, idxlen))
2474	{	2572	{
2475	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))	2573	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))
2476	{	2574	{
2477	object ob = get_archetype (SvPVutf8_nolen (elem));	2575	object ob = get_archetype (cfSvPVutf8_nolen (elem));
2478	ob->flag [FLAG_NO_MAP_SAVE] = true;	2576	ob->flag [FLAG_NO_MAP_SAVE] = true;
2479	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);	2577	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2480		2578
2481	if (ob->randomitems)	2579	if (ob->randomitems && !ob->above)
2482	{	2580	{
2483	if (!ob->above)
2484	{
2485	ob->create_treasure (ob->randomitems);	2581	ob->create_treasure (ob->randomitems);
2486		2582
2487	for (object *op = ob->above; op; op = op->above)	2583	for (object *op = ob->above; op; op = op->above)
2488	op->flag [FLAG_NO_MAP_SAVE] = true;	2584	op->flag [FLAG_NO_MAP_SAVE] = true;
2489	}	2585	// TODO: if this is a pickable object, then the item
2490		2586	// will at a bit weird - saving inside the player
2491	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.
2492	}	2591	}
2493	}	2592	}
2494	}	2593	}
2495	}	2594	}
2496		2595
2497	skip_space: ;	2596	skip: ;
2498	}	2597	}
2499	}	2598	}
2500		2599
2501	void	2600	void
2502	maptile::set_regiondata (SV data, int offset, int stride, SV palette)	2601	maptile::set_regiondata (SV data, int offset, int stride, SV palette)
…		…
2512		2611
2513	region_ptr regionmap = new region_ptr [av_len ((AV )palette) + 1];	2612	region_ptr regionmap = new region_ptr [av_len ((AV )palette) + 1];
2514	uint8_t *regions = salloc<uint8_t> (THIS->size ());	2613	uint8_t *regions = salloc<uint8_t> (THIS->size ());
2515		2614
2516	for (int i = av_len ((AV *)palette) + 1; i--; )	2615	for (int i = av_len ((AV *)palette) + 1; i--; )
2517	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)));
2518		2617
2519	for (int y = 0; y < THIS->height; ++y)	2618	for (int y = 0; y < THIS->height; ++y)
2520	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);	2619	memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2521		2620
2522	sfree (THIS->regions, THIS->size ());	2621	sfree (THIS->regions, THIS->size ());
…		…
2747	archetype *archetypes (U32 index)	2846	archetype *archetypes (U32 index)
2748	CODE:	2847	CODE:
2749	RETVAL = index < archetypes.size () ? archetypes [index] : 0;	2848	RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2750	OUTPUT: RETVAL	2849	OUTPUT: RETVAL
2751		2850
2752	object instantiate (archetype arch)
2753	CODE:
2754	RETVAL = arch_to_object (arch);
2755	OUTPUT:
2756	RETVAL
2757
2758	INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h \|	2851	INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h \|
2759		2852
2760	MODULE = cf PACKAGE = cf::party	2853	MODULE = cf PACKAGE = cf::party
2761		2854
2762	partylist *first ()	2855	partylist *first ()
…		…
2922	faceinfo *f = face_info (idx); assert (f);	3015	faceinfo *f = face_info (idx); assert (f);
2923	facedata *d = &(faceset ? f->data64 : f->data32);	3016	facedata *d = &(faceset ? f->data64 : f->data32);
2924	sv_to (data, d->data);	3017	sv_to (data, d->data);
2925	STRLEN clen;	3018	STRLEN clen;
2926	char *cdata = SvPVbyte (chksum, clen);	3019	char *cdata = SvPVbyte (chksum, clen);
2927	clen = min (CHKSUM_SIZE, clen);	3020	clen = min (CHKSUM_MAXLEN, clen);
2928		3021
		3022	assert (("cf::face::set_data must be called with a non-empty checksum", clen));
		3023
2929	if (memcmp (d->chksum, cdata, clen))	3024	if (clen != d->chksum_len \|\| memcmp (d->chksum, cdata, clen))
2930	{	3025	{
		3026	d->chksum_len = clen;
2931	memcpy (d->chksum, cdata, clen);	3027	memcpy (d->chksum, cdata, clen);
2932		3028
2933	// invalidate existing client face info	3029	// invalidate existing client face info
2934	for_all_clients (ns)	3030	for_all_clients (ns)
2935	if (ns->faceset == faceset)	3031	if (ns->faceset == faceset)
…		…
2950		3046
2951	SV *get_chksum (faceidx idx, int faceset = 0)	3047	SV *get_chksum (faceidx idx, int faceset = 0)
2952	CODE:	3048	CODE:
2953	facedata *d = face_data (idx, faceset);	3049	facedata *d = face_data (idx, faceset);
2954	if (!d) XSRETURN_UNDEF;	3050	if (!d) XSRETURN_UNDEF;
2955	RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);	3051	RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2956	OUTPUT:	3052	OUTPUT:
2957	RETVAL	3053	RETVAL
2958		3054
2959	SV *get_data (faceidx idx, int faceset = 0)	3055	SV *get_data (faceidx idx, int faceset = 0)
2960	CODE:	3056	CODE:
…		…
3005	}	3101	}
3006	else	3102	else
3007	anim = &animation::create (name, av_len (av) + 1, facings);	3103	anim = &animation::create (name, av_len (av) + 1, facings);
3008		3104
3009	for (int i = 0; i < anim->num_animations; ++i)	3105	for (int i = 0; i < anim->num_animations; ++i)
3010	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)));
3011	}	3107	}
3012	OUTPUT: RETVAL	3108	OUTPUT: RETVAL
3013		3109
3014	void invalidate_all ()	3110	void invalidate_all ()
3015	CODE:	3111	CODE:

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.328 by root, Tue Nov 3 22:57:06 2009 UTC vs. Revision 1.348 by root, Sun Jan 31 03:46:20 2010 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.328 by root, Tue Nov 3 22:57:06 2009 UTC vs.
Revision 1.348 by root, Sun Jan 31 03:46:20 2010 UTC