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.328 by root, Tue Nov 3 22:57:06 2009 UTC vs.
Revision 1.339 by root, Thu Nov 26 08:08:40 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 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
403static long 421static long
404SvPTR (SV *sv, const char *klass) 422SvPTR (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
417static long noinline 430static long noinline
418SvPTR_ornull (SV *sv, const char *klass) 431SvPTR_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
438static long noinline
439SvPTR_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
451static long noinline
452SvPTR_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
466static long noinline
467SvPTR_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
426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 479static 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); } 480static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
428inline SV *to_sv (bool v) { return newSViv (v); } 481static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 482static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 483static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 484static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 485static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 486static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 487static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 488static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 489static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 490static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 491static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 492static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 493static inline SV *to_sv (double v) { return newSVnv (v); }
441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 494static 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); } 495static 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); } 496static 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); } 497static 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); } 498static 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); } 499static 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); } 500static 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); } 501static 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); } 502static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
450 503
451inline SV *to_sv (object & v) { return to_sv (&v); } 504static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 505static inline SV *to_sv (living & v) { return to_sv (&v); }
453 506
454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 507static 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); } 508static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 509
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 510static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 511
459inline SV *to_sv (dynbuf * v) 512static 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
473inline SV *to_sv (dynbuf_text * v) 526static 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
480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 533static 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; } 534static 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); } 535static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 536static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 537static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 538static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 539static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 540static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 541static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 542static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 543static 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); } 544static 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); } 545static 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); } 546static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 547static 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"); } 548static 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"); } 549static 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"); } 550static 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"); } 551static 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"); } 552static 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"); } 553static 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"); } 554static 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"); } 555static 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"); } 556static 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"); } 557static 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"); } 558static 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" ); } 559static 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)]; }
509inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 562static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510 563
511template<class T> 564template<class T>
512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 565static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
513 566
514template<int N> 567template<int N>
515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 568static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516 569
517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 570static 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); } 571static 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); } 572static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 573static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 574
522inline void sv_to (SV *sv, std::string &v) 575static 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
529inline void sv_to (SV *sv, UUID &v) 582static 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
535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 588static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536 589
537static SV * 590static SV *
538newSVdt_va (va_list &ap, data_type type) 591newSVdt_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
645SV * 698static SV *
646registry (attachable *ext) 699registry (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
939SV * 992static SV *
940cfperl_result (int idx) 993cfperl_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;
… …
1220 bool matched = count && SvTRUE (TOPs); 1273 bool matched = count && SvTRUE (TOPs);
1221 1274
1222 CALL_END; 1275 CALL_END;
1223 1276
1224 return matched; 1277 return matched;
1278}
1279
1280object *
1281match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1282{
1283 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1284 expr += sizeof ("match ") - 1;
1285
1286 CALL_BEGIN (5);
1287 CALL_ARG (expr);
1288 CALL_ARG (ob);
1289 CALL_ARG (self);
1290 CALL_ARG (source);
1291 CALL_ARG (originator);
1292 CALL_CALL (cv_cf_match_match, G_ARRAY);
1293
1294 object *one = 0;
1295
1296 if (count)
1297 sv_to (TOPs, one);
1298
1299 CALL_END;
1300
1301 return one;
1225} 1302}
1226 1303
1227///////////////////////////////////////////////////////////////////////////// 1304/////////////////////////////////////////////////////////////////////////////
1228 1305
1229struct EVAPI *evapi::GEVAPI; 1306struct EVAPI *evapi::GEVAPI;
… …
1399 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)
1400 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)
1401 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)
1402 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)
1403 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)
1404 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)
1405 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)
1406 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)
1407 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)
1408 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)
1409 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)
… …
1987 RETVAL 2064 RETVAL
1988 2065
1989void 2066void
1990debug_trace (attachable *obj, bool on = true) 2067debug_trace (attachable *obj, bool on = true)
1991 CODE: 2068 CODE:
1992 obj->flags &= ~attachable::F_DEBUG_TRACE; 2069 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1993 if (on) 2070 if (on)
1994 obj->flags |= attachable::F_DEBUG_TRACE; 2071 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1995 2072
1996int mortals_size () 2073int mortals_size ()
1997 CODE: 2074 CODE:
1998 RETVAL = attachable::mortals.size (); 2075 RETVAL = attachable::mortals.size ();
1999 OUTPUT: RETVAL 2076 OUTPUT: RETVAL
… …
2140 CODE: 2217 CODE:
2141 player_apply_below (op); 2218 player_apply_below (op);
2142 2219
2143int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2220int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2144 2221
2222int casting_level (object *caster, object *spell)
2223
2145int pay_item (object *op, object *buyer) 2224int pay_item (object *op, object *buyer)
2146 CODE: 2225 CODE:
2147 RETVAL = pay_for_item (op, buyer); 2226 RETVAL = pay_for_item (op, buyer);
2148 OUTPUT: RETVAL 2227 OUTPUT: RETVAL
2149 2228
… …
2191 2270
2192void player_lvl_adj (object *who, object *skill = 0) 2271void player_lvl_adj (object *who, object *skill = 0)
2193 2272
2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2273int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2195 2274
2196int calc_skill_exp (object *who, object *op, object *skill); 2275int calc_skill_exp (object *who, object *op, object *skill)
2197 2276
2198void push_button (object *op, object *originator); 2277void push_button (object *op, object *originator)
2199 2278
2200void use_trigger (object *op, object *originator); 2279void use_trigger (object *op, object *originator)
2201 2280
2202void handle_apply_yield (object *op); 2281void handle_apply_yield (object *op)
2203 2282
2204int convert_item (object *item, object *converter); 2283int convert_item (object *item, object *converter)
2205 2284
2206 2285
2207MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2286MODULE = cf PACKAGE = cf::object PREFIX = cf_
2208 2287
2209# 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
… …
2222object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2301object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2223 PROTOTYPE: $$$$$$ 2302 PROTOTYPE: $$$$$$
2224 CODE: 2303 CODE:
2225{ 2304{
2226 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2305 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2306
2307 if (RETVAL->destroyed ())
2308 RETVAL = 0;
2227} 2309}
2228 2310
2229shstr 2311shstr
2230object::kv_get (shstr key) 2312object::kv_get (shstr key)
2231 2313
… …
2922 faceinfo *f = face_info (idx); assert (f); 3004 faceinfo *f = face_info (idx); assert (f);
2923 facedata *d = &(faceset ? f->data64 : f->data32); 3005 facedata *d = &(faceset ? f->data64 : f->data32);
2924 sv_to (data, d->data); 3006 sv_to (data, d->data);
2925 STRLEN clen; 3007 STRLEN clen;
2926 char *cdata = SvPVbyte (chksum, clen); 3008 char *cdata = SvPVbyte (chksum, clen);
2927 clen = min (CHKSUM_SIZE, clen); 3009 clen = min (CHKSUM_MAXLEN, clen);
2928 3010
2929 if (memcmp (d->chksum, cdata, clen)) 3011 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2930 { 3012 {
3013 d->chksum_len = clen;
2931 memcpy (d->chksum, cdata, clen); 3014 memcpy (d->chksum, cdata, clen);
2932 3015
2933 // invalidate existing client face info 3016 // invalidate existing client face info
2934 for_all_clients (ns) 3017 for_all_clients (ns)
2935 if (ns->faceset == faceset) 3018 if (ns->faceset == faceset)
… …
2950 3033
2951SV *get_chksum (faceidx idx, int faceset = 0) 3034SV *get_chksum (faceidx idx, int faceset = 0)
2952 CODE: 3035 CODE:
2953 facedata *d = face_data (idx, faceset); 3036 facedata *d = face_data (idx, faceset);
2954 if (!d) XSRETURN_UNDEF; 3037 if (!d) XSRETURN_UNDEF;
2955 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3038 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2956 OUTPUT: 3039 OUTPUT:
2957 RETVAL 3040 RETVAL
2958 3041
2959SV *get_data (faceidx idx, int faceset = 0) 3042SV *get_data (faceidx idx, int faceset = 0)
2960 CODE: 3043 CODE:

Diff Legend

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