ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC vs.
Revision 1.345 by root, Sat Jan 16 13:41:37 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
102static inline SV * 100static SV *
103newSVpv_utf8 (const char *s) 101newSVpv_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
115static inline SV * 113static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_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
128static noinline utf8_string
129cfSvPVutf8_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
131template<class super> 145template<class super>
132static super * 146static super *
133is_a (attachable *at) 147is_a (attachable *at)
210attachable::destroy () 224attachable::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
220void 234void
294 308
295 attach = src.attach; 309 attach = src.attach;
296 return *this; 310 return *this;
297} 311}
298 312
313#if 0
299template<typename T> 314template<typename T>
300static bool 315static bool
301find_backref (void *ptr, T *obj) 316find_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
316void 331static void
317find_backref (void *ptr) 332find_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
334static SV * 350static SV *
335newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (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
393static void 410static void
394clearSVptr (SV *sv) 411clearSVptr (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
421static long
422SvPTR_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
403static long 436static long
404SvPTR (SV *sv, const char *klass) 437SvPTR (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
417static long noinline 445static long noinline
418SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_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
453static long noinline
454SvPTR_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
466static long noinline
467SvPTR_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
481static long noinline
482SvPTR_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
426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 494static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
427inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 495static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
428inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 509static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
442inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 510static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
443inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 511static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
444inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 512static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
445inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 513static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
446inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 514static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
447inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 515static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
448inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 516static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
449inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 517static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
450 518
451inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
453 521
454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 522static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 524
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 526
459inline SV *to_sv (dynbuf * v) 527static 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
473inline SV *to_sv (dynbuf_text * v) 541static 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
480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 548static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
481inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 549static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
491inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 559static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
492inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 560static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
493inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
495inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 563static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
496inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 564static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
497inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 565static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
498inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 566static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
499inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 567static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
500inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 568static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
501inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 569static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
502inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 570static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
503inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 571static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
504inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 572static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
505inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 573static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
506inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 574static 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)]; }
509inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 577static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510 578
511template<class T> 579template<class T>
512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 580static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
513 581
514template<int N> 582template<int N>
515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 583static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516 584
517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 585static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
518inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 586static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
519inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 589
522inline void sv_to (SV *sv, std::string &v) 590static 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
529inline void sv_to (SV *sv, UUID &v) 597static 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
535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 603static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536 604
537static SV * 605static SV *
538newSVdt_va (va_list &ap, data_type type) 606newSVdt_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
645SV * 713static SV *
646registry (attachable *ext) 714registry (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
939SV * 1007static SV *
940cfperl_result (int idx) 1008cfperl_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;
1180 1248
1181 return retval; 1249 return retval;
1182} 1250}
1183 1251
1184void 1252void
1185log_backtrace (const char *msg) 1253log_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
1423 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)
1424 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)
1425 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)
1426 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)
1427 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)
1428 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)
1429 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)
1430 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)
1431 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)
1432 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)
1433 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)
2011 RETVAL 2079 RETVAL
2012 2080
2013void 2081void
2014debug_trace (attachable *obj, bool on = true) 2082debug_trace (attachable *obj, bool on = true)
2015 CODE: 2083 CODE:
2016 obj->flags &= ~attachable::F_DEBUG_TRACE; 2084 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2017 if (on) 2085 if (on)
2018 obj->flags |= attachable::F_DEBUG_TRACE; 2086 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
2019 2087
2020int mortals_size () 2088int mortals_size ()
2021 CODE: 2089 CODE:
2022 RETVAL = attachable::mortals.size (); 2090 RETVAL = attachable::mortals.size ();
2023 OUTPUT: RETVAL 2091 OUTPUT: RETVAL
2217 2285
2218void player_lvl_adj (object *who, object *skill = 0) 2286void player_lvl_adj (object *who, object *skill = 0)
2219 2287
2220int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2288int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2221 2289
2222int calc_skill_exp (object *who, object *op, object *skill); 2290int calc_skill_exp (object *who, object *op, object *skill)
2223 2291
2224void push_button (object *op, object *originator); 2292void push_button (object *op, object *originator)
2225 2293
2226void use_trigger (object *op, object *originator); 2294void use_trigger (object *op, object *originator)
2227 2295
2228void handle_apply_yield (object *op); 2296void handle_apply_yield (object *op)
2229 2297
2230int convert_item (object *item, object *converter); 2298int convert_item (object *item, object *converter)
2231 2299
2232 2300
2233MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2301MODULE = cf PACKAGE = cf::object PREFIX = cf_
2234 2302
2235# 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
2493 for (int x = 0; x < THIS->width; ++x) 2561 for (int x = 0; x < THIS->width; ++x)
2494 for (int y = 0; y < THIS->height; ++y) 2562 for (int y = 0; y < THIS->height; ++y)
2495 { 2563 {
2496 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)
2497 if (op->flag [FLAG_IS_FLOOR]) 2565 if (op->flag [FLAG_IS_FLOOR])
2498 goto skip_space; 2566 goto skip;
2499 2567
2500 { 2568 {
2501 int offs = offset + y * stride + x; 2569 int offs = offset + y * stride + x;
2570
2502 if (IN_RANGE_EXC (offs, 0, idxlen)) 2571 if (IN_RANGE_EXC (offs, 0, idxlen))
2503 { 2572 {
2504 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2573 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2505 { 2574 {
2506 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2575 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2507 ob->flag [FLAG_NO_MAP_SAVE] = true; 2576 ob->flag [FLAG_NO_MAP_SAVE] = true;
2508 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2577 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2509 2578
2510 if (ob->randomitems) 2579 if (ob->randomitems && !ob->above)
2511 { 2580 {
2512 if (!ob->above)
2513 {
2514 ob->create_treasure (ob->randomitems); 2581 ob->create_treasure (ob->randomitems);
2515 2582
2516 for (object *op = ob->above; op; op = op->above) 2583 for (object *op = ob->above; op; op = op->above)
2517 op->flag [FLAG_NO_MAP_SAVE] = true; 2584 op->flag [FLAG_NO_MAP_SAVE] = true;
2518 } 2585 // TODO: if this is a pickable object, then the item
2519 2586 // will at a bit weird - saving inside the player
2520 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.
2521 } 2591 }
2522 } 2592 }
2523 } 2593 }
2524 } 2594 }
2525 2595
2526 skip_space: ; 2596 skip: ;
2527 } 2597 }
2528} 2598}
2529 2599
2530void 2600void
2531maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2601maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2541 2611
2542 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2612 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2543 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2613 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2544 2614
2545 for (int i = av_len ((AV *)palette) + 1; i--; ) 2615 for (int i = av_len ((AV *)palette) + 1; i--; )
2546 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)));
2547 2617
2548 for (int y = 0; y < THIS->height; ++y) 2618 for (int y = 0; y < THIS->height; ++y)
2549 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2619 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2550 2620
2551 sfree (THIS->regions, THIS->size ()); 2621 sfree (THIS->regions, THIS->size ());
2776archetype *archetypes (U32 index) 2846archetype *archetypes (U32 index)
2777 CODE: 2847 CODE:
2778 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2848 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2779 OUTPUT: RETVAL 2849 OUTPUT: RETVAL
2780 2850
2781object *instantiate (archetype *arch)
2782 CODE:
2783 RETVAL = arch_to_object (arch);
2784 OUTPUT:
2785 RETVAL
2786
2787INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2851INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2788 2852
2789MODULE = cf PACKAGE = cf::party 2853MODULE = cf PACKAGE = cf::party
2790 2854
2791partylist *first () 2855partylist *first ()
2951 faceinfo *f = face_info (idx); assert (f); 3015 faceinfo *f = face_info (idx); assert (f);
2952 facedata *d = &(faceset ? f->data64 : f->data32); 3016 facedata *d = &(faceset ? f->data64 : f->data32);
2953 sv_to (data, d->data); 3017 sv_to (data, d->data);
2954 STRLEN clen; 3018 STRLEN clen;
2955 char *cdata = SvPVbyte (chksum, clen); 3019 char *cdata = SvPVbyte (chksum, clen);
2956 clen = min (CHKSUM_SIZE, clen); 3020 clen = min (CHKSUM_MAXLEN, clen);
2957 3021
3022 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3023
2958 if (memcmp (d->chksum, cdata, clen)) 3024 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2959 { 3025 {
3026 d->chksum_len = clen;
2960 memcpy (d->chksum, cdata, clen); 3027 memcpy (d->chksum, cdata, clen);
2961 3028
2962 // invalidate existing client face info 3029 // invalidate existing client face info
2963 for_all_clients (ns) 3030 for_all_clients (ns)
2964 if (ns->faceset == faceset) 3031 if (ns->faceset == faceset)
2979 3046
2980SV *get_chksum (faceidx idx, int faceset = 0) 3047SV *get_chksum (faceidx idx, int faceset = 0)
2981 CODE: 3048 CODE:
2982 facedata *d = face_data (idx, faceset); 3049 facedata *d = face_data (idx, faceset);
2983 if (!d) XSRETURN_UNDEF; 3050 if (!d) XSRETURN_UNDEF;
2984 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3051 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2985 OUTPUT: 3052 OUTPUT:
2986 RETVAL 3053 RETVAL
2987 3054
2988SV *get_data (faceidx idx, int faceset = 0) 3055SV *get_data (faceidx idx, int faceset = 0)
2989 CODE: 3056 CODE:
3034 } 3101 }
3035 else 3102 else
3036 anim = &animation::create (name, av_len (av) + 1, facings); 3103 anim = &animation::create (name, av_len (av) + 1, facings);
3037 3104
3038 for (int i = 0; i < anim->num_animations; ++i) 3105 for (int i = 0; i < anim->num_animations; ++i)
3039 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)));
3040} 3107}
3041 OUTPUT: RETVAL 3108 OUTPUT: RETVAL
3042 3109
3043void invalidate_all () 3110void invalidate_all ()
3044 CODE: 3111 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines