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.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.373 by root, Thu Apr 15 04:56:47 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include "autoconf.h" 23#include "autoconf.h"
… …
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h"
35#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
… …
54#include <XSUB.h> 52#include <XSUB.h>
55 53
56#include "CoroAPI.h" 54#include "CoroAPI.h"
57#include "perlxsi.c" 55#include "perlxsi.c"
58 56
59extern sint64 *levels; // the experience table
60
61typedef object_thawer &object_thawer_ref; 57typedef object_thawer &object_thawer_ref;
62typedef object_freezer &object_freezer_ref; 58typedef object_freezer &object_freezer_ref;
63 59
64typedef std::string std__string; 60typedef std::string std__string;
65 61
… …
71static int tick_pending; 67static int tick_pending;
72 68
73global gbl_ev; 69global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 70static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 71static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
72static AV *av_reflect;
76 73
77bitset<NUM_EVENT_TYPES> ev_want_event; 74bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 75bitset<NUM_TYPES> ev_want_type;
79 76
80static HV 77static HV
… …
88 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 88 *stash_cf_living_wrap;
92 89
90static SV
91 *cv_cf_do_invoke,
92 *cv_cf__can_merge,
93 *cv_cf_client_send_msg,
94 *cv_cf_tick,
95 *cv_cf_match_match;
96
97#ifndef newSVpv_utf8
93static inline SV * 98static SV *
94newSVpv_utf8 (const char *s) 99newSVpv_utf8 (const char *s)
95{ 100{
96 if (!s) 101 if (!s)
97 return newSV (0); 102 return newSV (0);
98 103
99 SV *sv = newSVpv (s, 0); 104 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 105 SvUTF8_on (sv);
101 return sv; 106 return sv;
102} 107}
108#endif
103 109
110#ifndef newSVpvn_utf8
104static inline SV * 111static SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 112newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 113{
107 if (!s) 114 if (!s)
108 return newSV (0); 115 return newSV (0);
109 116
110 SV *sv = newSVpvn (s, l); 117 SV *sv = newSVpvn (s, l);
118
119 if (utf8)
111 SvUTF8_on (sv); 120 SvUTF8_on (sv);
121
112 return sv; 122 return sv;
123}
124#endif
125
126static noinline utf8_string
127cfSvPVutf8_nolen (SV *sv)
128{
129 SvGETMAGIC (sv);
130
131 if (SvPOK (sv))
132 {
133 if (!SvUTF8 (sv))
134 sv_utf8_upgrade_nomg (sv);
135
136 return SvPVX (sv);
137 }
138
139 return SvPV_nolen (sv);
113} 140}
114 141
115// helper cast function, returns super class * or 0 142// helper cast function, returns super class * or 0
116template<class super> 143template<class super>
117static super * 144static super *
… …
151 SvREFCNT_inc (self); 178 SvREFCNT_inc (self);
152 hv_clear (self); 179 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 180 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 181 SvREFCNT_dec (self);
155 182
156 // self *must* be null now because thats sv_unmagic's job. 183 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 184 assert (!this->self);
158 } 185 }
159} 186}
160 187
161void 188void
… …
195attachable::destroy () 222attachable::destroy ()
196{ 223{
197 if (destroyed ()) 224 if (destroyed ())
198 return; 225 return;
199 226
200 flags |= F_DESTROYED; 227 attachable_flags |= F_DESTROYED;
201 do_destroy (); 228 do_destroy ();
202 sever_self (); 229 sever_self ();
230}
231
232void
233attachable::do_delete ()
234{
235 delete this;
203} 236}
204 237
205void 238void
206attachable::check_mortals () 239attachable::check_mortals ()
207{ 240{
… …
223 256
224 if (0) 257 if (0)
225 { 258 {
226 for (int j = 0; j < mortals.size (); ++j)//D 259 for (int j = 0; j < mortals.size (); ++j)//D
227 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 260 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
261
228 fprintf (stderr, "\n");//D 262 fprintf (stderr, "\n");//D
229 } 263 }
230 } 264 }
231 } 265 }
232 266
… …
252 } 286 }
253 else 287 else
254 { 288 {
255 mortals.erase (i); 289 mortals.erase (i);
256 obj->sever_self (); 290 obj->sever_self ();
257 delete obj; 291 obj->do_delete ();
258 } 292 }
259 } 293 }
260} 294}
261 295
262void 296void
… …
279 313
280 attach = src.attach; 314 attach = src.attach;
281 return *this; 315 return *this;
282} 316}
283 317
318#if 0
284template<typename T> 319template<typename T>
285static bool 320static bool
286find_backref (void *ptr, T *obj) 321find_backref (void *ptr, T *obj)
287{ 322{
288 char *s = (char *)obj; 323 char *s = (char *)obj;
… …
296 331
297 return false; 332 return false;
298} 333}
299 334
300// for debugging, find "live" objects containing this ptr 335// for debugging, find "live" objects containing this ptr
301void 336static void
302find_backref (void *ptr) 337find_backref (void *ptr)
303{ 338{
304 for_all_objects (op) 339 for_all_objects (op)
305 if (find_backref (ptr, op)) 340 if (find_backref (ptr, op))
306 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 341 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
310 fprintf (stderr, "P %p\n", pl); 345 fprintf (stderr, "P %p\n", pl);
311 346
312 for_all_clients (ns) 347 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 348 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 349 fprintf (stderr, "C %p\n", ns);
315
316} 350}
351#endif
317 352
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 353//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 354
320static SV * 355static SV *
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 356newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
374 409
375 return sv; 410 return sv;
376 } 411 }
377} 412}
378 413
414#if 0 // unused
379static void 415static void
380clearSVptr (SV *sv) 416clearSVptr (SV *sv)
381{ 417{
382 if (SvROK (sv)) 418 if (SvROK (sv))
383 sv = SvRV (sv); 419 sv = SvRV (sv);
384 420
385 hv_clear ((HV *)sv); 421 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 422 sv_unmagic (sv, PERL_MAGIC_ext);
387} 423}
424#endif
425
426static long
427SvPTR_nc (SV *sv)
428{
429 sv = SvRV (sv);
430
431 // very important shortcut
432 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
433 return (long)SvMAGIC (sv)->mg_ptr;
434
435 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
436 return (long)mg->mg_ptr;
437
438 croak ("perl code used object, but C object is already destroyed, caught");
439}
388 440
389static long 441static long
390SvPTR (SV *sv, const char *klass) 442SvPTR (SV *sv, const char *klass)
391{ 443{
392 if (!sv_derived_from (sv, klass)) 444 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 445 croak ("object of type %s expected", klass);
394 446
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 447 return SvPTR_nc (sv);
396
397 if (!mg)
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399
400 return (long)mg->mg_ptr;
401} 448}
402 449
403static long 450static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 451SvPTR_ornull (SV *sv, const char *klass)
405{ 452{
406 if (SvOK (sv)) 453 if (expect_false (!SvOK (sv))) return 0;
454
407 return SvPTR (sv, klass); 455 return SvPTR (sv, klass);
408 else
409 return 0;
410} 456}
411 457
458static long noinline
459SvPTR_ornull_client (SV *sv)
460{
461 if (expect_false (!SvOK (sv))) return 0;
462
463 if (!SvROK (sv)
464 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
465 && !sv_derived_from (sv, "cf::client")))
466 croak ("object of type cf::client expected");
467
468 return SvPTR_nc (sv);
469}
470
471static long noinline
472SvPTR_ornull_object (SV *sv)
473{
474 if (expect_false (!SvOK (sv))) return 0;
475
476 if (!SvROK (sv)
477 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
478 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
479 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
480 && !sv_derived_from (sv, "cf::object")))
481 croak ("object of type cf::object expected");
482
483 return SvPTR_nc (sv);
484}
485
486static long noinline
487SvPTR_ornull_player (SV *sv)
488{
489 if (expect_false (!SvOK (sv))) return 0;
490
491 if (!SvROK (sv)
492 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
493 && !sv_derived_from (sv, "cf::player")))
494 croak ("object of type cf::player expected");
495
496 return SvPTR_nc (sv);
497}
498
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 499static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 500static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 501static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 502static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 503static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 504static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 505static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 506static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 507static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 508static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 509static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 510static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 511static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 512static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 513static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 514static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
428inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 515static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
429inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 516static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 517static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
431inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 518static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
432inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 519static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 520static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
434inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 521static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
435inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 522static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 523
437inline SV *to_sv (object & v) { return to_sv (&v); } 524static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 525static inline SV *to_sv (living & v) { return to_sv (&v); }
439 526
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 527static 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); } 528static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 529
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 530static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 531
445inline SV *to_sv (dynbuf * v) 532static inline SV *to_sv (dynbuf * v)
446{ 533{
447 SV *sv = newSV (0); 534 SV *sv = newSV (0);
448 535
449 sv_upgrade (sv, SVt_PV); 536 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 537 SvGROW (sv, v->size () + 1);
… …
454 *SvEND (sv) = 0; 541 *SvEND (sv) = 0;
455 542
456 return sv; 543 return sv;
457} 544}
458 545
459inline SV *to_sv (dynbuf_text * v) 546static inline SV *to_sv (dynbuf_text * v)
460{ 547{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 548 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 549 SvUTF8_on (sv);
463 return sv; 550 return sv;
464} 551}
465 552
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 553static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 554static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 556static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 558static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 559static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 560static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 561static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 562static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 563static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
477inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 564static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
478inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 565static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 566static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 567static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
481inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 568static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 569static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 570static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 571static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
485inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 572static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
486inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 573static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 574static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 575static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
489inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 576static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
490inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 577static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
491inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 578static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
492inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 579static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
493 580
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 581//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 582static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 583
497template<class T> 584template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 585static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 586
500template<int N> 587template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 588static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 589
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 590static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
504inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 591static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 592static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 593static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 594
508inline void sv_to (SV *sv, std::string &v) 595static inline void sv_to (SV *sv, std::string &v)
509{ 596{
510 STRLEN len; 597 STRLEN len;
511 char *data = SvPVbyte (sv, len); 598 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 599 v.assign (data, len);
513} 600}
514 601
515inline void sv_to (SV *sv, UUID &v) 602static inline void sv_to (SV *sv, UUID &v)
516{ 603{
517 if (!v.parse (SvPV_nolen (sv))) 604 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 605 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 606}
520 607
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 608static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 609
523static SV * 610static SV *
524newSVdt_va (va_list &ap, data_type type) 611newSVdt_va (va_list &ap, data_type type)
525{ 612{
526 SV *sv; 613 SV *sv;
… …
600 va_end (ap); 687 va_end (ap);
601 688
602 return sv; 689 return sv;
603} 690}
604 691
692// typemap support, mostly to avoid excessive inlining
693template<class type>
694static void noinline
695cf_obj_to (SV *arg, type &var)
696{
697 sv_to (arg, var);
698 if (!var)
699 croak ("must not pass invalid/null cf_obj here");
700}
701
702template<class object>
703static void noinline
704cf_obj_ornull_to (SV *arg, object *&var)
705{
706 if (SvOK (arg))
707 {
708 sv_to (arg, var);
709 if (!var)
710 croak ("unable to convert perl object to C++ object");
711 }
712 else
713 var = 0;
714}
715
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 716//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 717
607SV * 718static SV *
608registry (attachable *ext) 719registry (attachable *ext)
609{ 720{
610 if (!ext->cb) 721 if (!ext->cb)
611 ext->cb = newAV (); 722 ext->cb = newAV ();
612 723
… …
626 737
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 738 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 739
629 const char *argv[] = { 740 const char *argv[] = {
630 settings.argv [0], 741 settings.argv [0],
631 "-e" 742 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 743 };
637 744
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 745 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 746 || perl_run (perl))
640 { 747 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 748 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 749 exit (EXIT_FAILURE);
643 } 750 }
644 751
752 eval_pv (
753 "#line 1 'cfperl init'\n"
754 "use EV ();\n"
755 "use Coro ();\n"
756 "cf->bootstrap;\n"
757 "unshift @INC, cf::datadir ();\n"
758 "require cf;\n",
759 0
760 );
761
762 if (SvTRUE (ERRSV))
645 { 763 {
646 dSP; 764 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 765 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 766 }
652} 767}
653 768
769void
654void cfperl_main () 770cfperl_main ()
655{ 771{
656 dSP; 772 dSP;
657 773
658 PUSHMARK (SP); 774 PUSHMARK (SP);
659 PUTBACK; 775 PUTBACK;
… …
684# undef def 800# undef def
685}; 801};
686 802
687#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 803#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688 804
689static void 805static void noinline
690gather_callbacks (AV *&callbacks, AV *registry, event_type event) 806gather_callbacks (AV *&callbacks, AV *registry, event_type event)
691{ 807{
692 // event must be in array 808 // event must be in array
693 if (event >= 0 && event <= AvFILLp (registry)) 809 if (event >= 0 && event <= AvFILLp (registry))
694 { 810 {
… …
780{ 896{
781 attachable::gather_callbacks (callbacks, event); 897 attachable::gather_callbacks (callbacks, event);
782 ::gather_callbacks (callbacks, cb_map, event); 898 ::gather_callbacks (callbacks, cb_map, event);
783} 899}
784 900
785void 901static void noinline
786_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 902_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787{ 903{
788 for (int event = 0; event <= AvFILLp (registry); ++event) 904 for (int event = 0; event <= AvFILLp (registry); ++event)
789 { 905 {
790 SV *cbs_ = AvARRAY (registry)[event]; 906 SV *cbs_ = AvARRAY (registry)[event];
… …
800 } 916 }
801 } 917 }
802} 918}
803 919
804// very slow and inefficient way to recalculate the global want bitsets 920// very slow and inefficient way to recalculate the global want bitsets
805void 921static void
806_recalc_want () 922_recalc_want ()
807{ 923{
808 ev_want_event.reset (); 924 ev_want_event.reset ();
809 925
810 _recalc_want (ev_want_event, cb_global); 926 _recalc_want (ev_want_event, cb_global);
… …
883 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 999 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
884 } 1000 }
885 1001
886 va_end (ap); 1002 va_end (ap);
887 1003
888 CALL_CALL ("cf::do_invoke", G_SCALAR); 1004 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
889 count = count > 0 ? POPi : 0; 1005 count = count > 0 ? POPi : 0;
890 1006
891 CALL_END; 1007 CALL_END;
892 1008
893 return count; 1009 return count;
894} 1010}
895 1011
896SV * 1012static SV *
897cfperl_result (int idx) 1013cfperl_result (int idx)
898{ 1014{
899 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1015 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
900 if (!av) 1016 if (!av)
901 return &PL_sv_undef; 1017 return &PL_sv_undef;
… …
920} 1036}
921 1037
922///////////////////////////////////////////////////////////////////////////// 1038/////////////////////////////////////////////////////////////////////////////
923// various c++ => perl glue functions 1039// various c++ => perl glue functions
924 1040
1041void
925void cfperl_tick () 1042cfperl_tick ()
926{ 1043{
927 tick_pending = 1; 1044 tick_pending = 1;
928 1045
929 if (tick_inhibit) 1046 if (tick_inhibit)
930 return; 1047 return;
… …
933 1050
934 dSP; 1051 dSP;
935 1052
936 PUSHMARK (SP); 1053 PUSHMARK (SP);
937 PUTBACK; 1054 PUTBACK;
938 call_pv ("cf::tick", G_DISCARD | G_VOID); 1055 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
939 1056
940 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1057 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
941} 1058}
942 1059
943void 1060void
… …
966 CALL_CALL ("ext::books::make_book", G_VOID); 1083 CALL_CALL ("ext::books::make_book", G_VOID);
967 CALL_END; 1084 CALL_END;
968} 1085}
969 1086
970void 1087void
971cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1088cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
972{ 1089{
973 CALL_BEGIN (4); 1090 CALL_BEGIN (4);
974 CALL_ARG (ns); 1091 CALL_ARG (ns);
975 CALL_ARG (type); 1092 CALL_ARG (type);
976 CALL_ARG_SV (newSVpv_utf8 (msg)); 1093 CALL_ARG_SV (newSVpv_utf8 (msg));
977 CALL_ARG (color); 1094 CALL_ARG (color);
978 CALL_CALL ("cf::client::send_msg", G_VOID); 1095 CALL_CALL (cv_cf_client_send_msg, G_VOID);
979 CALL_END; 1096 CALL_END;
980} 1097}
981 1098
982int 1099int
983cfperl_can_merge (object *ob1, object *ob2) 1100cfperl_can_merge (object *ob1, object *ob2)
… …
985 int can; 1102 int can;
986 1103
987 CALL_BEGIN (2); 1104 CALL_BEGIN (2);
988 CALL_ARG (ob1); 1105 CALL_ARG (ob1);
989 CALL_ARG (ob2); 1106 CALL_ARG (ob2);
990 CALL_CALL ("cf::_can_merge", G_SCALAR); 1107 CALL_CALL (cv_cf__can_merge, G_SCALAR);
991 can = count && SvTRUE (TOPs); 1108 can = count && SvTRUE (TOPs);
992 CALL_END; 1109 CALL_END;
993 1110
994 return can; 1111 return can;
995} 1112}
996 1113
1114void
1115cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1116{
1117 CALL_BEGIN (4);
1118 CALL_ARG (ob);
1119 CALL_ARG (state);
1120 CALL_ARG (activator);
1121 CALL_ARG (originator);
1122 CALL_CALL ("cf::mapscript::activate", G_VOID);
1123 CALL_END;
1124}
1125
997player * 1126player *
998player::find (const char *name) 1127player::find (const_utf8_string name)
999{ 1128{
1000 CALL_BEGIN (1); 1129 CALL_BEGIN (1);
1001 CALL_ARG (name); 1130 CALL_ARG (name);
1002 CALL_CALL ("cf::player::find", G_SCALAR); 1131 CALL_CALL ("cf::player::find", G_SCALAR);
1003 1132
… …
1008 1137
1009 return retval; 1138 return retval;
1010} 1139}
1011 1140
1012maptile * 1141maptile *
1013find_style (const char *dirname, const char *stylename, int difficulty) 1142find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1014{ 1143{
1015 CALL_BEGIN (3); 1144 CALL_BEGIN (4);
1016 CALL_ARG (dirname); 1145 CALL_ARG (dirname);
1017 CALL_ARG (stylename); 1146 CALL_ARG (stylename);
1018 CALL_ARG (difficulty); 1147 CALL_ARG (difficulty);
1148 CALL_ARG (recurse);
1019 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1149 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1020 1150
1021 maptile *retval = 0; 1151 maptile *retval = 0;
1022 if (count) sv_to (POPs, retval); 1152 if (count) sv_to (POPs, retval);
1023 1153
… …
1025 1155
1026 return retval; 1156 return retval;
1027} 1157}
1028 1158
1029maptile * 1159maptile *
1030maptile::find_sync (const char *path, maptile *origin) 1160maptile::find_sync (const_utf8_string path, maptile *origin)
1031{ 1161{
1032 CALL_BEGIN (2); 1162 CALL_BEGIN (2);
1033 CALL_ARG (path); 1163 CALL_ARG (path);
1034 CALL_ARG (origin); 1164 CALL_ARG (origin);
1035 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1165 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1041 1171
1042 return retval; 1172 return retval;
1043} 1173}
1044 1174
1045maptile * 1175maptile *
1046maptile::find_async (const char *path, maptile *origin, bool load) 1176maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1047{ 1177{
1048 CALL_BEGIN (3); 1178 CALL_BEGIN (3);
1049 CALL_ARG (path); 1179 CALL_ARG (path);
1050 CALL_ARG (origin); 1180 CALL_ARG (origin);
1051 CALL_ARG (load); 1181 CALL_ARG (load);
… …
1067 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1197 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068 CALL_END; 1198 CALL_END;
1069} 1199}
1070 1200
1071void 1201void
1072maptile::change_all_map_light (int change)
1073{
1074 CALL_BEGIN (1);
1075 CALL_ARG (change);
1076 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077 CALL_END;
1078}
1079
1080void
1081object::enter_exit (object *exit) 1202object::enter_exit (object *exit)
1082{ 1203{
1083 if (type != PLAYER) 1204 if (type != PLAYER)
1084 return; 1205 return;
1085 1206
… …
1089 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1210 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1090 CALL_END; 1211 CALL_END;
1091} 1212}
1092 1213
1093void 1214void
1094object::player_goto (const char *path, int x, int y) 1215object::player_goto (const_utf8_string path, int x, int y)
1095{ 1216{
1096 if (type != PLAYER) 1217 if (type != PLAYER)
1097 return; 1218 return;
1098 1219
1099 CALL_BEGIN (4); 1220 CALL_BEGIN (4);
… …
1103 CALL_ARG (y); 1224 CALL_ARG (y);
1104 CALL_CALL ("cf::object::player::goto", G_VOID); 1225 CALL_CALL ("cf::object::player::goto", G_VOID);
1105 CALL_END; 1226 CALL_END;
1106} 1227}
1107 1228
1108const char * 1229const_utf8_string
1109object::ref () const 1230object::ref () const
1110{ 1231{
1111 if (type == PLAYER) 1232 if (type == PLAYER)
1112 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1233 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1113 else 1234 else
1235 // TODO: should be able to save references within the same map, at least
1114 return 0; 1236 return 0;
1115} 1237}
1116 1238
1117object * 1239object *
1118object::deref (const char *ref) 1240object::deref (const_utf8_string ref)
1119{ 1241{
1120 object *retval = 0; 1242 object *retval = 0;
1121 1243
1122 if (ref) 1244 if (ref)
1123 { 1245 {
… …
1133 1255
1134 return retval; 1256 return retval;
1135} 1257}
1136 1258
1137void 1259void
1138log_backtrace (const char *msg) 1260log_backtrace (const_utf8_string msg)
1139{ 1261{
1140#if HAVE_BACKTRACE 1262#if HAVE_BACKTRACE
1141 void *addr [20]; 1263 void *addr [20];
1142 int size = backtrace (addr, 20); 1264 int size = backtrace (addr, 20);
1143 1265
… …
1148 CALL_CALL ("cf::_log_backtrace", G_VOID); 1270 CALL_CALL ("cf::_log_backtrace", G_VOID);
1149 CALL_END; 1271 CALL_END;
1150#endif 1272#endif
1151} 1273}
1152 1274
1275bool
1276is_match_expr (const_utf8_string expr)
1277{
1278 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1279}
1280
1281bool
1282match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1283{
1284 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1285 expr += sizeof ("match ") - 1;
1286
1287 CALL_BEGIN (5);
1288 CALL_ARG (expr);
1289 CALL_ARG (ob);
1290 CALL_ARG (self);
1291 CALL_ARG (source);
1292 CALL_ARG (originator);
1293 CALL_CALL (cv_cf_match_match, G_SCALAR);
1294
1295 bool matched = count && SvTRUE (TOPs);
1296
1297 CALL_END;
1298
1299 return matched;
1300}
1301
1302object *
1303match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1304{
1305 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1306 expr += sizeof ("match ") - 1;
1307
1308 CALL_BEGIN (5);
1309 CALL_ARG (expr);
1310 CALL_ARG (ob);
1311 CALL_ARG (self);
1312 CALL_ARG (source);
1313 CALL_ARG (originator);
1314 CALL_CALL (cv_cf_match_match, G_ARRAY);
1315
1316 object *one = 0;
1317
1318 if (count)
1319 sv_to (TOPs, one);
1320
1321 CALL_END;
1322
1323 return one;
1324}
1325
1153///////////////////////////////////////////////////////////////////////////// 1326/////////////////////////////////////////////////////////////////////////////
1154 1327
1155struct EVAPI *evapi::GEVAPI; 1328struct EVAPI *evapi::GEVAPI;
1156struct CoroAPI *coroapi::GCoroAPI; 1329struct CoroAPI *coroapi::GCoroAPI;
1157 1330
1331void
1158void coroapi::do_cede_to_tick () 1332coroapi::do_cede_to_tick ()
1159{ 1333{
1160 cede_pending = 0; 1334 cede_pending = 0;
1161 cede (); 1335 cede ();
1162} 1336}
1163 1337
… …
1187 ev_io_set ((ev_io *)this, fd, events); 1361 ev_io_set ((ev_io *)this, fd, events);
1188 if (active) start (); 1362 if (active) start ();
1189 } 1363 }
1190} 1364}
1191 1365
1192void 1366static void
1193_connect_to_perl () 1367_connect_to_perl_1 ()
1194{ 1368{
1195 stash_cf = gv_stashpv ("cf", 1); 1369 stash_cf = gv_stashpv ("cf", 1);
1196 1370
1197 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1371 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1198 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1372 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1217 cb_client = get_av ("cf::CB_CLIENT", 1); 1391 cb_client = get_av ("cf::CB_CLIENT", 1);
1218 cb_type = get_av ("cf::CB_TYPE" , 1); 1392 cb_type = get_av ("cf::CB_TYPE" , 1);
1219 cb_map = get_av ("cf::CB_MAP" , 1); 1393 cb_map = get_av ("cf::CB_MAP" , 1);
1220} 1394}
1221 1395
1396static void
1397_connect_to_perl_2 ()
1398{
1399 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1400 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1401 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1402 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1403 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1404}
1405
1222MODULE = cf PACKAGE = cf PREFIX = cf_ 1406MODULE = cf PACKAGE = cf PREFIX = cf_
1223 1407
1224BOOT: 1408BOOT:
1225{ 1409{
1226 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1410 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1227 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1411 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1228 1412
1229 _connect_to_perl (); 1413 _connect_to_perl_1 ();
1230 1414
1231 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1415 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1232 1416
1233 //{ 1417 //{
1234 // require_pv ("Time::HiRes"); 1418 // require_pv ("Time::HiRes");
… …
1242 static const struct { 1426 static const struct {
1243 const char *name; 1427 const char *name;
1244 IV iv; 1428 IV iv;
1245 } *civ, const_iv[] = { 1429 } *civ, const_iv[] = {
1246# define const_iv(name) { # name, (IV)name }, 1430# define const_iv(name) { # name, (IV)name },
1431# include "const_iv.h"
1432# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1433# include "attackinc.h"
1434# undef def
1435# define def(uc, flags) const_iv (SK_ ## uc)
1436# include "skillinc.h"
1437# undef def
1438
1247 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1439 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1248 const_iv (logBacktrace) 1440 const_iv (logBacktrace)
1249 1441
1250 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1442 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1251 1443
1252 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1444 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1253 1445
1254 const_iv (MAX_TIME) 1446 const_iv (MAX_TIME)
1255 const_iv (MAXSOCKBUF) 1447 const_iv (MAXSOCKBUF)
1256 1448
1257 const_iv (NUM_BODY_LOCATIONS)
1258 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1259 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1260 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1261 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1262 const_iv (body_wrist) const_iv (body_waist)
1263
1264 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1265 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1266 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1267 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1268 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1269 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1270 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1271 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1272 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1273 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1274 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1275 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1276 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1277 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1278 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1279 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1280 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1281 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1282 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1283 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1284 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1285 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1286 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1287 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1288 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1289 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1290 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1291 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1292
1293 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1294
1295 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1296 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1297
1298 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1299 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1300 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1301 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1302 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1303 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1304 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1305
1306 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1307 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1308 const_iv (WEAP_BLUD)
1309
1310 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1311 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1312 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1313 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1314 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1315 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1316 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1317 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1318 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1319 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1320 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1321 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1322 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1323 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1324 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1325 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1326 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1327 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1328 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1329 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1330 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1331 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1332 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1333 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1334 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1335 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336
1337 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1338 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1339 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1340 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1341 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1342 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1343
1344 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1449 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1345 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1450 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1346 1451
1347 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1452 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1348
1349 const_iv (SP_RAISE_DEAD)
1350 const_iv (SP_RUNE)
1351 const_iv (SP_MAKE_MARK)
1352 const_iv (SP_BOLT)
1353 const_iv (SP_BULLET)
1354 const_iv (SP_EXPLOSION)
1355 const_iv (SP_CONE)
1356 const_iv (SP_BOMB)
1357 const_iv (SP_WONDER)
1358 const_iv (SP_SMITE)
1359 const_iv (SP_MAGIC_MISSILE)
1360 const_iv (SP_SUMMON_GOLEM)
1361 const_iv (SP_DIMENSION_DOOR)
1362 const_iv (SP_MAGIC_MAPPING)
1363 const_iv (SP_MAGIC_WALL)
1364 const_iv (SP_DESTRUCTION)
1365 const_iv (SP_PERCEIVE_SELF)
1366 const_iv (SP_WORD_OF_RECALL)
1367 const_iv (SP_INVISIBLE)
1368 const_iv (SP_PROBE)
1369 const_iv (SP_HEALING)
1370 const_iv (SP_CREATE_FOOD)
1371 const_iv (SP_EARTH_TO_DUST)
1372 const_iv (SP_CHANGE_ABILITY)
1373 const_iv (SP_BLESS)
1374 const_iv (SP_CURSE)
1375 const_iv (SP_SUMMON_MONSTER)
1376 const_iv (SP_CHARGING)
1377 const_iv (SP_POLYMORPH)
1378 const_iv (SP_ALCHEMY)
1379 const_iv (SP_REMOVE_CURSE)
1380 const_iv (SP_IDENTIFY)
1381 const_iv (SP_DETECTION)
1382 const_iv (SP_MOOD_CHANGE)
1383 const_iv (SP_MOVING_BALL)
1384 const_iv (SP_SWARM)
1385 const_iv (SP_CHANGE_MANA)
1386 const_iv (SP_DISPEL_RUNE)
1387 const_iv (SP_CREATE_MISSILE)
1388 const_iv (SP_CONSECRATE)
1389 const_iv (SP_ANIMATE_WEAPON)
1390 const_iv (SP_LIGHT)
1391 const_iv (SP_CHANGE_MAP_LIGHT)
1392 const_iv (SP_FAERY_FIRE)
1393 const_iv (SP_CAUSE_DISEASE)
1394 const_iv (SP_AURA)
1395 const_iv (SP_TOWN_PORTAL)
1396 const_iv (SP_PARTY_SPELL)
1397 1453
1398 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1454 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1399 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1455 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1400 const_iv (F_LOCKED) 1456 const_iv (F_LOCKED)
1401 1457
1402 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1403
1404 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1458 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1405 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1459 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1406 1460
1407 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1408
1409 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1410 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1411
1412 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1413 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1414
1415 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1461 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1416
1417 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1418 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1419 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1420 const_iv (M_ICE) const_iv (M_SPECIAL)
1421 1462
1422 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1463 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1423 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1464 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1424 1465
1425 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1426 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1427 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1428 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1429 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1430 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1431 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1432 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1433 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1434 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1435 const_iv (SK_POISON_NAIL)
1436
1437 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1438 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1439 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1440 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1441 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1442 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1443
1444 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1445
1446 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1447 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1448 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1449 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1450 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1451 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1452 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1453
1454 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1466 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1455 const_iv (MAP_INACTIVE) 1467 const_iv (MAP_INACTIVE)
1456 1468
1457 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1469 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1458 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1470 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1459 1471
1460 const_iv (VERSION_CS) const_iv (VERSION_SC)
1461
1462 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1472 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1463 1473
1464 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1465
1466 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1474 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1467
1468 // random map generator
1469 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1470 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1471
1472 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1473 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1474 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1475
1476 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1477 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1478
1479 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1480 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1481
1482 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1483 const_iv (FT_RSRC) const_iv (FT_NUM)
1484 }; 1475 };
1485 1476
1486 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1487 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1478 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1488 1479
… …
1505 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1496 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1506 av_push (event, newSViv (eiv->klass)); 1497 av_push (event, newSViv (eiv->klass));
1507 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1498 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1508 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1499 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1509 } 1500 }
1501
1502 // used by autogenerated BOOT sections from genacc
1503 av_reflect = get_av ("cf::REFLECT", 1);
1510} 1504}
1511 1505
1512void _gv_clear (SV *gv) 1506void _gv_clear (SV *gv)
1513 CODE: 1507 CODE:
1514 assert (SvTYPE (gv) == SVt_PVGV); 1508 assert (SvTYPE (gv) == SVt_PVGV);
… …
1521 f (GvGP (gv)->gp_cv); 1515 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1516 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1517 GvMULTI_off (gv);
1524# undef f 1518# undef f
1525 1519
1526
1527void _connect_to_perl () 1520void _connect_to_perl_1 ()
1521
1522void _connect_to_perl_2 ()
1528 1523
1529void _recalc_want () 1524void _recalc_want ()
1530 1525
1526# not used by default anymore
1531void _global_reattach () 1527void _global_reattach ()
1532 CODE: 1528 CODE:
1533{ 1529{
1534 // reattach to all attachable objects in the game. 1530 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1531 for_all_clients (ns)
… …
1579 } 1575 }
1580 1576
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1577 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 1578}
1583 1579
1580void init_anim ()
1581
1582void init_globals ()
1583
1584void init_experience ()
1585
1586void init_attackmess ()
1587
1588void init_dynamic ()
1589
1590void load_settings ()
1591
1592void load_materials ()
1593
1594void init_uuid ()
1595 CODE:
1596 UUID::init ();
1597
1598void init_signals ()
1599
1600void init_skills ()
1601
1602void init_beforeplay ()
1603
1584void evthread_start (int aiofd) 1604void evthread_start (int aiofd)
1585 1605
1586void cede_to_tick () 1606void cede_to_tick ()
1587 CODE: 1607 CODE:
1588 coroapi::cede_to_tick (); 1608 coroapi::cede_to_tick ();
… …
1613 } 1633 }
1614 1634
1615void server_tick () 1635void server_tick ()
1616 CODE: 1636 CODE:
1617{ 1637{
1638 ev_now_update (EV_DEFAULT);
1618 NOW = ev_now (EV_DEFAULT); 1639 NOW = ev_now (EV_DEFAULT);
1619 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1640 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1620 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1641 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1621 runtime = SvNVX (sv_runtime); 1642 runtime = SvNVX (sv_runtime);
1622 1643
1623 server_tick (); 1644 server_tick ();
1624 1645
1625 NOW = ev_time (); 1646 ev_now_update (EV_DEFAULT);
1647 NOW = ev_now (EV_DEFAULT);
1626 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1648 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1627 runtime += TICK; 1649 runtime += TICK;
1628 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1650 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1629} 1651}
1630 1652
… …
1641 switch (items) 1663 switch (items)
1642 { 1664 {
1643 case 0: RETVAL = gen (); break; 1665 case 0: RETVAL = gen (); break;
1644 case 1: RETVAL = gen (SvUV (ST (0))); break; 1666 case 1: RETVAL = gen (SvUV (ST (0))); break;
1645 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1667 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1646 default: croak ("cf::rndm requires none, one or two parameters."); break; 1668 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1647 } 1669 }
1648} 1670}
1649 OUTPUT: 1671 OUTPUT:
1650 RETVAL 1672 RETVAL
1651 1673
… …
1658NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1680NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1659 CODE: 1681 CODE:
1660 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1682 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1661 OUTPUT: 1683 OUTPUT:
1662 RETVAL 1684 RETVAL
1685
1686const char *ordinal (int i)
1663 1687
1664void weaken (...) 1688void weaken (...)
1665 PROTOTYPE: @ 1689 PROTOTYPE: @
1666 CODE: 1690 CODE:
1667 while (items > 0) 1691 while (items > 0)
1668 sv_rvweaken (ST (--items)); 1692 sv_rvweaken (ST (--items));
1669 1693
1670void 1694void log_suspend ()
1695
1696void log_resume ()
1697
1671log_backtrace (utf8_string msg) 1698void log_backtrace (utf8_string msg)
1672 1699
1673void
1674LOG (int flags, utf8_string msg) 1700void LOG (int flags, utf8_string msg)
1675 PROTOTYPE: $$ 1701 PROTOTYPE: $$
1676 C_ARGS: flags, "%s", msg 1702 C_ARGS: flags, "%s", msg
1677 1703
1678octet_string path_combine (octet_string base, octet_string path) 1704octet_string path_combine (octet_string base, octet_string path)
1679 PROTOTYPE: $$ 1705 PROTOTYPE: $$
… …
1756 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1782 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1757 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1783 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1758 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1784 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1759 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1785 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1760#endif 1786#endif
1761 EXTEND (SP, 2*2); 1787 EXTEND (SP, 5*2);
1762 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1788 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1763 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1789 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1764 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1790 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1791 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1792 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1765} 1793}
1766 1794
1767int find_animation (utf8_string text) 1795int find_animation (utf8_string text)
1768 PROTOTYPE: $ 1796 PROTOTYPE: $
1769 1797
1770int random_roll (int min, int max, object *op, int goodbad); 1798int random_roll (int min, int max, object *op, int goodbad);
1771 1799
1772const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1800const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1773 1801
1774int
1775exp_to_level (val64 exp) 1802int exp_to_level (val64 exp)
1776 CODE:
1777{
1778 int i = 0;
1779 1803
1780 RETVAL = settings.max_level;
1781
1782 for (i = 1; i <= settings.max_level; i++)
1783 {
1784 if (levels[i] > exp)
1785 {
1786 RETVAL = i - 1;
1787 break;
1788 }
1789 }
1790}
1791 OUTPUT: RETVAL
1792
1793val64
1794level_to_min_exp (int level) 1804val64 level_to_min_exp (int level)
1795 CODE:
1796 if (level > settings.max_level)
1797 RETVAL = levels[settings.max_level];
1798 else if (level < 1)
1799 RETVAL = 0;
1800 else
1801 RETVAL = levels[level];
1802 OUTPUT: RETVAL
1803 1805
1804SV * 1806SV *
1805resistance_to_string (int atnr) 1807resistance_to_string (int atnr)
1806 CODE: 1808 CODE:
1807 if (atnr >= 0 && atnr < NROFATTACKS) 1809 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1868 RETVAL 1870 RETVAL
1869 1871
1870void 1872void
1871debug_trace (attachable *obj, bool on = true) 1873debug_trace (attachable *obj, bool on = true)
1872 CODE: 1874 CODE:
1873 obj->flags &= ~attachable::F_DEBUG_TRACE; 1875 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1874 if (on) 1876 if (on)
1875 obj->flags |= attachable::F_DEBUG_TRACE; 1877 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1876 1878
1877int mortals_size () 1879int mortals_size ()
1878 CODE: 1880 CODE:
1879 RETVAL = attachable::mortals.size (); 1881 RETVAL = attachable::mortals.size ();
1880 OUTPUT: RETVAL 1882 OUTPUT: RETVAL
… …
1882#object *mortals (U32 index) 1884#object *mortals (U32 index)
1883# CODE: 1885# CODE:
1884# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1886# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1885# OUTPUT: RETVAL 1887# OUTPUT: RETVAL
1886 1888
1887INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1889INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1888 1890
1889MODULE = cf PACKAGE = cf::global 1891MODULE = cf PACKAGE = cf::global
1890 1892
1891int invoke (SV *klass, int event, ...) 1893int invoke (SV *klass, int event, ...)
1892 CODE: 1894 CODE:
… …
1896 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1898 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1897 OUTPUT: RETVAL 1899 OUTPUT: RETVAL
1898 1900
1899MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1901MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1900 1902
1901INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1903INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1902 1904
1903int invoke (object *op, int event, ...) 1905int invoke (object *op, int event, ...)
1904 CODE: 1906 CODE:
1905 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1907 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1906 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1908 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1933int mortals_size () 1935int mortals_size ()
1934 CODE: 1936 CODE:
1935 RETVAL = attachable::mortals.size (); 1937 RETVAL = attachable::mortals.size ();
1936 OUTPUT: RETVAL 1938 OUTPUT: RETVAL
1937 1939
1938const char *slot_use_name (U32 slot) 1940const_utf8_string slot_use_name (U32 slot)
1939 ALIAS: 1941 ALIAS:
1940 slot_nonuse_name = 1 1942 slot_nonuse_name = 1
1941 CODE: 1943 CODE:
1942{ 1944{
1943 if (slot >= NUM_BODY_LOCATIONS) 1945 if (slot >= NUM_BODY_LOCATIONS)
… …
1999 OUTPUT: 2001 OUTPUT:
2000 RETVAL 2002 RETVAL
2001 2003
2002object *find_best_object_match (object *op, utf8_string match) 2004object *find_best_object_match (object *op, utf8_string match)
2003 2005
2004object *find_marked_object (object *op)
2005
2006int need_identify (object *obj);
2007
2008int apply_shop_mat (object *shop_mat, object *op); 2006int apply_shop_mat (object *shop_mat, object *op);
2009 2007
2010int move (object *op, int dir, object *originator = op) 2008int move (object *op, int dir, object *originator = op)
2011 CODE: 2009 CODE:
2012 RETVAL = move_ob (op, dir, originator); 2010 RETVAL = op->move (dir, originator);
2013 OUTPUT: 2011 OUTPUT:
2014 RETVAL 2012 RETVAL
2015 2013
2016void apply (object *applier, object *applied, int flags = 0)
2017 CODE:
2018 manual_apply (applied, applier, flags);
2019
2020void apply_below (object *op) 2014void apply_below (object *op)
2021 CODE: 2015 CODE:
2022 player_apply_below (op); 2016 player_apply_below (op);
2023 2017
2024int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2018int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2019
2020int casting_level (object *caster, object *spell)
2025 2021
2026int pay_item (object *op, object *buyer) 2022int pay_item (object *op, object *buyer)
2027 CODE: 2023 CODE:
2028 RETVAL = pay_for_item (op, buyer); 2024 RETVAL = pay_for_item (op, buyer);
2029 OUTPUT: RETVAL 2025 OUTPUT: RETVAL
… …
2072 2068
2073void player_lvl_adj (object *who, object *skill = 0) 2069void player_lvl_adj (object *who, object *skill = 0)
2074 2070
2075int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2071int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2076 2072
2077int calc_skill_exp (object *who, object *op, object *skill); 2073int calc_skill_exp (object *who, object *op, object *skill)
2078 2074
2079void push_button (object *op); 2075void push_button (object *op, object *originator)
2080 2076
2081void use_trigger (object *op); 2077void use_trigger (object *op, object *originator)
2082 2078
2083void add_button_link (object *button, maptile *map, int connected);
2084
2085void remove_button_link (object *op);
2086
2087void handle_apply_yield (object *op); 2079void handle_apply_yield (object *op)
2088 2080
2081int convert_item (object *item, object *converter)
2082
2083void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2089 2084
2090MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2085MODULE = cf PACKAGE = cf::object PREFIX = cf_
2091 2086
2092# no clean way to get an object from an archetype - stupid idiotic 2087# no clean way to get an object from an archetype - stupid idiotic
2093# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2088# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2097 CODE: 2092 CODE:
2098 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2093 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2099 OUTPUT: 2094 OUTPUT:
2100 RETVAL 2095 RETVAL
2101 2096
2097object *generate (utf8_string arch, object *creator)
2098 CODE:
2099 object *obj = get_archetype (arch);
2100 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2101 RETVAL = obj;
2102 OUTPUT:
2103 RETVAL
2104
2102object *find_object (U32 tag) 2105object *find_object (U32 tag)
2106
2107object *find_object_uuid (UUID i)
2103 2108
2104# TODO: nuke 2109# TODO: nuke
2105object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2110object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2106 PROTOTYPE: $$$$$$ 2111 PROTOTYPE: $$$$$$
2107 CODE: 2112 CODE:
2108{ 2113{
2109 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2114 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2115
2116 if (RETVAL->destroyed ())
2117 RETVAL = 0;
2110} 2118}
2111 2119
2112shstr 2120shstr
2113object::kv_get (shstr key) 2121object::kv_get (shstr key)
2114 2122
… …
2127 PROTOTYPE: $$;$ 2135 PROTOTYPE: $$;$
2128 PPCODE: 2136 PPCODE:
2129{ 2137{
2130 rv_vector rv; 2138 rv_vector rv;
2131 2139
2132 PUTBACK;
2133 get_rangevector (ob, other, &rv, flags); 2140 get_rangevector (ob, other, &rv, flags);
2134 SPAGAIN;
2135 2141
2136 EXTEND (SP, 5); 2142 EXTEND (SP, 5);
2137 PUSHs (newSVuv (rv.distance)); 2143 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2138 PUSHs (newSViv (rv.distance_x)); 2144 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2139 PUSHs (newSViv (rv.distance_y)); 2145 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2140 PUSHs (newSViv (rv.direction)); 2146 PUSHs (sv_2mortal (newSViv (rv.direction)));
2141 PUSHs (to_sv (rv.part)); 2147 PUSHs (sv_2mortal (to_sv (rv.part)));
2142} 2148}
2143 2149
2144bool on_same_map_as (object *ob, object *other) 2150bool on_same_map_as (object *ob, object *other)
2145 CODE: 2151 CODE:
2146 RETVAL = on_same_map (ob, other); 2152 RETVAL = on_same_map (ob, other);
… …
2166 RETVAL = op->contr; 2172 RETVAL = op->contr;
2167 OUTPUT: RETVAL 2173 OUTPUT: RETVAL
2168 2174
2169bool move_player (object *op, int dir) 2175bool move_player (object *op, int dir)
2170 2176
2171void check_score (object *op)
2172
2173void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2177void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2174 CODE: 2178 CODE:
2175 new_draw_info (flags, 0, op, txt); 2179 new_draw_info (flags, 0, op, txt);
2176 2180
2177void kill_player (object *op) 2181void kill_player (object *op)
… …
2189int command_arrest (object *op, utf8_string params) 2193int command_arrest (object *op, utf8_string params)
2190 2194
2191 2195
2192MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2196MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2193 2197
2194INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2198INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2195 2199
2196int invoke (player *pl, int event, ...) 2200int invoke (player *pl, int event, ...)
2197 CODE: 2201 CODE:
2198 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2202 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2199 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2203 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2209 pl->ob->stats.hp = pl->ob->stats.maxhp; 2213 pl->ob->stats.hp = pl->ob->stats.maxhp;
2210 pl->ob->stats.sp = pl->ob->stats.maxsp; 2214 pl->ob->stats.sp = pl->ob->stats.maxsp;
2211 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2215 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212 pl->orig_stats = pl->ob->stats; 2216 pl->orig_stats = pl->ob->stats;
2213 2217
2214void clear_los (player *pl) 2218# should only be temporary
2219void esrv_new_player (player *pl)
2215 2220
2221#d# TODO: replace by blocked_los accessor, fix code using this
2216bool 2222bool
2217cell_visible (player *pl, int dx, int dy) 2223cell_visible (player *pl, int dx, int dy)
2218 CODE: 2224 CODE:
2219 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2225 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221 OUTPUT: 2226 OUTPUT:
2222 RETVAL 2227 RETVAL
2223 2228
2224void 2229void
2225send (player *pl, SV *packet) 2230send (player *pl, SV *packet)
… …
2290 if (op->tag) 2295 if (op->tag)
2291 XPUSHs (sv_2mortal (to_sv (op))); 2296 XPUSHs (sv_2mortal (to_sv (op)));
2292 } 2297 }
2293} 2298}
2294 2299
2295INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2300INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2301
2302void
2303adjust_daylight ()
2304 CODE:
2305 maptile::adjust_daylight ();
2306
2307int
2308outdoor_darkness (int darkness = 0)
2309 CODE:
2310 RETVAL = maptile::outdoor_darkness;
2311 if (items)
2312 maptile::outdoor_darkness = darkness;
2313 OUTPUT:
2314 RETVAL
2296 2315
2297void 2316void
2298maptile::instantiate () 2317maptile::instantiate ()
2299 2318
2300maptile *new () 2319maptile *new ()
… …
2332 for (int x = 0; x < THIS->width; ++x) 2351 for (int x = 0; x < THIS->width; ++x)
2333 for (int y = 0; y < THIS->height; ++y) 2352 for (int y = 0; y < THIS->height; ++y)
2334 { 2353 {
2335 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2354 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2336 if (op->flag [FLAG_IS_FLOOR]) 2355 if (op->flag [FLAG_IS_FLOOR])
2337 goto skip_space; 2356 goto skip;
2338 2357
2339 { 2358 {
2340 int offs = offset + y * stride + x; 2359 int offs = offset + y * stride + x;
2360
2341 if (IN_RANGE_EXC (offs, 0, idxlen)) 2361 if (IN_RANGE_EXC (offs, 0, idxlen))
2342 { 2362 {
2343 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2363 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2344 { 2364 {
2345 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2365 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2346 ob->flag [FLAG_NO_MAP_SAVE] = true; 2366 ob->flag [FLAG_NO_MAP_SAVE] = true;
2347 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2367 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2348 2368
2349 if (ob->randomitems) 2369 if (ob->randomitems && !ob->above)
2350 { 2370 {
2351 if (!ob->above)
2352 {
2353 ob->create_treasure (ob->randomitems); 2371 ob->create_treasure (ob->randomitems);
2354 2372
2355 for (object *op = ob->above; op; op = op->above) 2373 for (object *op = ob->above; op; op = op->above)
2356 op->flag [FLAG_NO_MAP_SAVE] = true; 2374 op->flag [FLAG_NO_MAP_SAVE] = true;
2357 } 2375 // TODO: if this is a pickable object, then the item
2358 2376 // will at a bit weird - saving inside the player
2359 ob->randomitems = 0; 2377 // will clear the flag, but when the player drops
2378 // it without logging out, it keeps the flag.
2379 // nobody ahs reported this, but this can be rather
2380 // annoying on persistent maps.
2360 } 2381 }
2361 } 2382 }
2362 } 2383 }
2363 } 2384 }
2364 2385
2365 skip_space: ; 2386 skip: ;
2366 } 2387 }
2367} 2388}
2368 2389
2369void 2390void
2370maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2391maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2380 2401
2381 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2402 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2382 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2403 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2383 2404
2384 for (int i = av_len ((AV *)palette) + 1; i--; ) 2405 for (int i = av_len ((AV *)palette) + 1; i--; )
2385 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2406 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2386 2407
2387 for (int y = 0; y < THIS->height; ++y) 2408 for (int y = 0; y < THIS->height; ++y)
2388 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2409 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2389 2410
2390 sfree (THIS->regions, THIS->size ()); 2411 sfree (THIS->regions, THIS->size ());
… …
2409 } 2430 }
2410 2431
2411int out_of_map (maptile *map, int x, int y) 2432int out_of_map (maptile *map, int x, int y)
2412 2433
2413void 2434void
2414trigger (maptile *map, long connection, bool state = true) 2435find_link (maptile *map, shstr_tmp connection)
2415 CODE:
2416 activate_connection (map, connection, state);
2417
2418void
2419get_connection (maptile *map, long connection)
2420 PPCODE: 2436 PPCODE:
2421 oblinkpt *obp = get_connection_links (map, connection); 2437 if (oblinkpt *obp = map->find_link (connection))
2422 if (obp)
2423 for (objectlink *ol = obp->link; ol; ol = ol->next) 2438 for (objectlink *ol = obp->link; ol; ol = ol->next)
2424 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2439 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2425 2440
2426void 2441void
2427get_map_flags (maptile *map, int x, int y) 2442get_map_flags (maptile *map, int x, int y)
… …
2481 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2496 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2482 XPUSHs (sv_2mortal (to_sv (o))); 2497 XPUSHs (sv_2mortal (to_sv (o)));
2483} 2498}
2484 2499
2485SV * 2500SV *
2486bot_at (maptile *obj, unsigned int x, unsigned int y) 2501bot_at (maptile *map, unsigned int x, unsigned int y)
2487 PROTOTYPE: $$$ 2502 PROTOTYPE: $$$
2488 ALIAS: 2503 ALIAS:
2489 top_at = 1 2504 top_at = 1
2490 flags_at = 2 2505 flags_at = 2
2491 light_at = 3 2506 light_at = 3
2492 move_block_at = 4 2507 move_block_at = 4
2493 move_slow_at = 5 2508 move_slow_at = 5
2494 move_on_at = 6 2509 move_on_at = 6
2495 move_off_at = 7 2510 move_off_at = 7
2496 INIT:
2497 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2498 CODE: 2511 CODE:
2512{
2513 sint16 nx = x;
2514 sint16 ny = y;
2515
2516 if (!xy_normalise (map, nx, ny))
2517 XSRETURN_UNDEF;
2518
2519 mapspace &ms = map->at (nx, ny);
2520
2521 ms.update ();
2522
2499 switch (ix) 2523 switch (ix)
2500 { 2524 {
2501 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2525 case 0: RETVAL = to_sv (ms.bot ); break;
2502 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2526 case 1: RETVAL = to_sv (ms.top ); break;
2503 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2527 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2528 case 3: RETVAL = newSViv (ms.light ); break;
2505 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2529 case 4: RETVAL = newSVuv (ms.move_block); break;
2506 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2530 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2531 case 6: RETVAL = newSVuv (ms.move_on ); break;
2508 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2532 case 7: RETVAL = newSVuv (ms.move_off ); break;
2509 } 2533 }
2534}
2510 OUTPUT: RETVAL 2535 OUTPUT: RETVAL
2511
2512void fix_walls (maptile *map, int x, int y)
2513
2514void fix_walls_around (maptile *map, int x, int y)
2515 2536
2516# worst xs function of my life 2537# worst xs function of my life
2517bool 2538bool
2518_create_random_map (\ 2539_create_random_map (\
2519 maptile *self,\ 2540 maptile *self,\
… …
2523 utf8_string monsterstyle,\ 2544 utf8_string monsterstyle,\
2524 utf8_string treasurestyle,\ 2545 utf8_string treasurestyle,\
2525 utf8_string layoutstyle,\ 2546 utf8_string layoutstyle,\
2526 utf8_string doorstyle,\ 2547 utf8_string doorstyle,\
2527 utf8_string decorstyle,\ 2548 utf8_string decorstyle,\
2549 utf8_string miningstyle,\
2528 utf8_string origin_map,\ 2550 utf8_string origin_map,\
2529 utf8_string final_map,\ 2551 utf8_string final_map,\
2530 utf8_string exitstyle,\ 2552 utf8_string exitstyle,\
2531 utf8_string this_map,\ 2553 utf8_string this_map,\
2532 utf8_string exit_on_final_map,\ 2554 utf8_string exit_on_final_map,\
… …
2564 assign (rmp.monsterstyle , monsterstyle); 2586 assign (rmp.monsterstyle , monsterstyle);
2565 assign (rmp.treasurestyle , treasurestyle); 2587 assign (rmp.treasurestyle , treasurestyle);
2566 assign (rmp.layoutstyle , layoutstyle); 2588 assign (rmp.layoutstyle , layoutstyle);
2567 assign (rmp.doorstyle , doorstyle); 2589 assign (rmp.doorstyle , doorstyle);
2568 assign (rmp.decorstyle , decorstyle); 2590 assign (rmp.decorstyle , decorstyle);
2591 assign (rmp.miningstyle , miningstyle);
2569 assign (rmp.exitstyle , exitstyle); 2592 assign (rmp.exitstyle , exitstyle);
2570 assign (rmp.exit_on_final_map, exit_on_final_map); 2593 assign (rmp.exit_on_final_map, exit_on_final_map);
2571 2594
2572 rmp.origin_map = origin_map; 2595 rmp.origin_map = origin_map;
2573 rmp.final_map = final_map; 2596 rmp.final_map = final_map;
… …
2601 OUTPUT: 2624 OUTPUT:
2602 RETVAL 2625 RETVAL
2603 2626
2604MODULE = cf PACKAGE = cf::mapspace 2627MODULE = cf PACKAGE = cf::mapspace
2605 2628
2606INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2629INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2607 2630
2608MODULE = cf PACKAGE = cf::arch 2631MODULE = cf PACKAGE = cf::arch
2609 2632
2610int archetypes_size () 2633int archetypes_size ()
2611 CODE: 2634 CODE:
… …
2615archetype *archetypes (U32 index) 2638archetype *archetypes (U32 index)
2616 CODE: 2639 CODE:
2617 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2640 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2618 OUTPUT: RETVAL 2641 OUTPUT: RETVAL
2619 2642
2620object *instantiate (archetype *arch)
2621 CODE:
2622 RETVAL = arch_to_object (arch);
2623 OUTPUT:
2624 RETVAL
2625
2626INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2643INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2627 2644
2628MODULE = cf PACKAGE = cf::party 2645MODULE = cf PACKAGE = cf::party
2629 2646
2630partylist *first () 2647partylist *first ()
2631 PROTOTYPE: 2648 PROTOTYPE:
2632 CODE: 2649 CODE:
2633 RETVAL = get_firstparty (); 2650 RETVAL = get_firstparty ();
2634 OUTPUT: RETVAL 2651 OUTPUT: RETVAL
2635 2652
2636INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2653INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2637 2654
2638MODULE = cf PACKAGE = cf::region 2655MODULE = cf PACKAGE = cf::region
2639 2656
2640void 2657void
2641list () 2658list ()
… …
2647 PROTOTYPE: $ 2664 PROTOTYPE: $
2648 CODE: 2665 CODE:
2649 RETVAL = region::find (name); 2666 RETVAL = region::find (name);
2650 OUTPUT: RETVAL 2667 OUTPUT: RETVAL
2651 2668
2652region *find_fuzzy (utf8_string name)
2653 PROTOTYPE: $
2654 CODE:
2655 RETVAL = region::find_fuzzy (name);
2656 OUTPUT: RETVAL
2657
2658int specificity (region *rgn) 2669int specificity (region *rgn)
2659 CODE: 2670 CODE:
2660 RETVAL = 0; 2671 RETVAL = 0;
2661 while (rgn = rgn->parent) 2672 while (rgn = rgn->parent)
2662 RETVAL++; 2673 RETVAL++;
2663 OUTPUT: RETVAL 2674 OUTPUT: RETVAL
2664 2675
2665INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2676INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2666 2677
2667MODULE = cf PACKAGE = cf::living 2678MODULE = cf PACKAGE = cf::living
2668 2679
2669INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2680INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2670 2681
2671MODULE = cf PACKAGE = cf::settings 2682MODULE = cf PACKAGE = cf::settings
2672 2683
2673INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2684INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2674 2685
2675MODULE = cf PACKAGE = cf::client 2686MODULE = cf PACKAGE = cf::client
2676 2687
2677INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2688INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2678 2689
2679int invoke (client *ns, int event, ...) 2690int invoke (client *ns, int event, ...)
2680 CODE: 2691 CODE:
2681 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2692 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2682 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2693 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2748 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2759 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2749 old_sound_index [idx] = face; 2760 old_sound_index [idx] = face;
2750 2761
2751MODULE = cf PACKAGE = cf::face PREFIX = face_ 2762MODULE = cf PACKAGE = cf::face PREFIX = face_
2752 2763
2753#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2764#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2754 2765
2755faceidx face_find (utf8_string name, faceidx defidx = 0) 2766faceidx face_find (utf8_string name, faceidx defidx = 0)
2756 2767
2757faceidx alloc (utf8_string name) 2768faceidx alloc (utf8_string name)
2758 CODE: 2769 CODE:
… …
2765 while (!RETVAL); // crude way to leave index 0 2776 while (!RETVAL); // crude way to leave index 0
2766 2777
2767 faces [RETVAL].name = name; 2778 faces [RETVAL].name = name;
2768 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2779 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2769 2780
2770 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2781 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2771 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2782 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2783 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2772} 2784}
2773 OUTPUT: RETVAL 2785 OUTPUT: RETVAL
2774 2786
2775void set_type (faceidx idx, int value) 2787void set_type (faceidx idx, int value)
2776 ALIAS: 2788 ALIAS:
… …
2796 faceinfo *f = face_info (idx); assert (f); 2808 faceinfo *f = face_info (idx); assert (f);
2797 facedata *d = &(faceset ? f->data64 : f->data32); 2809 facedata *d = &(faceset ? f->data64 : f->data32);
2798 sv_to (data, d->data); 2810 sv_to (data, d->data);
2799 STRLEN clen; 2811 STRLEN clen;
2800 char *cdata = SvPVbyte (chksum, clen); 2812 char *cdata = SvPVbyte (chksum, clen);
2801 clen = min (CHKSUM_SIZE, clen); 2813 clen = min (CHKSUM_MAXLEN, clen);
2802 2814
2815 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2816
2803 if (memcmp (d->chksum, cdata, clen)) 2817 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2804 { 2818 {
2819 d->chksum_len = clen;
2805 memcpy (d->chksum, cdata, clen); 2820 memcpy (d->chksum, cdata, clen);
2806 2821
2807 // invalidate existing client face info 2822 // invalidate existing client face info
2808 for_all_clients (ns) 2823 for_all_clients (ns)
2809 if (ns->faceset == faceset) 2824 if (ns->faceset == faceset)
… …
2824 2839
2825SV *get_chksum (faceidx idx, int faceset = 0) 2840SV *get_chksum (faceidx idx, int faceset = 0)
2826 CODE: 2841 CODE:
2827 facedata *d = face_data (idx, faceset); 2842 facedata *d = face_data (idx, faceset);
2828 if (!d) XSRETURN_UNDEF; 2843 if (!d) XSRETURN_UNDEF;
2829 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2844 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2830 OUTPUT: 2845 OUTPUT:
2831 RETVAL 2846 RETVAL
2832 2847
2833SV *get_data (faceidx idx, int faceset = 0) 2848SV *get_data (faceidx idx, int faceset = 0)
2834 CODE: 2849 CODE:
… …
2854 ns->force_newmap = true; 2869 ns->force_newmap = true;
2855 } 2870 }
2856 2871
2857MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2872MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2858 2873
2859#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2874#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2860 2875
2861animidx anim_find (utf8_string name) 2876animidx anim_find (utf8_string name)
2862 CODE: 2877 CODE:
2863 RETVAL = animation::find (name).number; 2878 RETVAL = animation::find (name).number;
2864 OUTPUT: RETVAL 2879 OUTPUT: RETVAL
… …
2879 } 2894 }
2880 else 2895 else
2881 anim = &animation::create (name, av_len (av) + 1, facings); 2896 anim = &animation::create (name, av_len (av) + 1, facings);
2882 2897
2883 for (int i = 0; i < anim->num_animations; ++i) 2898 for (int i = 0; i < anim->num_animations; ++i)
2884 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2899 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2885} 2900}
2886 OUTPUT: RETVAL 2901 OUTPUT: RETVAL
2887 2902
2888void invalidate_all () 2903void invalidate_all ()
2889 CODE: 2904 CODE:
2890 for_all_clients (ns) 2905 for_all_clients (ns)
2891 ns->anims_sent.reset (); 2906 ns->anims_sent.reset ();
2892 2907
2893MODULE = cf PACKAGE = cf::object::freezer 2908MODULE = cf PACKAGE = cf::object::freezer
2894 2909
2895INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2910INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2896 2911
2897SV * 2912SV *
2898new (char *klass) 2913new (char *klass)
2899 CODE: 2914 CODE:
2900 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2915 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2907 sv_to (sv, self); 2922 sv_to (sv, self);
2908 delete self; 2923 delete self;
2909 2924
2910MODULE = cf PACKAGE = cf::object::thawer 2925MODULE = cf PACKAGE = cf::object::thawer
2911 2926
2912INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2927INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2913 2928
2914SV * 2929SV *
2915new_from_file (char *klass, octet_string path) 2930new_from_file (char *klass, octet_string path)
2916 CODE: 2931 CODE:
2917 object_thawer *f = new object_thawer (path); 2932 object_thawer *f = new object_thawer (path);

Diff Legend

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