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.312 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.349 by elmex, Sat Mar 20 00:42:08 2010 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,2009,2010 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>
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * 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 7 * 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 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * 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/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include "autoconf.h" 23#include "autoconf.h"
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h"
35#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
71static int tick_pending; 69static int tick_pending;
72 70
73global gbl_ev; 71global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 72static 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; 73static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
74static AV *av_reflect;
76 75
77bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
79 78
80static HV 79static HV
88 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
92 91
92static SV
93 *cv_cf_do_invoke,
94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg,
96 *cv_cf_tick,
97 *cv_cf_match_match;
98
93#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
94static inline SV * 100static SV *
95newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
96{ 102{
97 if (!s) 103 if (!s)
98 return newSV (0); 104 return newSV (0);
99 105
102 return sv; 108 return sv;
103} 109}
104#endif 110#endif
105 111
106#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
107static inline SV * 113static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 115{
110 if (!s) 116 if (!s)
111 return newSV (0); 117 return newSV (0);
112 118
116 SvUTF8_on (sv); 122 SvUTF8_on (sv);
117 123
118 return sv; 124 return sv;
119} 125}
120#endif 126#endif
127
128static noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
121 143
122// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
123template<class super> 145template<class super>
124static super * 146static super *
125is_a (attachable *at) 147is_a (attachable *at)
158 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
159 hv_clear (self); 181 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
162 184
163 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 186 assert (!this->self);
165 } 187 }
166} 188}
167 189
168void 190void
202attachable::destroy () 224attachable::destroy ()
203{ 225{
204 if (destroyed ()) 226 if (destroyed ())
205 return; 227 return;
206 228
207 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
208 do_destroy (); 230 do_destroy ();
209 sever_self (); 231 sever_self ();
210} 232}
211 233
212void 234void
286 308
287 attach = src.attach; 309 attach = src.attach;
288 return *this; 310 return *this;
289} 311}
290 312
313#if 0
291template<typename T> 314template<typename T>
292static bool 315static bool
293find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
294{ 317{
295 char *s = (char *)obj; 318 char *s = (char *)obj;
303 326
304 return false; 327 return false;
305} 328}
306 329
307// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
308void 331static void
309find_backref (void *ptr) 332find_backref (void *ptr)
310{ 333{
311 for_all_objects (op) 334 for_all_objects (op)
312 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 336 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
317 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
318 341
319 for_all_clients (ns) 342 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
322
323} 345}
346#endif
324 347
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 349
327static SV * 350static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
381 404
382 return sv; 405 return sv;
383 } 406 }
384} 407}
385 408
409#if 0 // unused
386static void 410static void
387clearSVptr (SV *sv) 411clearSVptr (SV *sv)
388{ 412{
389 if (SvROK (sv)) 413 if (SvROK (sv))
390 sv = SvRV (sv); 414 sv = SvRV (sv);
391 415
392 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
394} 418}
419#endif
420
421static long
422SvPTR_nc (SV *sv)
423{
424 sv = SvRV (sv);
425
426 // very important shortcut
427 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
428 return (long)SvMAGIC (sv)->mg_ptr;
429
430 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
431 return (long)mg->mg_ptr;
432
433 croak ("perl code used object, but C object is already destroyed, caught");
434}
395 435
396static long 436static long
397SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
398{ 438{
399 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
401 441
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 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} 443}
409 444
410static long 445static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
412{ 447{
413 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
414 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
415 else
416 return 0;
417} 451}
418 452
453static long noinline
454SvPTR_ornull_client (SV *sv)
455{
456 if (expect_false (!SvOK (sv))) return 0;
457
458 if (!SvROK (sv)
459 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
460 && !sv_derived_from (sv, "cf::client")))
461 croak ("object of type cf::client expected");
462
463 return SvPTR_nc (sv);
464}
465
466static long noinline
467SvPTR_ornull_object (SV *sv)
468{
469 if (expect_false (!SvOK (sv))) return 0;
470
471 if (!SvROK (sv)
472 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
473 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
474 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
475 && !sv_derived_from (sv, "cf::object")))
476 croak ("object of type cf::object expected");
477
478 return SvPTR_nc (sv);
479}
480
481static long noinline
482SvPTR_ornull_player (SV *sv)
483{
484 if (expect_false (!SvOK (sv))) return 0;
485
486 if (!SvROK (sv)
487 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
488 && !sv_derived_from (sv, "cf::player")))
489 croak ("object of type cf::player expected");
490
491 return SvPTR_nc (sv);
492}
493
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 494static 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); } 495static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 509static 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); } 510static 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); } 511static 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); } 512static 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); } 513static 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); } 514static 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); } 515static 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); } 516static 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); } 517static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
443 518
444inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
446 521
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 522static 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); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 524
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 526
452inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
453{ 528{
454 SV *sv = newSV (0); 529 SV *sv = newSV (0);
455 530
456 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
461 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
462 537
463 return sv; 538 return sv;
464} 539}
465 540
466inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
467{ 542{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 544 SvUTF8_on (sv);
470 return sv; 545 return sv;
471} 546}
472 547
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 548static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 549static 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); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static 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); } 559static 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); } 560static 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); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static 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"); } 563static 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"); } 564static 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"); } 565static 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"); } 566static 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"); } 567static 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"); } 568static 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"); } 569static 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"); } 570static 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"); } 571static 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"); } 572static 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"); } 573static 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" ); } 574static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 575
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 576//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)); } 577static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 578
504template<class T> 579template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 580static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 581
507template<int N> 582template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 583static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 584
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 585static 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); } 586static 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); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 589
515inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
516{ 591{
517 STRLEN len; 592 STRLEN len;
518 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 594 v.assign (data, len);
520} 595}
521 596
522inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
523{ 598{
524 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 601}
527 602
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 603static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 604
530static SV * 605static SV *
531newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
532{ 607{
533 SV *sv; 608 SV *sv;
607 va_end (ap); 682 va_end (ap);
608 683
609 return sv; 684 return sv;
610} 685}
611 686
687// typemap support, mostly to avoid excessive inlining
688template<class type>
689static void noinline
690cf_obj_to (SV *arg, type &var)
691{
692 sv_to (arg, var);
693 if (!var)
694 croak ("must not pass invalid/null cf_obj here");
695}
696
697template<class object>
698static void noinline
699cf_obj_ornull_to (SV *arg, object *&var)
700{
701 if (SvOK (arg))
702 {
703 sv_to (arg, var);
704 if (!var)
705 croak ("unable to convert perl object to C++ object");
706 }
707 else
708 var = 0;
709}
710
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 712
614SV * 713static SV *
615registry (attachable *ext) 714registry (attachable *ext)
616{ 715{
617 if (!ext->cb) 716 if (!ext->cb)
618 ext->cb = newAV (); 717 ext->cb = newAV ();
619 718
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 760 exit (EXIT_FAILURE);
662 } 761 }
663} 762}
664 763
764void
665void cfperl_main () 765cfperl_main ()
666{ 766{
667 dSP; 767 dSP;
668 768
669 PUSHMARK (SP); 769 PUSHMARK (SP);
670 PUTBACK; 770 PUTBACK;
695# undef def 795# undef def
696}; 796};
697 797
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 798#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 799
700static void 800static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 802{
703 // event must be in array 803 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
705 { 805 {
791{ 891{
792 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
794} 894}
795 895
796void 896static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 898{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 900 {
801 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
811 } 911 }
812 } 912 }
813} 913}
814 914
815// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
816void 916static void
817_recalc_want () 917_recalc_want ()
818{ 918{
819 ev_want_event.reset (); 919 ev_want_event.reset ();
820 920
821 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 995 }
896 996
897 va_end (ap); 997 va_end (ap);
898 998
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
901 1001
902 CALL_END; 1002 CALL_END;
903 1003
904 return count; 1004 return count;
905} 1005}
906 1006
907SV * 1007static SV *
908cfperl_result (int idx) 1008cfperl_result (int idx)
909{ 1009{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 1011 if (!av)
912 return &PL_sv_undef; 1012 return &PL_sv_undef;
931} 1031}
932 1032
933///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 1034// various c++ => perl glue functions
935 1035
1036void
936void cfperl_tick () 1037cfperl_tick ()
937{ 1038{
938 tick_pending = 1; 1039 tick_pending = 1;
939 1040
940 if (tick_inhibit) 1041 if (tick_inhibit)
941 return; 1042 return;
944 1045
945 dSP; 1046 dSP;
946 1047
947 PUSHMARK (SP); 1048 PUSHMARK (SP);
948 PUTBACK; 1049 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 1051
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1052 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 1053}
953 1054
954void 1055void
977 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
978 CALL_END; 1079 CALL_END;
979} 1080}
980 1081
981void 1082void
982cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1083cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
983{ 1084{
984 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
985 CALL_ARG (ns); 1086 CALL_ARG (ns);
986 CALL_ARG (type); 1087 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1089 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1091 CALL_END;
991} 1092}
992 1093
993int 1094int
994cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
996 int can; 1097 int can;
997 1098
998 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
1003 CALL_END; 1104 CALL_END;
1004 1105
1005 return can; 1106 return can;
1006} 1107}
1007 1108
1109void
1110cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1111{
1112 CALL_BEGIN (4);
1113 CALL_ARG (ob);
1114 CALL_ARG (state);
1115 CALL_ARG (activator);
1116 CALL_ARG (originator);
1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1118 CALL_END;
1119}
1120
1008player * 1121player *
1009player::find (const char *name) 1122player::find (const_utf8_string name)
1010{ 1123{
1011 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1012 CALL_ARG (name); 1125 CALL_ARG (name);
1013 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1014 1127
1019 1132
1020 return retval; 1133 return retval;
1021} 1134}
1022 1135
1023maptile * 1136maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1025{ 1138{
1026 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1027 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1028 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1029 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
1036 1149
1037 return retval; 1150 return retval;
1038} 1151}
1039 1152
1040maptile * 1153maptile *
1041maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1042{ 1155{
1043 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1044 CALL_ARG (path); 1157 CALL_ARG (path);
1045 CALL_ARG (origin); 1158 CALL_ARG (origin);
1046 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1052 1165
1053 return retval; 1166 return retval;
1054} 1167}
1055 1168
1056maptile * 1169maptile *
1057maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1058{ 1171{
1059 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1060 CALL_ARG (path); 1173 CALL_ARG (path);
1061 CALL_ARG (origin); 1174 CALL_ARG (origin);
1062 CALL_ARG (load); 1175 CALL_ARG (load);
1091 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1092 CALL_END; 1205 CALL_END;
1093} 1206}
1094 1207
1095void 1208void
1096object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1097{ 1210{
1098 if (type != PLAYER) 1211 if (type != PLAYER)
1099 return; 1212 return;
1100 1213
1101 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
1105 CALL_ARG (y); 1218 CALL_ARG (y);
1106 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1107 CALL_END; 1220 CALL_END;
1108} 1221}
1109 1222
1110const char * 1223const_utf8_string
1111object::ref () const 1224object::ref () const
1112{ 1225{
1113 if (type == PLAYER) 1226 if (type == PLAYER)
1114 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1227 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1115 else 1228 else
1116 return 0; 1229 return 0;
1117} 1230}
1118 1231
1119object * 1232object *
1120object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1121{ 1234{
1122 object *retval = 0; 1235 object *retval = 0;
1123 1236
1124 if (ref) 1237 if (ref)
1125 { 1238 {
1135 1248
1136 return retval; 1249 return retval;
1137} 1250}
1138 1251
1139void 1252void
1140log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1141{ 1254{
1142#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1143 void *addr [20]; 1256 void *addr [20];
1144 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1145 1258
1150 CALL_CALL ("cf::_log_backtrace", G_VOID); 1263 CALL_CALL ("cf::_log_backtrace", G_VOID);
1151 CALL_END; 1264 CALL_END;
1152#endif 1265#endif
1153} 1266}
1154 1267
1268bool
1269is_match_expr (const_utf8_string expr)
1270{
1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1272}
1273
1274bool
1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1276{
1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1278 expr += sizeof ("match ") - 1;
1279
1280 CALL_BEGIN (5);
1281 CALL_ARG (expr);
1282 CALL_ARG (ob);
1283 CALL_ARG (self);
1284 CALL_ARG (source);
1285 CALL_ARG (originator);
1286 CALL_CALL (cv_cf_match_match, G_SCALAR);
1287
1288 bool matched = count && SvTRUE (TOPs);
1289
1290 CALL_END;
1291
1292 return matched;
1293}
1294
1295object *
1296match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1297{
1298 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1299 expr += sizeof ("match ") - 1;
1300
1301 CALL_BEGIN (5);
1302 CALL_ARG (expr);
1303 CALL_ARG (ob);
1304 CALL_ARG (self);
1305 CALL_ARG (source);
1306 CALL_ARG (originator);
1307 CALL_CALL (cv_cf_match_match, G_ARRAY);
1308
1309 object *one = 0;
1310
1311 if (count)
1312 sv_to (TOPs, one);
1313
1314 CALL_END;
1315
1316 return one;
1317}
1318
1155///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1156 1320
1157struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1158struct CoroAPI *coroapi::GCoroAPI; 1322struct CoroAPI *coroapi::GCoroAPI;
1159 1323
1324void
1160void coroapi::do_cede_to_tick () 1325coroapi::do_cede_to_tick ()
1161{ 1326{
1162 cede_pending = 0; 1327 cede_pending = 0;
1163 cede (); 1328 cede ();
1164} 1329}
1165 1330
1189 ev_io_set ((ev_io *)this, fd, events); 1354 ev_io_set ((ev_io *)this, fd, events);
1190 if (active) start (); 1355 if (active) start ();
1191 } 1356 }
1192} 1357}
1193 1358
1194void 1359static void
1195_connect_to_perl () 1360_connect_to_perl_1 ()
1196{ 1361{
1197 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1198 1363
1199 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1200 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1365 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1219 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1220 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1221 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1222} 1387}
1223 1388
1389static void
1390_connect_to_perl_2 ()
1391{
1392 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1393 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1394 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1395 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1396 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1397}
1398
1224MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1225 1400
1226BOOT: 1401BOOT:
1227{ 1402{
1228 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1229 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1230 1405
1231 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1232 1407
1233 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1234 1409
1235 //{ 1410 //{
1236 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
1280 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1455 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1281 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1456 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1282 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1457 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1283 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1458 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1284 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1459 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1285 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1460 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1286 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1461 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1287 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1462 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1288 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1463 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1289 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1464 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1290 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1465 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1291 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1466 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1292 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1467 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1293 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1468 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1469 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1294 1470
1295 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1471 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1296 1472
1297 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1473 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1298 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1474 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1315 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1491 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1316 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE) 1492 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1317 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING) 1493 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1318 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW) 1494 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1319 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE) 1495 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1320 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE) 1496 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1321 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE) 1497 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1322 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL) 1498 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1323 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON) 1499 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1324 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS) 1500 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1325 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH) 1501 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1507 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1683 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1508 av_push (event, newSViv (eiv->klass)); 1684 av_push (event, newSViv (eiv->klass));
1509 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1685 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1510 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1686 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1511 } 1687 }
1688
1689 // used by autogenerated BOOT sections from genacc
1690 av_reflect = get_av ("cf::REFLECT", 1);
1512} 1691}
1513 1692
1514void _gv_clear (SV *gv) 1693void _gv_clear (SV *gv)
1515 CODE: 1694 CODE:
1516 assert (SvTYPE (gv) == SVt_PVGV); 1695 assert (SvTYPE (gv) == SVt_PVGV);
1523 f (GvGP (gv)->gp_cv); 1702 f (GvGP (gv)->gp_cv);
1524 GvCVGEN (gv) = 0; 1703 GvCVGEN (gv) = 0;
1525 GvMULTI_off (gv); 1704 GvMULTI_off (gv);
1526# undef f 1705# undef f
1527 1706
1528void _connect_to_perl () 1707void _connect_to_perl_1 ()
1708
1709void _connect_to_perl_2 ()
1529 1710
1530void _recalc_want () 1711void _recalc_want ()
1531 1712
1532# not used by default anymore 1713# not used by default anymore
1533void _global_reattach () 1714void _global_reattach ()
1641 } 1822 }
1642 1823
1643void server_tick () 1824void server_tick ()
1644 CODE: 1825 CODE:
1645{ 1826{
1827 ev_now_update (EV_DEFAULT);
1646 NOW = ev_now (EV_DEFAULT); 1828 NOW = ev_now (EV_DEFAULT);
1647 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1829 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1648 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1830 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1649 runtime = SvNVX (sv_runtime); 1831 runtime = SvNVX (sv_runtime);
1650 1832
1651 server_tick (); 1833 server_tick ();
1652 1834
1653 NOW = ev_time (); 1835 ev_now_update (EV_DEFAULT);
1836 NOW = ev_now (EV_DEFAULT);
1654 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1837 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1655 runtime += TICK; 1838 runtime += TICK;
1656 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1839 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1657} 1840}
1658 1841
1898 RETVAL 2081 RETVAL
1899 2082
1900void 2083void
1901debug_trace (attachable *obj, bool on = true) 2084debug_trace (attachable *obj, bool on = true)
1902 CODE: 2085 CODE:
1903 obj->flags &= ~attachable::F_DEBUG_TRACE; 2086 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1904 if (on) 2087 if (on)
1905 obj->flags |= attachable::F_DEBUG_TRACE; 2088 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1906 2089
1907int mortals_size () 2090int mortals_size ()
1908 CODE: 2091 CODE:
1909 RETVAL = attachable::mortals.size (); 2092 RETVAL = attachable::mortals.size ();
1910 OUTPUT: RETVAL 2093 OUTPUT: RETVAL
1963int mortals_size () 2146int mortals_size ()
1964 CODE: 2147 CODE:
1965 RETVAL = attachable::mortals.size (); 2148 RETVAL = attachable::mortals.size ();
1966 OUTPUT: RETVAL 2149 OUTPUT: RETVAL
1967 2150
1968const char *slot_use_name (U32 slot) 2151const_utf8_string slot_use_name (U32 slot)
1969 ALIAS: 2152 ALIAS:
1970 slot_nonuse_name = 1 2153 slot_nonuse_name = 1
1971 CODE: 2154 CODE:
1972{ 2155{
1973 if (slot >= NUM_BODY_LOCATIONS) 2156 if (slot >= NUM_BODY_LOCATIONS)
2051 CODE: 2234 CODE:
2052 player_apply_below (op); 2235 player_apply_below (op);
2053 2236
2054int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2237int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2055 2238
2239int casting_level (object *caster, object *spell)
2240
2056int pay_item (object *op, object *buyer) 2241int pay_item (object *op, object *buyer)
2057 CODE: 2242 CODE:
2058 RETVAL = pay_for_item (op, buyer); 2243 RETVAL = pay_for_item (op, buyer);
2059 OUTPUT: RETVAL 2244 OUTPUT: RETVAL
2060 2245
2102 2287
2103void player_lvl_adj (object *who, object *skill = 0) 2288void player_lvl_adj (object *who, object *skill = 0)
2104 2289
2105int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2290int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2106 2291
2107int calc_skill_exp (object *who, object *op, object *skill); 2292int calc_skill_exp (object *who, object *op, object *skill)
2108 2293
2109void push_button (object *op); 2294void push_button (object *op, object *originator)
2110 2295
2111void use_trigger (object *op); 2296void use_trigger (object *op, object *originator)
2112 2297
2113void add_button_link (object *button, maptile *map, int connected);
2114
2115void remove_button_link (object *op);
2116
2117void handle_apply_yield (object *op); 2298void handle_apply_yield (object *op)
2299
2300int convert_item (object *item, object *converter)
2118 2301
2119 2302
2120MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2303MODULE = cf PACKAGE = cf::object PREFIX = cf_
2121 2304
2122# no clean way to get an object from an archetype - stupid idiotic 2305# no clean way to get an object from an archetype - stupid idiotic
2129 OUTPUT: 2312 OUTPUT:
2130 RETVAL 2313 RETVAL
2131 2314
2132object *find_object (U32 tag) 2315object *find_object (U32 tag)
2133 2316
2317object *find_object_uuid (UUID i)
2318
2134# TODO: nuke 2319# TODO: nuke
2135object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2320object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2136 PROTOTYPE: $$$$$$ 2321 PROTOTYPE: $$$$$$
2137 CODE: 2322 CODE:
2138{ 2323{
2139 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2324 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2325
2326 if (RETVAL->destroyed ())
2327 RETVAL = 0;
2140} 2328}
2141 2329
2142shstr 2330shstr
2143object::kv_get (shstr key) 2331object::kv_get (shstr key)
2144 2332
2195 CODE: 2383 CODE:
2196 RETVAL = op->contr; 2384 RETVAL = op->contr;
2197 OUTPUT: RETVAL 2385 OUTPUT: RETVAL
2198 2386
2199bool move_player (object *op, int dir) 2387bool move_player (object *op, int dir)
2200
2201void check_score (object *op)
2202 2388
2203void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2389void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2204 CODE: 2390 CODE:
2205 new_draw_info (flags, 0, op, txt); 2391 new_draw_info (flags, 0, op, txt);
2206 2392
2328void 2514void
2329adjust_daylight () 2515adjust_daylight ()
2330 CODE: 2516 CODE:
2331 maptile::adjust_daylight (); 2517 maptile::adjust_daylight ();
2332 2518
2519int
2520outdoor_darkness (int darkness = 0)
2521 CODE:
2522 RETVAL = maptile::outdoor_darkness;
2523 if (items)
2524 maptile::outdoor_darkness = darkness;
2525 OUTPUT:
2526 RETVAL
2527
2333void 2528void
2334maptile::instantiate () 2529maptile::instantiate ()
2335 2530
2336maptile *new () 2531maptile *new ()
2337 PROTOTYPE: 2532 PROTOTYPE:
2368 for (int x = 0; x < THIS->width; ++x) 2563 for (int x = 0; x < THIS->width; ++x)
2369 for (int y = 0; y < THIS->height; ++y) 2564 for (int y = 0; y < THIS->height; ++y)
2370 { 2565 {
2371 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2566 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2372 if (op->flag [FLAG_IS_FLOOR]) 2567 if (op->flag [FLAG_IS_FLOOR])
2373 goto skip_space; 2568 goto skip;
2374 2569
2375 { 2570 {
2376 int offs = offset + y * stride + x; 2571 int offs = offset + y * stride + x;
2572
2377 if (IN_RANGE_EXC (offs, 0, idxlen)) 2573 if (IN_RANGE_EXC (offs, 0, idxlen))
2378 { 2574 {
2379 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2575 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2380 { 2576 {
2381 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2577 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2382 ob->flag [FLAG_NO_MAP_SAVE] = true; 2578 ob->flag [FLAG_NO_MAP_SAVE] = true;
2383 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2579 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2384 2580
2385 if (ob->randomitems) 2581 if (ob->randomitems && !ob->above)
2386 { 2582 {
2387 if (!ob->above)
2388 {
2389 ob->create_treasure (ob->randomitems); 2583 ob->create_treasure (ob->randomitems);
2390 2584
2391 for (object *op = ob->above; op; op = op->above) 2585 for (object *op = ob->above; op; op = op->above)
2392 op->flag [FLAG_NO_MAP_SAVE] = true; 2586 op->flag [FLAG_NO_MAP_SAVE] = true;
2393 } 2587 // TODO: if this is a pickable object, then the item
2394 2588 // will at a bit weird - saving inside the player
2395 ob->randomitems = 0; 2589 // will clear the flag, but when the player drops
2590 // it without logging out, it keeps the flag.
2591 // nobody ahs reported this, but this can be rather
2592 // annoying on persistent maps.
2396 } 2593 }
2397 } 2594 }
2398 } 2595 }
2399 } 2596 }
2400 2597
2401 skip_space: ; 2598 skip: ;
2402 } 2599 }
2403} 2600}
2404 2601
2405void 2602void
2406maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2603maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2416 2613
2417 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2614 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2418 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2615 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2419 2616
2420 for (int i = av_len ((AV *)palette) + 1; i--; ) 2617 for (int i = av_len ((AV *)palette) + 1; i--; )
2421 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2618 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2422 2619
2423 for (int y = 0; y < THIS->height; ++y) 2620 for (int y = 0; y < THIS->height; ++y)
2424 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2621 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2425 2622
2426 sfree (THIS->regions, THIS->size ()); 2623 sfree (THIS->regions, THIS->size ());
2445 } 2642 }
2446 2643
2447int out_of_map (maptile *map, int x, int y) 2644int out_of_map (maptile *map, int x, int y)
2448 2645
2449void 2646void
2450trigger (maptile *map, long connection, bool state = true) 2647find_link (maptile *map, shstr_tmp connection)
2451 CODE:
2452 activate_connection (map, connection, state);
2453
2454void
2455get_connection (maptile *map, long connection)
2456 PPCODE: 2648 PPCODE:
2457 oblinkpt *obp = get_connection_links (map, connection); 2649 if (oblinkpt *obp = map->find_link (connection))
2458 if (obp)
2459 for (objectlink *ol = obp->link; ol; ol = ol->next) 2650 for (objectlink *ol = obp->link; ol; ol = ol->next)
2460 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2651 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2461 2652
2462void 2653void
2463get_map_flags (maptile *map, int x, int y) 2654get_map_flags (maptile *map, int x, int y)
2552 case 6: RETVAL = newSVuv (ms.move_on ); break; 2743 case 6: RETVAL = newSVuv (ms.move_on ); break;
2553 case 7: RETVAL = newSVuv (ms.move_off ); break; 2744 case 7: RETVAL = newSVuv (ms.move_off ); break;
2554 } 2745 }
2555} 2746}
2556 OUTPUT: RETVAL 2747 OUTPUT: RETVAL
2557
2558void fix_walls (maptile *map, int x, int y)
2559
2560void fix_walls_around (maptile *map, int x, int y)
2561 2748
2562# worst xs function of my life 2749# worst xs function of my life
2563bool 2750bool
2564_create_random_map (\ 2751_create_random_map (\
2565 maptile *self,\ 2752 maptile *self,\
2661archetype *archetypes (U32 index) 2848archetype *archetypes (U32 index)
2662 CODE: 2849 CODE:
2663 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2850 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2664 OUTPUT: RETVAL 2851 OUTPUT: RETVAL
2665 2852
2666object *instantiate (archetype *arch)
2667 CODE:
2668 RETVAL = arch_to_object (arch);
2669 OUTPUT:
2670 RETVAL
2671
2672INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2853INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2673 2854
2674MODULE = cf PACKAGE = cf::party 2855MODULE = cf PACKAGE = cf::party
2675 2856
2676partylist *first () 2857partylist *first ()
2691 2872
2692region *find (utf8_string name) 2873region *find (utf8_string name)
2693 PROTOTYPE: $ 2874 PROTOTYPE: $
2694 CODE: 2875 CODE:
2695 RETVAL = region::find (name); 2876 RETVAL = region::find (name);
2696 OUTPUT: RETVAL
2697
2698region *find_fuzzy (utf8_string name)
2699 PROTOTYPE: $
2700 CODE:
2701 RETVAL = region::find_fuzzy (name);
2702 OUTPUT: RETVAL 2877 OUTPUT: RETVAL
2703 2878
2704int specificity (region *rgn) 2879int specificity (region *rgn)
2705 CODE: 2880 CODE:
2706 RETVAL = 0; 2881 RETVAL = 0;
2842 faceinfo *f = face_info (idx); assert (f); 3017 faceinfo *f = face_info (idx); assert (f);
2843 facedata *d = &(faceset ? f->data64 : f->data32); 3018 facedata *d = &(faceset ? f->data64 : f->data32);
2844 sv_to (data, d->data); 3019 sv_to (data, d->data);
2845 STRLEN clen; 3020 STRLEN clen;
2846 char *cdata = SvPVbyte (chksum, clen); 3021 char *cdata = SvPVbyte (chksum, clen);
2847 clen = min (CHKSUM_SIZE, clen); 3022 clen = min (CHKSUM_MAXLEN, clen);
2848 3023
3024 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3025
2849 if (memcmp (d->chksum, cdata, clen)) 3026 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2850 { 3027 {
3028 d->chksum_len = clen;
2851 memcpy (d->chksum, cdata, clen); 3029 memcpy (d->chksum, cdata, clen);
2852 3030
2853 // invalidate existing client face info 3031 // invalidate existing client face info
2854 for_all_clients (ns) 3032 for_all_clients (ns)
2855 if (ns->faceset == faceset) 3033 if (ns->faceset == faceset)
2870 3048
2871SV *get_chksum (faceidx idx, int faceset = 0) 3049SV *get_chksum (faceidx idx, int faceset = 0)
2872 CODE: 3050 CODE:
2873 facedata *d = face_data (idx, faceset); 3051 facedata *d = face_data (idx, faceset);
2874 if (!d) XSRETURN_UNDEF; 3052 if (!d) XSRETURN_UNDEF;
2875 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3053 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2876 OUTPUT: 3054 OUTPUT:
2877 RETVAL 3055 RETVAL
2878 3056
2879SV *get_data (faceidx idx, int faceset = 0) 3057SV *get_data (faceidx idx, int faceset = 0)
2880 CODE: 3058 CODE:
2925 } 3103 }
2926 else 3104 else
2927 anim = &animation::create (name, av_len (av) + 1, facings); 3105 anim = &animation::create (name, av_len (av) + 1, facings);
2928 3106
2929 for (int i = 0; i < anim->num_animations; ++i) 3107 for (int i = 0; i < anim->num_animations; ++i)
2930 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3108 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2931} 3109}
2932 OUTPUT: RETVAL 3110 OUTPUT: RETVAL
2933 3111
2934void invalidate_all () 3112void invalidate_all ()
2935 CODE: 3113 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines