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.281 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.365 by root, Sun Apr 11 04:09:56 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"
25 24
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#if HAVE_EXECINFO_H 25#if HAVE_EXECINFO_H
30# include <execinfo.h> 26# include <execinfo.h>
31#endif 27#endif
32 28
33#include <cstdarg> 29#include <cstdarg>
30#include <typeinfo>
34 31
35#include "global.h" 32#include "global.h"
36#include "loader.h"
37#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
38#include "evthread.h" 34#include "evthread.h"
39#include "sproto.h" 35#include "sproto.h"
40 36
41#include <unistd.h> 37#include <unistd.h>
… …
73static int tick_pending; 69static int tick_pending;
74 70
75global gbl_ev; 71global gbl_ev;
76static 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;
77static 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;
78 75
79bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
80bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
81 78
82static HV 79static HV
83 *stash_cf, 80 *stash_cf,
84 *stash_cf_object_wrap, 81 *stash_cf_object_wrap,
85 *stash_cf_object_player_wrap, 82 *stash_cf_object_player_wrap,
86 *stash_cf_player_wrap, 83 *stash_cf_player_wrap,
87 *stash_cf_map_wrap, 84 *stash_cf_map_wrap,
85 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 86 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
93 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
94static inline SV * 100static SV *
95newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
96{ 102{
97 if (!s) 103 if (!s)
98 return newSV (0); 104 return newSV (0);
99 105
100 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
101 SvUTF8_on (sv); 107 SvUTF8_on (sv);
102 return sv; 108 return sv;
103} 109}
110#endif
104 111
112#ifndef newSVpvn_utf8
105static inline SV * 113static SV *
106newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
107{ 115{
108 if (!s) 116 if (!s)
109 return newSV (0); 117 return newSV (0);
110 118
111 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
112 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
113 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);
114} 142}
115 143
116// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
117template<class super> 145template<class super>
118static super * 146static super *
… …
152 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
153 hv_clear (self); 181 hv_clear (self);
154 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
155 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
156 184
157 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
158 assert (!this->self); 186 assert (!this->self);
159 } 187 }
160} 188}
161 189
162void 190void
… …
196attachable::destroy () 224attachable::destroy ()
197{ 225{
198 if (destroyed ()) 226 if (destroyed ())
199 return; 227 return;
200 228
201 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
202 do_destroy (); 230 do_destroy ();
203 sever_self (); 231 sever_self ();
204} 232}
205 233
206void 234void
… …
280 308
281 attach = src.attach; 309 attach = src.attach;
282 return *this; 310 return *this;
283} 311}
284 312
313#if 0
285template<typename T> 314template<typename T>
286static bool 315static bool
287find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
288{ 317{
289 char *s = (char *)obj; 318 char *s = (char *)obj;
… …
297 326
298 return false; 327 return false;
299} 328}
300 329
301// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
302void 331static void
303find_backref (void *ptr) 332find_backref (void *ptr)
304{ 333{
305 for_all_objects (op) 334 for_all_objects (op)
306 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
307 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);
… …
311 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
312 341
313 for_all_clients (ns) 342 for_all_clients (ns)
314 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
315 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
316
317} 345}
346#endif
318 347
319////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
320 349
321static SV * 350static SV *
322newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
375 404
376 return sv; 405 return sv;
377 } 406 }
378} 407}
379 408
409#if 0 // unused
380static void 410static void
381clearSVptr (SV *sv) 411clearSVptr (SV *sv)
382{ 412{
383 if (SvROK (sv)) 413 if (SvROK (sv))
384 sv = SvRV (sv); 414 sv = SvRV (sv);
385 415
386 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
387 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
388} 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}
389 435
390static long 436static long
391SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
392{ 438{
393 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
394 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
395 441
396 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
397
398 if (!mg)
399 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
400
401 return (long)mg->mg_ptr;
402} 443}
403 444
404static long 445static long noinline
405SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
406{ 447{
407 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
408 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
409 else
410 return 0;
411} 451}
412 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
413inline 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); }
414inline 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); }
415inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
416inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
417inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
418inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
419inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
420inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
421inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
422inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
423inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
424inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
425inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
426inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
427inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432inline 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); }
433inline 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); }
434inline 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); }
435inline 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); }
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
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
445inline 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; }
446inline 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; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
449inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
450inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
451inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
452inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
453inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
454inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
455inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
456inline 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); }
457inline 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); }
458inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
459inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
460inline 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); }
461inline 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); }
462inline 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); }
463inline 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"); }
464inline 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"); }
465inline 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"); }
466inline 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"); }
467inline 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"); }
468inline 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"); }
469inline 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"); }
470inline 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" ); }
471 575
472//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)]; }
473inline 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)); }
474 578
475template<class T> 579template<class T>
476inline 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; }
477 581
478template<int N> 582template<int N>
479inline 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)); }
480 584
481inline 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); }
482inline 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); }
483inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
484inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
485 589
486inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
487{ 591{
488 STRLEN len; 592 STRLEN len;
489 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
490 v.assign (data, len); 594 v.assign (data, len);
491} 595}
492 596
493inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
494{ 598{
495 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
496 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
497} 601}
498 602
499inline 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); }
500 604
501static SV * 605static SV *
502newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
503{ 607{
504 SV *sv; 608 SV *sv;
… …
578 va_end (ap); 682 va_end (ap);
579 683
580 return sv; 684 return sv;
581} 685}
582 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
583////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
584 712
585SV * 713static SV *
586registry (attachable *ext) 714registry (attachable *ext)
587{ 715{
588 if (!ext->cb) 716 if (!ext->cb)
589 ext->cb = newAV (); 717 ext->cb = newAV ();
590 718
… …
604 732
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 733 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 734
607 const char *argv[] = { 735 const char *argv[] = {
608 settings.argv [0], 736 settings.argv [0],
609 "-e" 737 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 738 };
615 739
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 740 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 741 || perl_run (perl))
618 { 742 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 743 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 744 exit (EXIT_FAILURE);
621 } 745 }
622 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))
623 { 758 {
624 dSP; 759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 760 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 761 }
630} 762}
631 763
764void
632void cfperl_main () 765cfperl_main ()
633{ 766{
634 dSP; 767 dSP;
635 768
636 PUSHMARK (SP); 769 PUSHMARK (SP);
637 PUTBACK; 770 PUTBACK;
… …
662# undef def 795# undef def
663}; 796};
664 797
665#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)
666 799
667static void 800static void noinline
668gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
669{ 802{
670 // event must be in array 803 // event must be in array
671 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
672 { 805 {
… …
758{ 891{
759 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
760 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
761} 894}
762 895
763void 896static void noinline
764_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
765{ 898{
766 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
767 { 900 {
768 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
… …
778 } 911 }
779 } 912 }
780} 913}
781 914
782// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
783void 916static void
784_recalc_want () 917_recalc_want ()
785{ 918{
786 ev_want_event.reset (); 919 ev_want_event.reset ();
787 920
788 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
… …
861 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
862 } 995 }
863 996
864 va_end (ap); 997 va_end (ap);
865 998
866 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
867 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
868 1001
869 CALL_END; 1002 CALL_END;
870 1003
871 return count; 1004 return count;
872} 1005}
873 1006
874SV * 1007static SV *
875cfperl_result (int idx) 1008cfperl_result (int idx)
876{ 1009{
877 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
878 if (!av) 1011 if (!av)
879 return &PL_sv_undef; 1012 return &PL_sv_undef;
… …
898} 1031}
899 1032
900///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
901// various c++ => perl glue functions 1034// various c++ => perl glue functions
902 1035
1036void
903void cfperl_tick () 1037cfperl_tick ()
904{ 1038{
905 tick_pending = 1; 1039 tick_pending = 1;
906 1040
907 if (tick_inhibit) 1041 if (tick_inhibit)
908 return; 1042 return;
… …
911 1045
912 dSP; 1046 dSP;
913 1047
914 PUSHMARK (SP); 1048 PUSHMARK (SP);
915 PUTBACK; 1049 PUTBACK;
916 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
917 1051
918 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);
919} 1053}
920 1054
921void 1055void
… …
944 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
945 CALL_END; 1079 CALL_END;
946} 1080}
947 1081
948void 1082void
949cfperl_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)
950{ 1084{
951 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
952 CALL_ARG (ns); 1086 CALL_ARG (ns);
953 CALL_ARG (type); 1087 CALL_ARG (type);
954 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
955 CALL_ARG (color); 1089 CALL_ARG (color);
956 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
957 CALL_END; 1091 CALL_END;
958} 1092}
959 1093
960int 1094int
961cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
… …
963 int can; 1097 int can;
964 1098
965 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
966 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
967 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
968 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
969 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
970 CALL_END; 1104 CALL_END;
971 1105
972 return can; 1106 return can;
973} 1107}
974 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
975player * 1121player *
976player::find (const char *name) 1122player::find (const_utf8_string name)
977{ 1123{
978 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
979 CALL_ARG (name); 1125 CALL_ARG (name);
980 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
981 1127
982 player *retval; 1128 player *retval = 0;
983
984 if (count)
985 sv_to (POPs, retval); 1129 if (count) sv_to (POPs, retval);
986 else
987 retval = 0;
988 1130
989 CALL_END; 1131 CALL_END;
990 1132
991 return retval; 1133 return retval;
992} 1134}
993 1135
994maptile * 1136maptile *
1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1138{
1139 CALL_BEGIN (3);
1140 CALL_ARG (dirname);
1141 CALL_ARG (stylename);
1142 CALL_ARG (difficulty);
1143 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1144
1145 maptile *retval = 0;
1146 if (count) sv_to (POPs, retval);
1147
1148 CALL_END;
1149
1150 return retval;
1151}
1152
1153maptile *
995maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
996{ 1155{
997 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
998 CALL_ARG (path); 1157 CALL_ARG (path);
999 CALL_ARG (origin); 1158 CALL_ARG (origin);
1000 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1001 1160
1002 maptile *retval; 1161 maptile *retval = 0;
1003
1004 if (count)
1005 sv_to (POPs, retval); 1162 if (count) sv_to (POPs, retval);
1006 else
1007 retval = 0;
1008 1163
1009 CALL_END; 1164 CALL_END;
1010 1165
1011 return retval; 1166 return retval;
1012} 1167}
1013 1168
1014maptile * 1169maptile *
1015maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1016{ 1171{
1017 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1018 CALL_ARG (path); 1173 CALL_ARG (path);
1019 CALL_ARG (origin); 1174 CALL_ARG (origin);
1020 CALL_ARG (load); 1175 CALL_ARG (load);
1021 CALL_CALL ("cf::map::find_async", G_SCALAR); 1176 CALL_CALL ("cf::map::find_async", G_SCALAR);
1022 1177
1023 maptile *retval; 1178 maptile *retval = 0;
1024
1025 if (count)
1026 sv_to (POPs, retval); 1179 if (count) sv_to (POPs, retval);
1027 else
1028 retval = 0;
1029 1180
1030 CALL_END; 1181 CALL_END;
1031 1182
1032 return retval; 1183 return retval;
1033} 1184}
… …
1036maptile::do_load_sync () 1187maptile::do_load_sync ()
1037{ 1188{
1038 CALL_BEGIN (1); 1189 CALL_BEGIN (1);
1039 CALL_ARG (this); 1190 CALL_ARG (this);
1040 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1191 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1041 CALL_END;
1042}
1043
1044void
1045maptile::change_all_map_light (int change)
1046{
1047 CALL_BEGIN (1);
1048 CALL_ARG (change);
1049 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1050 CALL_END; 1192 CALL_END;
1051} 1193}
1052 1194
1053void 1195void
1054object::enter_exit (object *exit) 1196object::enter_exit (object *exit)
… …
1061 CALL_ARG (exit); 1203 CALL_ARG (exit);
1062 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1063 CALL_END; 1205 CALL_END;
1064} 1206}
1065 1207
1066const char * 1208void
1209object::player_goto (const_utf8_string path, int x, int y)
1210{
1211 if (type != PLAYER)
1212 return;
1213
1214 CALL_BEGIN (4);
1215 CALL_ARG (this);
1216 CALL_ARG (path);
1217 CALL_ARG (x);
1218 CALL_ARG (y);
1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1220 CALL_END;
1221}
1222
1223const_utf8_string
1067object::ref () const 1224object::ref () const
1068{ 1225{
1069 if (type == PLAYER) 1226 if (type == PLAYER)
1070 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);
1071 else 1228 else
1229 // TODO: should be able to save references within the same map, at least
1072 return 0; 1230 return 0;
1073} 1231}
1074 1232
1075object * 1233object *
1076object::deref (const char *ref) 1234object::deref (const_utf8_string ref)
1077{ 1235{
1078 object *retval = 0; 1236 object *retval = 0;
1079 1237
1080 if (ref) 1238 if (ref)
1081 { 1239 {
… …
1091 1249
1092 return retval; 1250 return retval;
1093} 1251}
1094 1252
1095void 1253void
1096log_backtrace (const char *msg) 1254log_backtrace (const_utf8_string msg)
1097{ 1255{
1098#if HAVE_BACKTRACE 1256#if HAVE_BACKTRACE
1099 void *addr [20]; 1257 void *addr [20];
1100 int size = backtrace (addr, 20); 1258 int size = backtrace (addr, 20);
1101 1259
… …
1106 CALL_CALL ("cf::_log_backtrace", G_VOID); 1264 CALL_CALL ("cf::_log_backtrace", G_VOID);
1107 CALL_END; 1265 CALL_END;
1108#endif 1266#endif
1109} 1267}
1110 1268
1269bool
1270is_match_expr (const_utf8_string expr)
1271{
1272 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1273}
1274
1275bool
1276match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1277{
1278 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1279 expr += sizeof ("match ") - 1;
1280
1281 CALL_BEGIN (5);
1282 CALL_ARG (expr);
1283 CALL_ARG (ob);
1284 CALL_ARG (self);
1285 CALL_ARG (source);
1286 CALL_ARG (originator);
1287 CALL_CALL (cv_cf_match_match, G_SCALAR);
1288
1289 bool matched = count && SvTRUE (TOPs);
1290
1291 CALL_END;
1292
1293 return matched;
1294}
1295
1296object *
1297match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1298{
1299 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1300 expr += sizeof ("match ") - 1;
1301
1302 CALL_BEGIN (5);
1303 CALL_ARG (expr);
1304 CALL_ARG (ob);
1305 CALL_ARG (self);
1306 CALL_ARG (source);
1307 CALL_ARG (originator);
1308 CALL_CALL (cv_cf_match_match, G_ARRAY);
1309
1310 object *one = 0;
1311
1312 if (count)
1313 sv_to (TOPs, one);
1314
1315 CALL_END;
1316
1317 return one;
1318}
1319
1111///////////////////////////////////////////////////////////////////////////// 1320/////////////////////////////////////////////////////////////////////////////
1112 1321
1113struct EVAPI *evapi::GEVAPI; 1322struct EVAPI *evapi::GEVAPI;
1114struct CoroAPI *coroapi::GCoroAPI; 1323struct CoroAPI *coroapi::GCoroAPI;
1115 1324
1325void
1116void coroapi::do_cede_to_tick () 1326coroapi::do_cede_to_tick ()
1117{ 1327{
1118 cede_pending = 0; 1328 cede_pending = 0;
1119 cede (); 1329 cede ();
1120} 1330}
1121 1331
… …
1145 ev_io_set ((ev_io *)this, fd, events); 1355 ev_io_set ((ev_io *)this, fd, events);
1146 if (active) start (); 1356 if (active) start ();
1147 } 1357 }
1148} 1358}
1149 1359
1150void 1360static void
1151_connect_to_perl () 1361_connect_to_perl_1 ()
1152{ 1362{
1153 stash_cf = gv_stashpv ("cf", 1); 1363 stash_cf = gv_stashpv ("cf", 1);
1154 1364
1155 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1365 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1156 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1366 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1157 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1367 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1158 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1368 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1369 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1159 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1370 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1160 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1371 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1161 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1372 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1162 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1373 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1163 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1374 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1174 cb_client = get_av ("cf::CB_CLIENT", 1); 1385 cb_client = get_av ("cf::CB_CLIENT", 1);
1175 cb_type = get_av ("cf::CB_TYPE" , 1); 1386 cb_type = get_av ("cf::CB_TYPE" , 1);
1176 cb_map = get_av ("cf::CB_MAP" , 1); 1387 cb_map = get_av ("cf::CB_MAP" , 1);
1177} 1388}
1178 1389
1390static void
1391_connect_to_perl_2 ()
1392{
1393 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1394 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1395 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1396 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1397 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1398}
1399
1179MODULE = cf PACKAGE = cf PREFIX = cf_ 1400MODULE = cf PACKAGE = cf PREFIX = cf_
1180 1401
1181BOOT: 1402BOOT:
1182{ 1403{
1183 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1404 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1184 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1405 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1185 1406
1186 _connect_to_perl (); 1407 _connect_to_perl_1 ();
1187 1408
1188 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1409 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1189 1410
1190 //{ 1411 //{
1191 // require_pv ("Time::HiRes"); 1412 // require_pv ("Time::HiRes");
… …
1199 static const struct { 1420 static const struct {
1200 const char *name; 1421 const char *name;
1201 IV iv; 1422 IV iv;
1202 } *civ, const_iv[] = { 1423 } *civ, const_iv[] = {
1203# define const_iv(name) { # name, (IV)name }, 1424# define const_iv(name) { # name, (IV)name },
1425# include "const_iv.h"
1426# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1427# include "attackinc.h"
1428# undef def
1429# define def(uc, flags) const_iv (SK_ ## uc)
1430# include "skillinc.h"
1431# undef def
1432
1204 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1433 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1205 const_iv (logBacktrace) 1434 const_iv (logBacktrace)
1206 1435
1207 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1436 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1208 1437
1209 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1438 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1210 1439
1211 const_iv (MAX_TIME) 1440 const_iv (MAX_TIME)
1212 const_iv (MAXSOCKBUF) 1441 const_iv (MAXSOCKBUF)
1213 1442
1214 const_iv (NUM_BODY_LOCATIONS)
1215 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1216 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1217 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1218 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1219 const_iv (body_wrist) const_iv (body_waist)
1220
1221 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1222 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1223 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1224 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1225 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1226 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1227 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1228 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1229 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1230 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1231 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1232 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1233 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1234 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1235 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1236 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1237 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1238 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1239 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1240 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1241 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1242 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1243 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1244 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1245 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1246 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1247 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1248 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1249
1250 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1251
1252 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1253 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1254
1255 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1256 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1257 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1258 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1259 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1260 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1261 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1262
1263 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1264 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1265 const_iv (WEAP_BLUD)
1266
1267 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1268 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1269 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1270 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1271 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1272 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1273 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1274 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1275 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1276 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1277 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1278 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1279 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1280 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1281 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1282 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1283 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1284 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1285 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1286 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1287 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1288 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK)
1289 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1290 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1291 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1292 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1293
1294 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1295 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1296 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1297 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1298 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1299 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR)
1300
1301 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1443 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1302 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1444 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1303 1445
1304 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1446 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1305
1306 const_iv (SP_RAISE_DEAD)
1307 const_iv (SP_RUNE)
1308 const_iv (SP_MAKE_MARK)
1309 const_iv (SP_BOLT)
1310 const_iv (SP_BULLET)
1311 const_iv (SP_EXPLOSION)
1312 const_iv (SP_CONE)
1313 const_iv (SP_BOMB)
1314 const_iv (SP_WONDER)
1315 const_iv (SP_SMITE)
1316 const_iv (SP_MAGIC_MISSILE)
1317 const_iv (SP_SUMMON_GOLEM)
1318 const_iv (SP_DIMENSION_DOOR)
1319 const_iv (SP_MAGIC_MAPPING)
1320 const_iv (SP_MAGIC_WALL)
1321 const_iv (SP_DESTRUCTION)
1322 const_iv (SP_PERCEIVE_SELF)
1323 const_iv (SP_WORD_OF_RECALL)
1324 const_iv (SP_INVISIBLE)
1325 const_iv (SP_PROBE)
1326 const_iv (SP_HEALING)
1327 const_iv (SP_CREATE_FOOD)
1328 const_iv (SP_EARTH_TO_DUST)
1329 const_iv (SP_CHANGE_ABILITY)
1330 const_iv (SP_BLESS)
1331 const_iv (SP_CURSE)
1332 const_iv (SP_SUMMON_MONSTER)
1333 const_iv (SP_CHARGING)
1334 const_iv (SP_POLYMORPH)
1335 const_iv (SP_ALCHEMY)
1336 const_iv (SP_REMOVE_CURSE)
1337 const_iv (SP_IDENTIFY)
1338 const_iv (SP_DETECTION)
1339 const_iv (SP_MOOD_CHANGE)
1340 const_iv (SP_MOVING_BALL)
1341 const_iv (SP_SWARM)
1342 const_iv (SP_CHANGE_MANA)
1343 const_iv (SP_DISPEL_RUNE)
1344 const_iv (SP_CREATE_MISSILE)
1345 const_iv (SP_CONSECRATE)
1346 const_iv (SP_ANIMATE_WEAPON)
1347 const_iv (SP_LIGHT)
1348 const_iv (SP_CHANGE_MAP_LIGHT)
1349 const_iv (SP_FAERY_FIRE)
1350 const_iv (SP_CAUSE_DISEASE)
1351 const_iv (SP_AURA)
1352 const_iv (SP_TOWN_PORTAL)
1353 const_iv (SP_PARTY_SPELL)
1354 1447
1355 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1448 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1356 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1449 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1357 const_iv (F_LOCKED) 1450 const_iv (F_LOCKED)
1358 1451
1359 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1360
1361 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1452 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1362 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1453 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1363 1454
1364 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1365
1366 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1367 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1368
1369 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1370 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1371
1372 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1455 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1373
1374 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1375 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1376 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1377 const_iv (M_ICE) const_iv (M_SPECIAL)
1378 1456
1379 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1457 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1380 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1458 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1381 1459
1382 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1383 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1384 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1385 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1386 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1387 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1388 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1389 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1390 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1391 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1392 const_iv (SK_POISON_NAIL)
1393
1394 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1395 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1396 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1397 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1398 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1399 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1400
1401 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1402
1403 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1404 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1405 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1406 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1407 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1408 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1409 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1410
1411 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1460 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1412 const_iv (MAP_INACTIVE) 1461 const_iv (MAP_INACTIVE)
1413 1462
1414 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1463 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1415 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1464 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1416 1465
1417 const_iv (VERSION_CS) const_iv (VERSION_SC)
1418
1419 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1466 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1420 1467
1421 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1422
1423 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1468 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1424
1425 // random map generator
1426 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1427 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1428
1429 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1430 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1431 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1432
1433 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1434 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1435
1436 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1437 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1438
1439 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1440 const_iv (FT_RSRC) const_iv (FT_NUM)
1441 }; 1469 };
1442 1470
1443 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1471 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1444 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1472 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1445 1473
… …
1462 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1490 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1463 av_push (event, newSViv (eiv->klass)); 1491 av_push (event, newSViv (eiv->klass));
1464 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1492 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1465 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1493 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1466 } 1494 }
1467}
1468 1495
1496 // used by autogenerated BOOT sections from genacc
1497 av_reflect = get_av ("cf::REFLECT", 1);
1498}
1499
1500void _gv_clear (SV *gv)
1501 CODE:
1502 assert (SvTYPE (gv) == SVt_PVGV);
1503# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1504 f (GvGP (gv)->gp_form);
1505 f (GvGP (gv)->gp_io);
1506 f (GvGP (gv)->gp_sv);
1507 f (GvGP (gv)->gp_av);
1508 f (GvGP (gv)->gp_hv);
1509 f (GvGP (gv)->gp_cv);
1510 GvCVGEN (gv) = 0;
1511 GvMULTI_off (gv);
1512# undef f
1513
1469void _connect_to_perl () 1514void _connect_to_perl_1 ()
1515
1516void _connect_to_perl_2 ()
1470 1517
1471void _recalc_want () 1518void _recalc_want ()
1472 1519
1520# not used by default anymore
1473void _global_reattach () 1521void _global_reattach ()
1474 CODE: 1522 CODE:
1475{ 1523{
1476 // reattach to all attachable objects in the game. 1524 // reattach to all attachable objects in the game.
1477 for_all_clients (ns) 1525 for_all_clients (ns)
… …
1521 } 1569 }
1522 1570
1523 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1571 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1524} 1572}
1525 1573
1574void init_anim ()
1575
1576void init_globals ()
1577
1578void init_experience ()
1579
1580void init_attackmess ()
1581
1582void init_dynamic ()
1583
1584void load_settings ()
1585
1586void load_materials ()
1587
1588void init_uuid ()
1589 CODE:
1590 UUID::init ();
1591
1592void init_signals ()
1593
1594void init_skills ()
1595
1596void init_beforeplay ()
1597
1526void evthread_start (int aiofd) 1598void evthread_start (int aiofd)
1527 1599
1528void cede_to_tick () 1600void cede_to_tick ()
1529 CODE: 1601 CODE:
1530 coroapi::cede_to_tick (); 1602 coroapi::cede_to_tick ();
… …
1555 } 1627 }
1556 1628
1557void server_tick () 1629void server_tick ()
1558 CODE: 1630 CODE:
1559{ 1631{
1632 ev_now_update (EV_DEFAULT);
1560 NOW = ev_now (EV_DEFAULT); 1633 NOW = ev_now (EV_DEFAULT);
1561 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1634 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1562 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1635 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1563 runtime = SvNVX (sv_runtime); 1636 runtime = SvNVX (sv_runtime);
1564 1637
1565 server_tick (); 1638 server_tick ();
1566 1639
1567 NOW = ev_time (); 1640 ev_now_update (EV_DEFAULT);
1641 NOW = ev_now (EV_DEFAULT);
1568 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1642 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1569 runtime += TICK; 1643 runtime += TICK;
1570 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1644 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1571} 1645}
1572 1646
1573NV floor (NV x) 1647NV floor (NV x)
1574 1648
1575NV ceil (NV x) 1649NV ceil (NV x)
1576 1650
1577NV rndm (...) 1651NV rndm (...)
1652 ALIAS:
1653 rmg_rndm = 1
1578 CODE: 1654 CODE:
1655{
1656 rand_gen &gen = ix ? rmg_rndm : rndm;
1579 switch (items) 1657 switch (items)
1580 { 1658 {
1581 case 0: RETVAL = rndm (); break; 1659 case 0: RETVAL = gen (); break;
1582 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1660 case 1: RETVAL = gen (SvUV (ST (0))); break;
1583 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1661 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1584 default: croak ("cf::rndm requires none, one or two parameters."); break; 1662 default: croak ("cf::rndm requires none, one or two parameters."); break;
1585 } 1663 }
1664}
1586 OUTPUT: 1665 OUTPUT:
1587 RETVAL 1666 RETVAL
1588 1667
1589NV clamp (NV value, NV min_value, NV max_value) 1668NV clamp (NV value, NV min_value, NV max_value)
1590 CODE: 1669 CODE:
… …
1595NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1674NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1596 CODE: 1675 CODE:
1597 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1676 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1598 OUTPUT: 1677 OUTPUT:
1599 RETVAL 1678 RETVAL
1679
1680const char *ordinal (int i)
1600 1681
1601void weaken (...) 1682void weaken (...)
1602 PROTOTYPE: @ 1683 PROTOTYPE: @
1603 CODE: 1684 CODE:
1604 while (items > 0) 1685 while (items > 0)
… …
1662#if _POSIX_MEMLOCK 1743#if _POSIX_MEMLOCK
1663 1744
1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1745int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1665 INIT: 1746 INIT:
1666#if __GLIBC__ 1747#if __GLIBC__
1748 mallopt (M_TOP_PAD, 1024 * 1024);
1749 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1750 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1667 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1751 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1668#endif 1752#endif
1669 1753
1670int munlockall () 1754int munlockall ()
1671 1755
… …
1690 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1774 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1691 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1775 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1692 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1776 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1693 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1777 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1694#endif 1778#endif
1695 EXTEND (SP, 2*2); 1779 EXTEND (SP, 5*2);
1696 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1780 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1697 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1781 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1782 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1783 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1784 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1698} 1785}
1699 1786
1700int find_animation (utf8_string text) 1787int find_animation (utf8_string text)
1701 PROTOTYPE: $ 1788 PROTOTYPE: $
1702 1789
… …
1786 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i])))); 1873 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1787 1874
1788bool 1875bool
1789load_resource_file_ (octet_string filename) 1876load_resource_file_ (octet_string filename)
1790 1877
1878void
1879fix_weight ()
1880
1791MODULE = cf PACKAGE = cf::attachable 1881MODULE = cf PACKAGE = cf::attachable
1792 1882
1793int 1883int
1794valid (SV *obj) 1884valid (SV *obj)
1795 CODE: 1885 CODE:
… …
1798 RETVAL 1888 RETVAL
1799 1889
1800void 1890void
1801debug_trace (attachable *obj, bool on = true) 1891debug_trace (attachable *obj, bool on = true)
1802 CODE: 1892 CODE:
1803 obj->flags &= ~attachable::F_DEBUG_TRACE; 1893 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1804 if (on) 1894 if (on)
1805 obj->flags |= attachable::F_DEBUG_TRACE; 1895 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1806 1896
1807int mortals_size () 1897int mortals_size ()
1808 CODE: 1898 CODE:
1809 RETVAL = attachable::mortals.size (); 1899 RETVAL = attachable::mortals.size ();
1810 OUTPUT: RETVAL 1900 OUTPUT: RETVAL
… …
1812#object *mortals (U32 index) 1902#object *mortals (U32 index)
1813# CODE: 1903# CODE:
1814# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1904# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1815# OUTPUT: RETVAL 1905# OUTPUT: RETVAL
1816 1906
1817INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1907INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1818 1908
1819MODULE = cf PACKAGE = cf::global 1909MODULE = cf PACKAGE = cf::global
1820 1910
1821int invoke (SV *klass, int event, ...) 1911int invoke (SV *klass, int event, ...)
1822 CODE: 1912 CODE:
… …
1826 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1916 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1827 OUTPUT: RETVAL 1917 OUTPUT: RETVAL
1828 1918
1829MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1919MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1830 1920
1831INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1921INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1832 1922
1833int invoke (object *op, int event, ...) 1923int invoke (object *op, int event, ...)
1834 CODE: 1924 CODE:
1835 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1925 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1836 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1926 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1858object *actives (U32 index) 1948object *actives (U32 index)
1859 CODE: 1949 CODE:
1860 RETVAL = index < actives.size () ? actives [index] : 0; 1950 RETVAL = index < actives.size () ? actives [index] : 0;
1861 OUTPUT: RETVAL 1951 OUTPUT: RETVAL
1862 1952
1953int mortals_size ()
1954 CODE:
1955 RETVAL = attachable::mortals.size ();
1956 OUTPUT: RETVAL
1957
1863const char *slot_use_name (U32 slot) 1958const_utf8_string slot_use_name (U32 slot)
1864 ALIAS: 1959 ALIAS:
1865 slot_nonuse_name = 1 1960 slot_nonuse_name = 1
1866 CODE: 1961 CODE:
1867{ 1962{
1868 if (slot >= NUM_BODY_LOCATIONS) 1963 if (slot >= NUM_BODY_LOCATIONS)
… …
1932 2027
1933int apply_shop_mat (object *shop_mat, object *op); 2028int apply_shop_mat (object *shop_mat, object *op);
1934 2029
1935int move (object *op, int dir, object *originator = op) 2030int move (object *op, int dir, object *originator = op)
1936 CODE: 2031 CODE:
1937 RETVAL = move_ob (op, dir, originator); 2032 RETVAL = op->move (dir, originator);
1938 OUTPUT: 2033 OUTPUT:
1939 RETVAL 2034 RETVAL
1940 2035
1941void apply (object *applier, object *applied, int flags = 0)
1942 CODE:
1943 manual_apply (applied, applier, flags);
1944
1945void apply_below (object *op) 2036void apply_below (object *op)
1946 CODE: 2037 CODE:
1947 player_apply_below (op); 2038 player_apply_below (op);
1948 2039
1949int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2040int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1950 2041
1951#//TODO 2042int casting_level (object *caster, object *spell)
1952object *clone_ (object *op, int recursive = 0)
1953 CODE:
1954 if (recursive)
1955 RETVAL = object_create_clone (op);
1956 else
1957 {
1958 RETVAL = object::create ();
1959 op->copy_to (RETVAL);
1960 }
1961 OUTPUT: RETVAL
1962 2043
1963int pay_item (object *op, object *buyer) 2044int pay_item (object *op, object *buyer)
1964 CODE: 2045 CODE:
1965 RETVAL = pay_for_item (op, buyer); 2046 RETVAL = pay_for_item (op, buyer);
1966 OUTPUT: RETVAL 2047 OUTPUT: RETVAL
… …
2009 2090
2010void player_lvl_adj (object *who, object *skill = 0) 2091void player_lvl_adj (object *who, object *skill = 0)
2011 2092
2012int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2093int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2013 2094
2014int calc_skill_exp (object *who, object *op, object *skill); 2095int calc_skill_exp (object *who, object *op, object *skill)
2015 2096
2016void push_button (object *op); 2097void push_button (object *op, object *originator)
2017 2098
2018void use_trigger (object *op); 2099void use_trigger (object *op, object *originator)
2019 2100
2020void add_button_link (object *button, maptile *map, int connected);
2021
2022void remove_button_link (object *op);
2023
2024void handle_apply_yield (object *op); 2101void handle_apply_yield (object *op)
2025 2102
2103int convert_item (object *item, object *converter)
2104
2105void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2026 2106
2027MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2107MODULE = cf PACKAGE = cf::object PREFIX = cf_
2028 2108
2029# no clean way to get an object from an archetype - stupid idiotic 2109# no clean way to get an object from an archetype - stupid idiotic
2030# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2110# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2034 CODE: 2114 CODE:
2035 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2115 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2036 OUTPUT: 2116 OUTPUT:
2037 RETVAL 2117 RETVAL
2038 2118
2119object *generate (utf8_string arch, object *creator)
2120 CODE:
2121 object *obj = get_archetype (arch);
2122 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2123 RETVAL = obj;
2124 OUTPUT:
2125 RETVAL
2126
2039object *find_object (U32 tag) 2127object *find_object (U32 tag)
2128
2129object *find_object_uuid (UUID i)
2040 2130
2041# TODO: nuke 2131# TODO: nuke
2042object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2132object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2043 PROTOTYPE: $$$$$$ 2133 PROTOTYPE: $$$$$$
2044 CODE: 2134 CODE:
2045{ 2135{
2046 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2136 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2047}
2048 2137
2049const_utf8_string get_ob_key_value (object *op, utf8_string key) 2138 if (RETVAL->destroyed ())
2139 RETVAL = 0;
2140}
2050 2141
2051bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2142shstr
2143object::kv_get (shstr key)
2144
2145void
2146object::kv_del (shstr key)
2147
2148void
2149object::kv_set (shstr key, shstr value)
2052 2150
2053object *get_nearest_player (object *ob) 2151object *get_nearest_player (object *ob)
2054 ALIAS: nearest_player = 0 2152 ALIAS: nearest_player = 0
2055 PREINIT: 2153 PREINIT:
2056 extern object *get_nearest_player (object *); 2154 extern object *get_nearest_player (object *);
… …
2058void rangevector (object *ob, object *other, int flags = 0) 2156void rangevector (object *ob, object *other, int flags = 0)
2059 PROTOTYPE: $$;$ 2157 PROTOTYPE: $$;$
2060 PPCODE: 2158 PPCODE:
2061{ 2159{
2062 rv_vector rv; 2160 rv_vector rv;
2161
2063 get_rangevector (ob, other, &rv, flags); 2162 get_rangevector (ob, other, &rv, flags);
2163
2064 EXTEND (SP, 5); 2164 EXTEND (SP, 5);
2065 PUSHs (newSVuv (rv.distance)); 2165 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2066 PUSHs (newSViv (rv.distance_x)); 2166 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2067 PUSHs (newSViv (rv.distance_y)); 2167 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2068 PUSHs (newSViv (rv.direction)); 2168 PUSHs (sv_2mortal (newSViv (rv.direction)));
2069 PUSHs (to_sv (rv.part)); 2169 PUSHs (sv_2mortal (to_sv (rv.part)));
2070} 2170}
2071 2171
2072bool on_same_map_as (object *ob, object *other) 2172bool on_same_map_as (object *ob, object *other)
2073 CODE: 2173 CODE:
2074 RETVAL = on_same_map (ob, other); 2174 RETVAL = on_same_map (ob, other);
… …
2094 RETVAL = op->contr; 2194 RETVAL = op->contr;
2095 OUTPUT: RETVAL 2195 OUTPUT: RETVAL
2096 2196
2097bool move_player (object *op, int dir) 2197bool move_player (object *op, int dir)
2098 2198
2099void check_score (object *op)
2100
2101void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2199void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2102 CODE: 2200 CODE:
2103 new_draw_info (flags, 0, op, txt); 2201 new_draw_info (flags, 0, op, txt);
2104 2202
2105void kill_player (object *op) 2203void kill_player (object *op)
… …
2117int command_arrest (object *op, utf8_string params) 2215int command_arrest (object *op, utf8_string params)
2118 2216
2119 2217
2120MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2218MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2121 2219
2122INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2220INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2123 2221
2124int invoke (player *pl, int event, ...) 2222int invoke (player *pl, int event, ...)
2125 CODE: 2223 CODE:
2126 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2224 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2127 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2225 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2137 pl->ob->stats.hp = pl->ob->stats.maxhp; 2235 pl->ob->stats.hp = pl->ob->stats.maxhp;
2138 pl->ob->stats.sp = pl->ob->stats.maxsp; 2236 pl->ob->stats.sp = pl->ob->stats.maxsp;
2139 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2237 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2140 pl->orig_stats = pl->ob->stats; 2238 pl->orig_stats = pl->ob->stats;
2141 2239
2142void clear_los (player *pl) 2240# should only be temporary
2241void esrv_new_player (player *pl)
2143 2242
2243#d# TODO: replace by blocked_los accessor, fix code using this
2144bool 2244bool
2145cell_visible (player *pl, int dx, int dy) 2245cell_visible (player *pl, int dx, int dy)
2146 CODE: 2246 CODE:
2147 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2247 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2148 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2149 OUTPUT: 2248 OUTPUT:
2150 RETVAL 2249 RETVAL
2151 2250
2152void 2251void
2153send (player *pl, SV *packet) 2252send (player *pl, SV *packet)
… …
2159 if (len > MAXSOCKBUF) 2258 if (len > MAXSOCKBUF)
2160 pl->failmsg ("[packet too long for client]"); 2259 pl->failmsg ("[packet too long for client]");
2161 else if (pl->ns) 2260 else if (pl->ns)
2162 pl->ns->send_packet (buf, len); 2261 pl->ns->send_packet (buf, len);
2163} 2262}
2164
2165int
2166listening (player *pl, int new_value = -1)
2167 CODE:
2168 RETVAL = pl->listening;
2169 if (new_value >= 0)
2170 pl->listening = new_value;
2171 OUTPUT:
2172 RETVAL
2173 2263
2174void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2264void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2175 PROTOTYPE: $;$$$ 2265 PROTOTYPE: $;$$$
2176 PPCODE: 2266 PPCODE:
2177 if (GIMME_V != G_VOID) 2267 if (GIMME_V != G_VOID)
… …
2227 if (op->tag) 2317 if (op->tag)
2228 XPUSHs (sv_2mortal (to_sv (op))); 2318 XPUSHs (sv_2mortal (to_sv (op)));
2229 } 2319 }
2230} 2320}
2231 2321
2232INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2322INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2323
2324void
2325adjust_daylight ()
2326 CODE:
2327 maptile::adjust_daylight ();
2328
2329int
2330outdoor_darkness (int darkness = 0)
2331 CODE:
2332 RETVAL = maptile::outdoor_darkness;
2333 if (items)
2334 maptile::outdoor_darkness = darkness;
2335 OUTPUT:
2336 RETVAL
2233 2337
2234void 2338void
2235maptile::instantiate () 2339maptile::instantiate ()
2236 2340
2237maptile *new () 2341maptile *new ()
… …
2269 for (int x = 0; x < THIS->width; ++x) 2373 for (int x = 0; x < THIS->width; ++x)
2270 for (int y = 0; y < THIS->height; ++y) 2374 for (int y = 0; y < THIS->height; ++y)
2271 { 2375 {
2272 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2376 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2273 if (op->flag [FLAG_IS_FLOOR]) 2377 if (op->flag [FLAG_IS_FLOOR])
2274 goto skip_space; 2378 goto skip;
2275 2379
2276 { 2380 {
2277 int offs = offset + y * stride + x; 2381 int offs = offset + y * stride + x;
2382
2278 if (IN_RANGE_EXC (offs, 0, idxlen)) 2383 if (IN_RANGE_EXC (offs, 0, idxlen))
2279 { 2384 {
2280 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2385 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2281 { 2386 {
2282 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2387 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2283 ob->flag [FLAG_NO_MAP_SAVE] = true; 2388 ob->flag [FLAG_NO_MAP_SAVE] = true;
2284 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2389 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2285 2390
2286 if (ob->randomitems) 2391 if (ob->randomitems && !ob->above)
2287 { 2392 {
2288 if (!ob->above)
2289 {
2290 ob->create_treasure (ob->randomitems); 2393 ob->create_treasure (ob->randomitems);
2291 2394
2292 for (object *op = ob->above; op; op = op->above) 2395 for (object *op = ob->above; op; op = op->above)
2293 op->flag [FLAG_NO_MAP_SAVE] = true; 2396 op->flag [FLAG_NO_MAP_SAVE] = true;
2294 } 2397 // TODO: if this is a pickable object, then the item
2295 2398 // will at a bit weird - saving inside the player
2296 ob->randomitems = 0; 2399 // will clear the flag, but when the player drops
2400 // it without logging out, it keeps the flag.
2401 // nobody ahs reported this, but this can be rather
2402 // annoying on persistent maps.
2297 } 2403 }
2298 } 2404 }
2299 } 2405 }
2300 } 2406 }
2301 2407
2302 skip_space: ; 2408 skip: ;
2303 } 2409 }
2304} 2410}
2305 2411
2306void 2412void
2307maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2413maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2317 2423
2318 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2424 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2319 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2425 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2320 2426
2321 for (int i = av_len ((AV *)palette) + 1; i--; ) 2427 for (int i = av_len ((AV *)palette) + 1; i--; )
2322 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2428 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2323 2429
2324 for (int y = 0; y < THIS->height; ++y) 2430 for (int y = 0; y < THIS->height; ++y)
2325 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2431 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2326 2432
2327 sfree (THIS->regions, THIS->size ()); 2433 sfree (THIS->regions, THIS->size ());
… …
2332} 2438}
2333 2439
2334void 2440void
2335maptile::create_region_treasure () 2441maptile::create_region_treasure ()
2336 CODE: 2442 CODE:
2337{
2338 object *op = object::create ();
2339 op->type = FLOOR;
2340 op->map = THIS;
2341
2342 for (int x = 0; x < THIS->width; ++x) 2443 for (int x = 0; x < THIS->width; ++x)
2343 for (int y = 0; y < THIS->height; ++y) 2444 for (int y = 0; y < THIS->height; ++y)
2344 { 2445 {
2345 region *rgn = THIS->region (x, y); 2446 region *rgn = THIS->region (x, y);
2346 2447
2347 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2448 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2449 if (object *op = THIS->at (x, y).top)
2348 if (rgn->treasure && rndm () < rgn->treasure_density) 2450 if (rgn->treasure && rndm () < rgn->treasure_density)
2349 {
2350 op->x = x;
2351 op->y = y;
2352 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2451 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2353 }
2354 } 2452 }
2355 2453
2356 op->destroy ();
2357}
2358
2359int out_of_map (maptile *map, int x, int y) 2454int out_of_map (maptile *map, int x, int y)
2360 2455
2361void 2456void
2362trigger (maptile *map, long connection, bool state = true) 2457find_link (maptile *map, shstr_tmp connection)
2363 CODE:
2364 activate_connection (map, connection, state);
2365
2366void
2367get_connection (maptile *map, long connection)
2368 PPCODE: 2458 PPCODE:
2369 oblinkpt *obp = get_connection_links (map, connection); 2459 if (oblinkpt *obp = map->find_link (connection))
2370 if (obp)
2371 for (objectlink *ol = obp->link; ol; ol = ol->next) 2460 for (objectlink *ol = obp->link; ol; ol = ol->next)
2372 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2461 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2373 2462
2374void 2463void
2375get_map_flags (maptile *map, int x, int y) 2464get_map_flags (maptile *map, int x, int y)
2376 PPCODE: 2465 PPCODE:
2377{ 2466{
2378 maptile *nmap = 0; 2467 maptile *nmap = 0;
2379 I16 nx = 0, ny = 0; 2468 I16 nx = 0, ny = 0;
2469
2470 PUTBACK;
2380 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2471 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2472 SPAGAIN;
2381 2473
2382 EXTEND (SP, 4); 2474 EXTEND (SP, 4);
2383 PUSHs (sv_2mortal (newSViv (flags))); 2475 PUSHs (sv_2mortal (newSViv (flags)));
2384 2476
2385 if (GIMME_V == G_ARRAY) 2477 if (GIMME_V == G_ARRAY)
… …
2388 PUSHs (sv_2mortal (newSViv (nx))); 2480 PUSHs (sv_2mortal (newSViv (nx)));
2389 PUSHs (sv_2mortal (newSViv (ny))); 2481 PUSHs (sv_2mortal (newSViv (ny)));
2390 } 2482 }
2391} 2483}
2392 2484
2485mapspace *
2486ms (maptile *map, unsigned int x, unsigned int y)
2487 PROTOTYPE: $$$
2488 CODE:
2489{
2490 maptile *nmap = 0;
2491 I16 nx, ny;
2492
2493 PUTBACK;
2494 get_map_flags (map, &nmap, x, y, &nx, &ny);
2495 SPAGAIN;
2496
2497 if (!nmap)
2498 XSRETURN_UNDEF;
2499
2500 RETVAL = &nmap->at (nx, ny);
2501}
2502 OUTPUT:
2503 RETVAL
2504
2393void 2505void
2394at (maptile *map, unsigned int x, unsigned int y) 2506at (maptile *map, unsigned int x, unsigned int y)
2395 PROTOTYPE: $$$ 2507 PROTOTYPE: $$$
2396 PPCODE: 2508 PPCODE:
2397{ 2509{
2398 object *o;
2399 maptile *nmap = 0; 2510 maptile *nmap = 0;
2400 I16 nx, ny; 2511 I16 nx, ny;
2401 2512
2513 PUTBACK;
2402 get_map_flags (map, &nmap, x, y, &nx, &ny); 2514 get_map_flags (map, &nmap, x, y, &nx, &ny);
2515 SPAGAIN;
2403 2516
2404 if (nmap) 2517 if (nmap)
2405 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2518 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2406 XPUSHs (sv_2mortal (to_sv (o))); 2519 XPUSHs (sv_2mortal (to_sv (o)));
2407} 2520}
2408 2521
2409SV * 2522SV *
2410bot_at (maptile *obj, unsigned int x, unsigned int y) 2523bot_at (maptile *map, unsigned int x, unsigned int y)
2411 PROTOTYPE: $$$ 2524 PROTOTYPE: $$$
2412 ALIAS: 2525 ALIAS:
2413 top_at = 1 2526 top_at = 1
2414 flags_at = 2 2527 flags_at = 2
2415 light_at = 3 2528 light_at = 3
2416 move_block_at = 4 2529 move_block_at = 4
2417 move_slow_at = 5 2530 move_slow_at = 5
2418 move_on_at = 6 2531 move_on_at = 6
2419 move_off_at = 7 2532 move_off_at = 7
2420 INIT:
2421 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2422 CODE: 2533 CODE:
2534{
2535 sint16 nx = x;
2536 sint16 ny = y;
2537
2538 if (!xy_normalise (map, nx, ny))
2539 XSRETURN_UNDEF;
2540
2541 mapspace &ms = map->at (nx, ny);
2542
2543 ms.update ();
2544
2423 switch (ix) 2545 switch (ix)
2424 { 2546 {
2425 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2547 case 0: RETVAL = to_sv (ms.bot ); break;
2426 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2548 case 1: RETVAL = to_sv (ms.top ); break;
2427 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2549 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2428 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2550 case 3: RETVAL = newSViv (ms.light ); break;
2429 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2551 case 4: RETVAL = newSVuv (ms.move_block); break;
2430 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2552 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2431 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2553 case 6: RETVAL = newSVuv (ms.move_on ); break;
2432 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2554 case 7: RETVAL = newSVuv (ms.move_off ); break;
2433 } 2555 }
2556}
2434 OUTPUT: RETVAL 2557 OUTPUT: RETVAL
2435
2436void fix_walls (maptile *map, int x, int y)
2437
2438void fix_walls_around (maptile *map, int x, int y)
2439 2558
2440# worst xs function of my life 2559# worst xs function of my life
2441bool 2560bool
2442_create_random_map (\ 2561_create_random_map (\
2443 maptile *self,\ 2562 maptile *self,\
… …
2447 utf8_string monsterstyle,\ 2566 utf8_string monsterstyle,\
2448 utf8_string treasurestyle,\ 2567 utf8_string treasurestyle,\
2449 utf8_string layoutstyle,\ 2568 utf8_string layoutstyle,\
2450 utf8_string doorstyle,\ 2569 utf8_string doorstyle,\
2451 utf8_string decorstyle,\ 2570 utf8_string decorstyle,\
2571 utf8_string miningstyle,\
2452 utf8_string origin_map,\ 2572 utf8_string origin_map,\
2453 utf8_string final_map,\ 2573 utf8_string final_map,\
2454 utf8_string exitstyle,\ 2574 utf8_string exitstyle,\
2455 utf8_string this_map,\ 2575 utf8_string this_map,\
2456 utf8_string exit_on_final_map,\ 2576 utf8_string exit_on_final_map,\
… …
2488 assign (rmp.monsterstyle , monsterstyle); 2608 assign (rmp.monsterstyle , monsterstyle);
2489 assign (rmp.treasurestyle , treasurestyle); 2609 assign (rmp.treasurestyle , treasurestyle);
2490 assign (rmp.layoutstyle , layoutstyle); 2610 assign (rmp.layoutstyle , layoutstyle);
2491 assign (rmp.doorstyle , doorstyle); 2611 assign (rmp.doorstyle , doorstyle);
2492 assign (rmp.decorstyle , decorstyle); 2612 assign (rmp.decorstyle , decorstyle);
2613 assign (rmp.miningstyle , miningstyle);
2493 assign (rmp.exitstyle , exitstyle); 2614 assign (rmp.exitstyle , exitstyle);
2494 assign (rmp.exit_on_final_map, exit_on_final_map); 2615 assign (rmp.exit_on_final_map, exit_on_final_map);
2495 2616
2496 rmp.origin_map = origin_map; 2617 rmp.origin_map = origin_map;
2497 rmp.final_map = final_map; 2618 rmp.final_map = final_map;
… …
2523 RETVAL = self->generate_random_map (&rmp); 2644 RETVAL = self->generate_random_map (&rmp);
2524} 2645}
2525 OUTPUT: 2646 OUTPUT:
2526 RETVAL 2647 RETVAL
2527 2648
2649MODULE = cf PACKAGE = cf::mapspace
2650
2651INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2652
2528MODULE = cf PACKAGE = cf::arch 2653MODULE = cf PACKAGE = cf::arch
2529 2654
2530int archetypes_size () 2655int archetypes_size ()
2531 CODE: 2656 CODE:
2532 RETVAL = archetypes.size (); 2657 RETVAL = archetypes.size ();
… …
2535archetype *archetypes (U32 index) 2660archetype *archetypes (U32 index)
2536 CODE: 2661 CODE:
2537 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2662 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2538 OUTPUT: RETVAL 2663 OUTPUT: RETVAL
2539 2664
2540object *instantiate (archetype *arch)
2541 CODE:
2542 RETVAL = arch_to_object (arch);
2543 OUTPUT:
2544 RETVAL
2545
2546INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2665INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2547 2666
2548MODULE = cf PACKAGE = cf::party 2667MODULE = cf PACKAGE = cf::party
2549 2668
2550partylist *first () 2669partylist *first ()
2551 PROTOTYPE: 2670 PROTOTYPE:
2552 CODE: 2671 CODE:
2553 RETVAL = get_firstparty (); 2672 RETVAL = get_firstparty ();
2554 OUTPUT: RETVAL 2673 OUTPUT: RETVAL
2555 2674
2556INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2675INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2557 2676
2558MODULE = cf PACKAGE = cf::region 2677MODULE = cf PACKAGE = cf::region
2559 2678
2560void 2679void
2561list () 2680list ()
… …
2567 PROTOTYPE: $ 2686 PROTOTYPE: $
2568 CODE: 2687 CODE:
2569 RETVAL = region::find (name); 2688 RETVAL = region::find (name);
2570 OUTPUT: RETVAL 2689 OUTPUT: RETVAL
2571 2690
2572region *find_fuzzy (utf8_string name)
2573 PROTOTYPE: $
2574 CODE:
2575 RETVAL = region::find_fuzzy (name);
2576 OUTPUT: RETVAL
2577
2578int specificity (region *rgn) 2691int specificity (region *rgn)
2579 CODE: 2692 CODE:
2580 RETVAL = 0; 2693 RETVAL = 0;
2581 while (rgn = rgn->parent) 2694 while (rgn = rgn->parent)
2582 RETVAL++; 2695 RETVAL++;
2583 OUTPUT: RETVAL 2696 OUTPUT: RETVAL
2584 2697
2585INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2698INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2586 2699
2587MODULE = cf PACKAGE = cf::living 2700MODULE = cf PACKAGE = cf::living
2588 2701
2589INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2702INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2590 2703
2591MODULE = cf PACKAGE = cf::settings 2704MODULE = cf PACKAGE = cf::settings
2592 2705
2593INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2706INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2594 2707
2595MODULE = cf PACKAGE = cf::client 2708MODULE = cf PACKAGE = cf::client
2596 2709
2597INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2710INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2598 2711
2599int invoke (client *ns, int event, ...) 2712int invoke (client *ns, int event, ...)
2600 CODE: 2713 CODE:
2601 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2714 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2602 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2715 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2668 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2781 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2669 old_sound_index [idx] = face; 2782 old_sound_index [idx] = face;
2670 2783
2671MODULE = cf PACKAGE = cf::face PREFIX = face_ 2784MODULE = cf PACKAGE = cf::face PREFIX = face_
2672 2785
2673#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2786#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2674 2787
2675faceidx face_find (utf8_string name, faceidx defidx = 0) 2788faceidx face_find (utf8_string name, faceidx defidx = 0)
2676 2789
2677faceidx alloc (utf8_string name) 2790faceidx alloc (utf8_string name)
2678 CODE: 2791 CODE:
… …
2716 faceinfo *f = face_info (idx); assert (f); 2829 faceinfo *f = face_info (idx); assert (f);
2717 facedata *d = &(faceset ? f->data64 : f->data32); 2830 facedata *d = &(faceset ? f->data64 : f->data32);
2718 sv_to (data, d->data); 2831 sv_to (data, d->data);
2719 STRLEN clen; 2832 STRLEN clen;
2720 char *cdata = SvPVbyte (chksum, clen); 2833 char *cdata = SvPVbyte (chksum, clen);
2721 clen = min (CHKSUM_SIZE, clen); 2834 clen = min (CHKSUM_MAXLEN, clen);
2722 2835
2836 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2837
2723 if (memcmp (d->chksum, cdata, clen)) 2838 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2724 { 2839 {
2840 d->chksum_len = clen;
2725 memcpy (d->chksum, cdata, clen); 2841 memcpy (d->chksum, cdata, clen);
2726 2842
2727 // invalidate existing client face info 2843 // invalidate existing client face info
2728 for_all_clients (ns) 2844 for_all_clients (ns)
2729 if (ns->faceset == faceset) 2845 if (ns->faceset == faceset)
… …
2744 2860
2745SV *get_chksum (faceidx idx, int faceset = 0) 2861SV *get_chksum (faceidx idx, int faceset = 0)
2746 CODE: 2862 CODE:
2747 facedata *d = face_data (idx, faceset); 2863 facedata *d = face_data (idx, faceset);
2748 if (!d) XSRETURN_UNDEF; 2864 if (!d) XSRETURN_UNDEF;
2749 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2865 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2750 OUTPUT: 2866 OUTPUT:
2751 RETVAL 2867 RETVAL
2752 2868
2753SV *get_data (faceidx idx, int faceset = 0) 2869SV *get_data (faceidx idx, int faceset = 0)
2754 CODE: 2870 CODE:
… …
2774 ns->force_newmap = true; 2890 ns->force_newmap = true;
2775 } 2891 }
2776 2892
2777MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2893MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2778 2894
2779#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2895#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2780 2896
2781animidx anim_find (utf8_string name) 2897animidx anim_find (utf8_string name)
2782 CODE: 2898 CODE:
2783 RETVAL = animation::find (name).number; 2899 RETVAL = animation::find (name).number;
2784 OUTPUT: RETVAL 2900 OUTPUT: RETVAL
… …
2799 } 2915 }
2800 else 2916 else
2801 anim = &animation::create (name, av_len (av) + 1, facings); 2917 anim = &animation::create (name, av_len (av) + 1, facings);
2802 2918
2803 for (int i = 0; i < anim->num_animations; ++i) 2919 for (int i = 0; i < anim->num_animations; ++i)
2804 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2920 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2805} 2921}
2806 OUTPUT: RETVAL 2922 OUTPUT: RETVAL
2807 2923
2808void invalidate_all () 2924void invalidate_all ()
2809 CODE: 2925 CODE:
2810 for_all_clients (ns) 2926 for_all_clients (ns)
2811 ns->anims_sent.reset (); 2927 ns->anims_sent.reset ();
2812 2928
2813MODULE = cf PACKAGE = cf::object::freezer 2929MODULE = cf PACKAGE = cf::object::freezer
2814 2930
2815INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2931INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2816 2932
2817SV * 2933SV *
2818new (char *klass) 2934new (char *klass)
2819 CODE: 2935 CODE:
2820 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2936 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2827 sv_to (sv, self); 2943 sv_to (sv, self);
2828 delete self; 2944 delete self;
2829 2945
2830MODULE = cf PACKAGE = cf::object::thawer 2946MODULE = cf PACKAGE = cf::object::thawer
2831 2947
2832INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2948INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
2833 2949
2834SV * 2950SV *
2835new_from_file (char *klass, octet_string path) 2951new_from_file (char *klass, octet_string path)
2836 CODE: 2952 CODE:
2837 object_thawer *f = new object_thawer (path); 2953 object_thawer *f = new object_thawer (path);

Diff Legend

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