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.320 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.388 by root, Wed Jun 30 01:57:54 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
86 *stash_cf_mapspace_wrap, 83 *stash_cf_mapspace_wrap,
87 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
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,
89 *stash_ext_map_world;
90
91static SV
92 *cv_cf_do_invoke,
93 *cv_cf__can_merge,
94 *cv_cf_client_send_msg,
95 *cv_cf_tick,
96 *cv_cf_match_match;
92 97
93#ifndef newSVpv_utf8 98#ifndef newSVpv_utf8
94static inline SV * 99static SV *
95newSVpv_utf8 (const char *s) 100newSVpv_utf8 (const char *s)
96{ 101{
97 if (!s) 102 if (!s)
98 return newSV (0); 103 return newSV (0);
99 104
102 return sv; 107 return sv;
103} 108}
104#endif 109#endif
105 110
106#ifndef newSVpvn_utf8 111#ifndef newSVpvn_utf8
107static inline SV * 112static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 113newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 114{
110 if (!s) 115 if (!s)
111 return newSV (0); 116 return newSV (0);
112 117
116 SvUTF8_on (sv); 121 SvUTF8_on (sv);
117 122
118 return sv; 123 return sv;
119} 124}
120#endif 125#endif
126
127noinline utf8_string
128cfSvPVutf8_nolen (SV *sv)
129{
130 SvGETMAGIC (sv);
131
132 if (SvPOK (sv))
133 {
134 if (!SvUTF8 (sv))
135 sv_utf8_upgrade_nomg (sv);
136
137 return SvPVX (sv);
138 }
139
140 return SvPV_nolen (sv);
141}
121 142
122// helper cast function, returns super class * or 0 143// helper cast function, returns super class * or 0
123template<class super> 144template<class super>
124static super * 145static super *
125is_a (attachable *at) 146is_a (attachable *at)
202attachable::destroy () 223attachable::destroy ()
203{ 224{
204 if (destroyed ()) 225 if (destroyed ())
205 return; 226 return;
206 227
207 flags |= F_DESTROYED; 228 attachable_flags |= F_DESTROYED;
208 do_destroy (); 229 do_destroy ();
209 sever_self (); 230 sever_self ();
231}
232
233void
234attachable::do_delete ()
235{
236 delete this;
210} 237}
211 238
212void 239void
213attachable::check_mortals () 240attachable::check_mortals ()
214{ 241{
230 257
231 if (0) 258 if (0)
232 { 259 {
233 for (int j = 0; j < mortals.size (); ++j)//D 260 for (int j = 0; j < mortals.size (); ++j)//D
234 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 261 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
262
235 fprintf (stderr, "\n");//D 263 fprintf (stderr, "\n");//D
236 } 264 }
237 } 265 }
238 } 266 }
239 267
259 } 287 }
260 else 288 else
261 { 289 {
262 mortals.erase (i); 290 mortals.erase (i);
263 obj->sever_self (); 291 obj->sever_self ();
264 delete obj; 292 obj->do_delete ();
265 } 293 }
266 } 294 }
267} 295}
268 296
269void 297void
286 314
287 attach = src.attach; 315 attach = src.attach;
288 return *this; 316 return *this;
289} 317}
290 318
319#if 0
291template<typename T> 320template<typename T>
292static bool 321static bool
293find_backref (void *ptr, T *obj) 322find_backref (void *ptr, T *obj)
294{ 323{
295 char *s = (char *)obj; 324 char *s = (char *)obj;
303 332
304 return false; 333 return false;
305} 334}
306 335
307// for debugging, find "live" objects containing this ptr 336// for debugging, find "live" objects containing this ptr
308void 337static void
309find_backref (void *ptr) 338find_backref (void *ptr)
310{ 339{
311 for_all_objects (op) 340 for_all_objects (op)
312 if (find_backref (ptr, op)) 341 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 342 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
318 347
319 for_all_clients (ns) 348 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 349 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 350 fprintf (stderr, "C %p\n", ns);
322} 351}
352#endif
323 353
324////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 354//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
325 355
326static SV * 356static SV *
327newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 357newSVptr (void *ptr, HV *stash, HV *hv)
328{ 358{
329 SV *sv;
330
331 if (!ptr) 359 if (!ptr)
332 return newSV (0); 360 return newSV (0);
333 361
334 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 362 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
335 return sv_bless (newRV_noinc ((SV *)hv), stash); 363 return sv_bless (newRV_noinc ((SV *)hv), stash);
364}
365
366static SV * noinline
367newSVptr (void *ptr, HV *stash)
368{
369 return newSVptr (ptr, stash, newHV ());
336} 370}
337 371
338static int 372static int
339attachable_free (pTHX_ SV *sv, MAGIC *mg) 373attachable_free (pTHX_ SV *sv, MAGIC *mg)
340{ 374{
352 return 0; 386 return 0;
353} 387}
354 388
355MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 389MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
356 390
357static SV * 391static SV * noinline
358newSVattachable (attachable *obj, HV *stash) 392newSVattachable (attachable *obj, HV *stash)
359{ 393{
360 if (!obj) 394 if (!obj)
361 return newSV (0); 395 return newSV (0);
362 396
380 414
381 return sv; 415 return sv;
382 } 416 }
383} 417}
384 418
419#if 0 // unused
385static void 420static void
386clearSVptr (SV *sv) 421clearSVptr (SV *sv)
387{ 422{
388 if (SvROK (sv)) 423 if (SvROK (sv))
389 sv = SvRV (sv); 424 sv = SvRV (sv);
390 425
391 hv_clear ((HV *)sv); 426 hv_clear ((HV *)sv);
392 sv_unmagic (sv, PERL_MAGIC_ext); 427 sv_unmagic (sv, PERL_MAGIC_ext);
393} 428}
429#endif
430
431static long
432SvPTR_nc (SV *sv)
433{
434 sv = SvRV (sv);
435
436 // very important shortcut
437 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
438 return (long)SvMAGIC (sv)->mg_ptr;
439
440 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
441 return (long)mg->mg_ptr;
442
443 croak ("perl code used object, but C object is already destroyed, caught");
444}
394 445
395static long 446static long
396SvPTR (SV *sv, const char *klass) 447SvPTR (SV *sv, const char *klass)
397{ 448{
398 if (!sv_derived_from (sv, klass)) 449 if (!sv_derived_from (sv, klass))
399 croak ("object of type %s expected", klass); 450 croak ("object of type %s expected", klass);
400 451
401 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 452 return SvPTR_nc (sv);
402
403 if (!mg)
404 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
405
406 return (long)mg->mg_ptr;
407} 453}
408 454
409static long noinline 455static long noinline
410SvPTR_ornull (SV *sv, const char *klass) 456SvPTR_ornull (SV *sv, const char *klass)
411{ 457{
412 if (SvOK (sv)) 458 if (expect_false (!SvOK (sv))) return 0;
459
413 return SvPTR (sv, klass); 460 return SvPTR (sv, klass);
414 else
415 return 0;
416} 461}
417 462
463static long noinline
464SvPTR_ornull_client (SV *sv)
465{
466 if (expect_false (!SvOK (sv))) return 0;
467
468 if (!SvROK (sv)
469 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
470 && !sv_derived_from (sv, "cf::client")))
471 croak ("object of type cf::client expected");
472
473 return SvPTR_nc (sv);
474}
475
476static long noinline
477SvPTR_ornull_object (SV *sv)
478{
479 if (expect_false (!SvOK (sv))) return 0;
480
481 if (!SvROK (sv)
482 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
483 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
484 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
485 && !sv_derived_from (sv, "cf::object")))
486 croak ("object of type cf::object expected");
487
488 return SvPTR_nc (sv);
489}
490
491static long noinline
492SvPTR_ornull_maptile (SV *sv)
493{
494 if (expect_false (!SvOK (sv))) return 0;
495
496 if (!SvROK (sv)
497 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
498 && SvSTASH (SvRV (sv)) != stash_ext_map_world
499 && !sv_derived_from (sv, "cf::map")))
500 croak ("object of type cf::map expected");
501
502 return SvPTR_nc (sv);
503}
504
505static long noinline
506SvPTR_ornull_player (SV *sv)
507{
508 if (expect_false (!SvOK (sv))) return 0;
509
510 if (!SvROK (sv)
511 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
512 && !sv_derived_from (sv, "cf::player")))
513 croak ("object of type cf::player expected");
514
515 return SvPTR_nc (sv);
516}
517
418inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 518static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
419inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 519static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
420inline SV *to_sv (bool v) { return newSViv (v); } 520static inline SV *to_sv (bool v) { return newSViv (v); }
421inline SV *to_sv ( signed char v) { return newSViv (v); } 521static inline SV *to_sv ( signed char v) { return newSViv (v); }
422inline SV *to_sv (unsigned char v) { return newSViv (v); } 522static inline SV *to_sv (unsigned char v) { return newSViv (v); }
423inline SV *to_sv ( signed short v) { return newSViv (v); } 523static inline SV *to_sv ( signed short v) { return newSViv (v); }
424inline SV *to_sv (unsigned short v) { return newSVuv (v); } 524static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
425inline SV *to_sv ( signed int v) { return newSViv (v); } 525static inline SV *to_sv ( signed int v) { return newSViv (v); }
426inline SV *to_sv (unsigned int v) { return newSVuv (v); } 526static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
427inline SV *to_sv ( signed long v) { return newSViv (v); } 527static inline SV *to_sv ( signed long v) { return newSViv (v); }
428inline SV *to_sv (unsigned long v) { return newSVuv (v); } 528static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
429inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 529static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
430inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 530static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
431inline SV *to_sv (float v) { return newSVnv (v); } 531static inline SV *to_sv (float v) { return newSVnv (v); }
432inline SV *to_sv (double v) { return newSVnv (v); } 532static inline SV *to_sv (double v) { return newSVnv (v); }
433inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 533static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
434inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 534static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
535// gcc dislikes noilnine on to_sv
435inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 536static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
537static inline SV *to_sv (object * v) { return to_sv_ni (v); }
436inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 538static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
437inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 539static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
438inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 540static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
439inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 541static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
440inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 542static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
441inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 543static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
442 544
443inline SV *to_sv (object & v) { return to_sv (&v); } 545static inline SV *to_sv (object & v) { return to_sv (&v); }
444inline SV *to_sv (living & v) { return to_sv (&v); } 546static inline SV *to_sv (living & v) { return to_sv (&v); }
445 547
446inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 548static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
447inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 549static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
448 550
449inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 551static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
450 552
451inline SV *to_sv (dynbuf * v) 553static inline SV *to_sv (dynbuf * v)
452{ 554{
453 SV *sv = newSV (0); 555 SV *sv = newSV (0);
454 556
455 sv_upgrade (sv, SVt_PV); 557 sv_upgrade (sv, SVt_PV);
456 SvGROW (sv, v->size () + 1); 558 SvGROW (sv, v->size () + 1);
460 *SvEND (sv) = 0; 562 *SvEND (sv) = 0;
461 563
462 return sv; 564 return sv;
463} 565}
464 566
465inline SV *to_sv (dynbuf_text * v) 567static inline SV *to_sv (dynbuf_text * v)
466{ 568{
467 SV *sv = to_sv (static_cast<dynbuf *> (v)); 569 SV *sv = to_sv (static_cast<dynbuf *> (v));
468 SvUTF8_on (sv); 570 SvUTF8_on (sv);
469 return sv; 571 return sv;
470} 572}
471 573
472inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 574static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
473inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 575static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
474inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 576static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
475inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 577static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 578static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 582static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
481inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 583static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
482inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 584static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
483inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 585static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
484inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 586static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
485inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 587static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
486inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 588static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 589static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
488inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 590static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
489inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 591static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
592static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
490inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 593static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
491inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
492inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 594static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
493inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 595static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
494inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 596static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
495inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 597static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
496inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 598static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
497inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 599static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
498inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 600static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
499 601
500//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 602//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
501inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 603static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
502 604
503template<class T> 605template<class T>
504inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 606static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
505 607
506template<int N> 608template<int N>
507inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 609static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
508 610
509inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 611static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
510inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 612static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
511inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 613static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
512inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 614static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
513 615
514inline void sv_to (SV *sv, std::string &v) 616static inline void sv_to (SV *sv, std::string &v)
515{ 617{
516 STRLEN len; 618 STRLEN len;
517 char *data = SvPVbyte (sv, len); 619 char *data = SvPVbyte (sv, len);
518 v.assign (data, len); 620 v.assign (data, len);
519} 621}
520 622
521inline void sv_to (SV *sv, UUID &v) 623static inline void sv_to (SV *sv, UUID &v)
522{ 624{
523 if (!v.parse (SvPV_nolen (sv))) 625 if (!v.parse (SvPV_nolen (sv)))
524 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 626 croak ("unparsable uuid: %s", SvPV_nolen (sv));
525} 627}
526 628
527inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 629static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
528 630
529static SV * 631static SV *
530newSVdt_va (va_list &ap, data_type type) 632newSVdt_va (va_list &ap, data_type type)
531{ 633{
532 SV *sv; 634 SV *sv;
612template<class type> 714template<class type>
613static void noinline 715static void noinline
614cf_obj_to (SV *arg, type &var) 716cf_obj_to (SV *arg, type &var)
615{ 717{
616 sv_to (arg, var); 718 sv_to (arg, var);
617 if (!var) 719 if (expect_false (!var))
618 croak ("must not pass invalid/null cf_obj here"); 720 croak ("must not pass invalid/null cf_obj here");
619} 721}
620 722
621template<class object> 723template<class object>
622static void noinline 724static void noinline
623cf_obj_ornull_to (SV *arg, object *&var) 725cf_obj_ornull_to (SV *arg, object *&var)
624{ 726{
625 if (SvOK (arg)) 727 if (SvOK (arg))
626 { 728 {
627 sv_to (arg, var); 729 sv_to (arg, var);
628 if (!var) 730 if (expect_false (!var))
629 croak ("unable to convert perl object to C++ object"); 731 croak ("unable to convert perl object to C++ object");
630 } 732 }
631 else 733 else
632 var = 0; 734 var = 0;
633} 735}
634 736
635////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 737//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
636 738
637SV * 739static SV *
638registry (attachable *ext) 740registry (attachable *ext)
639{ 741{
640 if (!ext->cb) 742 if (!ext->cb)
641 ext->cb = newAV (); 743 ext->cb = newAV ();
642 744
668 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
669 } 771 }
670 772
671 eval_pv ( 773 eval_pv (
672 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
673 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
674 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
675 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
676 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
677 "require cf;\n", 779 "require cf;\n",
678 0 780 0
679 ); 781 );
680 782
681 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
918 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 1020 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
919 } 1021 }
920 1022
921 va_end (ap); 1023 va_end (ap);
922 1024
923 CALL_CALL ("cf::do_invoke", G_SCALAR); 1025 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
924 count = count > 0 ? POPi : 0; 1026 count = count > 0 ? POPi : 0;
925 1027
926 CALL_END; 1028 CALL_END;
927 1029
928 return count; 1030 return count;
929} 1031}
930 1032
931SV * 1033static SV *
932cfperl_result (int idx) 1034cfperl_result (int idx)
933{ 1035{
934 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1036 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
935 if (!av) 1037 if (!av)
936 return &PL_sv_undef; 1038 return &PL_sv_undef;
969 1071
970 dSP; 1072 dSP;
971 1073
972 PUSHMARK (SP); 1074 PUSHMARK (SP);
973 PUTBACK; 1075 PUTBACK;
974 call_pv ("cf::tick", G_DISCARD | G_VOID); 1076 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
975 1077
976 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1078 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
977} 1079}
978 1080
979void 1081void
1002 CALL_CALL ("ext::books::make_book", G_VOID); 1104 CALL_CALL ("ext::books::make_book", G_VOID);
1003 CALL_END; 1105 CALL_END;
1004} 1106}
1005 1107
1006void 1108void
1007cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1109cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1008{ 1110{
1009 CALL_BEGIN (4); 1111 CALL_BEGIN (4);
1010 CALL_ARG (ns); 1112 CALL_ARG (ns);
1011 CALL_ARG (type); 1113 CALL_ARG (type);
1012 CALL_ARG_SV (newSVpv_utf8 (msg)); 1114 CALL_ARG_SV (newSVpv_utf8 (msg));
1013 CALL_ARG (color); 1115 CALL_ARG (color);
1014 CALL_CALL ("cf::client::send_msg", G_VOID); 1116 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1015 CALL_END; 1117 CALL_END;
1016} 1118}
1017 1119
1018int 1120int
1019cfperl_can_merge (object *ob1, object *ob2) 1121cfperl_can_merge (object *ob1, object *ob2)
1021 int can; 1123 int can;
1022 1124
1023 CALL_BEGIN (2); 1125 CALL_BEGIN (2);
1024 CALL_ARG (ob1); 1126 CALL_ARG (ob1);
1025 CALL_ARG (ob2); 1127 CALL_ARG (ob2);
1026 CALL_CALL ("cf::_can_merge", G_SCALAR); 1128 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1027 can = count && SvTRUE (TOPs); 1129 can = count && SvTRUE (TOPs);
1028 CALL_END; 1130 CALL_END;
1029 1131
1030 return can; 1132 return can;
1031} 1133}
1041 CALL_CALL ("cf::mapscript::activate", G_VOID); 1143 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END; 1144 CALL_END;
1043} 1145}
1044 1146
1045player * 1147player *
1046player::find (const char *name) 1148player::find (const_utf8_string name)
1047{ 1149{
1048 CALL_BEGIN (1); 1150 CALL_BEGIN (1);
1049 CALL_ARG (name); 1151 CALL_ARG (name);
1050 CALL_CALL ("cf::player::find", G_SCALAR); 1152 CALL_CALL ("cf::player::find", G_SCALAR);
1051 1153
1056 1158
1057 return retval; 1159 return retval;
1058} 1160}
1059 1161
1060maptile * 1162maptile *
1061find_style (const char *dirname, const char *stylename, int difficulty) 1163find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1062{ 1164{
1063 CALL_BEGIN (3); 1165 CALL_BEGIN (4);
1064 CALL_ARG (dirname); 1166 CALL_ARG (dirname);
1065 CALL_ARG (stylename); 1167 CALL_ARG (stylename);
1066 CALL_ARG (difficulty); 1168 CALL_ARG (difficulty);
1169 CALL_ARG (recurse);
1067 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1170 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1068 1171
1069 maptile *retval = 0; 1172 maptile *retval = 0;
1070 if (count) sv_to (POPs, retval); 1173 if (count) sv_to (POPs, retval);
1071 1174
1073 1176
1074 return retval; 1177 return retval;
1075} 1178}
1076 1179
1077maptile * 1180maptile *
1078maptile::find_sync (const char *path, maptile *origin) 1181maptile::find_sync (const_utf8_string path, maptile *origin)
1079{ 1182{
1080 CALL_BEGIN (2); 1183 CALL_BEGIN (2);
1081 CALL_ARG (path); 1184 CALL_ARG (path);
1082 CALL_ARG (origin); 1185 CALL_ARG (origin);
1083 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1186 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1089 1192
1090 return retval; 1193 return retval;
1091} 1194}
1092 1195
1093maptile * 1196maptile *
1094maptile::find_async (const char *path, maptile *origin, bool load) 1197maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1095{ 1198{
1096 CALL_BEGIN (3); 1199 CALL_BEGIN (3);
1097 CALL_ARG (path); 1200 CALL_ARG (path);
1098 CALL_ARG (origin); 1201 CALL_ARG (origin);
1099 CALL_ARG (load); 1202 CALL_ARG (load);
1128 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1231 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1129 CALL_END; 1232 CALL_END;
1130} 1233}
1131 1234
1132void 1235void
1133object::player_goto (const char *path, int x, int y) 1236object::player_goto (const_utf8_string path, int x, int y)
1134{ 1237{
1135 if (type != PLAYER) 1238 if (type != PLAYER)
1136 return; 1239 return;
1137 1240
1138 CALL_BEGIN (4); 1241 CALL_BEGIN (4);
1142 CALL_ARG (y); 1245 CALL_ARG (y);
1143 CALL_CALL ("cf::object::player::goto", G_VOID); 1246 CALL_CALL ("cf::object::player::goto", G_VOID);
1144 CALL_END; 1247 CALL_END;
1145} 1248}
1146 1249
1147const char * 1250const_utf8_string
1148object::ref () const 1251object::ref () const
1149{ 1252{
1150 if (type == PLAYER) 1253 if (type == PLAYER)
1151 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1254 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1152 else 1255 else
1256 // TODO: should be able to save references within the same map, at least
1153 return 0; 1257 return 0;
1154} 1258}
1155 1259
1156object * 1260object *
1157object::deref (const char *ref) 1261object::deref (const_utf8_string ref)
1158{ 1262{
1159 object *retval = 0; 1263 object *retval = 0;
1160 1264
1161 if (ref) 1265 if (ref)
1162 { 1266 {
1172 1276
1173 return retval; 1277 return retval;
1174} 1278}
1175 1279
1176void 1280void
1177log_backtrace (const char *msg) 1281log_backtrace (const_utf8_string msg)
1178{ 1282{
1179#if HAVE_BACKTRACE 1283#if HAVE_BACKTRACE
1180 void *addr [20]; 1284 void *addr [20];
1181 int size = backtrace (addr, 20); 1285 int size = backtrace (addr, 20);
1182 1286
1187 CALL_CALL ("cf::_log_backtrace", G_VOID); 1291 CALL_CALL ("cf::_log_backtrace", G_VOID);
1188 CALL_END; 1292 CALL_END;
1189#endif 1293#endif
1190} 1294}
1191 1295
1296bool
1297is_match_expr (const_utf8_string expr)
1298{
1299 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1300}
1301
1302bool
1303match (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_SCALAR);
1315
1316 bool matched = count && SvTRUE (TOPs);
1317
1318 CALL_END;
1319
1320 return matched;
1321}
1322
1323object *
1324match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1325{
1326 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1327 expr += sizeof ("match ") - 1;
1328
1329 CALL_BEGIN (5);
1330 CALL_ARG (expr);
1331 CALL_ARG (ob);
1332 CALL_ARG (self);
1333 CALL_ARG (source);
1334 CALL_ARG (originator);
1335 CALL_CALL (cv_cf_match_match, G_ARRAY);
1336
1337 object *one = 0;
1338
1339 if (count)
1340 sv_to (TOPs, one);
1341
1342 CALL_END;
1343
1344 return one;
1345}
1346
1192///////////////////////////////////////////////////////////////////////////// 1347/////////////////////////////////////////////////////////////////////////////
1193 1348
1194struct EVAPI *evapi::GEVAPI; 1349struct EVAPI *evapi::GEVAPI;
1195struct CoroAPI *coroapi::GCoroAPI; 1350struct CoroAPI *coroapi::GCoroAPI;
1196 1351
1228 if (active) start (); 1383 if (active) start ();
1229 } 1384 }
1230} 1385}
1231 1386
1232static void 1387static void
1233_connect_to_perl () 1388_connect_to_perl_1 ()
1234{ 1389{
1235 stash_cf = gv_stashpv ("cf", 1); 1390 stash_cf = gv_stashpv ("cf", 1);
1236 1391
1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1392 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1238 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1393 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1242 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1397 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1243 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1398 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1244 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1399 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1245 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1400 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1246 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1401 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1402 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1247 1403
1248 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1404 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1249 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1405 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1250 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1406 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1251 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1407 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1257 cb_client = get_av ("cf::CB_CLIENT", 1); 1413 cb_client = get_av ("cf::CB_CLIENT", 1);
1258 cb_type = get_av ("cf::CB_TYPE" , 1); 1414 cb_type = get_av ("cf::CB_TYPE" , 1);
1259 cb_map = get_av ("cf::CB_MAP" , 1); 1415 cb_map = get_av ("cf::CB_MAP" , 1);
1260} 1416}
1261 1417
1418static void
1419_connect_to_perl_2 ()
1420{
1421 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1422 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1423 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1424 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1425 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1426}
1427
1262MODULE = cf PACKAGE = cf PREFIX = cf_ 1428MODULE = cf PACKAGE = cf PREFIX = cf_
1263 1429
1264BOOT: 1430BOOT:
1265{ 1431{
1266 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1432 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1267 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1433 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1268 1434
1269 _connect_to_perl (); 1435 _connect_to_perl_1 ();
1270 1436
1271 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1437 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1272 1438
1273 //{ 1439 //{
1274 // require_pv ("Time::HiRes"); 1440 // require_pv ("Time::HiRes");
1282 static const struct { 1448 static const struct {
1283 const char *name; 1449 const char *name;
1284 IV iv; 1450 IV iv;
1285 } *civ, const_iv[] = { 1451 } *civ, const_iv[] = {
1286# define const_iv(name) { # name, (IV)name }, 1452# define const_iv(name) { # name, (IV)name },
1287 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1453# include "const_iv.h"
1288 const_iv (logBacktrace) 1454# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1455# include "attackinc.h"
1456# undef def
1457# define def(uc, flags) const_iv (SK_ ## uc)
1458# include "skillinc.h"
1459# undef def
1289 1460
1290 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1291 1462
1292 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1293 1464
1294 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
1295 const_iv (MAXSOCKBUF) 1466 const_iv (MAXSOCKBUF)
1296 1467
1297 const_iv (NUM_BODY_LOCATIONS)
1298 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1299 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1300 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1301 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1302 const_iv (body_wrist) const_iv (body_waist)
1303
1304 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1305 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1306 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1307 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1308 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1309 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1310 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1311 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1312 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1313 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1314 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1315 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1316 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1317 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1318 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1319 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1320 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1321 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1322 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1323 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1324 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1325 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1326 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1327 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1328 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1329 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1330 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1331 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1332 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1333
1334 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1335
1336 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1337 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1338
1339 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1340 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1341 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1342 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1343 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1344 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1345 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1346
1347 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1348 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1349 const_iv (WEAP_BLUD)
1350
1351 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1352 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1353 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1354 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1355 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1356 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1357 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1358 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1359 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1360 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1361 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1362 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1363 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1364 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1365 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1366 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1367 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1368 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1369 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1370 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1371 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1372 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1373 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1374 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1375 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1376 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1377
1378 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1379 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1380 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1381 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1382 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1383 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1384
1385 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1468 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1386 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1469 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1387 1470
1388 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1471 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1389
1390 const_iv (SP_RAISE_DEAD)
1391 const_iv (SP_RUNE)
1392 const_iv (SP_MAKE_MARK)
1393 const_iv (SP_BOLT)
1394 const_iv (SP_BULLET)
1395 const_iv (SP_EXPLOSION)
1396 const_iv (SP_CONE)
1397 const_iv (SP_BOMB)
1398 const_iv (SP_WONDER)
1399 const_iv (SP_SMITE)
1400 const_iv (SP_MAGIC_MISSILE)
1401 const_iv (SP_SUMMON_GOLEM)
1402 const_iv (SP_DIMENSION_DOOR)
1403 const_iv (SP_MAGIC_MAPPING)
1404 const_iv (SP_MAGIC_WALL)
1405 const_iv (SP_DESTRUCTION)
1406 const_iv (SP_PERCEIVE_SELF)
1407 const_iv (SP_WORD_OF_RECALL)
1408 const_iv (SP_INVISIBLE)
1409 const_iv (SP_PROBE)
1410 const_iv (SP_HEALING)
1411 const_iv (SP_CREATE_FOOD)
1412 const_iv (SP_EARTH_TO_DUST)
1413 const_iv (SP_CHANGE_ABILITY)
1414 const_iv (SP_BLESS)
1415 const_iv (SP_CURSE)
1416 const_iv (SP_SUMMON_MONSTER)
1417 const_iv (SP_CHARGING)
1418 const_iv (SP_POLYMORPH)
1419 const_iv (SP_ALCHEMY)
1420 const_iv (SP_REMOVE_CURSE)
1421 const_iv (SP_IDENTIFY)
1422 const_iv (SP_DETECTION)
1423 const_iv (SP_MOOD_CHANGE)
1424 const_iv (SP_MOVING_BALL)
1425 const_iv (SP_SWARM)
1426 const_iv (SP_CHANGE_MANA)
1427 const_iv (SP_DISPEL_RUNE)
1428 const_iv (SP_CREATE_MISSILE)
1429 const_iv (SP_CONSECRATE)
1430 const_iv (SP_ANIMATE_WEAPON)
1431 const_iv (SP_LIGHT)
1432 const_iv (SP_CHANGE_MAP_LIGHT)
1433 const_iv (SP_FAERY_FIRE)
1434 const_iv (SP_CAUSE_DISEASE)
1435 const_iv (SP_AURA)
1436 const_iv (SP_TOWN_PORTAL)
1437 const_iv (SP_PARTY_SPELL)
1438 1472
1439 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1473 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1440 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1474 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1441 const_iv (F_LOCKED) 1475 const_iv (F_LOCKED)
1442 1476
1443 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1444
1445 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1477 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1446 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1478 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1447 1479
1448 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1449
1450 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1451 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1452
1453 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1454 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1455
1456 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1480 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1457
1458 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1459 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1460 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1461 const_iv (M_ICE) const_iv (M_SPECIAL)
1462 1481
1463 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1482 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1464 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1483 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1465 1484
1466 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1467 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1468 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1469 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1470 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1471 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1472 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1473 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1474 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1475 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1476 const_iv (SK_POISON_NAIL)
1477
1478 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1479 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1480 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1481 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1482 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1483 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1484
1485 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1486
1487 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1488 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1489 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1490 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1491 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1492 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1493 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1494
1495 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1485 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1496 const_iv (MAP_INACTIVE) 1486 const_iv (MAP_INACTIVE)
1497 1487
1498 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1488 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1499 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1489 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1500 1490
1501 const_iv (VERSION_CS) const_iv (VERSION_SC)
1502
1503 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1491 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1504 1492
1505 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1506
1507 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1493 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1508
1509 // random map generator
1510 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1511 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1512
1513 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1514 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1515 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1516
1517 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1518 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1519
1520 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1521 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1522
1523 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1524 const_iv (FT_RSRC) const_iv (FT_NUM)
1525 }; 1494 };
1526 1495
1527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1496 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1528 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1529 1498
1530 static const struct { 1499 static const struct {
1531 const char *name; 1500 const char *name;
1532 int skip; 1501 int skip;
1538# undef def 1507# undef def
1539 }; 1508 };
1540 1509
1541 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1542 1511
1543 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1512 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1544 { 1513 {
1545 AV *event = newAV (); 1514 AV *event = newAV ();
1546 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1547 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1518 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1550 } 1519 }
1520
1521 // used by autogenerated BOOT sections from genacc
1522 av_reflect = get_av ("cf::REFLECT", 1);
1551} 1523}
1552 1524
1553void _gv_clear (SV *gv) 1525void _gv_clear (SV *gv)
1554 CODE: 1526 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV); 1527 assert (SvTYPE (gv) == SVt_PVGV);
1562 f (GvGP (gv)->gp_cv); 1534 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0; 1535 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv); 1536 GvMULTI_off (gv);
1565# undef f 1537# undef f
1566 1538
1567void _connect_to_perl () 1539void _connect_to_perl_1 ()
1540
1541void _connect_to_perl_2 ()
1568 1542
1569void _recalc_want () 1543void _recalc_want ()
1570 1544
1571# not used by default anymore 1545# not used by default anymore
1572void _global_reattach () 1546void _global_reattach ()
1624 1598
1625void init_anim () 1599void init_anim ()
1626 1600
1627void init_globals () 1601void init_globals ()
1628 1602
1629void init_experience ()
1630
1631void init_attackmess () 1603void init_attackmess ()
1632 1604
1633void init_dynamic () 1605void init_dynamic ()
1634 1606
1635void load_settings () 1607void load_settings ()
1636 1608
1609void reload_exp_table ()
1610
1637void load_materials () 1611void reload_materials ()
1638 1612
1639void init_uuid () 1613void init_uuid ()
1640 CODE: 1614 CODE:
1641 UUID::init (); 1615 UUID::init ();
1642 1616
1643void init_signals () 1617void init_signals ()
1644
1645void init_commands ()
1646 1618
1647void init_skills () 1619void init_skills ()
1648 1620
1649void init_beforeplay () 1621void init_beforeplay ()
1650 1622
1680 } 1652 }
1681 1653
1682void server_tick () 1654void server_tick ()
1683 CODE: 1655 CODE:
1684{ 1656{
1657 ev_now_update (EV_DEFAULT);
1685 NOW = ev_now (EV_DEFAULT); 1658 NOW = ev_now (EV_DEFAULT);
1686 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1659 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1687 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1660 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1688 runtime = SvNVX (sv_runtime); 1661 runtime = SvNVX (sv_runtime);
1689 1662
1690 server_tick (); 1663 server_tick ();
1691 1664
1692 NOW = ev_time (); 1665 ev_now_update (EV_DEFAULT);
1666 NOW = ev_now (EV_DEFAULT);
1693 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1667 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1694 runtime += TICK; 1668 runtime += TICK;
1695 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1669 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1696} 1670}
1697 1671
1708 switch (items) 1682 switch (items)
1709 { 1683 {
1710 case 0: RETVAL = gen (); break; 1684 case 0: RETVAL = gen (); break;
1711 case 1: RETVAL = gen (SvUV (ST (0))); break; 1685 case 1: RETVAL = gen (SvUV (ST (0))); break;
1712 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1686 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1713 default: croak ("cf::rndm requires none, one or two parameters."); break; 1687 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1714 } 1688 }
1715} 1689}
1716 OUTPUT: 1690 OUTPUT:
1717 RETVAL 1691 RETVAL
1718 1692
1725NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1699NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1726 CODE: 1700 CODE:
1727 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1701 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1728 OUTPUT: 1702 OUTPUT:
1729 RETVAL 1703 RETVAL
1704
1705const char *ordinal (int i)
1730 1706
1731void weaken (...) 1707void weaken (...)
1732 PROTOTYPE: @ 1708 PROTOTYPE: @
1733 CODE: 1709 CODE:
1734 while (items > 0) 1710 while (items > 0)
1735 sv_rvweaken (ST (--items)); 1711 sv_rvweaken (ST (--items));
1736 1712
1737void 1713void log_suspend ()
1714
1715void log_resume ()
1716
1738log_backtrace (utf8_string msg) 1717void log_backtrace (utf8_string msg)
1739 1718
1740void
1741LOG (int flags, utf8_string msg) 1719void LOG (int flags, utf8_string msg)
1742 PROTOTYPE: $$ 1720 PROTOTYPE: $$
1743 C_ARGS: flags, "%s", msg 1721 C_ARGS: flags, "%s", msg
1744 1722
1745octet_string path_combine (octet_string base, octet_string path) 1723octet_string path_combine (octet_string base, octet_string path)
1746 PROTOTYPE: $$ 1724 PROTOTYPE: $$
1838 1816
1839int random_roll (int min, int max, object *op, int goodbad); 1817int random_roll (int min, int max, object *op, int goodbad);
1840 1818
1841const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1819const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1842 1820
1843int
1844exp_to_level (val64 exp) 1821int exp_to_level (val64 exp)
1845 CODE:
1846{
1847 int i = 0;
1848 1822
1849 RETVAL = settings.max_level;
1850
1851 for (i = 1; i <= settings.max_level; i++)
1852 {
1853 if (levels[i] > exp)
1854 {
1855 RETVAL = i - 1;
1856 break;
1857 }
1858 }
1859}
1860 OUTPUT: RETVAL
1861
1862val64
1863level_to_min_exp (int level) 1823val64 level_to_min_exp (int level)
1864 CODE:
1865 if (level > settings.max_level)
1866 RETVAL = levels[settings.max_level];
1867 else if (level < 1)
1868 RETVAL = 0;
1869 else
1870 RETVAL = levels[level];
1871 OUTPUT: RETVAL
1872 1824
1873SV * 1825SV *
1874resistance_to_string (int atnr) 1826resistance_to_string (int atnr)
1875 CODE: 1827 CODE:
1876 if (atnr >= 0 && atnr < NROFATTACKS) 1828 if (atnr >= 0 && atnr < NROFATTACKS)
1934 CODE: 1886 CODE:
1935 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1887 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1936 OUTPUT: 1888 OUTPUT:
1937 RETVAL 1889 RETVAL
1938 1890
1891bool should_invoke (attachable *obj, int event)
1892 CODE:
1893 RETVAL = obj->should_invoke ((event_type)event);
1894 OUTPUT: RETVAL
1895
1939void 1896void
1940debug_trace (attachable *obj, bool on = true) 1897debug_trace (attachable *obj, bool on = true)
1941 CODE: 1898 CODE:
1942 obj->flags &= ~attachable::F_DEBUG_TRACE; 1899 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1943 if (on) 1900 if (on)
1944 obj->flags |= attachable::F_DEBUG_TRACE; 1901 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1945 1902
1946int mortals_size () 1903int mortals_size ()
1947 CODE: 1904 CODE:
1948 RETVAL = attachable::mortals.size (); 1905 RETVAL = attachable::mortals.size ();
1949 OUTPUT: RETVAL 1906 OUTPUT: RETVAL
1951#object *mortals (U32 index) 1908#object *mortals (U32 index)
1952# CODE: 1909# CODE:
1953# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1910# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1954# OUTPUT: RETVAL 1911# OUTPUT: RETVAL
1955 1912
1956INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1913INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1957 1914
1958MODULE = cf PACKAGE = cf::global 1915MODULE = cf PACKAGE = cf::global
1959 1916
1960int invoke (SV *klass, int event, ...) 1917int invoke (SV *klass, int event, ...)
1961 CODE: 1918 CODE:
1965 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1922 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1966 OUTPUT: RETVAL 1923 OUTPUT: RETVAL
1967 1924
1968MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1925MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1969 1926
1970INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1927INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1971 1928
1972int invoke (object *op, int event, ...) 1929int invoke (object *op, int event, ...)
1973 CODE: 1930 CODE:
1974 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1931 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1975 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1932 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2002int mortals_size () 1959int mortals_size ()
2003 CODE: 1960 CODE:
2004 RETVAL = attachable::mortals.size (); 1961 RETVAL = attachable::mortals.size ();
2005 OUTPUT: RETVAL 1962 OUTPUT: RETVAL
2006 1963
2007const char *slot_use_name (U32 slot) 1964const_utf8_string slot_use_name (U32 slot)
2008 ALIAS: 1965 ALIAS:
2009 slot_nonuse_name = 1 1966 slot_nonuse_name = 1
2010 CODE: 1967 CODE:
2011{ 1968{
2012 if (slot >= NUM_BODY_LOCATIONS) 1969 if (slot >= NUM_BODY_LOCATIONS)
2068 OUTPUT: 2025 OUTPUT:
2069 RETVAL 2026 RETVAL
2070 2027
2071object *find_best_object_match (object *op, utf8_string match) 2028object *find_best_object_match (object *op, utf8_string match)
2072 2029
2073object *find_marked_object (object *op)
2074
2075int need_identify (object *obj);
2076
2077int apply_shop_mat (object *shop_mat, object *op); 2030int apply_shop_mat (object *shop_mat, object *op);
2078 2031
2079int move (object *op, int dir, object *originator = op) 2032int move (object *op, int dir, object *originator = op)
2080 CODE: 2033 CODE:
2081 RETVAL = move_ob (op, dir, originator); 2034 RETVAL = op->move (dir, originator);
2082 OUTPUT: 2035 OUTPUT:
2083 RETVAL 2036 RETVAL
2084 2037
2085void apply (object *applier, object *applied, int flags = 0)
2086 CODE:
2087 manual_apply (applied, applier, flags);
2088
2089void apply_below (object *op) 2038void apply_below (object *op)
2090 CODE: 2039 CODE:
2091 player_apply_below (op); 2040 player_apply_below (op);
2092 2041
2093int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2042int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2043
2044int casting_level (object *caster, object *spell)
2094 2045
2095int pay_item (object *op, object *buyer) 2046int pay_item (object *op, object *buyer)
2096 CODE: 2047 CODE:
2097 RETVAL = pay_for_item (op, buyer); 2048 RETVAL = pay_for_item (op, buyer);
2098 OUTPUT: RETVAL 2049 OUTPUT: RETVAL
2135 2086
2136void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
2137 2088
2138void update_object (object *op, int action) 2089void update_object (object *op, int action)
2139 2090
2140void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2091void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2141 2092
2142void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
2143 2094
2144int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2145 2096
2146int calc_skill_exp (object *who, object *op, object *skill); 2097int calc_skill_exp (object *who, object *op, object *skill)
2147 2098
2148void push_button (object *op, object *originator); 2099void push_button (object *op, object *originator)
2149 2100
2150void use_trigger (object *op, object *originator); 2101void use_trigger (object *op, object *originator)
2151 2102
2152void handle_apply_yield (object *op); 2103void handle_apply_yield (object *op)
2153 2104
2154int convert_item (object *item, object *converter); 2105int convert_item (object *item, object *converter)
2155 2106
2107void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2156 2108
2157MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2109MODULE = cf PACKAGE = cf::object PREFIX = cf_
2158 2110
2159# no clean way to get an object from an archetype - stupid idiotic 2111# no clean way to get an object from an archetype - stupid idiotic
2160# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2112# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2164 CODE: 2116 CODE:
2165 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2117 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2166 OUTPUT: 2118 OUTPUT:
2167 RETVAL 2119 RETVAL
2168 2120
2121object *generate (utf8_string arch, object *creator)
2122 CODE:
2123 object *obj = get_archetype (arch);
2124 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2125 RETVAL = obj;
2126 OUTPUT:
2127 RETVAL
2128
2169object *find_object (U32 tag) 2129object *find_object (U32 tag)
2130
2131object *find_object_uuid (UUID i)
2170 2132
2171# TODO: nuke 2133# TODO: nuke
2172object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2134object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2173 PROTOTYPE: $$$$$$ 2135 PROTOTYPE: $$$$$$
2174 CODE: 2136 CODE:
2175{ 2137{
2176 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2138 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2139
2140 if (RETVAL->destroyed ())
2141 RETVAL = 0;
2177} 2142}
2178 2143
2179shstr 2144shstr
2180object::kv_get (shstr key) 2145object::kv_get (shstr key)
2181 2146
2194 PROTOTYPE: $$;$ 2159 PROTOTYPE: $$;$
2195 PPCODE: 2160 PPCODE:
2196{ 2161{
2197 rv_vector rv; 2162 rv_vector rv;
2198 2163
2199 PUTBACK;
2200 get_rangevector (ob, other, &rv, flags); 2164 get_rangevector (ob, other, &rv, flags);
2201 SPAGAIN;
2202 2165
2203 EXTEND (SP, 5); 2166 EXTEND (SP, 5);
2204 PUSHs (newSVuv (rv.distance)); 2167 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2205 PUSHs (newSViv (rv.distance_x)); 2168 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2206 PUSHs (newSViv (rv.distance_y)); 2169 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2207 PUSHs (newSViv (rv.direction)); 2170 PUSHs (sv_2mortal (newSViv (rv.direction)));
2208 PUSHs (to_sv (rv.part)); 2171 PUSHs (sv_2mortal (to_sv (rv.part)));
2209} 2172}
2210 2173
2211bool on_same_map_as (object *ob, object *other) 2174bool on_same_map_as (object *ob, object *other)
2212 CODE: 2175 CODE:
2213 RETVAL = on_same_map (ob, other); 2176 RETVAL = on_same_map (ob, other);
2233 RETVAL = op->contr; 2196 RETVAL = op->contr;
2234 OUTPUT: RETVAL 2197 OUTPUT: RETVAL
2235 2198
2236bool move_player (object *op, int dir) 2199bool move_player (object *op, int dir)
2237 2200
2238void check_score (object *op)
2239
2240void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2201void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2241 CODE: 2202 CODE:
2242 new_draw_info (flags, 0, op, txt); 2203 new_draw_info (flags, 0, op, txt);
2243 2204
2244void kill_player (object *op) 2205void kill_player (object *op)
2256int command_arrest (object *op, utf8_string params) 2217int command_arrest (object *op, utf8_string params)
2257 2218
2258 2219
2259MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2220MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2260 2221
2261INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2222INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2262 2223
2263int invoke (player *pl, int event, ...) 2224int invoke (player *pl, int event, ...)
2264 CODE: 2225 CODE:
2265 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2226 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2266 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2227 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2358 if (op->tag) 2319 if (op->tag)
2359 XPUSHs (sv_2mortal (to_sv (op))); 2320 XPUSHs (sv_2mortal (to_sv (op)));
2360 } 2321 }
2361} 2322}
2362 2323
2363INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2324INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2364 2325
2365void 2326void
2366adjust_daylight () 2327adjust_daylight ()
2367 CODE: 2328 CODE:
2368 maptile::adjust_daylight (); 2329 maptile::adjust_daylight ();
2414 for (int x = 0; x < THIS->width; ++x) 2375 for (int x = 0; x < THIS->width; ++x)
2415 for (int y = 0; y < THIS->height; ++y) 2376 for (int y = 0; y < THIS->height; ++y)
2416 { 2377 {
2417 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2378 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2418 if (op->flag [FLAG_IS_FLOOR]) 2379 if (op->flag [FLAG_IS_FLOOR])
2419 goto skip_space; 2380 goto skip;
2420 2381
2421 { 2382 {
2422 int offs = offset + y * stride + x; 2383 int offs = offset + y * stride + x;
2384
2423 if (IN_RANGE_EXC (offs, 0, idxlen)) 2385 if (IN_RANGE_EXC (offs, 0, idxlen))
2424 { 2386 {
2425 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2387 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2426 { 2388 {
2427 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2389 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2428 ob->flag [FLAG_NO_MAP_SAVE] = true; 2390 ob->flag [FLAG_NO_MAP_SAVE] = true;
2429 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2391 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2430 2392
2431 if (ob->randomitems) 2393 if (ob->randomitems && !ob->above)
2432 { 2394 {
2433 if (!ob->above)
2434 {
2435 ob->create_treasure (ob->randomitems); 2395 ob->create_treasure (ob->randomitems);
2436 2396
2437 for (object *op = ob->above; op; op = op->above) 2397 for (object *op = ob->above; op; op = op->above)
2438 op->flag [FLAG_NO_MAP_SAVE] = true; 2398 op->flag [FLAG_NO_MAP_SAVE] = true;
2439 } 2399 // TODO: if this is a pickable object, then the item
2440 2400 // will at a bit weird - saving inside the player
2441 ob->randomitems = 0; 2401 // will clear the flag, but when the player drops
2402 // it without logging out, it keeps the flag.
2403 // nobody ahs reported this, but this can be rather
2404 // annoying on persistent maps.
2442 } 2405 }
2443 } 2406 }
2444 } 2407 }
2445 } 2408 }
2446 2409
2447 skip_space: ; 2410 skip: ;
2448 } 2411 }
2449} 2412}
2450 2413
2451void 2414void
2452maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2415maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2462 2425
2463 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2426 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2464 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2427 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2465 2428
2466 for (int i = av_len ((AV *)palette) + 1; i--; ) 2429 for (int i = av_len ((AV *)palette) + 1; i--; )
2467 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2430 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2468 2431
2469 for (int y = 0; y < THIS->height; ++y) 2432 for (int y = 0; y < THIS->height; ++y)
2470 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2433 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2471 2434
2472 sfree (THIS->regions, THIS->size ()); 2435 sfree (THIS->regions, THIS->size ());
2498 if (oblinkpt *obp = map->find_link (connection)) 2461 if (oblinkpt *obp = map->find_link (connection))
2499 for (objectlink *ol = obp->link; ol; ol = ol->next) 2462 for (objectlink *ol = obp->link; ol; ol = ol->next)
2500 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2463 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2501 2464
2502void 2465void
2503get_map_flags (maptile *map, int x, int y) 2466xy_normalise (maptile *map, int x, int y, int dir = 0)
2504 PPCODE: 2467 PPCODE:
2505{ 2468{
2506 maptile *nmap = 0; 2469 mapxy pos (map, x, y);
2507 I16 nx = 0, ny = 0; 2470 if (!pos.move (dir).normalise ())
2471 XSRETURN_EMPTY;
2508 2472
2509 PUTBACK;
2510 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2511 SPAGAIN;
2512
2513 EXTEND (SP, 4); 2473 EXTEND (SP, 3);
2514 PUSHs (sv_2mortal (newSViv (flags)));
2515
2516 if (GIMME_V == G_ARRAY)
2517 {
2518 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (pos.m)));
2519 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (to_sv (pos.x)));
2520 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (to_sv (pos.y)));
2521 }
2522} 2477}
2523 2478
2524mapspace * 2479mapspace *
2525ms (maptile *map, unsigned int x, unsigned int y) 2480ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2526 PROTOTYPE: $$$ 2481 PROTOTYPE: $$$;$
2527 CODE: 2482 CODE:
2528{ 2483{
2529 maptile *nmap = 0; 2484 mapxy pos (map, x, y);
2530 I16 nx, ny; 2485 if (!pos.move (dir).normalise ())
2531
2532 PUTBACK;
2533 get_map_flags (map, &nmap, x, y, &nx, &ny);
2534 SPAGAIN;
2535
2536 if (!nmap)
2537 XSRETURN_UNDEF; 2486 XSRETURN_UNDEF;
2538 2487
2539 RETVAL = &nmap->at (nx, ny); 2488 RETVAL = &*pos;
2540} 2489}
2541 OUTPUT: 2490 OUTPUT:
2542 RETVAL 2491 RETVAL
2543 2492
2544void 2493void
2545at (maptile *map, unsigned int x, unsigned int y) 2494at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2546 PROTOTYPE: $$$ 2495 PROTOTYPE: $$$;$
2547 PPCODE: 2496 PPCODE:
2548{ 2497 mapxy pos (map, x, y);
2549 maptile *nmap = 0; 2498 if (pos.move (dir).normalise ())
2550 I16 nx, ny;
2551
2552 PUTBACK;
2553 get_map_flags (map, &nmap, x, y, &nx, &ny);
2554 SPAGAIN;
2555
2556 if (nmap)
2557 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2499 for (object *o = pos->bot; o; o = o->above)
2558 XPUSHs (sv_2mortal (to_sv (o))); 2500 XPUSHs (sv_2mortal (to_sv (o)));
2559}
2560 2501
2561SV * 2502SV *
2562bot_at (maptile *map, unsigned int x, unsigned int y) 2503bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2563 PROTOTYPE: $$$ 2504 PROTOTYPE: $$$;$
2564 ALIAS: 2505 ALIAS:
2565 top_at = 1 2506 top_at = 1
2566 flags_at = 2 2507 flags_at = 2
2567 light_at = 3 2508 light_at = 3
2568 move_block_at = 4 2509 move_block_at = 4
2569 move_slow_at = 5 2510 move_slow_at = 5
2570 move_on_at = 6 2511 move_on_at = 6
2571 move_off_at = 7 2512 move_off_at = 7
2572 CODE: 2513 CODE:
2573{ 2514{
2574 sint16 nx = x; 2515 mapxy pos (map, x, y);
2575 sint16 ny = y; 2516 if (!pos.move (dir).normalise ())
2576
2577 if (!xy_normalise (map, nx, ny))
2578 XSRETURN_UNDEF; 2517 XSRETURN_UNDEF;
2579 2518
2580 mapspace &ms = map->at (nx, ny); 2519 mapspace &ms = *pos;
2581 2520
2582 ms.update (); 2521 ms.update ();
2583 2522
2584 switch (ix) 2523 switch (ix)
2585 { 2524 {
2593 case 7: RETVAL = newSVuv (ms.move_off ); break; 2532 case 7: RETVAL = newSVuv (ms.move_off ); break;
2594 } 2533 }
2595} 2534}
2596 OUTPUT: RETVAL 2535 OUTPUT: RETVAL
2597 2536
2598void fix_walls (maptile *map, int x, int y)
2599
2600void fix_walls_around (maptile *map, int x, int y)
2601
2602# worst xs function of my life 2537# worst xs function of my life
2603bool 2538bool
2604_create_random_map (\ 2539_create_random_map (\
2605 maptile *self,\ 2540 maptile *self,\
2606 utf8_string wallstyle,\ 2541 SV *options,\
2607 utf8_string wall_name,\
2608 utf8_string floorstyle,\
2609 utf8_string monsterstyle,\
2610 utf8_string treasurestyle,\
2611 utf8_string layoutstyle,\
2612 utf8_string doorstyle,\
2613 utf8_string decorstyle,\
2614 utf8_string origin_map,\
2615 utf8_string final_map,\
2616 utf8_string exitstyle,\
2617 utf8_string this_map,\
2618 utf8_string exit_on_final_map,\
2619 int xsize,\
2620 int ysize,\
2621 int expand2x,\
2622 int layoutoptions1,\
2623 int layoutoptions2,\
2624 int layoutoptions3,\
2625 int symmetry,\
2626 int difficulty,\
2627 int difficulty_given,\
2628 float difficulty_increase,\
2629 int dungeon_level,\
2630 int dungeon_depth,\
2631 int decoroptions,\
2632 int orientation,\
2633 int origin_y,\
2634 int origin_x,\
2635 U32 random_seed,\
2636 val64 total_map_hp,\ 2542 val64 total_map_hp,\
2637 int map_layout_style,\
2638 int treasureoptions,\
2639 int symmetry_used,\
2640 region *region,\ 2543 region *region\
2641 utf8_string custom\
2642) 2544)
2643 CODE: 2545 CODE:
2644{ 2546{
2645 random_map_params rmp; 2547 random_map_params rmp;
2646 2548
2647 assign (rmp.wallstyle , wallstyle); 2549 rmp.hv = (HV *)SvREFCNT_inc_NN (SvRV (options));
2550
2648 assign (rmp.wall_name , wall_name); 2551 assign (rmp.wall_name , rmp.get_str ("wall_name"));
2649 assign (rmp.floorstyle , floorstyle);
2650 assign (rmp.monsterstyle , monsterstyle); 2552 assign (rmp.monsterstyle , rmp.get_str ("monsterstyle"));
2651 assign (rmp.treasurestyle , treasurestyle);
2652 assign (rmp.layoutstyle , layoutstyle); 2553 assign (rmp.layoutstyle , rmp.get_str ("layoutstyle"));
2653 assign (rmp.doorstyle , doorstyle); 2554 assign (rmp.doorstyle , rmp.get_str ("doorstyle"));
2654 assign (rmp.decorstyle , decorstyle);
2655 assign (rmp.exitstyle , exitstyle);
2656 assign (rmp.exit_on_final_map, exit_on_final_map); 2555 assign (rmp.exit_on_final_map, rmp.get_str ("exit_on_final_map"));
2657 2556
2658 rmp.origin_map = origin_map; 2557 rmp.origin_map = rmp.get_str ("origin_map");
2558 rmp.origin_x = rmp.get_iv ("origin_x");
2559 rmp.origin_y = rmp.get_iv ("origin_y");
2659 rmp.final_map = final_map; 2560 rmp.final_map = rmp.get_str ("final_map");
2660 rmp.this_map = this_map; 2561 rmp.this_map = rmp.get_str ("this_map");
2661 rmp.xsize = xsize; 2562 rmp.xsize = rmp.get_iv ("xsize");
2662 rmp.ysize = ysize; 2563 rmp.ysize = rmp.get_iv ("ysize");
2663 rmp.expand2x = expand2x; 2564 rmp.expand2x = rmp.get_iv ("expand2x");
2664 rmp.layoutoptions1 = layoutoptions1; 2565 rmp.layoutoptions1 = rmp.get_iv ("layoutoptions1");
2665 rmp.layoutoptions2 = layoutoptions2; 2566 rmp.layoutoptions2 = rmp.get_iv ("layoutoptions2");
2666 rmp.layoutoptions3 = layoutoptions3; 2567 rmp.layoutoptions3 = rmp.get_iv ("layoutoptions3");
2667 rmp.symmetry = symmetry; 2568 rmp.symmetry = rmp.get_iv ("symmetry");
2668 rmp.difficulty = difficulty; 2569 rmp.difficulty = rmp.get_iv ("difficulty");
2669 rmp.difficulty_given = difficulty_given; 2570 rmp.difficulty_given = rmp.get_iv ("difficulty_given");
2670 rmp.difficulty_increase = difficulty_increase; 2571 rmp.difficulty_increase = rmp.get_nv ("difficulty_increase");
2671 rmp.dungeon_level = dungeon_level; 2572 rmp.dungeon_level = rmp.get_iv ("dungeon_level");
2672 rmp.dungeon_depth = dungeon_depth; 2573 rmp.dungeon_depth = rmp.get_iv ("dungeon_depth");
2673 rmp.decoroptions = decoroptions;
2674 rmp.orientation = orientation; 2574 rmp.orientation = rmp.get_iv ("orientation");
2675 rmp.origin_y = origin_y;
2676 rmp.origin_x = origin_x;
2677 rmp.random_seed = random_seed; 2575 rmp.random_seed = rmp.get_uv ("random_seed");
2678 rmp.total_map_hp = (uint64_t) total_map_hp; 2576 rmp.total_map_hp = (uint64_t)total_map_hp;
2679 rmp.map_layout_style = map_layout_style; 2577 rmp.map_layout_style = rmp.get_iv ("map_layout_style");
2680 rmp.treasureoptions = treasureoptions;
2681 rmp.symmetry_used = symmetry_used; 2578 rmp.symmetry_used = rmp.get_iv ("symmetry_used");
2682 rmp.region = region; 2579 rmp.region = region;
2683 rmp.custom = custom;
2684 2580
2685 RETVAL = self->generate_random_map (&rmp); 2581 RETVAL = self->generate_random_map (&rmp);
2686} 2582}
2687 OUTPUT: 2583 OUTPUT:
2688 RETVAL 2584 RETVAL
2689 2585
2690MODULE = cf PACKAGE = cf::mapspace 2586MODULE = cf PACKAGE = cf::mapspace
2691 2587
2692INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2588INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2693 2589
2694MODULE = cf PACKAGE = cf::arch 2590MODULE = cf PACKAGE = cf::arch
2695 2591
2696int archetypes_size () 2592int archetypes_size ()
2697 CODE: 2593 CODE:
2701archetype *archetypes (U32 index) 2597archetype *archetypes (U32 index)
2702 CODE: 2598 CODE:
2703 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2599 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2704 OUTPUT: RETVAL 2600 OUTPUT: RETVAL
2705 2601
2706object *instantiate (archetype *arch)
2707 CODE:
2708 RETVAL = arch_to_object (arch);
2709 OUTPUT:
2710 RETVAL
2711
2712INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2602INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2713 2603
2714MODULE = cf PACKAGE = cf::party 2604MODULE = cf PACKAGE = cf::party
2715 2605
2716partylist *first () 2606partylist *first ()
2717 PROTOTYPE: 2607 PROTOTYPE:
2718 CODE: 2608 CODE:
2719 RETVAL = get_firstparty (); 2609 RETVAL = get_firstparty ();
2720 OUTPUT: RETVAL 2610 OUTPUT: RETVAL
2721 2611
2722INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2612INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2723 2613
2724MODULE = cf PACKAGE = cf::region 2614MODULE = cf PACKAGE = cf::region
2725 2615
2726void 2616void
2727list () 2617list ()
2728 PPCODE: 2618 PPCODE:
2729 for_all_regions (rgn) 2619 for_all_regions (rgn)
2730 XPUSHs (sv_2mortal (to_sv (rgn))); 2620 XPUSHs (sv_2mortal (to_sv (rgn)));
2731 2621
2732region *find (utf8_string name)
2733 PROTOTYPE: $
2734 CODE:
2735 RETVAL = region::find (name);
2736 OUTPUT: RETVAL
2737
2738int specificity (region *rgn) 2622int specificity (region *rgn)
2739 CODE: 2623 CODE:
2740 RETVAL = 0; 2624 RETVAL = 0;
2741 while (rgn = rgn->parent) 2625 while (rgn = rgn->parent)
2742 RETVAL++; 2626 RETVAL++;
2743 OUTPUT: RETVAL 2627 OUTPUT: RETVAL
2744 2628
2745INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2629INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2746 2630
2747MODULE = cf PACKAGE = cf::living 2631MODULE = cf PACKAGE = cf::living
2748 2632
2749INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2633INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2750 2634
2751MODULE = cf PACKAGE = cf::settings 2635MODULE = cf PACKAGE = cf::settings
2752 2636
2753INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2637INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2754 2638
2755MODULE = cf PACKAGE = cf::client 2639MODULE = cf PACKAGE = cf::client
2756 2640
2757INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2641INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2758 2642
2759int invoke (client *ns, int event, ...) 2643int invoke (client *ns, int event, ...)
2760 CODE: 2644 CODE:
2761 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2645 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2762 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2646 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2828 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2712 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2829 old_sound_index [idx] = face; 2713 old_sound_index [idx] = face;
2830 2714
2831MODULE = cf PACKAGE = cf::face PREFIX = face_ 2715MODULE = cf PACKAGE = cf::face PREFIX = face_
2832 2716
2833#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2717#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2834 2718
2835faceidx face_find (utf8_string name, faceidx defidx = 0) 2719faceidx face_find (utf8_string name, faceidx defidx = 0)
2836 2720
2837faceidx alloc (utf8_string name) 2721faceidx alloc (utf8_string name)
2838 CODE: 2722 CODE:
2845 while (!RETVAL); // crude way to leave index 0 2729 while (!RETVAL); // crude way to leave index 0
2846 2730
2847 faces [RETVAL].name = name; 2731 faces [RETVAL].name = name;
2848 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2732 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2849 2733
2850 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2734 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2851 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2735 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2736 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2852} 2737}
2853 OUTPUT: RETVAL 2738 OUTPUT: RETVAL
2854 2739
2855void set_type (faceidx idx, int value) 2740void set_type (faceidx idx, int value)
2856 ALIAS: 2741 ALIAS:
2876 faceinfo *f = face_info (idx); assert (f); 2761 faceinfo *f = face_info (idx); assert (f);
2877 facedata *d = &(faceset ? f->data64 : f->data32); 2762 facedata *d = &(faceset ? f->data64 : f->data32);
2878 sv_to (data, d->data); 2763 sv_to (data, d->data);
2879 STRLEN clen; 2764 STRLEN clen;
2880 char *cdata = SvPVbyte (chksum, clen); 2765 char *cdata = SvPVbyte (chksum, clen);
2881 clen = min (CHKSUM_SIZE, clen); 2766 clen = min (CHKSUM_MAXLEN, clen);
2882 2767
2768 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2769
2883 if (memcmp (d->chksum, cdata, clen)) 2770 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2884 { 2771 {
2772 d->chksum_len = clen;
2885 memcpy (d->chksum, cdata, clen); 2773 memcpy (d->chksum, cdata, clen);
2886 2774
2887 // invalidate existing client face info 2775 // invalidate existing client face info
2888 for_all_clients (ns) 2776 for_all_clients (ns)
2889 if (ns->faceset == faceset) 2777 if (ns->faceset == faceset)
2904 2792
2905SV *get_chksum (faceidx idx, int faceset = 0) 2793SV *get_chksum (faceidx idx, int faceset = 0)
2906 CODE: 2794 CODE:
2907 facedata *d = face_data (idx, faceset); 2795 facedata *d = face_data (idx, faceset);
2908 if (!d) XSRETURN_UNDEF; 2796 if (!d) XSRETURN_UNDEF;
2909 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2797 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2910 OUTPUT: 2798 OUTPUT:
2911 RETVAL 2799 RETVAL
2912 2800
2913SV *get_data (faceidx idx, int faceset = 0) 2801SV *get_data (faceidx idx, int faceset = 0)
2914 CODE: 2802 CODE:
2934 ns->force_newmap = true; 2822 ns->force_newmap = true;
2935 } 2823 }
2936 2824
2937MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2825MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2938 2826
2939#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2827#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2940 2828
2941animidx anim_find (utf8_string name) 2829animidx anim_find (utf8_string name)
2942 CODE: 2830 CODE:
2943 RETVAL = animation::find (name).number; 2831 RETVAL = animation::find (name).number;
2944 OUTPUT: RETVAL 2832 OUTPUT: RETVAL
2959 } 2847 }
2960 else 2848 else
2961 anim = &animation::create (name, av_len (av) + 1, facings); 2849 anim = &animation::create (name, av_len (av) + 1, facings);
2962 2850
2963 for (int i = 0; i < anim->num_animations; ++i) 2851 for (int i = 0; i < anim->num_animations; ++i)
2964 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2852 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2965} 2853}
2966 OUTPUT: RETVAL 2854 OUTPUT: RETVAL
2967 2855
2968void invalidate_all () 2856void invalidate_all ()
2969 CODE: 2857 CODE:
2970 for_all_clients (ns) 2858 for_all_clients (ns)
2971 ns->anims_sent.reset (); 2859 ns->anims_sent.reset ();
2972 2860
2973MODULE = cf PACKAGE = cf::object::freezer 2861MODULE = cf PACKAGE = cf::object::freezer
2974 2862
2975INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2863INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2976 2864
2977SV * 2865SV *
2978new (char *klass) 2866new (char *klass)
2979 CODE: 2867 CODE:
2980 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2868 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
2987 sv_to (sv, self); 2875 sv_to (sv, self);
2988 delete self; 2876 delete self;
2989 2877
2990MODULE = cf PACKAGE = cf::object::thawer 2878MODULE = cf PACKAGE = cf::object::thawer
2991 2879
2992INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2880INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2881
2882bool
2883errors_are_fatal (bool fatal)
2884 CODE:
2885 RETVAL = object_thawer::errors_are_fatal;
2886 object_thawer::errors_are_fatal = fatal;
2887 OUTPUT:
2888 RETVAL
2993 2889
2994SV * 2890SV *
2995new_from_file (char *klass, octet_string path) 2891new_from_file (char *klass, octet_string path)
2996 CODE: 2892 CODE:
2997 object_thawer *f = new object_thawer (path); 2893 object_thawer *f = new object_thawer (path);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines