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.308 by root, Mon Nov 24 05:19:59 2008 UTC vs.
Revision 1.335 by root, Wed Nov 11 04:45:23 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
… …
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
395 406
396static long 407static long
397SvPTR (SV *sv, const char *klass) 408SvPTR (SV *sv, const char *klass)
398{ 409{
399 if (!sv_derived_from (sv, klass)) 410 if (!sv_derived_from (sv, klass))
… …
405 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 416 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
406 417
407 return (long)mg->mg_ptr; 418 return (long)mg->mg_ptr;
408} 419}
409 420
410static long 421static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 422SvPTR_ornull (SV *sv, const char *klass)
412{ 423{
413 if (SvOK (sv)) 424 if (SvOK (sv))
414 return SvPTR (sv, klass); 425 return SvPTR (sv, klass);
415 else 426 else
416 return 0; 427 return 0;
417} 428}
418 429
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 430static 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); } 431static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 432static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 433static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 434static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 435static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 436static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 437static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 438static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 439static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 440static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 441static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 442static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 443static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 444static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 445static 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); } 446static 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); } 447static 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); } 448static 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); } 449static 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); } 450static 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); } 451static 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); } 452static 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); } 453static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
443 454
444inline SV *to_sv (object & v) { return to_sv (&v); } 455static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 456static inline SV *to_sv (living & v) { return to_sv (&v); }
446 457
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 458static 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); } 459static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 460
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 461static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 462
452inline SV *to_sv (dynbuf * v) 463static inline SV *to_sv (dynbuf * v)
453{ 464{
454 SV *sv = newSV (0); 465 SV *sv = newSV (0);
455 466
456 sv_upgrade (sv, SVt_PV); 467 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 468 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 472 *SvEND (sv) = 0;
462 473
463 return sv; 474 return sv;
464} 475}
465 476
466inline SV *to_sv (dynbuf_text * v) 477static inline SV *to_sv (dynbuf_text * v)
467{ 478{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 479 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 480 SvUTF8_on (sv);
470 return sv; 481 return sv;
471} 482}
472 483
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 484static 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; } 485static 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); } 486static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 487static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 488static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 489static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 490static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 491static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 492static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 493static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 494static 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); } 495static 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); } 496static 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); } 497static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 498static 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"); } 499static inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
489inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 500static inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
490inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 501static inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
491inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 502static 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"); } 503static 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"); } 504static 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"); } 505static 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"); } 506static 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"); } 507static 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"); } 508static 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"); } 509static 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" ); } 510static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
500 511
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 512//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)); } 513static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 514
504template<class T> 515template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 516static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 517
507template<int N> 518template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 519static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 520
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 521static 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); } 522static 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); } 523static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 524static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 525
515inline void sv_to (SV *sv, std::string &v) 526static inline void sv_to (SV *sv, std::string &v)
516{ 527{
517 STRLEN len; 528 STRLEN len;
518 char *data = SvPVbyte (sv, len); 529 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 530 v.assign (data, len);
520} 531}
521 532
522inline void sv_to (SV *sv, UUID &v) 533static inline void sv_to (SV *sv, UUID &v)
523{ 534{
524 if (!v.parse (SvPV_nolen (sv))) 535 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 536 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 537}
527 538
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 539static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 540
530static SV * 541static SV *
531newSVdt_va (va_list &ap, data_type type) 542newSVdt_va (va_list &ap, data_type type)
532{ 543{
533 SV *sv; 544 SV *sv;
… …
607 va_end (ap); 618 va_end (ap);
608 619
609 return sv; 620 return sv;
610} 621}
611 622
623// typemap support, mostly to avoid excessive inlining
624template<class type>
625static void noinline
626cf_obj_to (SV *arg, type &var)
627{
628 sv_to (arg, var);
629 if (!var)
630 croak ("must not pass invalid/null cf_obj here");
631}
632
633template<class object>
634static void noinline
635cf_obj_ornull_to (SV *arg, object *&var)
636{
637 if (SvOK (arg))
638 {
639 sv_to (arg, var);
640 if (!var)
641 croak ("unable to convert perl object to C++ object");
642 }
643 else
644 var = 0;
645}
646
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 647//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 648
614SV * 649static SV *
615registry (attachable *ext) 650registry (attachable *ext)
616{ 651{
617 if (!ext->cb) 652 if (!ext->cb)
618 ext->cb = newAV (); 653 ext->cb = newAV ();
619 654
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 695 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 696 exit (EXIT_FAILURE);
662 } 697 }
663} 698}
664 699
700void
665void cfperl_main () 701cfperl_main ()
666{ 702{
667 dSP; 703 dSP;
668 704
669 PUSHMARK (SP); 705 PUSHMARK (SP);
670 PUTBACK; 706 PUTBACK;
… …
695# undef def 731# undef def
696}; 732};
697 733
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 734#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 735
700static void 736static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 737gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 738{
703 // event must be in array 739 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 740 if (event >= 0 && event <= AvFILLp (registry))
705 { 741 {
… …
791{ 827{
792 attachable::gather_callbacks (callbacks, event); 828 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 829 ::gather_callbacks (callbacks, cb_map, event);
794} 830}
795 831
796void 832static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 833_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 834{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 835 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 836 {
801 SV *cbs_ = AvARRAY (registry)[event]; 837 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 847 }
812 } 848 }
813} 849}
814 850
815// very slow and inefficient way to recalculate the global want bitsets 851// very slow and inefficient way to recalculate the global want bitsets
816void 852static void
817_recalc_want () 853_recalc_want ()
818{ 854{
819 ev_want_event.reset (); 855 ev_want_event.reset ();
820 856
821 _recalc_want (ev_want_event, cb_global); 857 _recalc_want (ev_want_event, cb_global);
… …
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 930 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 931 }
896 932
897 va_end (ap); 933 va_end (ap);
898 934
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 935 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 936 count = count > 0 ? POPi : 0;
901 937
902 CALL_END; 938 CALL_END;
903 939
904 return count; 940 return count;
905} 941}
906 942
907SV * 943static SV *
908cfperl_result (int idx) 944cfperl_result (int idx)
909{ 945{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 946 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 947 if (!av)
912 return &PL_sv_undef; 948 return &PL_sv_undef;
… …
931} 967}
932 968
933///////////////////////////////////////////////////////////////////////////// 969/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 970// various c++ => perl glue functions
935 971
972void
936void cfperl_tick () 973cfperl_tick ()
937{ 974{
938 tick_pending = 1; 975 tick_pending = 1;
939 976
940 if (tick_inhibit) 977 if (tick_inhibit)
941 return; 978 return;
… …
944 981
945 dSP; 982 dSP;
946 983
947 PUSHMARK (SP); 984 PUSHMARK (SP);
948 PUTBACK; 985 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 986 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 987
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 988 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 989}
953 990
954void 991void
… …
984 CALL_BEGIN (4); 1021 CALL_BEGIN (4);
985 CALL_ARG (ns); 1022 CALL_ARG (ns);
986 CALL_ARG (type); 1023 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1024 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1025 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1026 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1027 CALL_END;
991} 1028}
992 1029
993int 1030int
994cfperl_can_merge (object *ob1, object *ob2) 1031cfperl_can_merge (object *ob1, object *ob2)
… …
996 int can; 1033 int can;
997 1034
998 CALL_BEGIN (2); 1035 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1036 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1037 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1038 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1039 can = count && SvTRUE (TOPs);
1003 CALL_END; 1040 CALL_END;
1004 1041
1005 return can; 1042 return can;
1043}
1044
1045void
1046cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1047{
1048 CALL_BEGIN (4);
1049 CALL_ARG (ob);
1050 CALL_ARG (state);
1051 CALL_ARG (activator);
1052 CALL_ARG (originator);
1053 CALL_CALL ("cf::mapscript::activate", G_VOID);
1054 CALL_END;
1006} 1055}
1007 1056
1008player * 1057player *
1009player::find (const char *name) 1058player::find (const char *name)
1010{ 1059{
… …
1074maptile::do_load_sync () 1123maptile::do_load_sync ()
1075{ 1124{
1076 CALL_BEGIN (1); 1125 CALL_BEGIN (1);
1077 CALL_ARG (this); 1126 CALL_ARG (this);
1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1127 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; 1128 CALL_END;
1089} 1129}
1090 1130
1091void 1131void
1092object::enter_exit (object *exit) 1132object::enter_exit (object *exit)
… …
1159 CALL_CALL ("cf::_log_backtrace", G_VOID); 1199 CALL_CALL ("cf::_log_backtrace", G_VOID);
1160 CALL_END; 1200 CALL_END;
1161#endif 1201#endif
1162} 1202}
1163 1203
1204bool
1205is_match_expr (const char *expr)
1206{
1207 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1208}
1209
1210bool
1211match (const char *expr, object *ob, object *self, object *source, object *originator)
1212{
1213 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1214 expr += sizeof ("match ") - 1;
1215
1216 CALL_BEGIN (5);
1217 CALL_ARG (expr);
1218 CALL_ARG (ob);
1219 CALL_ARG (self);
1220 CALL_ARG (source);
1221 CALL_ARG (originator);
1222 CALL_CALL (cv_cf_match_match, G_SCALAR);
1223
1224 bool matched = count && SvTRUE (TOPs);
1225
1226 CALL_END;
1227
1228 return matched;
1229}
1230
1231object *
1232match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1233{
1234 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1235 expr += sizeof ("match ") - 1;
1236
1237 CALL_BEGIN (5);
1238 CALL_ARG (expr);
1239 CALL_ARG (ob);
1240 CALL_ARG (self);
1241 CALL_ARG (source);
1242 CALL_ARG (originator);
1243 CALL_CALL (cv_cf_match_match, G_ARRAY);
1244
1245 object *one = 0;
1246
1247 if (count)
1248 sv_to (TOPs, one);
1249
1250 CALL_END;
1251
1252 return one;
1253}
1254
1164///////////////////////////////////////////////////////////////////////////// 1255/////////////////////////////////////////////////////////////////////////////
1165 1256
1166struct EVAPI *evapi::GEVAPI; 1257struct EVAPI *evapi::GEVAPI;
1167struct CoroAPI *coroapi::GCoroAPI; 1258struct CoroAPI *coroapi::GCoroAPI;
1168 1259
1260void
1169void coroapi::do_cede_to_tick () 1261coroapi::do_cede_to_tick ()
1170{ 1262{
1171 cede_pending = 0; 1263 cede_pending = 0;
1172 cede (); 1264 cede ();
1173} 1265}
1174 1266
… …
1198 ev_io_set ((ev_io *)this, fd, events); 1290 ev_io_set ((ev_io *)this, fd, events);
1199 if (active) start (); 1291 if (active) start ();
1200 } 1292 }
1201} 1293}
1202 1294
1203void 1295static void
1204_connect_to_perl () 1296_connect_to_perl_1 ()
1205{ 1297{
1206 stash_cf = gv_stashpv ("cf", 1); 1298 stash_cf = gv_stashpv ("cf", 1);
1207 1299
1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1300 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1301 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1228 cb_client = get_av ("cf::CB_CLIENT", 1); 1320 cb_client = get_av ("cf::CB_CLIENT", 1);
1229 cb_type = get_av ("cf::CB_TYPE" , 1); 1321 cb_type = get_av ("cf::CB_TYPE" , 1);
1230 cb_map = get_av ("cf::CB_MAP" , 1); 1322 cb_map = get_av ("cf::CB_MAP" , 1);
1231} 1323}
1232 1324
1325static void
1326_connect_to_perl_2 ()
1327{
1328 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1329 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1330 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1331 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1332 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1333}
1334
1233MODULE = cf PACKAGE = cf PREFIX = cf_ 1335MODULE = cf PACKAGE = cf PREFIX = cf_
1234 1336
1235BOOT: 1337BOOT:
1236{ 1338{
1237 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1339 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1238 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1340 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1239 1341
1240 _connect_to_perl (); 1342 _connect_to_perl_1 ();
1241 1343
1242 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1344 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1243 1345
1244 //{ 1346 //{
1245 // require_pv ("Time::HiRes"); 1347 // require_pv ("Time::HiRes");
… …
1289 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1391 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) 1392 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) 1393 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) 1394 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) 1395 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) 1396 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) 1397 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) 1398 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) 1399 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) 1400 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) 1401 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) 1402 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) 1403 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) 1404 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1405 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1303 1406
1304 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1407 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1305 1408
1306 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1409 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) 1410 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) 1427 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) 1428 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) 1429 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) 1430 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) 1431 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) 1432 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) 1433 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) 1434 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) 1435 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) 1436 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) 1437 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) 1442 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) 1443 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) 1444 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) 1445 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) 1446 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) 1447 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) 1448 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) 1449 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1347 1450
1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1451 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) 1452 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)); 1619 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1517 av_push (event, newSViv (eiv->klass)); 1620 av_push (event, newSViv (eiv->klass));
1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1621 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1622 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1520 } 1623 }
1624
1625 // used by autogenerated BOOT sections from genacc
1626 av_reflect = get_av ("cf::REFLECT", 1);
1521} 1627}
1522 1628
1523void _gv_clear (SV *gv) 1629void _gv_clear (SV *gv)
1524 CODE: 1630 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV); 1631 assert (SvTYPE (gv) == SVt_PVGV);
… …
1532 f (GvGP (gv)->gp_cv); 1638 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0; 1639 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv); 1640 GvMULTI_off (gv);
1535# undef f 1641# undef f
1536 1642
1537void _connect_to_perl () 1643void _connect_to_perl_1 ()
1644
1645void _connect_to_perl_2 ()
1538 1646
1539void _recalc_want () 1647void _recalc_want ()
1540 1648
1541# not used by default anymore 1649# not used by default anymore
1542void _global_reattach () 1650void _global_reattach ()
… …
1599void init_experience () 1707void init_experience ()
1600 1708
1601void init_attackmess () 1709void init_attackmess ()
1602 1710
1603void init_dynamic () 1711void init_dynamic ()
1604
1605void init_block ()
1606 1712
1607void load_settings () 1713void load_settings ()
1608 1714
1609void load_materials () 1715void load_materials ()
1610 1716
… …
2062 CODE: 2168 CODE:
2063 player_apply_below (op); 2169 player_apply_below (op);
2064 2170
2065int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2171int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2066 2172
2173int casting_level (object *caster, object *spell)
2174
2067int pay_item (object *op, object *buyer) 2175int pay_item (object *op, object *buyer)
2068 CODE: 2176 CODE:
2069 RETVAL = pay_for_item (op, buyer); 2177 RETVAL = pay_for_item (op, buyer);
2070 OUTPUT: RETVAL 2178 OUTPUT: RETVAL
2071 2179
… …
2113 2221
2114void player_lvl_adj (object *who, object *skill = 0) 2222void player_lvl_adj (object *who, object *skill = 0)
2115 2223
2116int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2224int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2117 2225
2118int calc_skill_exp (object *who, object *op, object *skill); 2226int calc_skill_exp (object *who, object *op, object *skill)
2119 2227
2120void push_button (object *op); 2228void push_button (object *op, object *originator)
2121 2229
2122void use_trigger (object *op); 2230void use_trigger (object *op, object *originator)
2123 2231
2124void add_button_link (object *button, maptile *map, int connected);
2125
2126void remove_button_link (object *op);
2127
2128void handle_apply_yield (object *op); 2232void handle_apply_yield (object *op)
2233
2234int convert_item (object *item, object *converter)
2129 2235
2130 2236
2131MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2237MODULE = cf PACKAGE = cf::object PREFIX = cf_
2132 2238
2133# no clean way to get an object from an archetype - stupid idiotic 2239# no clean way to get an object from an archetype - stupid idiotic
… …
2146object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2252object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2147 PROTOTYPE: $$$$$$ 2253 PROTOTYPE: $$$$$$
2148 CODE: 2254 CODE:
2149{ 2255{
2150 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2256 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2257
2258 if (RETVAL->destroyed ())
2259 RETVAL = 0;
2151} 2260}
2152 2261
2153shstr 2262shstr
2154object::kv_get (shstr key) 2263object::kv_get (shstr key)
2155 2264
… …
2250 pl->ob->stats.hp = pl->ob->stats.maxhp; 2359 pl->ob->stats.hp = pl->ob->stats.maxhp;
2251 pl->ob->stats.sp = pl->ob->stats.maxsp; 2360 pl->ob->stats.sp = pl->ob->stats.maxsp;
2252 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2361 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2253 pl->orig_stats = pl->ob->stats; 2362 pl->orig_stats = pl->ob->stats;
2254 2363
2255void clear_los (player *pl)
2256
2257# should only be temporary 2364# should only be temporary
2258void esrv_new_player (player *pl) 2365void esrv_new_player (player *pl)
2259 2366
2367#d# TODO: replace by blocked_los accessor, fix code using this
2260bool 2368bool
2261cell_visible (player *pl, int dx, int dy) 2369cell_visible (player *pl, int dx, int dy)
2262 CODE: 2370 CODE:
2263 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2371 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2264 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2265 OUTPUT: 2372 OUTPUT:
2266 RETVAL 2373 RETVAL
2267 2374
2268void 2375void
2269send (player *pl, SV *packet) 2376send (player *pl, SV *packet)
… …
2337} 2444}
2338 2445
2339INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2446INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2340 2447
2341void 2448void
2449adjust_daylight ()
2450 CODE:
2451 maptile::adjust_daylight ();
2452
2453int
2454outdoor_darkness (int darkness = 0)
2455 CODE:
2456 RETVAL = maptile::outdoor_darkness;
2457 if (items)
2458 maptile::outdoor_darkness = darkness;
2459 OUTPUT:
2460 RETVAL
2461
2462void
2342maptile::instantiate () 2463maptile::instantiate ()
2343 2464
2344maptile *new () 2465maptile *new ()
2345 PROTOTYPE: 2466 PROTOTYPE:
2346 CODE: 2467 CODE:
… …
2453 } 2574 }
2454 2575
2455int out_of_map (maptile *map, int x, int y) 2576int out_of_map (maptile *map, int x, int y)
2456 2577
2457void 2578void
2458trigger (maptile *map, long connection, bool state = true) 2579find_link (maptile *map, shstr_tmp connection)
2459 CODE:
2460 activate_connection (map, connection, state);
2461
2462void
2463get_connection (maptile *map, long connection)
2464 PPCODE: 2580 PPCODE:
2465 oblinkpt *obp = get_connection_links (map, connection); 2581 if (oblinkpt *obp = map->find_link (connection))
2466 if (obp)
2467 for (objectlink *ol = obp->link; ol; ol = ol->next) 2582 for (objectlink *ol = obp->link; ol; ol = ol->next)
2468 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2583 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2469 2584
2470void 2585void
2471get_map_flags (maptile *map, int x, int y) 2586get_map_flags (maptile *map, int x, int y)
… …
2525 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2640 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2526 XPUSHs (sv_2mortal (to_sv (o))); 2641 XPUSHs (sv_2mortal (to_sv (o)));
2527} 2642}
2528 2643
2529SV * 2644SV *
2530bot_at (maptile *obj, unsigned int x, unsigned int y) 2645bot_at (maptile *map, unsigned int x, unsigned int y)
2531 PROTOTYPE: $$$ 2646 PROTOTYPE: $$$
2532 ALIAS: 2647 ALIAS:
2533 top_at = 1 2648 top_at = 1
2534 flags_at = 2 2649 flags_at = 2
2535 light_at = 3 2650 light_at = 3
2536 move_block_at = 4 2651 move_block_at = 4
2537 move_slow_at = 5 2652 move_slow_at = 5
2538 move_on_at = 6 2653 move_on_at = 6
2539 move_off_at = 7 2654 move_off_at = 7
2540 INIT:
2541 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2542 CODE: 2655 CODE:
2656{
2657 sint16 nx = x;
2658 sint16 ny = y;
2659
2660 if (!xy_normalise (map, nx, ny))
2661 XSRETURN_UNDEF;
2662
2663 mapspace &ms = map->at (nx, ny);
2664
2665 ms.update ();
2666
2543 switch (ix) 2667 switch (ix)
2544 { 2668 {
2545 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2669 case 0: RETVAL = to_sv (ms.bot ); break;
2546 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2670 case 1: RETVAL = to_sv (ms.top ); break;
2547 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2671 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2548 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2672 case 3: RETVAL = newSViv (ms.light ); break;
2549 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2673 case 4: RETVAL = newSVuv (ms.move_block); break;
2550 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2674 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2551 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2675 case 6: RETVAL = newSVuv (ms.move_on ); break;
2552 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2676 case 7: RETVAL = newSVuv (ms.move_off ); break;
2553 } 2677 }
2678}
2554 OUTPUT: RETVAL 2679 OUTPUT: RETVAL
2555
2556void fix_walls (maptile *map, int x, int y)
2557
2558void fix_walls_around (maptile *map, int x, int y)
2559 2680
2560# worst xs function of my life 2681# worst xs function of my life
2561bool 2682bool
2562_create_random_map (\ 2683_create_random_map (\
2563 maptile *self,\ 2684 maptile *self,\
… …
2691 PROTOTYPE: $ 2812 PROTOTYPE: $
2692 CODE: 2813 CODE:
2693 RETVAL = region::find (name); 2814 RETVAL = region::find (name);
2694 OUTPUT: RETVAL 2815 OUTPUT: RETVAL
2695 2816
2696region *find_fuzzy (utf8_string name)
2697 PROTOTYPE: $
2698 CODE:
2699 RETVAL = region::find_fuzzy (name);
2700 OUTPUT: RETVAL
2701
2702int specificity (region *rgn) 2817int specificity (region *rgn)
2703 CODE: 2818 CODE:
2704 RETVAL = 0; 2819 RETVAL = 0;
2705 while (rgn = rgn->parent) 2820 while (rgn = rgn->parent)
2706 RETVAL++; 2821 RETVAL++;

Diff Legend

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