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.311 by root, Sat Dec 20 02:32:31 2008 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"
… …
71static int tick_pending; 71static int tick_pending;
72 72
73global gbl_ev; 73global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
76 77
77bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
79 80
80static HV 81static HV
… …
88 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
92 93
94static SV
95 *cv_cf_do_invoke,
96 *cv_cf__can_merge,
97 *cv_cf_client_send_msg,
98 *cv_cf_tick,
99 *cv_cf_match_match;
100
93#ifndef newSVpv_utf8 101#ifndef newSVpv_utf8
94static inline SV * 102static inline SV *
95newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
96{ 104{
97 if (!s) 105 if (!s)
… …
158 SvREFCNT_inc (self); 166 SvREFCNT_inc (self);
159 hv_clear (self); 167 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 168 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 169 SvREFCNT_dec (self);
162 170
163 // self *must* be null now because thats sv_unmagic's job. 171 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 172 assert (!this->self);
165 } 173 }
166} 174}
167 175
168void 176void
… …
202attachable::destroy () 210attachable::destroy ()
203{ 211{
204 if (destroyed ()) 212 if (destroyed ())
205 return; 213 return;
206 214
207 flags |= F_DESTROYED; 215 attachable_flags |= F_DESTROYED;
208 do_destroy (); 216 do_destroy ();
209 sever_self (); 217 sever_self ();
210} 218}
211 219
212void 220void
… …
286 294
287 attach = src.attach; 295 attach = src.attach;
288 return *this; 296 return *this;
289} 297}
290 298
299#if 0
291template<typename T> 300template<typename T>
292static bool 301static bool
293find_backref (void *ptr, T *obj) 302find_backref (void *ptr, T *obj)
294{ 303{
295 char *s = (char *)obj; 304 char *s = (char *)obj;
… …
303 312
304 return false; 313 return false;
305} 314}
306 315
307// for debugging, find "live" objects containing this ptr 316// for debugging, find "live" objects containing this ptr
308void 317static void
309find_backref (void *ptr) 318find_backref (void *ptr)
310{ 319{
311 for_all_objects (op) 320 for_all_objects (op)
312 if (find_backref (ptr, op)) 321 if (find_backref (ptr, op))
313 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);
… …
317 fprintf (stderr, "P %p\n", pl); 326 fprintf (stderr, "P %p\n", pl);
318 327
319 for_all_clients (ns) 328 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 329 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 330 fprintf (stderr, "C %p\n", ns);
322
323} 331}
332#endif
324 333
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 334//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 335
327static SV * 336static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 337newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
381 390
382 return sv; 391 return sv;
383 } 392 }
384} 393}
385 394
395#if 0 // unused
386static void 396static void
387clearSVptr (SV *sv) 397clearSVptr (SV *sv)
388{ 398{
389 if (SvROK (sv)) 399 if (SvROK (sv))
390 sv = SvRV (sv); 400 sv = SvRV (sv);
391 401
392 hv_clear ((HV *)sv); 402 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 403 sv_unmagic (sv, PERL_MAGIC_ext);
394} 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}
395 420
396static long 421static long
397SvPTR (SV *sv, const char *klass) 422SvPTR (SV *sv, const char *klass)
398{ 423{
399 if (!sv_derived_from (sv, klass)) 424 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 425 croak ("object of type %s expected", klass);
401 426
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 427 return SvPTR_nc (sv);
403
404 if (!mg)
405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
406
407 return (long)mg->mg_ptr;
408} 428}
409 429
410static long 430static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 431SvPTR_ornull (SV *sv, const char *klass)
412{ 432{
413 if (SvOK (sv)) 433 if (expect_false (!SvOK (sv))) return 0;
434
414 return SvPTR (sv, klass); 435 return SvPTR (sv, klass);
415 else
416 return 0;
417} 436}
418 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
419inline 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); }
420inline 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); }
421inline SV *to_sv (bool v) { return newSViv (v); } 485static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 486static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 487static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 488static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 489static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 490static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 491static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 492static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 493static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 494static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 495static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 496static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 497static inline SV *to_sv (double v) { return newSVnv (v); }
434inline 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); }
435inline 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); }
436inline 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); }
437inline 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); }
438inline 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); }
439inline 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); }
440inline 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); }
441inline 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); }
442inline 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); }
443 507
444inline SV *to_sv (object & v) { return to_sv (&v); } 508static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 509static inline SV *to_sv (living & v) { return to_sv (&v); }
446 510
447inline 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 ()); }
448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 512static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 513
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 514static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 515
452inline SV *to_sv (dynbuf * v) 516static inline SV *to_sv (dynbuf * v)
453{ 517{
454 SV *sv = newSV (0); 518 SV *sv = newSV (0);
455 519
456 sv_upgrade (sv, SVt_PV); 520 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 521 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 525 *SvEND (sv) = 0;
462 526
463 return sv; 527 return sv;
464} 528}
465 529
466inline SV *to_sv (dynbuf_text * v) 530static inline SV *to_sv (dynbuf_text * v)
467{ 531{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 532 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 533 SvUTF8_on (sv);
470 return sv; 534 return sv;
471} 535}
472 536
473inline 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; }
474inline 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; }
475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 539static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 540static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 541static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 542static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 543static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 544static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 545static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 546static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 547static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
484inline 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); }
485inline 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); }
486inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 550static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 551static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
488inline 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); }
489inline 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); }
490inline 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); }
491inline 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"); }
492inline 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"); }
493inline 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"); }
494inline 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"); }
495inline 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"); }
496inline 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"); }
497inline 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"); }
498inline 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"); }
499inline 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" ); }
500 564
501//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)]; }
502inline 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)); }
503 567
504template<class T> 568template<class T>
505inline 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; }
506 570
507template<int N> 571template<int N>
508inline 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)); }
509 573
510inline 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); }
511inline 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); }
512inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 576static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 577static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 578
515inline void sv_to (SV *sv, std::string &v) 579static inline void sv_to (SV *sv, std::string &v)
516{ 580{
517 STRLEN len; 581 STRLEN len;
518 char *data = SvPVbyte (sv, len); 582 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 583 v.assign (data, len);
520} 584}
521 585
522inline void sv_to (SV *sv, UUID &v) 586static inline void sv_to (SV *sv, UUID &v)
523{ 587{
524 if (!v.parse (SvPV_nolen (sv))) 588 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 589 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 590}
527 591
528inline 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); }
529 593
530static SV * 594static SV *
531newSVdt_va (va_list &ap, data_type type) 595newSVdt_va (va_list &ap, data_type type)
532{ 596{
533 SV *sv; 597 SV *sv;
… …
607 va_end (ap); 671 va_end (ap);
608 672
609 return sv; 673 return sv;
610} 674}
611 675
676// typemap support, mostly to avoid excessive inlining
677template<class type>
678static void noinline
679cf_obj_to (SV *arg, type &var)
680{
681 sv_to (arg, var);
682 if (!var)
683 croak ("must not pass invalid/null cf_obj here");
684}
685
686template<class object>
687static void noinline
688cf_obj_ornull_to (SV *arg, object *&var)
689{
690 if (SvOK (arg))
691 {
692 sv_to (arg, var);
693 if (!var)
694 croak ("unable to convert perl object to C++ object");
695 }
696 else
697 var = 0;
698}
699
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 700//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 701
614SV * 702static SV *
615registry (attachable *ext) 703registry (attachable *ext)
616{ 704{
617 if (!ext->cb) 705 if (!ext->cb)
618 ext->cb = newAV (); 706 ext->cb = newAV ();
619 707
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 748 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 749 exit (EXIT_FAILURE);
662 } 750 }
663} 751}
664 752
753void
665void cfperl_main () 754cfperl_main ()
666{ 755{
667 dSP; 756 dSP;
668 757
669 PUSHMARK (SP); 758 PUSHMARK (SP);
670 PUTBACK; 759 PUTBACK;
… …
695# undef def 784# undef def
696}; 785};
697 786
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 787#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 788
700static void 789static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 790gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 791{
703 // event must be in array 792 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 793 if (event >= 0 && event <= AvFILLp (registry))
705 { 794 {
… …
791{ 880{
792 attachable::gather_callbacks (callbacks, event); 881 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 882 ::gather_callbacks (callbacks, cb_map, event);
794} 883}
795 884
796void 885static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 886_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 887{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 888 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 889 {
801 SV *cbs_ = AvARRAY (registry)[event]; 890 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 900 }
812 } 901 }
813} 902}
814 903
815// very slow and inefficient way to recalculate the global want bitsets 904// very slow and inefficient way to recalculate the global want bitsets
816void 905static void
817_recalc_want () 906_recalc_want ()
818{ 907{
819 ev_want_event.reset (); 908 ev_want_event.reset ();
820 909
821 _recalc_want (ev_want_event, cb_global); 910 _recalc_want (ev_want_event, cb_global);
… …
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 983 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 984 }
896 985
897 va_end (ap); 986 va_end (ap);
898 987
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 988 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 989 count = count > 0 ? POPi : 0;
901 990
902 CALL_END; 991 CALL_END;
903 992
904 return count; 993 return count;
905} 994}
906 995
907SV * 996static SV *
908cfperl_result (int idx) 997cfperl_result (int idx)
909{ 998{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 999 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 1000 if (!av)
912 return &PL_sv_undef; 1001 return &PL_sv_undef;
… …
931} 1020}
932 1021
933///////////////////////////////////////////////////////////////////////////// 1022/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 1023// various c++ => perl glue functions
935 1024
1025void
936void cfperl_tick () 1026cfperl_tick ()
937{ 1027{
938 tick_pending = 1; 1028 tick_pending = 1;
939 1029
940 if (tick_inhibit) 1030 if (tick_inhibit)
941 return; 1031 return;
… …
944 1034
945 dSP; 1035 dSP;
946 1036
947 PUSHMARK (SP); 1037 PUSHMARK (SP);
948 PUTBACK; 1038 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 1039 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 1040
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1041 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 1042}
953 1043
954void 1044void
… …
984 CALL_BEGIN (4); 1074 CALL_BEGIN (4);
985 CALL_ARG (ns); 1075 CALL_ARG (ns);
986 CALL_ARG (type); 1076 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1077 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1078 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1079 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1080 CALL_END;
991} 1081}
992 1082
993int 1083int
994cfperl_can_merge (object *ob1, object *ob2) 1084cfperl_can_merge (object *ob1, object *ob2)
… …
996 int can; 1086 int can;
997 1087
998 CALL_BEGIN (2); 1088 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1089 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1090 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1091 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1092 can = count && SvTRUE (TOPs);
1003 CALL_END; 1093 CALL_END;
1004 1094
1005 return can; 1095 return can;
1096}
1097
1098void
1099cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1100{
1101 CALL_BEGIN (4);
1102 CALL_ARG (ob);
1103 CALL_ARG (state);
1104 CALL_ARG (activator);
1105 CALL_ARG (originator);
1106 CALL_CALL ("cf::mapscript::activate", G_VOID);
1107 CALL_END;
1006} 1108}
1007 1109
1008player * 1110player *
1009player::find (const char *name) 1111player::find (const char *name)
1010{ 1112{
… …
1074maptile::do_load_sync () 1176maptile::do_load_sync ()
1075{ 1177{
1076 CALL_BEGIN (1); 1178 CALL_BEGIN (1);
1077 CALL_ARG (this); 1179 CALL_ARG (this);
1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1180 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1079 CALL_END;
1080}
1081
1082void
1083maptile::change_all_map_light (int change)
1084{
1085 CALL_BEGIN (1);
1086 CALL_ARG (change);
1087 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1088 CALL_END; 1181 CALL_END;
1089} 1182}
1090 1183
1091void 1184void
1092object::enter_exit (object *exit) 1185object::enter_exit (object *exit)
… …
1159 CALL_CALL ("cf::_log_backtrace", G_VOID); 1252 CALL_CALL ("cf::_log_backtrace", G_VOID);
1160 CALL_END; 1253 CALL_END;
1161#endif 1254#endif
1162} 1255}
1163 1256
1257bool
1258is_match_expr (const char *expr)
1259{
1260 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1261}
1262
1263bool
1264match (const char *expr, object *ob, object *self, object *source, object *originator)
1265{
1266 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1267 expr += sizeof ("match ") - 1;
1268
1269 CALL_BEGIN (5);
1270 CALL_ARG (expr);
1271 CALL_ARG (ob);
1272 CALL_ARG (self);
1273 CALL_ARG (source);
1274 CALL_ARG (originator);
1275 CALL_CALL (cv_cf_match_match, G_SCALAR);
1276
1277 bool matched = count && SvTRUE (TOPs);
1278
1279 CALL_END;
1280
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;
1306}
1307
1164///////////////////////////////////////////////////////////////////////////// 1308/////////////////////////////////////////////////////////////////////////////
1165 1309
1166struct EVAPI *evapi::GEVAPI; 1310struct EVAPI *evapi::GEVAPI;
1167struct CoroAPI *coroapi::GCoroAPI; 1311struct CoroAPI *coroapi::GCoroAPI;
1168 1312
1313void
1169void coroapi::do_cede_to_tick () 1314coroapi::do_cede_to_tick ()
1170{ 1315{
1171 cede_pending = 0; 1316 cede_pending = 0;
1172 cede (); 1317 cede ();
1173} 1318}
1174 1319
… …
1198 ev_io_set ((ev_io *)this, fd, events); 1343 ev_io_set ((ev_io *)this, fd, events);
1199 if (active) start (); 1344 if (active) start ();
1200 } 1345 }
1201} 1346}
1202 1347
1203void 1348static void
1204_connect_to_perl () 1349_connect_to_perl_1 ()
1205{ 1350{
1206 stash_cf = gv_stashpv ("cf", 1); 1351 stash_cf = gv_stashpv ("cf", 1);
1207 1352
1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1353 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1354 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1228 cb_client = get_av ("cf::CB_CLIENT", 1); 1373 cb_client = get_av ("cf::CB_CLIENT", 1);
1229 cb_type = get_av ("cf::CB_TYPE" , 1); 1374 cb_type = get_av ("cf::CB_TYPE" , 1);
1230 cb_map = get_av ("cf::CB_MAP" , 1); 1375 cb_map = get_av ("cf::CB_MAP" , 1);
1231} 1376}
1232 1377
1378static void
1379_connect_to_perl_2 ()
1380{
1381 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1382 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1383 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1384 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1385 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1386}
1387
1233MODULE = cf PACKAGE = cf PREFIX = cf_ 1388MODULE = cf PACKAGE = cf PREFIX = cf_
1234 1389
1235BOOT: 1390BOOT:
1236{ 1391{
1237 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1392 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1238 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1393 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1239 1394
1240 _connect_to_perl (); 1395 _connect_to_perl_1 ();
1241 1396
1242 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1397 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1243 1398
1244 //{ 1399 //{
1245 // require_pv ("Time::HiRes"); 1400 // require_pv ("Time::HiRes");
… …
1289 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)
1290 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)
1291 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)
1292 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)
1293 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)
1294 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)
1295 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)
1296 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)
1297 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)
1298 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)
1299 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)
1300 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1455 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1301 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1456 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1302 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1457 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1458 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1303 1459
1304 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1460 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1305 1461
1306 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1462 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1307 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1463 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1324 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)
1325 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)
1326 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)
1327 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)
1328 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)
1329 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)
1330 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)
1331 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)
1332 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)
1333 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)
1334 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)
… …
1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1495 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1496 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1497 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1498 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1499 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1500 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1501 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1502 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1347 1503
1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1504 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1505 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1516 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1672 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1517 av_push (event, newSViv (eiv->klass)); 1673 av_push (event, newSViv (eiv->klass));
1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1674 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1675 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1520 } 1676 }
1677
1678 // used by autogenerated BOOT sections from genacc
1679 av_reflect = get_av ("cf::REFLECT", 1);
1521} 1680}
1522 1681
1523void _gv_clear (SV *gv) 1682void _gv_clear (SV *gv)
1524 CODE: 1683 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV); 1684 assert (SvTYPE (gv) == SVt_PVGV);
… …
1532 f (GvGP (gv)->gp_cv); 1691 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0; 1692 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv); 1693 GvMULTI_off (gv);
1535# undef f 1694# undef f
1536 1695
1537void _connect_to_perl () 1696void _connect_to_perl_1 ()
1697
1698void _connect_to_perl_2 ()
1538 1699
1539void _recalc_want () 1700void _recalc_want ()
1540 1701
1541# not used by default anymore 1702# not used by default anymore
1542void _global_reattach () 1703void _global_reattach ()
… …
1907 RETVAL 2068 RETVAL
1908 2069
1909void 2070void
1910debug_trace (attachable *obj, bool on = true) 2071debug_trace (attachable *obj, bool on = true)
1911 CODE: 2072 CODE:
1912 obj->flags &= ~attachable::F_DEBUG_TRACE; 2073 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1913 if (on) 2074 if (on)
1914 obj->flags |= attachable::F_DEBUG_TRACE; 2075 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1915 2076
1916int mortals_size () 2077int mortals_size ()
1917 CODE: 2078 CODE:
1918 RETVAL = attachable::mortals.size (); 2079 RETVAL = attachable::mortals.size ();
1919 OUTPUT: RETVAL 2080 OUTPUT: RETVAL
… …
2060 CODE: 2221 CODE:
2061 player_apply_below (op); 2222 player_apply_below (op);
2062 2223
2063int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2224int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2064 2225
2226int casting_level (object *caster, object *spell)
2227
2065int pay_item (object *op, object *buyer) 2228int pay_item (object *op, object *buyer)
2066 CODE: 2229 CODE:
2067 RETVAL = pay_for_item (op, buyer); 2230 RETVAL = pay_for_item (op, buyer);
2068 OUTPUT: RETVAL 2231 OUTPUT: RETVAL
2069 2232
… …
2111 2274
2112void player_lvl_adj (object *who, object *skill = 0) 2275void player_lvl_adj (object *who, object *skill = 0)
2113 2276
2114int 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)
2115 2278
2116int calc_skill_exp (object *who, object *op, object *skill); 2279int calc_skill_exp (object *who, object *op, object *skill)
2117 2280
2118void push_button (object *op); 2281void push_button (object *op, object *originator)
2119 2282
2120void use_trigger (object *op); 2283void use_trigger (object *op, object *originator)
2121 2284
2122void add_button_link (object *button, maptile *map, int connected);
2123
2124void remove_button_link (object *op);
2125
2126void handle_apply_yield (object *op); 2285void handle_apply_yield (object *op)
2286
2287int convert_item (object *item, object *converter)
2127 2288
2128 2289
2129MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2290MODULE = cf PACKAGE = cf::object PREFIX = cf_
2130 2291
2131# 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
… …
2144object *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)
2145 PROTOTYPE: $$$$$$ 2306 PROTOTYPE: $$$$$$
2146 CODE: 2307 CODE:
2147{ 2308{
2148 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;
2149} 2313}
2150 2314
2151shstr 2315shstr
2152object::kv_get (shstr key) 2316object::kv_get (shstr key)
2153 2317
… …
2333} 2497}
2334 2498
2335INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2499INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2336 2500
2337void 2501void
2502adjust_daylight ()
2503 CODE:
2504 maptile::adjust_daylight ();
2505
2506int
2507outdoor_darkness (int darkness = 0)
2508 CODE:
2509 RETVAL = maptile::outdoor_darkness;
2510 if (items)
2511 maptile::outdoor_darkness = darkness;
2512 OUTPUT:
2513 RETVAL
2514
2515void
2338maptile::instantiate () 2516maptile::instantiate ()
2339 2517
2340maptile *new () 2518maptile *new ()
2341 PROTOTYPE: 2519 PROTOTYPE:
2342 CODE: 2520 CODE:
… …
2449 } 2627 }
2450 2628
2451int out_of_map (maptile *map, int x, int y) 2629int out_of_map (maptile *map, int x, int y)
2452 2630
2453void 2631void
2454trigger (maptile *map, long connection, bool state = true) 2632find_link (maptile *map, shstr_tmp connection)
2455 CODE:
2456 activate_connection (map, connection, state);
2457
2458void
2459get_connection (maptile *map, long connection)
2460 PPCODE: 2633 PPCODE:
2461 oblinkpt *obp = get_connection_links (map, connection); 2634 if (oblinkpt *obp = map->find_link (connection))
2462 if (obp)
2463 for (objectlink *ol = obp->link; ol; ol = ol->next) 2635 for (objectlink *ol = obp->link; ol; ol = ol->next)
2464 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2636 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2465 2637
2466void 2638void
2467get_map_flags (maptile *map, int x, int y) 2639get_map_flags (maptile *map, int x, int y)
… …
2556 case 6: RETVAL = newSVuv (ms.move_on ); break; 2728 case 6: RETVAL = newSVuv (ms.move_on ); break;
2557 case 7: RETVAL = newSVuv (ms.move_off ); break; 2729 case 7: RETVAL = newSVuv (ms.move_off ); break;
2558 } 2730 }
2559} 2731}
2560 OUTPUT: RETVAL 2732 OUTPUT: RETVAL
2561
2562void fix_walls (maptile *map, int x, int y)
2563
2564void fix_walls_around (maptile *map, int x, int y)
2565 2733
2566# worst xs function of my life 2734# worst xs function of my life
2567bool 2735bool
2568_create_random_map (\ 2736_create_random_map (\
2569 maptile *self,\ 2737 maptile *self,\
… …
2697 PROTOTYPE: $ 2865 PROTOTYPE: $
2698 CODE: 2866 CODE:
2699 RETVAL = region::find (name); 2867 RETVAL = region::find (name);
2700 OUTPUT: RETVAL 2868 OUTPUT: RETVAL
2701 2869
2702region *find_fuzzy (utf8_string name)
2703 PROTOTYPE: $
2704 CODE:
2705 RETVAL = region::find_fuzzy (name);
2706 OUTPUT: RETVAL
2707
2708int specificity (region *rgn) 2870int specificity (region *rgn)
2709 CODE: 2871 CODE:
2710 RETVAL = 0; 2872 RETVAL = 0;
2711 while (rgn = rgn->parent) 2873 while (rgn = rgn->parent)
2712 RETVAL++; 2874 RETVAL++;

Diff Legend

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