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.304 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.358 by root, Sun Apr 4 04:58:46 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
99#ifndef newSVpv_utf8
93static inline SV * 100static SV *
94newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
95{ 102{
96 if (!s) 103 if (!s)
97 return newSV (0); 104 return newSV (0);
98 105
99 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 107 SvUTF8_on (sv);
101 return sv; 108 return sv;
102} 109}
110#endif
103 111
112#ifndef newSVpvn_utf8
104static inline SV * 113static SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 115{
107 if (!s) 116 if (!s)
108 return newSV (0); 117 return newSV (0);
109 118
110 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
111 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
112 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);
113} 142}
114 143
115// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
116template<class super> 145template<class super>
117static super * 146static super *
… …
151 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
152 hv_clear (self); 181 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
155 184
156 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 186 assert (!this->self);
158 } 187 }
159} 188}
160 189
161void 190void
… …
195attachable::destroy () 224attachable::destroy ()
196{ 225{
197 if (destroyed ()) 226 if (destroyed ())
198 return; 227 return;
199 228
200 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
201 do_destroy (); 230 do_destroy ();
202 sever_self (); 231 sever_self ();
203} 232}
204 233
205void 234void
… …
279 308
280 attach = src.attach; 309 attach = src.attach;
281 return *this; 310 return *this;
282} 311}
283 312
313#if 0
284template<typename T> 314template<typename T>
285static bool 315static bool
286find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
287{ 317{
288 char *s = (char *)obj; 318 char *s = (char *)obj;
… …
296 326
297 return false; 327 return false;
298} 328}
299 329
300// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
301void 331static void
302find_backref (void *ptr) 332find_backref (void *ptr)
303{ 333{
304 for_all_objects (op) 334 for_all_objects (op)
305 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
306 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);
… …
310 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
311 341
312 for_all_clients (ns) 342 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
315
316} 345}
346#endif
317 347
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 349
320static SV * 350static SV *
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
374 404
375 return sv; 405 return sv;
376 } 406 }
377} 407}
378 408
409#if 0 // unused
379static void 410static void
380clearSVptr (SV *sv) 411clearSVptr (SV *sv)
381{ 412{
382 if (SvROK (sv)) 413 if (SvROK (sv))
383 sv = SvRV (sv); 414 sv = SvRV (sv);
384 415
385 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
387} 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}
388 435
389static long 436static long
390SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
391{ 438{
392 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
394 441
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
396
397 if (!mg)
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399
400 return (long)mg->mg_ptr;
401} 443}
402 444
403static long 445static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
405{ 447{
406 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
407 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
408 else
409 return 0;
410} 451}
411 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
412inline 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); }
413inline 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); }
414inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
427inline 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); }
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432inline 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); }
433inline 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); }
434inline 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); }
435inline 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); }
436 518
437inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
439 521
440inline 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 ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 524
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 526
445inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
446{ 528{
447 SV *sv = newSV (0); 529 SV *sv = newSV (0);
448 530
449 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
… …
454 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
455 537
456 return sv; 538 return sv;
457} 539}
458 540
459inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
460{ 542{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 544 SvUTF8_on (sv);
463 return sv; 545 return sv;
464} 546}
465 547
466inline 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; }
467inline 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; }
468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
477inline 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); }
478inline 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); }
479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
481inline 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); }
482inline 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); }
483inline 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); }
484inline 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"); }
485inline 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"); }
486inline 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"); }
487inline 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"); }
488inline 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"); }
489inline 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"); }
490inline 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"); }
491inline 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"); }
492inline 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" ); }
493 575
494//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)]; }
495inline 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)); }
496 578
497template<class T> 579template<class T>
498inline 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; }
499 581
500template<int N> 582template<int N>
501inline 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)); }
502 584
503inline 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); }
504inline 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); }
505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 589
508inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
509{ 591{
510 STRLEN len; 592 STRLEN len;
511 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 594 v.assign (data, len);
513} 595}
514 596
515inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
516{ 598{
517 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 601}
520 602
521inline 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); }
522 604
523static SV * 605static SV *
524newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
525{ 607{
526 SV *sv; 608 SV *sv;
… …
600 va_end (ap); 682 va_end (ap);
601 683
602 return sv; 684 return sv;
603} 685}
604 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
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 712
607SV * 713static SV *
608registry (attachable *ext) 714registry (attachable *ext)
609{ 715{
610 if (!ext->cb) 716 if (!ext->cb)
611 ext->cb = newAV (); 717 ext->cb = newAV ();
612 718
… …
653 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
654 exit (EXIT_FAILURE); 760 exit (EXIT_FAILURE);
655 } 761 }
656} 762}
657 763
764void
658void cfperl_main () 765cfperl_main ()
659{ 766{
660 dSP; 767 dSP;
661 768
662 PUSHMARK (SP); 769 PUSHMARK (SP);
663 PUTBACK; 770 PUTBACK;
… …
688# undef def 795# undef def
689}; 796};
690 797
691#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)
692 799
693static void 800static void noinline
694gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
695{ 802{
696 // event must be in array 803 // event must be in array
697 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
698 { 805 {
… …
784{ 891{
785 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
786 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
787} 894}
788 895
789void 896static void noinline
790_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
791{ 898{
792 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
793 { 900 {
794 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
… …
804 } 911 }
805 } 912 }
806} 913}
807 914
808// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
809void 916static void
810_recalc_want () 917_recalc_want ()
811{ 918{
812 ev_want_event.reset (); 919 ev_want_event.reset ();
813 920
814 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
… …
887 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
888 } 995 }
889 996
890 va_end (ap); 997 va_end (ap);
891 998
892 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
893 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
894 1001
895 CALL_END; 1002 CALL_END;
896 1003
897 return count; 1004 return count;
898} 1005}
899 1006
900SV * 1007static SV *
901cfperl_result (int idx) 1008cfperl_result (int idx)
902{ 1009{
903 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
904 if (!av) 1011 if (!av)
905 return &PL_sv_undef; 1012 return &PL_sv_undef;
… …
924} 1031}
925 1032
926///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
927// various c++ => perl glue functions 1034// various c++ => perl glue functions
928 1035
1036void
929void cfperl_tick () 1037cfperl_tick ()
930{ 1038{
931 tick_pending = 1; 1039 tick_pending = 1;
932 1040
933 if (tick_inhibit) 1041 if (tick_inhibit)
934 return; 1042 return;
… …
937 1045
938 dSP; 1046 dSP;
939 1047
940 PUSHMARK (SP); 1048 PUSHMARK (SP);
941 PUTBACK; 1049 PUTBACK;
942 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
943 1051
944 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);
945} 1053}
946 1054
947void 1055void
… …
970 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
971 CALL_END; 1079 CALL_END;
972} 1080}
973 1081
974void 1082void
975cfperl_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)
976{ 1084{
977 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
978 CALL_ARG (ns); 1086 CALL_ARG (ns);
979 CALL_ARG (type); 1087 CALL_ARG (type);
980 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
981 CALL_ARG (color); 1089 CALL_ARG (color);
982 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
983 CALL_END; 1091 CALL_END;
984} 1092}
985 1093
986int 1094int
987cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
… …
989 int can; 1097 int can;
990 1098
991 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
992 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
993 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
994 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
995 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
996 CALL_END; 1104 CALL_END;
997 1105
998 return can; 1106 return can;
999} 1107}
1000 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
1001player * 1121player *
1002player::find (const char *name) 1122player::find (const_utf8_string name)
1003{ 1123{
1004 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1005 CALL_ARG (name); 1125 CALL_ARG (name);
1006 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1007 1127
… …
1012 1132
1013 return retval; 1133 return retval;
1014} 1134}
1015 1135
1016maptile * 1136maptile *
1017find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1018{ 1138{
1019 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1020 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1021 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1022 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
… …
1029 1149
1030 return retval; 1150 return retval;
1031} 1151}
1032 1152
1033maptile * 1153maptile *
1034maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1035{ 1155{
1036 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1037 CALL_ARG (path); 1157 CALL_ARG (path);
1038 CALL_ARG (origin); 1158 CALL_ARG (origin);
1039 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1045 1165
1046 return retval; 1166 return retval;
1047} 1167}
1048 1168
1049maptile * 1169maptile *
1050maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1051{ 1171{
1052 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1053 CALL_ARG (path); 1173 CALL_ARG (path);
1054 CALL_ARG (origin); 1174 CALL_ARG (origin);
1055 CALL_ARG (load); 1175 CALL_ARG (load);
… …
1071 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1191 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1072 CALL_END; 1192 CALL_END;
1073} 1193}
1074 1194
1075void 1195void
1076maptile::change_all_map_light (int change)
1077{
1078 CALL_BEGIN (1);
1079 CALL_ARG (change);
1080 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1081 CALL_END;
1082}
1083
1084void
1085object::enter_exit (object *exit) 1196object::enter_exit (object *exit)
1086{ 1197{
1087 if (type != PLAYER) 1198 if (type != PLAYER)
1088 return; 1199 return;
1089 1200
… …
1093 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1094 CALL_END; 1205 CALL_END;
1095} 1206}
1096 1207
1097void 1208void
1098object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1099{ 1210{
1100 if (type != PLAYER) 1211 if (type != PLAYER)
1101 return; 1212 return;
1102 1213
1103 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
… …
1107 CALL_ARG (y); 1218 CALL_ARG (y);
1108 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1109 CALL_END; 1220 CALL_END;
1110} 1221}
1111 1222
1112const char * 1223const_utf8_string
1113object::ref () const 1224object::ref () const
1114{ 1225{
1115 if (type == PLAYER) 1226 if (type == PLAYER)
1116 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);
1117 else 1228 else
1118 return 0; 1229 return 0;
1119} 1230}
1120 1231
1121object * 1232object *
1122object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1123{ 1234{
1124 object *retval = 0; 1235 object *retval = 0;
1125 1236
1126 if (ref) 1237 if (ref)
1127 { 1238 {
… …
1137 1248
1138 return retval; 1249 return retval;
1139} 1250}
1140 1251
1141void 1252void
1142log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1143{ 1254{
1144#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1145 void *addr [20]; 1256 void *addr [20];
1146 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1147 1258
… …
1152 CALL_CALL ("cf::_log_backtrace", G_VOID); 1263 CALL_CALL ("cf::_log_backtrace", G_VOID);
1153 CALL_END; 1264 CALL_END;
1154#endif 1265#endif
1155} 1266}
1156 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
1157///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1158 1320
1159struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1160struct CoroAPI *coroapi::GCoroAPI; 1322struct CoroAPI *coroapi::GCoroAPI;
1161 1323
1324void
1162void coroapi::do_cede_to_tick () 1325coroapi::do_cede_to_tick ()
1163{ 1326{
1164 cede_pending = 0; 1327 cede_pending = 0;
1165 cede (); 1328 cede ();
1166} 1329}
1167 1330
… …
1191 ev_io_set ((ev_io *)this, fd, events); 1354 ev_io_set ((ev_io *)this, fd, events);
1192 if (active) start (); 1355 if (active) start ();
1193 } 1356 }
1194} 1357}
1195 1358
1196void 1359static void
1197_connect_to_perl () 1360_connect_to_perl_1 ()
1198{ 1361{
1199 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1200 1363
1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1202 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);
… …
1221 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1222 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1223 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1224} 1387}
1225 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
1226MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1227 1400
1228BOOT: 1401BOOT:
1229{ 1402{
1230 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1231 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1232 1405
1233 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1234 1407
1235 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1236 1409
1237 //{ 1410 //{
1238 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
… …
1246 static const struct { 1419 static const struct {
1247 const char *name; 1420 const char *name;
1248 IV iv; 1421 IV iv;
1249 } *civ, const_iv[] = { 1422 } *civ, const_iv[] = {
1250# define const_iv(name) { # name, (IV)name }, 1423# define const_iv(name) { # name, (IV)name },
1424# include "const_iv.h"
1251 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1425 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1252 const_iv (logBacktrace) 1426 const_iv (logBacktrace)
1253 1427
1254 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1428 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1255 1429
… …
1263 const_iv (body_arm) const_iv (body_torso) const_iv (body_head) 1437 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1264 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger) 1438 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1265 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand) 1439 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1266 const_iv (body_wrist) const_iv (body_waist) 1440 const_iv (body_wrist) const_iv (body_waist)
1267 1441
1268 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1269 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1270 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1271 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1272 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1273 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1274 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1275 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1276 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1277 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1278 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1279 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1280 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1281 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1282 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1283 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1284 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1285 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1286 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1287 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1288 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1289 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1290 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1291 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1292 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1293 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1294 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1295 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1296
1297 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1442 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1298
1299 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1300 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1301 1443
1302 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY) 1444 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1303 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN) 1445 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1304 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW) 1446 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1305 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION) 1447 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1306 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL) 1448 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1307 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL) 1449 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1308 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE) 1450 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1309 1451
1310 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1311 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1312 const_iv (WEAP_BLUD)
1313
1314 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1315 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1316 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1317 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1318 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1319 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1320 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1321 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1322 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1323 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1324 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1325 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1326 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1327 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1328 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1329 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1330 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1331 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1332 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1333 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1334 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1335 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1336 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1337 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1338 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1339 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1340
1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1342 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1343 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1344 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1345 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1346 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1347
1348 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1452 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1349 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1453 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1350 1454
1351 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1455 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1352 1456
1353 const_iv (SP_RAISE_DEAD) 1457 const_iv (SP_RAISE_DEAD)
1354 const_iv (SP_RUNE) 1458 const_iv (SP_RUNE)
1355 const_iv (SP_MAKE_MARK) 1459 const_iv (SP_MAKE_MARK)
1356 const_iv (SP_BOLT) 1460 const_iv (SP_BOLT)
… …
1397 const_iv (SP_CAUSE_DISEASE) 1501 const_iv (SP_CAUSE_DISEASE)
1398 const_iv (SP_AURA) 1502 const_iv (SP_AURA)
1399 const_iv (SP_TOWN_PORTAL) 1503 const_iv (SP_TOWN_PORTAL)
1400 const_iv (SP_PARTY_SPELL) 1504 const_iv (SP_PARTY_SPELL)
1401 1505
1506 const_iv (AP_TOGGLE) const_iv (AP_APPLY) const_iv (AP_UNAPPLY) const_iv (AP_MODE)
1507 const_iv (AP_NO_MERGE) const_iv (AP_NO_SLOT) const_iv (AP_PRINT) const_iv (AP_IGNORE_CURSE)
1508
1402 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1509 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1403 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1510 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1404 const_iv (F_LOCKED) 1511 const_iv (F_LOCKED)
1405
1406 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1407 1512
1408 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1513 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1409 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1514 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1410 1515
1411 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1516 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
… …
1434 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON) 1539 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1435 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP) 1540 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1436 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION) 1541 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1437 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY) 1542 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1438 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH) 1543 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1439 const_iv (SK_POISON_NAIL) 1544 const_iv (SK_POISON_NAIL) const_iv (SK_MINING) const_iv (SK_FISHING)
1440 1545
1441 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL) 1546 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1442 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1) 1547 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1443 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1) 1548 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1444 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED) 1549 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1445 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK) 1550 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1446 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0) 1551 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1447
1448 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1449 1552
1450 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY) 1553 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1451 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN) 1554 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1452 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW) 1555 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1453 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION) 1556 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
… …
1509 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1612 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1510 av_push (event, newSViv (eiv->klass)); 1613 av_push (event, newSViv (eiv->klass));
1511 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1614 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1512 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1615 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1513 } 1616 }
1617
1618 // used by autogenerated BOOT sections from genacc
1619 av_reflect = get_av ("cf::REFLECT", 1);
1514} 1620}
1515 1621
1516void _gv_clear (SV *gv) 1622void _gv_clear (SV *gv)
1517 CODE: 1623 CODE:
1518 assert (SvTYPE (gv) == SVt_PVGV); 1624 assert (SvTYPE (gv) == SVt_PVGV);
… …
1525 f (GvGP (gv)->gp_cv); 1631 f (GvGP (gv)->gp_cv);
1526 GvCVGEN (gv) = 0; 1632 GvCVGEN (gv) = 0;
1527 GvMULTI_off (gv); 1633 GvMULTI_off (gv);
1528# undef f 1634# undef f
1529 1635
1530void _connect_to_perl () 1636void _connect_to_perl_1 ()
1637
1638void _connect_to_perl_2 ()
1531 1639
1532void _recalc_want () 1640void _recalc_want ()
1533 1641
1534# not used by default anymore 1642# not used by default anymore
1535void _global_reattach () 1643void _global_reattach ()
… …
1593 1701
1594void init_attackmess () 1702void init_attackmess ()
1595 1703
1596void init_dynamic () 1704void init_dynamic ()
1597 1705
1598void init_block ()
1599
1600void load_settings () 1706void load_settings ()
1601 1707
1602void load_materials () 1708void load_materials ()
1603 1709
1604void init_uuid () 1710void init_uuid ()
… …
1645 } 1751 }
1646 1752
1647void server_tick () 1753void server_tick ()
1648 CODE: 1754 CODE:
1649{ 1755{
1756 ev_now_update (EV_DEFAULT);
1650 NOW = ev_now (EV_DEFAULT); 1757 NOW = ev_now (EV_DEFAULT);
1651 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1758 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1652 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1759 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1653 runtime = SvNVX (sv_runtime); 1760 runtime = SvNVX (sv_runtime);
1654 1761
1655 server_tick (); 1762 server_tick ();
1656 1763
1657 NOW = ev_time (); 1764 ev_now_update (EV_DEFAULT);
1765 NOW = ev_now (EV_DEFAULT);
1658 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1766 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1659 runtime += TICK; 1767 runtime += TICK;
1660 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1768 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1661} 1769}
1662 1770
… …
1788 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1896 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1789 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1897 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1790 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1898 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1791 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1899 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1792#endif 1900#endif
1793 EXTEND (SP, 2*2); 1901 EXTEND (SP, 5*2);
1794 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1902 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1795 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1903 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1796 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1904 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1905 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1906 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1797} 1907}
1798 1908
1799int find_animation (utf8_string text) 1909int find_animation (utf8_string text)
1800 PROTOTYPE: $ 1910 PROTOTYPE: $
1801 1911
… …
1900 RETVAL 2010 RETVAL
1901 2011
1902void 2012void
1903debug_trace (attachable *obj, bool on = true) 2013debug_trace (attachable *obj, bool on = true)
1904 CODE: 2014 CODE:
1905 obj->flags &= ~attachable::F_DEBUG_TRACE; 2015 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1906 if (on) 2016 if (on)
1907 obj->flags |= attachable::F_DEBUG_TRACE; 2017 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1908 2018
1909int mortals_size () 2019int mortals_size ()
1910 CODE: 2020 CODE:
1911 RETVAL = attachable::mortals.size (); 2021 RETVAL = attachable::mortals.size ();
1912 OUTPUT: RETVAL 2022 OUTPUT: RETVAL
… …
1914#object *mortals (U32 index) 2024#object *mortals (U32 index)
1915# CODE: 2025# CODE:
1916# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 2026# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1917# OUTPUT: RETVAL 2027# OUTPUT: RETVAL
1918 2028
1919INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 2029INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1920 2030
1921MODULE = cf PACKAGE = cf::global 2031MODULE = cf PACKAGE = cf::global
1922 2032
1923int invoke (SV *klass, int event, ...) 2033int invoke (SV *klass, int event, ...)
1924 CODE: 2034 CODE:
… …
1928 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 2038 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1929 OUTPUT: RETVAL 2039 OUTPUT: RETVAL
1930 2040
1931MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 2041MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1932 2042
1933INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 2043INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1934 2044
1935int invoke (object *op, int event, ...) 2045int invoke (object *op, int event, ...)
1936 CODE: 2046 CODE:
1937 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 2047 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1938 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2048 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1965int mortals_size () 2075int mortals_size ()
1966 CODE: 2076 CODE:
1967 RETVAL = attachable::mortals.size (); 2077 RETVAL = attachable::mortals.size ();
1968 OUTPUT: RETVAL 2078 OUTPUT: RETVAL
1969 2079
1970const char *slot_use_name (U32 slot) 2080const_utf8_string slot_use_name (U32 slot)
1971 ALIAS: 2081 ALIAS:
1972 slot_nonuse_name = 1 2082 slot_nonuse_name = 1
1973 CODE: 2083 CODE:
1974{ 2084{
1975 if (slot >= NUM_BODY_LOCATIONS) 2085 if (slot >= NUM_BODY_LOCATIONS)
… …
2039 2149
2040int apply_shop_mat (object *shop_mat, object *op); 2150int apply_shop_mat (object *shop_mat, object *op);
2041 2151
2042int move (object *op, int dir, object *originator = op) 2152int move (object *op, int dir, object *originator = op)
2043 CODE: 2153 CODE:
2044 RETVAL = move_ob (op, dir, originator); 2154 RETVAL = op->move (dir, originator);
2045 OUTPUT: 2155 OUTPUT:
2046 RETVAL 2156 RETVAL
2047 2157
2048void apply (object *applier, object *applied, int flags = 0)
2049 CODE:
2050 manual_apply (applied, applier, flags);
2051
2052void apply_below (object *op) 2158void apply_below (object *op)
2053 CODE: 2159 CODE:
2054 player_apply_below (op); 2160 player_apply_below (op);
2055 2161
2056int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2162int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2163
2164int casting_level (object *caster, object *spell)
2057 2165
2058int pay_item (object *op, object *buyer) 2166int pay_item (object *op, object *buyer)
2059 CODE: 2167 CODE:
2060 RETVAL = pay_for_item (op, buyer); 2168 RETVAL = pay_for_item (op, buyer);
2061 OUTPUT: RETVAL 2169 OUTPUT: RETVAL
… …
2104 2212
2105void player_lvl_adj (object *who, object *skill = 0) 2213void player_lvl_adj (object *who, object *skill = 0)
2106 2214
2107int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2215int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2108 2216
2109int calc_skill_exp (object *who, object *op, object *skill); 2217int calc_skill_exp (object *who, object *op, object *skill)
2110 2218
2111void push_button (object *op); 2219void push_button (object *op, object *originator)
2112 2220
2113void use_trigger (object *op); 2221void use_trigger (object *op, object *originator)
2114 2222
2115void add_button_link (object *button, maptile *map, int connected);
2116
2117void remove_button_link (object *op);
2118
2119void handle_apply_yield (object *op); 2223void handle_apply_yield (object *op)
2120 2224
2225int convert_item (object *item, object *converter)
2226
2227void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2121 2228
2122MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2229MODULE = cf PACKAGE = cf::object PREFIX = cf_
2123 2230
2124# no clean way to get an object from an archetype - stupid idiotic 2231# no clean way to get an object from an archetype - stupid idiotic
2125# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2232# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2129 CODE: 2236 CODE:
2130 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2237 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2131 OUTPUT: 2238 OUTPUT:
2132 RETVAL 2239 RETVAL
2133 2240
2241object *generate (utf8_string arch, object *creator)
2242 CODE:
2243 object *obj = get_archetype (arch);
2244 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2245 RETVAL = obj;
2246 OUTPUT:
2247 RETVAL
2248
2134object *find_object (U32 tag) 2249object *find_object (U32 tag)
2250
2251object *find_object_uuid (UUID i)
2135 2252
2136# TODO: nuke 2253# TODO: nuke
2137object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2254object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2138 PROTOTYPE: $$$$$$ 2255 PROTOTYPE: $$$$$$
2139 CODE: 2256 CODE:
2140{ 2257{
2141 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2258 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2259
2260 if (RETVAL->destroyed ())
2261 RETVAL = 0;
2142} 2262}
2143 2263
2144shstr 2264shstr
2145object::kv_get (shstr key) 2265object::kv_get (shstr key)
2146 2266
… …
2198 RETVAL = op->contr; 2318 RETVAL = op->contr;
2199 OUTPUT: RETVAL 2319 OUTPUT: RETVAL
2200 2320
2201bool move_player (object *op, int dir) 2321bool move_player (object *op, int dir)
2202 2322
2203void check_score (object *op)
2204
2205void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2323void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2206 CODE: 2324 CODE:
2207 new_draw_info (flags, 0, op, txt); 2325 new_draw_info (flags, 0, op, txt);
2208 2326
2209void kill_player (object *op) 2327void kill_player (object *op)
… …
2221int command_arrest (object *op, utf8_string params) 2339int command_arrest (object *op, utf8_string params)
2222 2340
2223 2341
2224MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2342MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2225 2343
2226INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2344INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2227 2345
2228int invoke (player *pl, int event, ...) 2346int invoke (player *pl, int event, ...)
2229 CODE: 2347 CODE:
2230 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2348 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2231 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2349 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2241 pl->ob->stats.hp = pl->ob->stats.maxhp; 2359 pl->ob->stats.hp = pl->ob->stats.maxhp;
2242 pl->ob->stats.sp = pl->ob->stats.maxsp; 2360 pl->ob->stats.sp = pl->ob->stats.maxsp;
2243 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2361 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2244 pl->orig_stats = pl->ob->stats; 2362 pl->orig_stats = pl->ob->stats;
2245 2363
2246void clear_los (player *pl) 2364# should only be temporary
2365void esrv_new_player (player *pl)
2247 2366
2367#d# TODO: replace by blocked_los accessor, fix code using this
2248bool 2368bool
2249cell_visible (player *pl, int dx, int dy) 2369cell_visible (player *pl, int dx, int dy)
2250 CODE: 2370 CODE:
2251 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2371 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2252 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2253 OUTPUT: 2372 OUTPUT:
2254 RETVAL 2373 RETVAL
2255 2374
2256void 2375void
2257send (player *pl, SV *packet) 2376send (player *pl, SV *packet)
… …
2322 if (op->tag) 2441 if (op->tag)
2323 XPUSHs (sv_2mortal (to_sv (op))); 2442 XPUSHs (sv_2mortal (to_sv (op)));
2324 } 2443 }
2325} 2444}
2326 2445
2327INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2446INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2447
2448void
2449adjust_daylight ()
2450 CODE:
2451 maptile::adjust_daylight ();
2452
2453int
2454outdoor_darkness (int darkness = 0)
2455 CODE:
2456 RETVAL = maptile::outdoor_darkness;
2457 if (items)
2458 maptile::outdoor_darkness = darkness;
2459 OUTPUT:
2460 RETVAL
2328 2461
2329void 2462void
2330maptile::instantiate () 2463maptile::instantiate ()
2331 2464
2332maptile *new () 2465maptile *new ()
… …
2364 for (int x = 0; x < THIS->width; ++x) 2497 for (int x = 0; x < THIS->width; ++x)
2365 for (int y = 0; y < THIS->height; ++y) 2498 for (int y = 0; y < THIS->height; ++y)
2366 { 2499 {
2367 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2500 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2368 if (op->flag [FLAG_IS_FLOOR]) 2501 if (op->flag [FLAG_IS_FLOOR])
2369 goto skip_space; 2502 goto skip;
2370 2503
2371 { 2504 {
2372 int offs = offset + y * stride + x; 2505 int offs = offset + y * stride + x;
2506
2373 if (IN_RANGE_EXC (offs, 0, idxlen)) 2507 if (IN_RANGE_EXC (offs, 0, idxlen))
2374 { 2508 {
2375 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2509 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2376 { 2510 {
2377 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2511 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2378 ob->flag [FLAG_NO_MAP_SAVE] = true; 2512 ob->flag [FLAG_NO_MAP_SAVE] = true;
2379 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2513 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2380 2514
2381 if (ob->randomitems) 2515 if (ob->randomitems && !ob->above)
2382 { 2516 {
2383 if (!ob->above)
2384 {
2385 ob->create_treasure (ob->randomitems); 2517 ob->create_treasure (ob->randomitems);
2386 2518
2387 for (object *op = ob->above; op; op = op->above) 2519 for (object *op = ob->above; op; op = op->above)
2388 op->flag [FLAG_NO_MAP_SAVE] = true; 2520 op->flag [FLAG_NO_MAP_SAVE] = true;
2389 } 2521 // TODO: if this is a pickable object, then the item
2390 2522 // will at a bit weird - saving inside the player
2391 ob->randomitems = 0; 2523 // will clear the flag, but when the player drops
2524 // it without logging out, it keeps the flag.
2525 // nobody ahs reported this, but this can be rather
2526 // annoying on persistent maps.
2392 } 2527 }
2393 } 2528 }
2394 } 2529 }
2395 } 2530 }
2396 2531
2397 skip_space: ; 2532 skip: ;
2398 } 2533 }
2399} 2534}
2400 2535
2401void 2536void
2402maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2537maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2412 2547
2413 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2548 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2414 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2549 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2415 2550
2416 for (int i = av_len ((AV *)palette) + 1; i--; ) 2551 for (int i = av_len ((AV *)palette) + 1; i--; )
2417 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2552 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2418 2553
2419 for (int y = 0; y < THIS->height; ++y) 2554 for (int y = 0; y < THIS->height; ++y)
2420 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2555 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2421 2556
2422 sfree (THIS->regions, THIS->size ()); 2557 sfree (THIS->regions, THIS->size ());
… …
2441 } 2576 }
2442 2577
2443int out_of_map (maptile *map, int x, int y) 2578int out_of_map (maptile *map, int x, int y)
2444 2579
2445void 2580void
2446trigger (maptile *map, long connection, bool state = true) 2581find_link (maptile *map, shstr_tmp connection)
2447 CODE:
2448 activate_connection (map, connection, state);
2449
2450void
2451get_connection (maptile *map, long connection)
2452 PPCODE: 2582 PPCODE:
2453 oblinkpt *obp = get_connection_links (map, connection); 2583 if (oblinkpt *obp = map->find_link (connection))
2454 if (obp)
2455 for (objectlink *ol = obp->link; ol; ol = ol->next) 2584 for (objectlink *ol = obp->link; ol; ol = ol->next)
2456 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2585 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2457 2586
2458void 2587void
2459get_map_flags (maptile *map, int x, int y) 2588get_map_flags (maptile *map, int x, int y)
… …
2513 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2642 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2514 XPUSHs (sv_2mortal (to_sv (o))); 2643 XPUSHs (sv_2mortal (to_sv (o)));
2515} 2644}
2516 2645
2517SV * 2646SV *
2518bot_at (maptile *obj, unsigned int x, unsigned int y) 2647bot_at (maptile *map, unsigned int x, unsigned int y)
2519 PROTOTYPE: $$$ 2648 PROTOTYPE: $$$
2520 ALIAS: 2649 ALIAS:
2521 top_at = 1 2650 top_at = 1
2522 flags_at = 2 2651 flags_at = 2
2523 light_at = 3 2652 light_at = 3
2524 move_block_at = 4 2653 move_block_at = 4
2525 move_slow_at = 5 2654 move_slow_at = 5
2526 move_on_at = 6 2655 move_on_at = 6
2527 move_off_at = 7 2656 move_off_at = 7
2528 INIT:
2529 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2530 CODE: 2657 CODE:
2658{
2659 sint16 nx = x;
2660 sint16 ny = y;
2661
2662 if (!xy_normalise (map, nx, ny))
2663 XSRETURN_UNDEF;
2664
2665 mapspace &ms = map->at (nx, ny);
2666
2667 ms.update ();
2668
2531 switch (ix) 2669 switch (ix)
2532 { 2670 {
2533 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2671 case 0: RETVAL = to_sv (ms.bot ); break;
2534 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2672 case 1: RETVAL = to_sv (ms.top ); break;
2535 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2673 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2536 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2674 case 3: RETVAL = newSViv (ms.light ); break;
2537 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2675 case 4: RETVAL = newSVuv (ms.move_block); break;
2538 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2676 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2539 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2677 case 6: RETVAL = newSVuv (ms.move_on ); break;
2540 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2678 case 7: RETVAL = newSVuv (ms.move_off ); break;
2541 } 2679 }
2680}
2542 OUTPUT: RETVAL 2681 OUTPUT: RETVAL
2543
2544void fix_walls (maptile *map, int x, int y)
2545
2546void fix_walls_around (maptile *map, int x, int y)
2547 2682
2548# worst xs function of my life 2683# worst xs function of my life
2549bool 2684bool
2550_create_random_map (\ 2685_create_random_map (\
2551 maptile *self,\ 2686 maptile *self,\
… …
2555 utf8_string monsterstyle,\ 2690 utf8_string monsterstyle,\
2556 utf8_string treasurestyle,\ 2691 utf8_string treasurestyle,\
2557 utf8_string layoutstyle,\ 2692 utf8_string layoutstyle,\
2558 utf8_string doorstyle,\ 2693 utf8_string doorstyle,\
2559 utf8_string decorstyle,\ 2694 utf8_string decorstyle,\
2695 utf8_string miningstyle,\
2560 utf8_string origin_map,\ 2696 utf8_string origin_map,\
2561 utf8_string final_map,\ 2697 utf8_string final_map,\
2562 utf8_string exitstyle,\ 2698 utf8_string exitstyle,\
2563 utf8_string this_map,\ 2699 utf8_string this_map,\
2564 utf8_string exit_on_final_map,\ 2700 utf8_string exit_on_final_map,\
… …
2596 assign (rmp.monsterstyle , monsterstyle); 2732 assign (rmp.monsterstyle , monsterstyle);
2597 assign (rmp.treasurestyle , treasurestyle); 2733 assign (rmp.treasurestyle , treasurestyle);
2598 assign (rmp.layoutstyle , layoutstyle); 2734 assign (rmp.layoutstyle , layoutstyle);
2599 assign (rmp.doorstyle , doorstyle); 2735 assign (rmp.doorstyle , doorstyle);
2600 assign (rmp.decorstyle , decorstyle); 2736 assign (rmp.decorstyle , decorstyle);
2737 assign (rmp.miningstyle , miningstyle);
2601 assign (rmp.exitstyle , exitstyle); 2738 assign (rmp.exitstyle , exitstyle);
2602 assign (rmp.exit_on_final_map, exit_on_final_map); 2739 assign (rmp.exit_on_final_map, exit_on_final_map);
2603 2740
2604 rmp.origin_map = origin_map; 2741 rmp.origin_map = origin_map;
2605 rmp.final_map = final_map; 2742 rmp.final_map = final_map;
… …
2633 OUTPUT: 2770 OUTPUT:
2634 RETVAL 2771 RETVAL
2635 2772
2636MODULE = cf PACKAGE = cf::mapspace 2773MODULE = cf PACKAGE = cf::mapspace
2637 2774
2638INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2775INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2639 2776
2640MODULE = cf PACKAGE = cf::arch 2777MODULE = cf PACKAGE = cf::arch
2641 2778
2642int archetypes_size () 2779int archetypes_size ()
2643 CODE: 2780 CODE:
… …
2647archetype *archetypes (U32 index) 2784archetype *archetypes (U32 index)
2648 CODE: 2785 CODE:
2649 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2786 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2650 OUTPUT: RETVAL 2787 OUTPUT: RETVAL
2651 2788
2652object *instantiate (archetype *arch)
2653 CODE:
2654 RETVAL = arch_to_object (arch);
2655 OUTPUT:
2656 RETVAL
2657
2658INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2789INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2659 2790
2660MODULE = cf PACKAGE = cf::party 2791MODULE = cf PACKAGE = cf::party
2661 2792
2662partylist *first () 2793partylist *first ()
2663 PROTOTYPE: 2794 PROTOTYPE:
2664 CODE: 2795 CODE:
2665 RETVAL = get_firstparty (); 2796 RETVAL = get_firstparty ();
2666 OUTPUT: RETVAL 2797 OUTPUT: RETVAL
2667 2798
2668INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2799INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2669 2800
2670MODULE = cf PACKAGE = cf::region 2801MODULE = cf PACKAGE = cf::region
2671 2802
2672void 2803void
2673list () 2804list ()
… …
2679 PROTOTYPE: $ 2810 PROTOTYPE: $
2680 CODE: 2811 CODE:
2681 RETVAL = region::find (name); 2812 RETVAL = region::find (name);
2682 OUTPUT: RETVAL 2813 OUTPUT: RETVAL
2683 2814
2684region *find_fuzzy (utf8_string name)
2685 PROTOTYPE: $
2686 CODE:
2687 RETVAL = region::find_fuzzy (name);
2688 OUTPUT: RETVAL
2689
2690int specificity (region *rgn) 2815int specificity (region *rgn)
2691 CODE: 2816 CODE:
2692 RETVAL = 0; 2817 RETVAL = 0;
2693 while (rgn = rgn->parent) 2818 while (rgn = rgn->parent)
2694 RETVAL++; 2819 RETVAL++;
2695 OUTPUT: RETVAL 2820 OUTPUT: RETVAL
2696 2821
2697INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2822INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2698 2823
2699MODULE = cf PACKAGE = cf::living 2824MODULE = cf PACKAGE = cf::living
2700 2825
2701INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2826INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2702 2827
2703MODULE = cf PACKAGE = cf::settings 2828MODULE = cf PACKAGE = cf::settings
2704 2829
2705INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2830INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2706 2831
2707MODULE = cf PACKAGE = cf::client 2832MODULE = cf PACKAGE = cf::client
2708 2833
2709INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2834INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2710 2835
2711int invoke (client *ns, int event, ...) 2836int invoke (client *ns, int event, ...)
2712 CODE: 2837 CODE:
2713 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2838 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2714 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2839 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2780 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2905 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2781 old_sound_index [idx] = face; 2906 old_sound_index [idx] = face;
2782 2907
2783MODULE = cf PACKAGE = cf::face PREFIX = face_ 2908MODULE = cf PACKAGE = cf::face PREFIX = face_
2784 2909
2785#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2910#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2786 2911
2787faceidx face_find (utf8_string name, faceidx defidx = 0) 2912faceidx face_find (utf8_string name, faceidx defidx = 0)
2788 2913
2789faceidx alloc (utf8_string name) 2914faceidx alloc (utf8_string name)
2790 CODE: 2915 CODE:
… …
2828 faceinfo *f = face_info (idx); assert (f); 2953 faceinfo *f = face_info (idx); assert (f);
2829 facedata *d = &(faceset ? f->data64 : f->data32); 2954 facedata *d = &(faceset ? f->data64 : f->data32);
2830 sv_to (data, d->data); 2955 sv_to (data, d->data);
2831 STRLEN clen; 2956 STRLEN clen;
2832 char *cdata = SvPVbyte (chksum, clen); 2957 char *cdata = SvPVbyte (chksum, clen);
2833 clen = min (CHKSUM_SIZE, clen); 2958 clen = min (CHKSUM_MAXLEN, clen);
2834 2959
2960 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2961
2835 if (memcmp (d->chksum, cdata, clen)) 2962 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2836 { 2963 {
2964 d->chksum_len = clen;
2837 memcpy (d->chksum, cdata, clen); 2965 memcpy (d->chksum, cdata, clen);
2838 2966
2839 // invalidate existing client face info 2967 // invalidate existing client face info
2840 for_all_clients (ns) 2968 for_all_clients (ns)
2841 if (ns->faceset == faceset) 2969 if (ns->faceset == faceset)
… …
2856 2984
2857SV *get_chksum (faceidx idx, int faceset = 0) 2985SV *get_chksum (faceidx idx, int faceset = 0)
2858 CODE: 2986 CODE:
2859 facedata *d = face_data (idx, faceset); 2987 facedata *d = face_data (idx, faceset);
2860 if (!d) XSRETURN_UNDEF; 2988 if (!d) XSRETURN_UNDEF;
2861 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2989 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2862 OUTPUT: 2990 OUTPUT:
2863 RETVAL 2991 RETVAL
2864 2992
2865SV *get_data (faceidx idx, int faceset = 0) 2993SV *get_data (faceidx idx, int faceset = 0)
2866 CODE: 2994 CODE:
… …
2886 ns->force_newmap = true; 3014 ns->force_newmap = true;
2887 } 3015 }
2888 3016
2889MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 3017MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2890 3018
2891#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 3019#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2892 3020
2893animidx anim_find (utf8_string name) 3021animidx anim_find (utf8_string name)
2894 CODE: 3022 CODE:
2895 RETVAL = animation::find (name).number; 3023 RETVAL = animation::find (name).number;
2896 OUTPUT: RETVAL 3024 OUTPUT: RETVAL
… …
2911 } 3039 }
2912 else 3040 else
2913 anim = &animation::create (name, av_len (av) + 1, facings); 3041 anim = &animation::create (name, av_len (av) + 1, facings);
2914 3042
2915 for (int i = 0; i < anim->num_animations; ++i) 3043 for (int i = 0; i < anim->num_animations; ++i)
2916 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3044 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2917} 3045}
2918 OUTPUT: RETVAL 3046 OUTPUT: RETVAL
2919 3047
2920void invalidate_all () 3048void invalidate_all ()
2921 CODE: 3049 CODE:
2922 for_all_clients (ns) 3050 for_all_clients (ns)
2923 ns->anims_sent.reset (); 3051 ns->anims_sent.reset ();
2924 3052
2925MODULE = cf PACKAGE = cf::object::freezer 3053MODULE = cf PACKAGE = cf::object::freezer
2926 3054
2927INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 3055INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2928 3056
2929SV * 3057SV *
2930new (char *klass) 3058new (char *klass)
2931 CODE: 3059 CODE:
2932 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 3060 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2939 sv_to (sv, self); 3067 sv_to (sv, self);
2940 delete self; 3068 delete self;
2941 3069
2942MODULE = cf PACKAGE = cf::object::thawer 3070MODULE = cf PACKAGE = cf::object::thawer
2943 3071
2944INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 3072INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
2945 3073
2946SV * 3074SV *
2947new_from_file (char *klass, octet_string path) 3075new_from_file (char *klass, octet_string path)
2948 CODE: 3076 CODE:
2949 object_thawer *f = new object_thawer (path); 3077 object_thawer *f = new object_thawer (path);

Diff Legend

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