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.324 by root, Mon Oct 12 04:02:17 2009 UTC vs.
Revision 1.337 by root, Thu Nov 12 01:11:52 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 6 *
8 * Deliantra is free software: you can redistribute it and/or modify 7 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 10 * option) any later version.
12 * 11 *
13 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 15 * GNU General Public License for more details.
17 * 16 *
18 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
… …
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)->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 if (SvSTASH (SvRV (sv)) != stash_cf_player_wrap)
477 printf ("unexpected stash %s:%s\n", HvNAME(SvSTASH(SvRV(sv))));//D
478
479
480 return SvPTR_nc (sv);
481}
482
426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 483static 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); } 484static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
428inline SV *to_sv (bool v) { return newSViv (v); } 485static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 486static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 487static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 488static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 489static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 490static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 491static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 492static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 493static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 494static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 495static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 496static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 497static inline SV *to_sv (double v) { return newSVnv (v); }
441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 498static 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); } 499static 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); } 500static 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); } 501static 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); } 502static 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); } 503static 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); } 504static 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); } 505static 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); } 506static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
450 507
451inline SV *to_sv (object & v) { return to_sv (&v); } 508static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 509static inline SV *to_sv (living & v) { return to_sv (&v); }
453 510
454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 511static 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); } 512static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 513
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 514static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 515
459inline SV *to_sv (dynbuf * v) 516static inline SV *to_sv (dynbuf * v)
460{ 517{
461 SV *sv = newSV (0); 518 SV *sv = newSV (0);
462 519
463 sv_upgrade (sv, SVt_PV); 520 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1); 521 SvGROW (sv, v->size () + 1);
… …
468 *SvEND (sv) = 0; 525 *SvEND (sv) = 0;
469 526
470 return sv; 527 return sv;
471} 528}
472 529
473inline SV *to_sv (dynbuf_text * v) 530static inline SV *to_sv (dynbuf_text * v)
474{ 531{
475 SV *sv = to_sv (static_cast<dynbuf *> (v)); 532 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv); 533 SvUTF8_on (sv);
477 return sv; 534 return sv;
478} 535}
479 536
480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 537static 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; } 538static 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); } 539static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 540static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 541static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 542static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 543static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 544static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 545static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 546static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 547static 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); } 548static 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); } 549static 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); } 550static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 551static 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"); } 552static 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"); } 553static 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"); } 554static 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"); } 555static 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"); } 556static 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"); } 557static 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"); } 558static 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"); } 559static 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"); } 560static 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"); } 561static 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"); } 562static 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" ); } 563static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
507 564
508//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 565//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)); } 566static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510 567
511template<class T> 568template<class T>
512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 569static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
513 570
514template<int N> 571template<int N>
515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 572static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516 573
517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 574static 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); } 575static 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); } 576static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 577static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 578
522inline void sv_to (SV *sv, std::string &v) 579static inline void sv_to (SV *sv, std::string &v)
523{ 580{
524 STRLEN len; 581 STRLEN len;
525 char *data = SvPVbyte (sv, len); 582 char *data = SvPVbyte (sv, len);
526 v.assign (data, len); 583 v.assign (data, len);
527} 584}
528 585
529inline void sv_to (SV *sv, UUID &v) 586static inline void sv_to (SV *sv, UUID &v)
530{ 587{
531 if (!v.parse (SvPV_nolen (sv))) 588 if (!v.parse (SvPV_nolen (sv)))
532 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 589 croak ("unparsable uuid: %s", SvPV_nolen (sv));
533} 590}
534 591
535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 592static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536 593
537static SV * 594static SV *
538newSVdt_va (va_list &ap, data_type type) 595newSVdt_va (va_list &ap, data_type type)
539{ 596{
540 SV *sv; 597 SV *sv;
… …
640 var = 0; 697 var = 0;
641} 698}
642 699
643////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 700//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644 701
645SV * 702static SV *
646registry (attachable *ext) 703registry (attachable *ext)
647{ 704{
648 if (!ext->cb) 705 if (!ext->cb)
649 ext->cb = newAV (); 706 ext->cb = newAV ();
650 707
… …
934 CALL_END; 991 CALL_END;
935 992
936 return count; 993 return count;
937} 994}
938 995
939SV * 996static SV *
940cfperl_result (int idx) 997cfperl_result (int idx)
941{ 998{
942 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 999 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943 if (!av) 1000 if (!av)
944 return &PL_sv_undef; 1001 return &PL_sv_undef;
… …
1220 bool matched = count && SvTRUE (TOPs); 1277 bool matched = count && SvTRUE (TOPs);
1221 1278
1222 CALL_END; 1279 CALL_END;
1223 1280
1224 return matched; 1281 return matched;
1282}
1283
1284object *
1285match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1286{
1287 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1288 expr += sizeof ("match ") - 1;
1289
1290 CALL_BEGIN (5);
1291 CALL_ARG (expr);
1292 CALL_ARG (ob);
1293 CALL_ARG (self);
1294 CALL_ARG (source);
1295 CALL_ARG (originator);
1296 CALL_CALL (cv_cf_match_match, G_ARRAY);
1297
1298 object *one = 0;
1299
1300 if (count)
1301 sv_to (TOPs, one);
1302
1303 CALL_END;
1304
1305 return one;
1225} 1306}
1226 1307
1227///////////////////////////////////////////////////////////////////////////// 1308/////////////////////////////////////////////////////////////////////////////
1228 1309
1229struct EVAPI *evapi::GEVAPI; 1310struct EVAPI *evapi::GEVAPI;
… …
1363 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1444 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1364 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1445 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1365 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1446 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1366 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1447 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1367 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1448 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1368 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1449 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1369 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1450 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1370 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1451 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1371 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1452 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1372 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1453 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1373 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1454 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
… …
1399 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1480 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) 1481 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) 1482 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) 1483 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) 1484 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) 1485 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) 1486 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) 1487 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) 1488 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) 1489 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) 1490 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
… …
1987 RETVAL 2068 RETVAL
1988 2069
1989void 2070void
1990debug_trace (attachable *obj, bool on = true) 2071debug_trace (attachable *obj, bool on = true)
1991 CODE: 2072 CODE:
1992 obj->flags &= ~attachable::F_DEBUG_TRACE; 2073 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1993 if (on) 2074 if (on)
1994 obj->flags |= attachable::F_DEBUG_TRACE; 2075 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1995 2076
1996int mortals_size () 2077int mortals_size ()
1997 CODE: 2078 CODE:
1998 RETVAL = attachable::mortals.size (); 2079 RETVAL = attachable::mortals.size ();
1999 OUTPUT: RETVAL 2080 OUTPUT: RETVAL
… …
2140 CODE: 2221 CODE:
2141 player_apply_below (op); 2222 player_apply_below (op);
2142 2223
2143int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2224int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2144 2225
2226int casting_level (object *caster, object *spell)
2227
2145int pay_item (object *op, object *buyer) 2228int pay_item (object *op, object *buyer)
2146 CODE: 2229 CODE:
2147 RETVAL = pay_for_item (op, buyer); 2230 RETVAL = pay_for_item (op, buyer);
2148 OUTPUT: RETVAL 2231 OUTPUT: RETVAL
2149 2232
… …
2191 2274
2192void player_lvl_adj (object *who, object *skill = 0) 2275void player_lvl_adj (object *who, object *skill = 0)
2193 2276
2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2277int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2195 2278
2196int calc_skill_exp (object *who, object *op, object *skill); 2279int calc_skill_exp (object *who, object *op, object *skill)
2197 2280
2198void push_button (object *op, object *originator); 2281void push_button (object *op, object *originator)
2199 2282
2200void use_trigger (object *op, object *originator); 2283void use_trigger (object *op, object *originator)
2201 2284
2202void handle_apply_yield (object *op); 2285void handle_apply_yield (object *op)
2203 2286
2204int convert_item (object *item, object *converter); 2287int convert_item (object *item, object *converter)
2205 2288
2206 2289
2207MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2290MODULE = cf PACKAGE = cf::object PREFIX = cf_
2208 2291
2209# no clean way to get an object from an archetype - stupid idiotic 2292# 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) 2305object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2223 PROTOTYPE: $$$$$$ 2306 PROTOTYPE: $$$$$$
2224 CODE: 2307 CODE:
2225{ 2308{
2226 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2309 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2310
2311 if (RETVAL->destroyed ())
2312 RETVAL = 0;
2227} 2313}
2228 2314
2229shstr 2315shstr
2230object::kv_get (shstr key) 2316object::kv_get (shstr key)
2231 2317
… …
2642 case 6: RETVAL = newSVuv (ms.move_on ); break; 2728 case 6: RETVAL = newSVuv (ms.move_on ); break;
2643 case 7: RETVAL = newSVuv (ms.move_off ); break; 2729 case 7: RETVAL = newSVuv (ms.move_off ); break;
2644 } 2730 }
2645} 2731}
2646 OUTPUT: RETVAL 2732 OUTPUT: RETVAL
2647
2648void fix_walls (maptile *map, int x, int y)
2649
2650void fix_walls_around (maptile *map, int x, int y)
2651 2733
2652# worst xs function of my life 2734# worst xs function of my life
2653bool 2735bool
2654_create_random_map (\ 2736_create_random_map (\
2655 maptile *self,\ 2737 maptile *self,\

Diff Legend

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