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.315 by root, Thu Jan 8 03:03:24 2009 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)
… …
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))
… …
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;
… …
633 var = 0; 644 var = 0;
634} 645}
635 646
636////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 647//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
637 648
638SV * 649static SV *
639registry (attachable *ext) 650registry (attachable *ext)
640{ 651{
641 if (!ext->cb) 652 if (!ext->cb)
642 ext->cb = newAV (); 653 ext->cb = newAV ();
643 654
… …
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 930 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 931 }
921 932
922 va_end (ap); 933 va_end (ap);
923 934
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 935 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 936 count = count > 0 ? POPi : 0;
926 937
927 CALL_END; 938 CALL_END;
928 939
929 return count; 940 return count;
930} 941}
931 942
932SV * 943static SV *
933cfperl_result (int idx) 944cfperl_result (int idx)
934{ 945{
935 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 946 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
936 if (!av) 947 if (!av)
937 return &PL_sv_undef; 948 return &PL_sv_undef;
… …
970 981
971 dSP; 982 dSP;
972 983
973 PUSHMARK (SP); 984 PUSHMARK (SP);
974 PUTBACK; 985 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 986 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 987
977 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);
978} 989}
979 990
980void 991void
… …
1010 CALL_BEGIN (4); 1021 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1022 CALL_ARG (ns);
1012 CALL_ARG (type); 1023 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1024 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1025 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1026 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1027 CALL_END;
1017} 1028}
1018 1029
1019int 1030int
1020cfperl_can_merge (object *ob1, object *ob2) 1031cfperl_can_merge (object *ob1, object *ob2)
… …
1022 int can; 1033 int can;
1023 1034
1024 CALL_BEGIN (2); 1035 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1036 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1037 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1038 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1039 can = count && SvTRUE (TOPs);
1029 CALL_END; 1040 CALL_END;
1030 1041
1031 return can; 1042 return can;
1032} 1043}
1033 1044
1034void 1045void
1035cfperl_mapscript_activate (object *ob, object *activator, int state) 1046cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1036{ 1047{
1037 CALL_BEGIN (3); 1048 CALL_BEGIN (4);
1038 CALL_ARG (ob); 1049 CALL_ARG (ob);
1050 CALL_ARG (state);
1039 CALL_ARG (activator); 1051 CALL_ARG (activator);
1040 CALL_ARG (state); 1052 CALL_ARG (originator);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID); 1053 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END; 1054 CALL_END;
1043} 1055}
1044 1056
1045player * 1057player *
… …
1187 CALL_CALL ("cf::_log_backtrace", G_VOID); 1199 CALL_CALL ("cf::_log_backtrace", G_VOID);
1188 CALL_END; 1200 CALL_END;
1189#endif 1201#endif
1190} 1202}
1191 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
1192///////////////////////////////////////////////////////////////////////////// 1255/////////////////////////////////////////////////////////////////////////////
1193 1256
1194struct EVAPI *evapi::GEVAPI; 1257struct EVAPI *evapi::GEVAPI;
1195struct CoroAPI *coroapi::GCoroAPI; 1258struct CoroAPI *coroapi::GCoroAPI;
1196 1259
… …
1228 if (active) start (); 1291 if (active) start ();
1229 } 1292 }
1230} 1293}
1231 1294
1232static void 1295static void
1233_connect_to_perl () 1296_connect_to_perl_1 ()
1234{ 1297{
1235 stash_cf = gv_stashpv ("cf", 1); 1298 stash_cf = gv_stashpv ("cf", 1);
1236 1299
1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1300 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1238 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);
… …
1257 cb_client = get_av ("cf::CB_CLIENT", 1); 1320 cb_client = get_av ("cf::CB_CLIENT", 1);
1258 cb_type = get_av ("cf::CB_TYPE" , 1); 1321 cb_type = get_av ("cf::CB_TYPE" , 1);
1259 cb_map = get_av ("cf::CB_MAP" , 1); 1322 cb_map = get_av ("cf::CB_MAP" , 1);
1260} 1323}
1261 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
1262MODULE = cf PACKAGE = cf PREFIX = cf_ 1335MODULE = cf PACKAGE = cf PREFIX = cf_
1263 1336
1264BOOT: 1337BOOT:
1265{ 1338{
1266 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1339 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1267 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1340 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1268 1341
1269 _connect_to_perl (); 1342 _connect_to_perl_1 ();
1270 1343
1271 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1344 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1272 1345
1273 //{ 1346 //{
1274 // require_pv ("Time::HiRes"); 1347 // require_pv ("Time::HiRes");
… …
1318 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)
1319 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)
1320 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)
1321 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)
1322 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)
1323 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)
1324 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)
1325 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)
1326 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)
1327 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)
1328 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)
… …
1354 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)
1355 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)
1356 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)
1357 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)
1358 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)
1359 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)
1360 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)
1361 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)
1362 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)
1363 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)
1364 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)
… …
1546 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1619 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1547 av_push (event, newSViv (eiv->klass)); 1620 av_push (event, newSViv (eiv->klass));
1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1621 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1622 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1550 } 1623 }
1624
1625 // used by autogenerated BOOT sections from genacc
1626 av_reflect = get_av ("cf::REFLECT", 1);
1551} 1627}
1552 1628
1553void _gv_clear (SV *gv) 1629void _gv_clear (SV *gv)
1554 CODE: 1630 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV); 1631 assert (SvTYPE (gv) == SVt_PVGV);
… …
1562 f (GvGP (gv)->gp_cv); 1638 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0; 1639 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv); 1640 GvMULTI_off (gv);
1565# undef f 1641# undef f
1566 1642
1567void _connect_to_perl () 1643void _connect_to_perl_1 ()
1644
1645void _connect_to_perl_2 ()
1568 1646
1569void _recalc_want () 1647void _recalc_want ()
1570 1648
1571# not used by default anymore 1649# not used by default anymore
1572void _global_reattach () 1650void _global_reattach ()
… …
2090 CODE: 2168 CODE:
2091 player_apply_below (op); 2169 player_apply_below (op);
2092 2170
2093int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2171int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2094 2172
2173int casting_level (object *caster, object *spell)
2174
2095int pay_item (object *op, object *buyer) 2175int pay_item (object *op, object *buyer)
2096 CODE: 2176 CODE:
2097 RETVAL = pay_for_item (op, buyer); 2177 RETVAL = pay_for_item (op, buyer);
2098 OUTPUT: RETVAL 2178 OUTPUT: RETVAL
2099 2179
… …
2141 2221
2142void player_lvl_adj (object *who, object *skill = 0) 2222void player_lvl_adj (object *who, object *skill = 0)
2143 2223
2144int 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)
2145 2225
2146int calc_skill_exp (object *who, object *op, object *skill); 2226int calc_skill_exp (object *who, object *op, object *skill)
2147 2227
2148void push_button (object *op); 2228void push_button (object *op, object *originator)
2149 2229
2150void use_trigger (object *op); 2230void use_trigger (object *op, object *originator)
2151 2231
2152void handle_apply_yield (object *op); 2232void handle_apply_yield (object *op)
2233
2234int convert_item (object *item, object *converter)
2153 2235
2154 2236
2155MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2237MODULE = cf PACKAGE = cf::object PREFIX = cf_
2156 2238
2157# 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
… …
2170object *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)
2171 PROTOTYPE: $$$$$$ 2253 PROTOTYPE: $$$$$$
2172 CODE: 2254 CODE:
2173{ 2255{
2174 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;
2175} 2260}
2176 2261
2177shstr 2262shstr
2178object::kv_get (shstr key) 2263object::kv_get (shstr key)
2179 2264
… …
2363void 2448void
2364adjust_daylight () 2449adjust_daylight ()
2365 CODE: 2450 CODE:
2366 maptile::adjust_daylight (); 2451 maptile::adjust_daylight ();
2367 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
2368void 2462void
2369maptile::instantiate () 2463maptile::instantiate ()
2370 2464
2371maptile *new () 2465maptile *new ()
2372 PROTOTYPE: 2466 PROTOTYPE:
… …
2581 case 6: RETVAL = newSVuv (ms.move_on ); break; 2675 case 6: RETVAL = newSVuv (ms.move_on ); break;
2582 case 7: RETVAL = newSVuv (ms.move_off ); break; 2676 case 7: RETVAL = newSVuv (ms.move_off ); break;
2583 } 2677 }
2584} 2678}
2585 OUTPUT: RETVAL 2679 OUTPUT: RETVAL
2586
2587void fix_walls (maptile *map, int x, int y)
2588
2589void fix_walls_around (maptile *map, int x, int y)
2590 2680
2591# worst xs function of my life 2681# worst xs function of my life
2592bool 2682bool
2593_create_random_map (\ 2683_create_random_map (\
2594 maptile *self,\ 2684 maptile *self,\

Diff Legend

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