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.290 by root, Sat May 17 14:57:23 2008 UTC vs.
Revision 1.351 by elmex, Mon Mar 22 18:16:39 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"
26#if HAVE_EXECINFO_H 25#if HAVE_EXECINFO_H
27# include <execinfo.h> 26# include <execinfo.h>
28#endif 27#endif
29 28
30#include <cstdarg> 29#include <cstdarg>
30#include <typeinfo>
31 31
32#include "global.h" 32#include "global.h"
33#include "loader.h"
34#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
35#include "evthread.h" 34#include "evthread.h"
36#include "sproto.h" 35#include "sproto.h"
37 36
38#include <unistd.h> 37#include <unistd.h>
70static int tick_pending; 69static int tick_pending;
71 70
72global gbl_ev; 71global gbl_ev;
73static 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;
74static 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;
75 75
76bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
77bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
78 78
79static HV 79static HV
80 *stash_cf, 80 *stash_cf,
81 *stash_cf_object_wrap, 81 *stash_cf_object_wrap,
82 *stash_cf_object_player_wrap, 82 *stash_cf_object_player_wrap,
83 *stash_cf_player_wrap, 83 *stash_cf_player_wrap,
84 *stash_cf_map_wrap, 84 *stash_cf_map_wrap,
85 *stash_cf_mapspace_wrap,
85 *stash_cf_client_wrap, 86 *stash_cf_client_wrap,
86 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
87 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
88 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
89 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
90 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
99#ifndef newSVpv_utf8
91static inline SV * 100static SV *
92newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
93{ 102{
94 if (!s) 103 if (!s)
95 return newSV (0); 104 return newSV (0);
96 105
97 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
98 SvUTF8_on (sv); 107 SvUTF8_on (sv);
99 return sv; 108 return sv;
100} 109}
110#endif
101 111
112#ifndef newSVpvn_utf8
102static inline SV * 113static SV *
103newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
104{ 115{
105 if (!s) 116 if (!s)
106 return newSV (0); 117 return newSV (0);
107 118
108 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
109 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
110 return sv; 124 return sv;
125}
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);
111} 142}
112 143
113// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
114template<class super> 145template<class super>
115static super * 146static super *
149 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
150 hv_clear (self); 181 hv_clear (self);
151 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
152 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
153 184
154 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
155 assert (!this->self); 186 assert (!this->self);
156 } 187 }
157} 188}
158 189
159void 190void
193attachable::destroy () 224attachable::destroy ()
194{ 225{
195 if (destroyed ()) 226 if (destroyed ())
196 return; 227 return;
197 228
198 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
199 do_destroy (); 230 do_destroy ();
200 sever_self (); 231 sever_self ();
201} 232}
202 233
203void 234void
277 308
278 attach = src.attach; 309 attach = src.attach;
279 return *this; 310 return *this;
280} 311}
281 312
313#if 0
282template<typename T> 314template<typename T>
283static bool 315static bool
284find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
285{ 317{
286 char *s = (char *)obj; 318 char *s = (char *)obj;
294 326
295 return false; 327 return false;
296} 328}
297 329
298// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
299void 331static void
300find_backref (void *ptr) 332find_backref (void *ptr)
301{ 333{
302 for_all_objects (op) 334 for_all_objects (op)
303 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
304 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);
308 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
309 341
310 for_all_clients (ns) 342 for_all_clients (ns)
311 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
312 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
313
314} 345}
346#endif
315 347
316////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
317 349
318static SV * 350static SV *
319newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
372 404
373 return sv; 405 return sv;
374 } 406 }
375} 407}
376 408
409#if 0 // unused
377static void 410static void
378clearSVptr (SV *sv) 411clearSVptr (SV *sv)
379{ 412{
380 if (SvROK (sv)) 413 if (SvROK (sv))
381 sv = SvRV (sv); 414 sv = SvRV (sv);
382 415
383 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
384 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
385} 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}
386 435
387static long 436static long
388SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
389{ 438{
390 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
391 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
392 441
393 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
394
395 if (!mg)
396 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
397
398 return (long)mg->mg_ptr;
399} 443}
400 444
401static long 445static long noinline
402SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
403{ 447{
404 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
405 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
406 else
407 return 0;
408} 451}
409 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
410inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 494static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
411inline 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); }
412inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
413inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
414inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
415inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
416inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
417inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
418inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
419inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
420inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
421inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
422inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
423inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
424inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
425inline 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); }
426inline 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); }
427inline 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); }
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432inline 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); }
517static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
433 518
434inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
435inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
436 521
437inline 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 ()); }
438inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
439 524
440inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
441 526
527static inline SV *to_sv (dynbuf * v)
528{
529 SV *sv = newSV (0);
530
531 sv_upgrade (sv, SVt_PV);
532 SvGROW (sv, v->size () + 1);
533 SvPOK_only (sv);
534 v->linearise (SvPVX (sv));
535 SvCUR_set (sv, v->size ());
536 *SvEND (sv) = 0;
537
538 return sv;
539}
540
541static inline SV *to_sv (dynbuf_text * v)
542{
543 SV *sv = to_sv (static_cast<dynbuf *> (v));
544 SvUTF8_on (sv);
545 return sv;
546}
547
442inline 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; }
443inline 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; }
444inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
445inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
446inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
447inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
449inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
450inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
451inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
452inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
453inline 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); }
454inline 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); }
455inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
456inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
457inline 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); }
458inline 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); }
459inline 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); }
460inline 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"); }
461inline 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"); }
462inline 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"); }
463inline 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"); }
464inline 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"); }
465inline 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"); }
572static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
466inline 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"); }
467inline 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" ); }
468 575
469//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)]; }
470inline 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)); }
471 578
472template<class T> 579template<class T>
473inline 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; }
474 581
475template<int N> 582template<int N>
476inline 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)); }
477 584
478inline 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); }
479inline 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); }
480inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
481inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
482 589
483inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
484{ 591{
485 STRLEN len; 592 STRLEN len;
486 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
487 v.assign (data, len); 594 v.assign (data, len);
488} 595}
489 596
490inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
491{ 598{
492 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
493 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
494} 601}
495 602
496inline 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); }
497 604
498static SV * 605static SV *
499newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
500{ 607{
501 SV *sv; 608 SV *sv;
575 va_end (ap); 682 va_end (ap);
576 683
577 return sv; 684 return sv;
578} 685}
579 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
580////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
581 712
582SV * 713static SV *
583registry (attachable *ext) 714registry (attachable *ext)
584{ 715{
585 if (!ext->cb) 716 if (!ext->cb)
586 ext->cb = newAV (); 717 ext->cb = newAV ();
587 718
601 732
602 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 733 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
603 734
604 const char *argv[] = { 735 const char *argv[] = {
605 settings.argv [0], 736 settings.argv [0],
606 "-e" 737 "-e0"
607 "use EV; use Coro;" // required for bootstrap
608 "cf->bootstrap;" // required for datadir :*>
609 "unshift @INC, cf::datadir ();"
610 "require cf;"
611 }; 738 };
612 739
613 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 740 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
614 || perl_run (perl)) 741 || perl_run (perl))
615 { 742 {
616 printf ("unable to initialize perl-interpreter, aborting.\n"); 743 printf ("unable to initialize perl-interpreter, aborting.\n");
617 exit (EXIT_FAILURE); 744 exit (EXIT_FAILURE);
618 } 745 }
619 746
747 eval_pv (
748 "#line 1 'cfperl init'\n"
749 "use EV ();\n"
750 "use Coro ();\n"
751 "cf->bootstrap;\n"
752 "unshift @INC, cf::datadir ();\n"
753 "require cf;\n",
754 0
755 );
756
757 if (SvTRUE (ERRSV))
620 { 758 {
621 dSP; 759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
622 760 exit (EXIT_FAILURE);
623 PUSHMARK (SP);
624 PUTBACK;
625 call_pv ("cf::init", G_DISCARD | G_VOID);
626 } 761 }
627} 762}
628 763
764void
629void cfperl_main () 765cfperl_main ()
630{ 766{
631 dSP; 767 dSP;
632 768
633 PUSHMARK (SP); 769 PUSHMARK (SP);
634 PUTBACK; 770 PUTBACK;
659# undef def 795# undef def
660}; 796};
661 797
662#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)
663 799
664static void 800static void noinline
665gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
666{ 802{
667 // event must be in array 803 // event must be in array
668 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
669 { 805 {
755{ 891{
756 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
757 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
758} 894}
759 895
760void 896static void noinline
761_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
762{ 898{
763 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
764 { 900 {
765 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
775 } 911 }
776 } 912 }
777} 913}
778 914
779// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
780void 916static void
781_recalc_want () 917_recalc_want ()
782{ 918{
783 ev_want_event.reset (); 919 ev_want_event.reset ();
784 920
785 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
858 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
859 } 995 }
860 996
861 va_end (ap); 997 va_end (ap);
862 998
863 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
864 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
865 1001
866 CALL_END; 1002 CALL_END;
867 1003
868 return count; 1004 return count;
869} 1005}
870 1006
871SV * 1007static SV *
872cfperl_result (int idx) 1008cfperl_result (int idx)
873{ 1009{
874 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
875 if (!av) 1011 if (!av)
876 return &PL_sv_undef; 1012 return &PL_sv_undef;
895} 1031}
896 1032
897///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
898// various c++ => perl glue functions 1034// various c++ => perl glue functions
899 1035
1036void
900void cfperl_tick () 1037cfperl_tick ()
901{ 1038{
902 tick_pending = 1; 1039 tick_pending = 1;
903 1040
904 if (tick_inhibit) 1041 if (tick_inhibit)
905 return; 1042 return;
908 1045
909 dSP; 1046 dSP;
910 1047
911 PUSHMARK (SP); 1048 PUSHMARK (SP);
912 PUTBACK; 1049 PUTBACK;
913 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
914 1051
915 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);
916} 1053}
917 1054
918void 1055void
941 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
942 CALL_END; 1079 CALL_END;
943} 1080}
944 1081
945void 1082void
946cfperl_expand_cfpod (player *pl, std::string &msg)
947{
948 CALL_BEGIN (2);
949 CALL_ARG (pl);
950 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
951 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
952
953 if (count)
954 {
955 STRLEN len;
956 char *data = SvPVutf8 (TOPs, len);
957 msg.assign (data, len);
958 }
959
960 CALL_END;
961}
962
963void
964cfperl_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)
965{ 1084{
966 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
967 CALL_ARG (ns); 1086 CALL_ARG (ns);
968 CALL_ARG (type); 1087 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color); 1089 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
972 CALL_END; 1091 CALL_END;
973} 1092}
974 1093
975int 1094int
976cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
978 int can; 1097 int can;
979 1098
980 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
981 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
982 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
984 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
985 CALL_END; 1104 CALL_END;
986 1105
987 return can; 1106 return can;
988} 1107}
989 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
990player * 1121player *
991player::find (const char *name) 1122player::find (const_utf8_string name)
992{ 1123{
993 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
994 CALL_ARG (name); 1125 CALL_ARG (name);
995 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
996 1127
1001 1132
1002 return retval; 1133 return retval;
1003} 1134}
1004 1135
1005maptile * 1136maptile *
1006find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1007{ 1138{
1008 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1009 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1010 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1011 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
1018 1149
1019 return retval; 1150 return retval;
1020} 1151}
1021 1152
1022maptile * 1153maptile *
1023maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1024{ 1155{
1025 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1026 CALL_ARG (path); 1157 CALL_ARG (path);
1027 CALL_ARG (origin); 1158 CALL_ARG (origin);
1028 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1034 1165
1035 return retval; 1166 return retval;
1036} 1167}
1037 1168
1038maptile * 1169maptile *
1039maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1040{ 1171{
1041 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1042 CALL_ARG (path); 1173 CALL_ARG (path);
1043 CALL_ARG (origin); 1174 CALL_ARG (origin);
1044 CALL_ARG (load); 1175 CALL_ARG (load);
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1191 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1061 CALL_END; 1192 CALL_END;
1062} 1193}
1063 1194
1064void 1195void
1065maptile::change_all_map_light (int change)
1066{
1067 CALL_BEGIN (1);
1068 CALL_ARG (change);
1069 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1070 CALL_END;
1071}
1072
1073void
1074object::enter_exit (object *exit) 1196object::enter_exit (object *exit)
1075{ 1197{
1076 if (type != PLAYER) 1198 if (type != PLAYER)
1077 return; 1199 return;
1078 1200
1082 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1083 CALL_END; 1205 CALL_END;
1084} 1206}
1085 1207
1086void 1208void
1087object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1088{ 1210{
1089 if (type != PLAYER) 1211 if (type != PLAYER)
1090 return; 1212 return;
1091 1213
1092 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
1096 CALL_ARG (y); 1218 CALL_ARG (y);
1097 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1098 CALL_END; 1220 CALL_END;
1099} 1221}
1100 1222
1101const char * 1223const_utf8_string
1102object::ref () const 1224object::ref () const
1103{ 1225{
1104 if (type == PLAYER) 1226 if (type == PLAYER)
1105 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);
1106 else 1228 else
1107 return 0; 1229 return 0;
1108} 1230}
1109 1231
1110object * 1232object *
1111object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1112{ 1234{
1113 object *retval = 0; 1235 object *retval = 0;
1114 1236
1115 if (ref) 1237 if (ref)
1116 { 1238 {
1126 1248
1127 return retval; 1249 return retval;
1128} 1250}
1129 1251
1130void 1252void
1131log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1132{ 1254{
1133#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1134 void *addr [20]; 1256 void *addr [20];
1135 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1136 1258
1141 CALL_CALL ("cf::_log_backtrace", G_VOID); 1263 CALL_CALL ("cf::_log_backtrace", G_VOID);
1142 CALL_END; 1264 CALL_END;
1143#endif 1265#endif
1144} 1266}
1145 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
1146///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1147 1320
1148struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1322struct CoroAPI *coroapi::GCoroAPI;
1150 1323
1324void
1151void coroapi::do_cede_to_tick () 1325coroapi::do_cede_to_tick ()
1152{ 1326{
1153 cede_pending = 0; 1327 cede_pending = 0;
1154 cede (); 1328 cede ();
1155} 1329}
1156 1330
1180 ev_io_set ((ev_io *)this, fd, events); 1354 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1355 if (active) start ();
1182 } 1356 }
1183} 1357}
1184 1358
1185void 1359static void
1186_connect_to_perl () 1360_connect_to_perl_1 ()
1187{ 1361{
1188 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1189 1363
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 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);
1192 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1366 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1193 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1367 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1368 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1194 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1369 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1195 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1370 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1196 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1371 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1197 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1372 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1198 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1373 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1209 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1210 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1211 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1212} 1387}
1213 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
1214MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1215 1400
1216BOOT: 1401BOOT:
1217{ 1402{
1218 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1219 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1220 1405
1221 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1222 1407
1223 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1224 1409
1225 //{ 1410 //{
1226 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
1270 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)
1271 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)
1272 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)
1273 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)
1274 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)
1275 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)
1276 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)
1277 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)
1278 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)
1279 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)
1280 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)
1281 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)
1282 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)
1283 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)
1284 1470
1285 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1471 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1286 1472
1287 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1473 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1288 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)
1305 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)
1306 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)
1307 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)
1308 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)
1309 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)
1310 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)
1311 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)
1312 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)
1313 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)
1314 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)
1315 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)
1318 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1504 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1319 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1505 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1320 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1506 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1321 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1507 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1322 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1508 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1323 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1509 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1324 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1510 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1325 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1511 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1326 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1512 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1327 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1513 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1328 1514
1329 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1515 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1330 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1516 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1331 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1517 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1332 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1518 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1333 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1519 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1334 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1520 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1335 1521
1336 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1522 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1337 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1523 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1338 1524
1339 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1525 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1340 1526
1341 const_iv (SP_RAISE_DEAD) 1527 const_iv (SP_RAISE_DEAD)
1342 const_iv (SP_RUNE) 1528 const_iv (SP_RUNE)
1343 const_iv (SP_MAKE_MARK) 1529 const_iv (SP_MAKE_MARK)
1344 const_iv (SP_BOLT) 1530 const_iv (SP_BOLT)
1391 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1577 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1392 const_iv (F_LOCKED) 1578 const_iv (F_LOCKED)
1393 1579
1394 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1580 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1395 1581
1396 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1582 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1397 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1583 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1398 1584
1399 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1585 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1400 1586
1401 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1587 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1497 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1683 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1498 av_push (event, newSViv (eiv->klass)); 1684 av_push (event, newSViv (eiv->klass));
1499 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1685 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1500 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1686 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1501 } 1687 }
1502}
1503 1688
1689 // used by autogenerated BOOT sections from genacc
1690 av_reflect = get_av ("cf::REFLECT", 1);
1691}
1692
1693void _gv_clear (SV *gv)
1694 CODE:
1695 assert (SvTYPE (gv) == SVt_PVGV);
1696# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1697 f (GvGP (gv)->gp_form);
1698 f (GvGP (gv)->gp_io);
1699 f (GvGP (gv)->gp_sv);
1700 f (GvGP (gv)->gp_av);
1701 f (GvGP (gv)->gp_hv);
1702 f (GvGP (gv)->gp_cv);
1703 GvCVGEN (gv) = 0;
1704 GvMULTI_off (gv);
1705# undef f
1706
1504void _connect_to_perl () 1707void _connect_to_perl_1 ()
1708
1709void _connect_to_perl_2 ()
1505 1710
1506void _recalc_want () 1711void _recalc_want ()
1507 1712
1713# not used by default anymore
1508void _global_reattach () 1714void _global_reattach ()
1509 CODE: 1715 CODE:
1510{ 1716{
1511 // reattach to all attachable objects in the game. 1717 // reattach to all attachable objects in the game.
1512 for_all_clients (ns) 1718 for_all_clients (ns)
1556 } 1762 }
1557 1763
1558 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1764 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1559} 1765}
1560 1766
1767void init_anim ()
1768
1769void init_globals ()
1770
1771void init_experience ()
1772
1773void init_attackmess ()
1774
1775void init_dynamic ()
1776
1777void load_settings ()
1778
1779void load_materials ()
1780
1781void init_uuid ()
1782 CODE:
1783 UUID::init ();
1784
1785void init_signals ()
1786
1787void init_commands ()
1788
1789void init_skills ()
1790
1791void init_beforeplay ()
1792
1561void evthread_start (int aiofd) 1793void evthread_start (int aiofd)
1562 1794
1563void cede_to_tick () 1795void cede_to_tick ()
1564 CODE: 1796 CODE:
1565 coroapi::cede_to_tick (); 1797 coroapi::cede_to_tick ();
1590 } 1822 }
1591 1823
1592void server_tick () 1824void server_tick ()
1593 CODE: 1825 CODE:
1594{ 1826{
1827 ev_now_update (EV_DEFAULT);
1595 NOW = ev_now (EV_DEFAULT); 1828 NOW = ev_now (EV_DEFAULT);
1596 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1829 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1597 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1830 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1598 runtime = SvNVX (sv_runtime); 1831 runtime = SvNVX (sv_runtime);
1599 1832
1600 server_tick (); 1833 server_tick ();
1601 1834
1602 NOW = ev_time (); 1835 ev_now_update (EV_DEFAULT);
1836 NOW = ev_now (EV_DEFAULT);
1603 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1837 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1604 runtime += TICK; 1838 runtime += TICK;
1605 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1839 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1606} 1840}
1607 1841
1702#if _POSIX_MEMLOCK 1936#if _POSIX_MEMLOCK
1703 1937
1704int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1938int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1705 INIT: 1939 INIT:
1706#if __GLIBC__ 1940#if __GLIBC__
1941 mallopt (M_TOP_PAD, 1024 * 1024);
1942 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1943 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1707 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1944 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1708#endif 1945#endif
1709 1946
1710int munlockall () 1947int munlockall ()
1711 1948
1730 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1967 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1731 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1968 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1732 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1969 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1733 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1970 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1734#endif 1971#endif
1735 EXTEND (SP, 2*2); 1972 EXTEND (SP, 5*2);
1736 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1973 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1737 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1974 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1738 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1975 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1976 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1977 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1739} 1978}
1740 1979
1741int find_animation (utf8_string text) 1980int find_animation (utf8_string text)
1742 PROTOTYPE: $ 1981 PROTOTYPE: $
1743 1982
1842 RETVAL 2081 RETVAL
1843 2082
1844void 2083void
1845debug_trace (attachable *obj, bool on = true) 2084debug_trace (attachable *obj, bool on = true)
1846 CODE: 2085 CODE:
1847 obj->flags &= ~attachable::F_DEBUG_TRACE; 2086 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1848 if (on) 2087 if (on)
1849 obj->flags |= attachable::F_DEBUG_TRACE; 2088 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1850 2089
1851int mortals_size () 2090int mortals_size ()
1852 CODE: 2091 CODE:
1853 RETVAL = attachable::mortals.size (); 2092 RETVAL = attachable::mortals.size ();
1854 OUTPUT: RETVAL 2093 OUTPUT: RETVAL
1907int mortals_size () 2146int mortals_size ()
1908 CODE: 2147 CODE:
1909 RETVAL = attachable::mortals.size (); 2148 RETVAL = attachable::mortals.size ();
1910 OUTPUT: RETVAL 2149 OUTPUT: RETVAL
1911 2150
1912const char *slot_use_name (U32 slot) 2151const_utf8_string slot_use_name (U32 slot)
1913 ALIAS: 2152 ALIAS:
1914 slot_nonuse_name = 1 2153 slot_nonuse_name = 1
1915 CODE: 2154 CODE:
1916{ 2155{
1917 if (slot >= NUM_BODY_LOCATIONS) 2156 if (slot >= NUM_BODY_LOCATIONS)
1995 CODE: 2234 CODE:
1996 player_apply_below (op); 2235 player_apply_below (op);
1997 2236
1998int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2237int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1999 2238
2239int casting_level (object *caster, object *spell)
2240
2000int pay_item (object *op, object *buyer) 2241int pay_item (object *op, object *buyer)
2001 CODE: 2242 CODE:
2002 RETVAL = pay_for_item (op, buyer); 2243 RETVAL = pay_for_item (op, buyer);
2003 OUTPUT: RETVAL 2244 OUTPUT: RETVAL
2004 2245
2046 2287
2047void player_lvl_adj (object *who, object *skill = 0) 2288void player_lvl_adj (object *who, object *skill = 0)
2048 2289
2049int 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)
2050 2291
2051int calc_skill_exp (object *who, object *op, object *skill); 2292int calc_skill_exp (object *who, object *op, object *skill)
2052 2293
2053void push_button (object *op); 2294void push_button (object *op, object *originator)
2054 2295
2055void use_trigger (object *op); 2296void use_trigger (object *op, object *originator)
2056 2297
2057void add_button_link (object *button, maptile *map, int connected);
2058
2059void remove_button_link (object *op);
2060
2061void handle_apply_yield (object *op); 2298void handle_apply_yield (object *op)
2299
2300int convert_item (object *item, object *converter)
2062 2301
2063 2302
2064MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2303MODULE = cf PACKAGE = cf::object PREFIX = cf_
2065 2304
2066# 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
2071 CODE: 2310 CODE:
2072 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2311 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2073 OUTPUT: 2312 OUTPUT:
2074 RETVAL 2313 RETVAL
2075 2314
2315object *generate (utf8_string arch, object *creator)
2316 CODE:
2317 object *obj = get_archetype (arch);
2318 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2319 RETVAL = obj;
2320 OUTPUT:
2321 RETVAL
2322
2076object *find_object (U32 tag) 2323object *find_object (U32 tag)
2324
2325object *find_object_uuid (UUID i)
2077 2326
2078# TODO: nuke 2327# TODO: nuke
2079object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2328object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2080 PROTOTYPE: $$$$$$ 2329 PROTOTYPE: $$$$$$
2081 CODE: 2330 CODE:
2082{ 2331{
2083 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2332 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2333
2334 if (RETVAL->destroyed ())
2335 RETVAL = 0;
2084} 2336}
2085 2337
2086shstr 2338shstr
2087object::kv_get (shstr key) 2339object::kv_get (shstr key)
2088 2340
2100void rangevector (object *ob, object *other, int flags = 0) 2352void rangevector (object *ob, object *other, int flags = 0)
2101 PROTOTYPE: $$;$ 2353 PROTOTYPE: $$;$
2102 PPCODE: 2354 PPCODE:
2103{ 2355{
2104 rv_vector rv; 2356 rv_vector rv;
2357
2358 PUTBACK;
2105 get_rangevector (ob, other, &rv, flags); 2359 get_rangevector (ob, other, &rv, flags);
2360 SPAGAIN;
2361
2106 EXTEND (SP, 5); 2362 EXTEND (SP, 5);
2107 PUSHs (newSVuv (rv.distance)); 2363 PUSHs (newSVuv (rv.distance));
2108 PUSHs (newSViv (rv.distance_x)); 2364 PUSHs (newSViv (rv.distance_x));
2109 PUSHs (newSViv (rv.distance_y)); 2365 PUSHs (newSViv (rv.distance_y));
2110 PUSHs (newSViv (rv.direction)); 2366 PUSHs (newSViv (rv.direction));
2136 RETVAL = op->contr; 2392 RETVAL = op->contr;
2137 OUTPUT: RETVAL 2393 OUTPUT: RETVAL
2138 2394
2139bool move_player (object *op, int dir) 2395bool move_player (object *op, int dir)
2140 2396
2141void check_score (object *op)
2142
2143void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2397void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2144 CODE: 2398 CODE:
2145 new_draw_info (flags, 0, op, txt); 2399 new_draw_info (flags, 0, op, txt);
2146 2400
2147void kill_player (object *op) 2401void kill_player (object *op)
2179 pl->ob->stats.hp = pl->ob->stats.maxhp; 2433 pl->ob->stats.hp = pl->ob->stats.maxhp;
2180 pl->ob->stats.sp = pl->ob->stats.maxsp; 2434 pl->ob->stats.sp = pl->ob->stats.maxsp;
2181 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2435 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2182 pl->orig_stats = pl->ob->stats; 2436 pl->orig_stats = pl->ob->stats;
2183 2437
2184void clear_los (player *pl) 2438# should only be temporary
2439void esrv_new_player (player *pl)
2185 2440
2441#d# TODO: replace by blocked_los accessor, fix code using this
2186bool 2442bool
2187cell_visible (player *pl, int dx, int dy) 2443cell_visible (player *pl, int dx, int dy)
2188 CODE: 2444 CODE:
2189 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2445 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2190 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2191 OUTPUT: 2446 OUTPUT:
2192 RETVAL 2447 RETVAL
2193 2448
2194void 2449void
2195send (player *pl, SV *packet) 2450send (player *pl, SV *packet)
2201 if (len > MAXSOCKBUF) 2456 if (len > MAXSOCKBUF)
2202 pl->failmsg ("[packet too long for client]"); 2457 pl->failmsg ("[packet too long for client]");
2203 else if (pl->ns) 2458 else if (pl->ns)
2204 pl->ns->send_packet (buf, len); 2459 pl->ns->send_packet (buf, len);
2205} 2460}
2206
2207int
2208listening (player *pl, int new_value = -1)
2209 CODE:
2210 RETVAL = pl->listening;
2211 if (new_value >= 0)
2212 pl->listening = new_value;
2213 OUTPUT:
2214 RETVAL
2215 2461
2216void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2462void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2217 PROTOTYPE: $;$$$ 2463 PROTOTYPE: $;$$$
2218 PPCODE: 2464 PPCODE:
2219 if (GIMME_V != G_VOID) 2465 if (GIMME_V != G_VOID)
2272} 2518}
2273 2519
2274INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2520INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2275 2521
2276void 2522void
2523adjust_daylight ()
2524 CODE:
2525 maptile::adjust_daylight ();
2526
2527int
2528outdoor_darkness (int darkness = 0)
2529 CODE:
2530 RETVAL = maptile::outdoor_darkness;
2531 if (items)
2532 maptile::outdoor_darkness = darkness;
2533 OUTPUT:
2534 RETVAL
2535
2536void
2277maptile::instantiate () 2537maptile::instantiate ()
2278 2538
2279maptile *new () 2539maptile *new ()
2280 PROTOTYPE: 2540 PROTOTYPE:
2281 CODE: 2541 CODE:
2311 for (int x = 0; x < THIS->width; ++x) 2571 for (int x = 0; x < THIS->width; ++x)
2312 for (int y = 0; y < THIS->height; ++y) 2572 for (int y = 0; y < THIS->height; ++y)
2313 { 2573 {
2314 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2574 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2315 if (op->flag [FLAG_IS_FLOOR]) 2575 if (op->flag [FLAG_IS_FLOOR])
2316 goto skip_space; 2576 goto skip;
2317 2577
2318 { 2578 {
2319 int offs = offset + y * stride + x; 2579 int offs = offset + y * stride + x;
2580
2320 if (IN_RANGE_EXC (offs, 0, idxlen)) 2581 if (IN_RANGE_EXC (offs, 0, idxlen))
2321 { 2582 {
2322 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2583 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2323 { 2584 {
2324 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2585 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2325 ob->flag [FLAG_NO_MAP_SAVE] = true; 2586 ob->flag [FLAG_NO_MAP_SAVE] = true;
2326 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2587 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2327 2588
2328 if (ob->randomitems) 2589 if (ob->randomitems && !ob->above)
2329 { 2590 {
2330 if (!ob->above)
2331 {
2332 ob->create_treasure (ob->randomitems); 2591 ob->create_treasure (ob->randomitems);
2333 2592
2334 for (object *op = ob->above; op; op = op->above) 2593 for (object *op = ob->above; op; op = op->above)
2335 op->flag [FLAG_NO_MAP_SAVE] = true; 2594 op->flag [FLAG_NO_MAP_SAVE] = true;
2336 } 2595 // TODO: if this is a pickable object, then the item
2337 2596 // will at a bit weird - saving inside the player
2338 ob->randomitems = 0; 2597 // will clear the flag, but when the player drops
2598 // it without logging out, it keeps the flag.
2599 // nobody ahs reported this, but this can be rather
2600 // annoying on persistent maps.
2339 } 2601 }
2340 } 2602 }
2341 } 2603 }
2342 } 2604 }
2343 2605
2344 skip_space: ; 2606 skip: ;
2345 } 2607 }
2346} 2608}
2347 2609
2348void 2610void
2349maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2611maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2359 2621
2360 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2622 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2361 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2623 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2362 2624
2363 for (int i = av_len ((AV *)palette) + 1; i--; ) 2625 for (int i = av_len ((AV *)palette) + 1; i--; )
2364 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2626 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2365 2627
2366 for (int y = 0; y < THIS->height; ++y) 2628 for (int y = 0; y < THIS->height; ++y)
2367 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2629 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2368 2630
2369 sfree (THIS->regions, THIS->size ()); 2631 sfree (THIS->regions, THIS->size ());
2374} 2636}
2375 2637
2376void 2638void
2377maptile::create_region_treasure () 2639maptile::create_region_treasure ()
2378 CODE: 2640 CODE:
2379{
2380 object *op = object::create ();
2381 op->type = FLOOR;
2382 op->map = THIS;
2383
2384 for (int x = 0; x < THIS->width; ++x) 2641 for (int x = 0; x < THIS->width; ++x)
2385 for (int y = 0; y < THIS->height; ++y) 2642 for (int y = 0; y < THIS->height; ++y)
2386 { 2643 {
2387 region *rgn = THIS->region (x, y); 2644 region *rgn = THIS->region (x, y);
2388 2645
2389 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2646 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2647 if (object *op = THIS->at (x, y).top)
2390 if (rgn->treasure && rndm () < rgn->treasure_density) 2648 if (rgn->treasure && rndm () < rgn->treasure_density)
2391 {
2392 op->x = x;
2393 op->y = y;
2394 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2649 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2395 }
2396 } 2650 }
2397 2651
2398 op->destroy ();
2399}
2400
2401int out_of_map (maptile *map, int x, int y) 2652int out_of_map (maptile *map, int x, int y)
2402 2653
2403void 2654void
2404trigger (maptile *map, long connection, bool state = true) 2655find_link (maptile *map, shstr_tmp connection)
2405 CODE:
2406 activate_connection (map, connection, state);
2407
2408void
2409get_connection (maptile *map, long connection)
2410 PPCODE: 2656 PPCODE:
2411 oblinkpt *obp = get_connection_links (map, connection); 2657 if (oblinkpt *obp = map->find_link (connection))
2412 if (obp)
2413 for (objectlink *ol = obp->link; ol; ol = ol->next) 2658 for (objectlink *ol = obp->link; ol; ol = ol->next)
2414 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2659 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2415 2660
2416void 2661void
2417get_map_flags (maptile *map, int x, int y) 2662get_map_flags (maptile *map, int x, int y)
2418 PPCODE: 2663 PPCODE:
2419{ 2664{
2420 maptile *nmap = 0; 2665 maptile *nmap = 0;
2421 I16 nx = 0, ny = 0; 2666 I16 nx = 0, ny = 0;
2667
2668 PUTBACK;
2422 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2669 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2670 SPAGAIN;
2423 2671
2424 EXTEND (SP, 4); 2672 EXTEND (SP, 4);
2425 PUSHs (sv_2mortal (newSViv (flags))); 2673 PUSHs (sv_2mortal (newSViv (flags)));
2426 2674
2427 if (GIMME_V == G_ARRAY) 2675 if (GIMME_V == G_ARRAY)
2430 PUSHs (sv_2mortal (newSViv (nx))); 2678 PUSHs (sv_2mortal (newSViv (nx)));
2431 PUSHs (sv_2mortal (newSViv (ny))); 2679 PUSHs (sv_2mortal (newSViv (ny)));
2432 } 2680 }
2433} 2681}
2434 2682
2683mapspace *
2684ms (maptile *map, unsigned int x, unsigned int y)
2685 PROTOTYPE: $$$
2686 CODE:
2687{
2688 maptile *nmap = 0;
2689 I16 nx, ny;
2690
2691 PUTBACK;
2692 get_map_flags (map, &nmap, x, y, &nx, &ny);
2693 SPAGAIN;
2694
2695 if (!nmap)
2696 XSRETURN_UNDEF;
2697
2698 RETVAL = &nmap->at (nx, ny);
2699}
2700 OUTPUT:
2701 RETVAL
2702
2435void 2703void
2436at (maptile *map, unsigned int x, unsigned int y) 2704at (maptile *map, unsigned int x, unsigned int y)
2437 PROTOTYPE: $$$ 2705 PROTOTYPE: $$$
2438 PPCODE: 2706 PPCODE:
2439{ 2707{
2440 object *o;
2441 maptile *nmap = 0; 2708 maptile *nmap = 0;
2442 I16 nx, ny; 2709 I16 nx, ny;
2443 2710
2711 PUTBACK;
2444 get_map_flags (map, &nmap, x, y, &nx, &ny); 2712 get_map_flags (map, &nmap, x, y, &nx, &ny);
2713 SPAGAIN;
2445 2714
2446 if (nmap) 2715 if (nmap)
2447 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2716 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2448 XPUSHs (sv_2mortal (to_sv (o))); 2717 XPUSHs (sv_2mortal (to_sv (o)));
2449} 2718}
2450 2719
2451SV * 2720SV *
2452bot_at (maptile *obj, unsigned int x, unsigned int y) 2721bot_at (maptile *map, unsigned int x, unsigned int y)
2453 PROTOTYPE: $$$ 2722 PROTOTYPE: $$$
2454 ALIAS: 2723 ALIAS:
2455 top_at = 1 2724 top_at = 1
2456 flags_at = 2 2725 flags_at = 2
2457 light_at = 3 2726 light_at = 3
2458 move_block_at = 4 2727 move_block_at = 4
2459 move_slow_at = 5 2728 move_slow_at = 5
2460 move_on_at = 6 2729 move_on_at = 6
2461 move_off_at = 7 2730 move_off_at = 7
2462 INIT:
2463 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2464 CODE: 2731 CODE:
2732{
2733 sint16 nx = x;
2734 sint16 ny = y;
2735
2736 if (!xy_normalise (map, nx, ny))
2737 XSRETURN_UNDEF;
2738
2739 mapspace &ms = map->at (nx, ny);
2740
2741 ms.update ();
2742
2465 switch (ix) 2743 switch (ix)
2466 { 2744 {
2467 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2745 case 0: RETVAL = to_sv (ms.bot ); break;
2468 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2746 case 1: RETVAL = to_sv (ms.top ); break;
2469 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2747 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2470 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2748 case 3: RETVAL = newSViv (ms.light ); break;
2471 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2749 case 4: RETVAL = newSVuv (ms.move_block); break;
2472 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2750 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2473 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2751 case 6: RETVAL = newSVuv (ms.move_on ); break;
2474 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2752 case 7: RETVAL = newSVuv (ms.move_off ); break;
2475 } 2753 }
2754}
2476 OUTPUT: RETVAL 2755 OUTPUT: RETVAL
2477
2478void fix_walls (maptile *map, int x, int y)
2479
2480void fix_walls_around (maptile *map, int x, int y)
2481 2756
2482# worst xs function of my life 2757# worst xs function of my life
2483bool 2758bool
2484_create_random_map (\ 2759_create_random_map (\
2485 maptile *self,\ 2760 maptile *self,\
2565 RETVAL = self->generate_random_map (&rmp); 2840 RETVAL = self->generate_random_map (&rmp);
2566} 2841}
2567 OUTPUT: 2842 OUTPUT:
2568 RETVAL 2843 RETVAL
2569 2844
2845MODULE = cf PACKAGE = cf::mapspace
2846
2847INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2848
2570MODULE = cf PACKAGE = cf::arch 2849MODULE = cf PACKAGE = cf::arch
2571 2850
2572int archetypes_size () 2851int archetypes_size ()
2573 CODE: 2852 CODE:
2574 RETVAL = archetypes.size (); 2853 RETVAL = archetypes.size ();
2576 2855
2577archetype *archetypes (U32 index) 2856archetype *archetypes (U32 index)
2578 CODE: 2857 CODE:
2579 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2858 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2580 OUTPUT: RETVAL 2859 OUTPUT: RETVAL
2581
2582object *instantiate (archetype *arch)
2583 CODE:
2584 RETVAL = arch_to_object (arch);
2585 OUTPUT:
2586 RETVAL
2587 2860
2588INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2861INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2589 2862
2590MODULE = cf PACKAGE = cf::party 2863MODULE = cf PACKAGE = cf::party
2591 2864
2607 2880
2608region *find (utf8_string name) 2881region *find (utf8_string name)
2609 PROTOTYPE: $ 2882 PROTOTYPE: $
2610 CODE: 2883 CODE:
2611 RETVAL = region::find (name); 2884 RETVAL = region::find (name);
2612 OUTPUT: RETVAL
2613
2614region *find_fuzzy (utf8_string name)
2615 PROTOTYPE: $
2616 CODE:
2617 RETVAL = region::find_fuzzy (name);
2618 OUTPUT: RETVAL 2885 OUTPUT: RETVAL
2619 2886
2620int specificity (region *rgn) 2887int specificity (region *rgn)
2621 CODE: 2888 CODE:
2622 RETVAL = 0; 2889 RETVAL = 0;
2758 faceinfo *f = face_info (idx); assert (f); 3025 faceinfo *f = face_info (idx); assert (f);
2759 facedata *d = &(faceset ? f->data64 : f->data32); 3026 facedata *d = &(faceset ? f->data64 : f->data32);
2760 sv_to (data, d->data); 3027 sv_to (data, d->data);
2761 STRLEN clen; 3028 STRLEN clen;
2762 char *cdata = SvPVbyte (chksum, clen); 3029 char *cdata = SvPVbyte (chksum, clen);
2763 clen = min (CHKSUM_SIZE, clen); 3030 clen = min (CHKSUM_MAXLEN, clen);
2764 3031
3032 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3033
2765 if (memcmp (d->chksum, cdata, clen)) 3034 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2766 { 3035 {
3036 d->chksum_len = clen;
2767 memcpy (d->chksum, cdata, clen); 3037 memcpy (d->chksum, cdata, clen);
2768 3038
2769 // invalidate existing client face info 3039 // invalidate existing client face info
2770 for_all_clients (ns) 3040 for_all_clients (ns)
2771 if (ns->faceset == faceset) 3041 if (ns->faceset == faceset)
2786 3056
2787SV *get_chksum (faceidx idx, int faceset = 0) 3057SV *get_chksum (faceidx idx, int faceset = 0)
2788 CODE: 3058 CODE:
2789 facedata *d = face_data (idx, faceset); 3059 facedata *d = face_data (idx, faceset);
2790 if (!d) XSRETURN_UNDEF; 3060 if (!d) XSRETURN_UNDEF;
2791 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3061 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2792 OUTPUT: 3062 OUTPUT:
2793 RETVAL 3063 RETVAL
2794 3064
2795SV *get_data (faceidx idx, int faceset = 0) 3065SV *get_data (faceidx idx, int faceset = 0)
2796 CODE: 3066 CODE:
2841 } 3111 }
2842 else 3112 else
2843 anim = &animation::create (name, av_len (av) + 1, facings); 3113 anim = &animation::create (name, av_len (av) + 1, facings);
2844 3114
2845 for (int i = 0; i < anim->num_animations; ++i) 3115 for (int i = 0; i < anim->num_animations; ++i)
2846 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3116 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2847} 3117}
2848 OUTPUT: RETVAL 3118 OUTPUT: RETVAL
2849 3119
2850void invalidate_all () 3120void invalidate_all ()
2851 CODE: 3121 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines