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.342 by root, Fri Dec 18 03:49:46 2009 UTC

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

Diff Legend

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