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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC vs.
Revision 1.340 by root, Sun Nov 29 09:41:28 2009 UTC

…		…
210	attachable::destroy ()	210	attachable::destroy ()
211	{	211	{
212	if (destroyed ())	212	if (destroyed ())
213	return;	213	return;
214		214
215	flags \|= F_DESTROYED;	215	attachable_flags \|= F_DESTROYED;
216	do_destroy ();	216	do_destroy ();
217	sever_self ();	217	sever_self ();
218	}	218	}
219		219
220	void	220	void
…		…
294		294
295	attach = src.attach;	295	attach = src.attach;
296	return *this;	296	return *this;
297	}	297	}
298		298
		299	#if 0
299	template<typename T>	300	template<typename T>
300	static bool	301	static bool
301	find_backref (void ptr, T obj)	302	find_backref (void ptr, T obj)
302	{	303	{
303	char s = (char )obj;	304	char s = (char )obj;
…		…
311		312
312	return false;	313	return false;
313	}	314	}
314		315
315	// for debugging, find "live" objects containing this ptr	316	// for debugging, find "live" objects containing this ptr
316	void	317	static void
317	find_backref (void *ptr)	318	find_backref (void *ptr)
318	{	319	{
319	for_all_objects (op)	320	for_all_objects (op)
320	if (find_backref (ptr, op))	321	if (find_backref (ptr, op))
321	fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);	322	fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
…		…
326		327
327	for_all_clients (ns)	328	for_all_clients (ns)
328	if (find_backref (ptr, ns))	329	if (find_backref (ptr, ns))
329	fprintf (stderr, "C %p\n", ns);	330	fprintf (stderr, "C %p\n", ns);
330	}	331	}
		332	#endif
331		333
332	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	334	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333		335
334	static SV *	336	static SV *
335	newSVptr (void ptr, HV stash, HV *hv = newHV ())	337	newSVptr (void ptr, HV stash, HV *hv = newHV ())
…		…
388		390
389	return sv;	391	return sv;
390	}	392	}
391	}	393	}
392		394
		395	#if 0 // unused
393	static void	396	static void
394	clearSVptr (SV *sv)	397	clearSVptr (SV *sv)
395	{	398	{
396	if (SvROK (sv))	399	if (SvROK (sv))
397	sv = SvRV (sv);	400	sv = SvRV (sv);
398		401
399	hv_clear ((HV *)sv);	402	hv_clear ((HV *)sv);
400	sv_unmagic (sv, PERL_MAGIC_ext);	403	sv_unmagic (sv, PERL_MAGIC_ext);
401	}	404	}
		405	#endif
		406
		407	static long SvPTR_nc (SV *sv)
		408	{
		409	sv = SvRV (sv);
		410
		411	// very important shortcut
		412	if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
		413	return (long)SvMAGIC (sv)->mg_ptr;
		414
		415	if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
		416	return (long)mg->mg_ptr;
		417
		418	croak ("perl code used object, but C object is already destroyed, caught");
		419	}
402		420
403	static long	421	static long
404	SvPTR (SV sv, const char klass)	422	SvPTR (SV sv, const char klass)
405	{	423	{
406	if (!sv_derived_from (sv, klass))	424	if (!sv_derived_from (sv, klass))
407	croak ("object of type %s expected", klass);	425	croak ("object of type %s expected", klass);
408		426
409	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	427	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	}	428	}
416		429
417	static long noinline	430	static long noinline
418	SvPTR_ornull (SV sv, const char klass)	431	SvPTR_ornull (SV sv, const char klass)
419	{	432	{
420	if (SvOK (sv))	433	if (expect_false (!SvOK (sv))) return 0;
		434
421	return SvPTR (sv, klass);	435	return SvPTR (sv, klass);
422	else
423	return 0;
424	}	436	}
425		437
		438	static long noinline
		439	SvPTR_ornull_client (SV *sv)
		440	{
		441	if (expect_false (!SvOK (sv))) return 0;
		442
		443	if (!SvROK (sv)
		444	\|\| (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
		445	&& !sv_derived_from (sv, "cf::client")))
		446	croak ("object of type cf::client expected");
		447
		448	return SvPTR_nc (sv);
		449	}
		450
		451	static long noinline
		452	SvPTR_ornull_object (SV *sv)
		453	{
		454	if (expect_false (!SvOK (sv))) return 0;
		455
		456	if (!SvROK (sv)
		457	\|\| (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
		458	&& SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
		459	&& SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
		460	&& !sv_derived_from (sv, "cf::object")))
		461	croak ("object of type cf::object expected");
		462
		463	return SvPTR_nc (sv);
		464	}
		465
		466	static long noinline
		467	SvPTR_ornull_player (SV *sv)
		468	{
		469	if (expect_false (!SvOK (sv))) return 0;
		470
		471	if (!SvROK (sv)
		472	\|\| (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
		473	&& !sv_derived_from (sv, "cf::player")))
		474	croak ("object of type cf::player expected");
		475
		476	return SvPTR_nc (sv);
		477	}
		478
426	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }	479	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); }	480	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); }	481	static inline SV *to_sv (bool v) { return newSViv (v); }
429	inline SV *to_sv ( signed char v) { return newSViv (v); }	482	static inline SV *to_sv ( signed char v) { return newSViv (v); }
430	inline SV *to_sv (unsigned char v) { return newSViv (v); }	483	static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431	inline SV *to_sv ( signed short v) { return newSViv (v); }	484	static inline SV *to_sv ( signed short v) { return newSViv (v); }
432	inline SV *to_sv (unsigned short v) { return newSVuv (v); }	485	static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433	inline SV *to_sv ( signed int v) { return newSViv (v); }	486	static inline SV *to_sv ( signed int v) { return newSViv (v); }
434	inline SV *to_sv (unsigned int v) { return newSVuv (v); }	487	static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435	inline SV *to_sv ( signed long v) { return newSViv (v); }	488	static inline SV *to_sv ( signed long v) { return newSViv (v); }
436	inline SV *to_sv (unsigned long v) { return newSVuv (v); }	489	static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437	inline SV *to_sv ( signed long long v) { return newSVval64 (v); }	490	static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438	inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }	491	static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439	inline SV *to_sv (float v) { return newSVnv (v); }	492	static inline SV *to_sv (float v) { return newSVnv (v); }
440	inline SV *to_sv (double v) { return newSVnv (v); }	493	static inline SV *to_sv (double v) { return newSVnv (v); }
441	inline SV to_sv (client v) { return newSVattachable (v, stash_cf_client_wrap); }	494	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); }	495	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); }	496	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); }	497	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); }	498	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); }	499	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); }	500	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); }	501	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); }	502	static inline SV to_sv (mapspace v) { return newSVptr (v, stash_cf_mapspace_wrap); }
450		503
451	inline SV *to_sv (object & v) { return to_sv (&v); }	504	static inline SV *to_sv (object & v) { return to_sv (&v); }
452	inline SV *to_sv (living & v) { return to_sv (&v); }	505	static inline SV *to_sv (living & v) { return to_sv (&v); }
453		506
454	inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }	507	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); }	508	static inline SV to_sv (const treasurelist v) { return to_sv (v->name); }
456		509
457	inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }	510	static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458		511
459	inline SV to_sv (dynbuf v)	512	static inline SV to_sv (dynbuf v)
460	{	513	{
461	SV *sv = newSV (0);	514	SV *sv = newSV (0);
462		515
463	sv_upgrade (sv, SVt_PV);	516	sv_upgrade (sv, SVt_PV);
464	SvGROW (sv, v->size () + 1);	517	SvGROW (sv, v->size () + 1);
…		…
468	*SvEND (sv) = 0;	521	*SvEND (sv) = 0;
469		522
470	return sv;	523	return sv;
471	}	524	}
472		525
473	inline SV to_sv (dynbuf_text v)	526	static inline SV to_sv (dynbuf_text v)
474	{	527	{
475	SV sv = to_sv (static_cast<dynbuf > (v));	528	SV sv = to_sv (static_cast<dynbuf > (v));
476	SvUTF8_on (sv);	529	SvUTF8_on (sv);
477	return sv;	530	return sv;
478	}	531	}
479		532
480	inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }	533	static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
481	inline void sv_to (SV sv, char &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }	534	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); }	535	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); }	536	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); }	537	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); }	538	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); }	539	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); }	540	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); }	541	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); }	542	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); }	543	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); }	544	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); }	545	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); }	546	static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494	inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }	547	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"); }	548	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"); }	549	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"); }	550	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"); }	551	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"); }	552	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"); }	553	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"); }	554	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"); }	555	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"); }	556	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"); }	557	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"); }	558	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" ); }	559	static inline void sv_to (SV sv, object_thawer &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
507		560
508	//inline void sv_to (SV sv, faceinfo &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }	561	//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)); }	562	static inline void sv_to (SV sv, treasurelist &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510		563
511	template<class T>	564	template<class T>
512	inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }	565	static inline void sv_to (SV sv, refptr<T> &v) { T tmp; sv_to (sv, tmp); v = tmp; }
513		566
514	template<int N>	567	template<int N>
515	inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }	568	static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516		569
517	inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }	570	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); }	571	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); }	572	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); }	573	static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521		574
522	inline void sv_to (SV *sv, std::string &v)	575	static inline void sv_to (SV *sv, std::string &v)
523	{	576	{
524	STRLEN len;	577	STRLEN len;
525	char *data = SvPVbyte (sv, len);	578	char *data = SvPVbyte (sv, len);
526	v.assign (data, len);	579	v.assign (data, len);
527	}	580	}
528		581
529	inline void sv_to (SV *sv, UUID &v)	582	static inline void sv_to (SV *sv, UUID &v)
530	{	583	{
531	if (!v.parse (SvPV_nolen (sv)))	584	if (!v.parse (SvPV_nolen (sv)))
532	croak ("unparsable uuid: %s", SvPV_nolen (sv));	585	croak ("unparsable uuid: %s", SvPV_nolen (sv));
533	}	586	}
534		587
535	inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }	588	static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536		589
537	static SV *	590	static SV *
538	newSVdt_va (va_list &ap, data_type type)	591	newSVdt_va (va_list &ap, data_type type)
539	{	592	{
540	SV *sv;	593	SV *sv;
…		…
640	var = 0;	693	var = 0;
641	}	694	}
642		695
643	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	696	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644		697
645	SV *	698	static SV *
646	registry (attachable *ext)	699	registry (attachable *ext)
647	{	700	{
648	if (!ext->cb)	701	if (!ext->cb)
649	ext->cb = newAV ();	702	ext->cb = newAV ();
650		703
…		…
934	CALL_END;	987	CALL_END;
935		988
936	return count;	989	return count;
937	}	990	}
938		991
939	SV *	992	static SV *
940	cfperl_result (int idx)	993	cfperl_result (int idx)
941	{	994	{
942	AV *av = get_av ("cf::INVOKE_RESULTS", 0);	995	AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943	if (!av)	996	if (!av)
944	return &PL_sv_undef;	997	return &PL_sv_undef;
…		…
1423	const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)	1476	const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1424	const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)	1477	const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1425	const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)	1478	const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1426	const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)	1479	const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1427	const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)	1480	const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1428	const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)	1481	const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1429	const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)	1482	const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1430	const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)	1483	const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1431	const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)	1484	const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1432	const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)	1485	const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1433	const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)	1486	const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
…		…
2011	RETVAL	2064	RETVAL
2012		2065
2013	void	2066	void
2014	debug_trace (attachable *obj, bool on = true)	2067	debug_trace (attachable *obj, bool on = true)
2015	CODE:	2068	CODE:
2016	obj->flags &= ~attachable::F_DEBUG_TRACE;	2069	obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2017	if (on)	2070	if (on)
2018	obj->flags \|= attachable::F_DEBUG_TRACE;	2071	obj->attachable_flags \|= attachable::F_DEBUG_TRACE;
2019		2072
2020	int mortals_size ()	2073	int mortals_size ()
2021	CODE:	2074	CODE:
2022	RETVAL = attachable::mortals.size ();	2075	RETVAL = attachable::mortals.size ();
2023	OUTPUT: RETVAL	2076	OUTPUT: RETVAL
…		…
2217		2270
2218	void player_lvl_adj (object who, object skill = 0)	2271	void player_lvl_adj (object who, object skill = 0)
2219		2272
2220	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)	2273	int kill_object (object op, int dam = 0, object hitter = 0, int type = AT_PHYSICAL)
2221		2274
2222	int calc_skill_exp (object who, object op, object *skill);	2275	int calc_skill_exp (object who, object op, object *skill)
2223		2276
2224	void push_button (object op, object originator);	2277	void push_button (object op, object originator)
2225		2278
2226	void use_trigger (object op, object originator);	2279	void use_trigger (object op, object originator)
2227		2280
2228	void handle_apply_yield (object *op);	2281	void handle_apply_yield (object *op)
2229		2282
2230	int convert_item (object item, object converter);	2283	int convert_item (object item, object converter)
2231		2284
2232		2285
2233	MODULE = cf PACKAGE = cf::object PREFIX = cf_	2286	MODULE = cf PACKAGE = cf::object PREFIX = cf_
2234		2287
2235	# no clean way to get an object from an archetype - stupid idiotic	2288	# no clean way to get an object from an archetype - stupid idiotic
…		…
2493	for (int x = 0; x < THIS->width; ++x)	2546	for (int x = 0; x < THIS->width; ++x)
2494	for (int y = 0; y < THIS->height; ++y)	2547	for (int y = 0; y < THIS->height; ++y)
2495	{	2548	{
2496	for (object *op = THIS->at (x, y).bot; op; op = op->above)	2549	for (object *op = THIS->at (x, y).bot; op; op = op->above)
2497	if (op->flag [FLAG_IS_FLOOR])	2550	if (op->flag [FLAG_IS_FLOOR])
2498	goto skip_space;	2551	goto skip;
2499		2552
2500	{	2553	{
2501	int offs = offset + y * stride + x;	2554	int offs = offset + y * stride + x;
		2555
2502	if (IN_RANGE_EXC (offs, 0, idxlen))	2556	if (IN_RANGE_EXC (offs, 0, idxlen))
2503	{	2557	{
2504	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))	2558	if (SV *elem = av_fetch ((AV )palette, idx [offs], 0))
2505	{	2559	{
2506	object ob = get_archetype (SvPVutf8_nolen (elem));	2560	object ob = get_archetype (SvPVutf8_nolen (elem));
2507	ob->flag [FLAG_NO_MAP_SAVE] = true;	2561	ob->flag [FLAG_NO_MAP_SAVE] = true;
2508	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);	2562	THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2509		2563
2510	if (ob->randomitems)	2564	if (ob->randomitems && !ob->above)
2511	{	2565	{
2512	if (!ob->above)
2513	{
2514	ob->create_treasure (ob->randomitems);	2566	ob->create_treasure (ob->randomitems);
2515		2567
2516	for (object *op = ob->above; op; op = op->above)	2568	for (object *op = ob->above; op; op = op->above)
2517	op->flag [FLAG_NO_MAP_SAVE] = true;	2569	op->flag [FLAG_NO_MAP_SAVE] = true;
2518	}	2570	// TODO: if this is a pickable object, then the item
2519		2571	// will at a bit weird - saving inside the player
2520	ob->randomitems = 0;	2572	// will clear the flag, but when the player drops
		2573	// it without logging out, it keeps the flag.
		2574	// nobody ahs reported this, but this can be rather
		2575	// annoying on persistent maps.
2521	}	2576	}
2522	}	2577	}
2523	}	2578	}
2524	}	2579	}
2525		2580
2526	skip_space: ;	2581	skip: ;
2527	}	2582	}
2528	}	2583	}
2529		2584
2530	void	2585	void
2531	maptile::set_regiondata (SV data, int offset, int stride, SV palette)	2586	maptile::set_regiondata (SV data, int offset, int stride, SV palette)
…		…
2951	faceinfo *f = face_info (idx); assert (f);	3006	faceinfo *f = face_info (idx); assert (f);
2952	facedata *d = &(faceset ? f->data64 : f->data32);	3007	facedata *d = &(faceset ? f->data64 : f->data32);
2953	sv_to (data, d->data);	3008	sv_to (data, d->data);
2954	STRLEN clen;	3009	STRLEN clen;
2955	char *cdata = SvPVbyte (chksum, clen);	3010	char *cdata = SvPVbyte (chksum, clen);
2956	clen = min (CHKSUM_SIZE, clen);	3011	clen = min (CHKSUM_MAXLEN, clen);
2957		3012
2958	if (memcmp (d->chksum, cdata, clen))	3013	if (clen != d->chksum_len \|\| memcmp (d->chksum, cdata, clen))
2959	{	3014	{
		3015	d->chksum_len = clen;
2960	memcpy (d->chksum, cdata, clen);	3016	memcpy (d->chksum, cdata, clen);
2961		3017
2962	// invalidate existing client face info	3018	// invalidate existing client face info
2963	for_all_clients (ns)	3019	for_all_clients (ns)
2964	if (ns->faceset == faceset)	3020	if (ns->faceset == faceset)
…		…
2979		3035
2980	SV *get_chksum (faceidx idx, int faceset = 0)	3036	SV *get_chksum (faceidx idx, int faceset = 0)
2981	CODE:	3037	CODE:
2982	facedata *d = face_data (idx, faceset);	3038	facedata *d = face_data (idx, faceset);
2983	if (!d) XSRETURN_UNDEF;	3039	if (!d) XSRETURN_UNDEF;
2984	RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);	3040	RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2985	OUTPUT:	3041	OUTPUT:
2986	RETVAL	3042	RETVAL
2987		3043
2988	SV *get_data (faceidx idx, int faceset = 0)	3044	SV *get_data (faceidx idx, int faceset = 0)
2989	CODE:	3045	CODE:

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC vs. Revision 1.340 by root, Sun Nov 29 09:41:28 2009 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC vs.
Revision 1.340 by root, Sun Nov 29 09:41:28 2009 UTC