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.328 by root, Tue Nov 3 22:57:06 2009 UTC vs.
Revision 1.405 by root, Wed May 4 19:04:45 2011 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 (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 9 * option) any later version.
… …
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
33#include "rmg.h"
34#include "loader.h" 34#include "noise.h"
35#include "../random_maps/random_map.h"
36#include "evthread.h" 35#include "evthread.h"
37#include "sproto.h" 36#include "sproto.h"
38 37
39#include <unistd.h> 38#include <unistd.h>
40#if _POSIX_MEMLOCK 39#if _POSIX_MEMLOCK
… …
54#include <XSUB.h> 53#include <XSUB.h>
55 54
56#include "CoroAPI.h" 55#include "CoroAPI.h"
57#include "perlxsi.c" 56#include "perlxsi.c"
58 57
59extern sint64 *levels; // the experience table
60
61typedef object_thawer &object_thawer_ref; 58typedef object_thawer &object_thawer_ref;
62typedef object_freezer &object_freezer_ref; 59typedef object_freezer &object_freezer_ref;
63 60
64typedef std::string std__string; 61typedef std::string std__string;
65 62
… …
70static int tick_inhibit; 67static int tick_inhibit;
71static int tick_pending; 68static int tick_pending;
72 69
73global gbl_ev; 70global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 71static 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; 72static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now, *sv_server_tick;
76static AV *av_reflect; 73static AV *av_reflect;
77 74
78bitset<NUM_EVENT_TYPES> ev_want_event; 75bitset<NUM_EVENT_TYPES> ev_want_event;
79bitset<NUM_TYPES> ev_want_type; 76bitset<NUM_TYPES> ev_want_type;
80 77
… …
87 *stash_cf_mapspace_wrap, 84 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 85 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 86 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 87 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 88 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 89 *stash_cf_living_wrap,
90 *stash_cf_layout_wrap,
91 *stash_ext_map_world;
93 92
94static SV 93static SV
95 *cv_cf_do_invoke, 94 *cv_cf_do_invoke,
96 *cv_cf__can_merge, 95 *cv_cf__can_merge,
97 *cv_cf_client_send_msg, 96 *cv_cf_client_send_msg,
98 *cv_cf_tick, 97 *cv_cf_tick,
99 *cv_cf_match_match; 98 *cv_cf_match_match;
100 99
101#ifndef newSVpv_utf8 100#ifndef newSVpv_utf8
102static inline SV * 101static SV *
103newSVpv_utf8 (const char *s) 102newSVpv_utf8 (const char *s)
104{ 103{
105 if (!s) 104 if (!s)
106 return newSV (0); 105 return newSV (0);
107 106
… …
110 return sv; 109 return sv;
111} 110}
112#endif 111#endif
113 112
114#ifndef newSVpvn_utf8 113#ifndef newSVpvn_utf8
115static inline SV * 114static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 115newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 116{
118 if (!s) 117 if (!s)
119 return newSV (0); 118 return newSV (0);
120 119
… …
124 SvUTF8_on (sv); 123 SvUTF8_on (sv);
125 124
126 return sv; 125 return sv;
127} 126}
128#endif 127#endif
128
129noinline utf8_string
130cfSvPVutf8_nolen (SV *sv)
131{
132 SvGETMAGIC (sv);
133
134 if (SvPOK (sv))
135 {
136 if (!SvUTF8 (sv))
137 sv_utf8_upgrade_nomg (sv);
138
139 return SvPVX (sv);
140 }
141
142 return SvPV_nolen (sv);
143}
129 144
130// helper cast function, returns super class * or 0 145// helper cast function, returns super class * or 0
131template<class super> 146template<class super>
132static super * 147static super *
133is_a (attachable *at) 148is_a (attachable *at)
… …
210attachable::destroy () 225attachable::destroy ()
211{ 226{
212 if (destroyed ()) 227 if (destroyed ())
213 return; 228 return;
214 229
215 flags |= F_DESTROYED; 230 attachable_flags |= F_DESTROYED;
216 do_destroy (); 231 do_destroy ();
217 sever_self (); 232 sever_self ();
233}
234
235void
236attachable::do_delete ()
237{
238 delete this;
218} 239}
219 240
220void 241void
221attachable::check_mortals () 242attachable::check_mortals ()
222{ 243{
… …
238 259
239 if (0) 260 if (0)
240 { 261 {
241 for (int j = 0; j < mortals.size (); ++j)//D 262 for (int j = 0; j < mortals.size (); ++j)//D
242 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 263 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
264
243 fprintf (stderr, "\n");//D 265 fprintf (stderr, "\n");//D
244 } 266 }
245 } 267 }
246 } 268 }
247 269
… …
267 } 289 }
268 else 290 else
269 { 291 {
270 mortals.erase (i); 292 mortals.erase (i);
271 obj->sever_self (); 293 obj->sever_self ();
272 delete obj; 294 obj->do_delete ();
273 } 295 }
274 } 296 }
275} 297}
276 298
277void 299void
… …
294 316
295 attach = src.attach; 317 attach = src.attach;
296 return *this; 318 return *this;
297} 319}
298 320
321#if 0
299template<typename T> 322template<typename T>
300static bool 323static bool
301find_backref (void *ptr, T *obj) 324find_backref (void *ptr, T *obj)
302{ 325{
303 char *s = (char *)obj; 326 char *s = (char *)obj;
… …
311 334
312 return false; 335 return false;
313} 336}
314 337
315// for debugging, find "live" objects containing this ptr 338// for debugging, find "live" objects containing this ptr
316void 339static void
317find_backref (void *ptr) 340find_backref (void *ptr)
318{ 341{
319 for_all_objects (op) 342 for_all_objects (op)
320 if (find_backref (ptr, op)) 343 if (find_backref (ptr, op))
321 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 344 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
326 349
327 for_all_clients (ns) 350 for_all_clients (ns)
328 if (find_backref (ptr, ns)) 351 if (find_backref (ptr, ns))
329 fprintf (stderr, "C %p\n", ns); 352 fprintf (stderr, "C %p\n", ns);
330} 353}
354#endif
331 355
332////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 356//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333 357
334static SV * 358static SV *
335newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 359newSVptr (void *ptr, HV *stash, HV *hv)
336{ 360{
337 SV *sv;
338
339 if (!ptr) 361 if (!ptr)
340 return newSV (0); 362 return newSV (0);
341 363
342 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
343 return sv_bless (newRV_noinc ((SV *)hv), stash); 365 return sv_bless (newRV_noinc ((SV *)hv), stash);
366}
367
368static SV * noinline
369newSVptr (void *ptr, HV *stash)
370{
371 return newSVptr (ptr, stash, newHV ());
344} 372}
345 373
346static int 374static int
347attachable_free (pTHX_ SV *sv, MAGIC *mg) 375attachable_free (pTHX_ SV *sv, MAGIC *mg)
348{ 376{
… …
360 return 0; 388 return 0;
361} 389}
362 390
363MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 391MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
364 392
365static SV * 393static SV * noinline
366newSVattachable (attachable *obj, HV *stash) 394newSVattachable (attachable *obj, HV *stash)
367{ 395{
368 if (!obj) 396 if (!obj)
369 return newSV (0); 397 return newSV (0);
370 398
… …
388 416
389 return sv; 417 return sv;
390 } 418 }
391} 419}
392 420
421#if 0 // unused
393static void 422static void
394clearSVptr (SV *sv) 423clearSVptr (SV *sv)
395{ 424{
396 if (SvROK (sv)) 425 if (SvROK (sv))
397 sv = SvRV (sv); 426 sv = SvRV (sv);
398 427
399 hv_clear ((HV *)sv); 428 hv_clear ((HV *)sv);
400 sv_unmagic (sv, PERL_MAGIC_ext); 429 sv_unmagic (sv, PERL_MAGIC_ext);
401} 430}
431#endif
432
433static long
434SvPTR_nc (SV *sv)
435{
436 sv = SvRV (sv);
437
438 // very important shortcut
439 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
440 return (long)SvMAGIC (sv)->mg_ptr;
441
442 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
443 return (long)mg->mg_ptr;
444
445 croak ("perl code used object, but C object is already destroyed, caught");
446}
402 447
403static long 448static long
404SvPTR (SV *sv, const char *klass) 449SvPTR (SV *sv, const char *klass)
405{ 450{
406 if (!sv_derived_from (sv, klass)) 451 if (!sv_derived_from (sv, klass))
407 croak ("object of type %s expected", klass); 452 croak ("object of type %s expected", klass);
408 453
409 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 454 return SvPTR_nc (sv);
410
411 if (!mg)
412 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
413
414 return (long)mg->mg_ptr;
415} 455}
416 456
417static long noinline 457static long noinline
418SvPTR_ornull (SV *sv, const char *klass) 458SvPTR_ornull (SV *sv, const char *klass)
419{ 459{
420 if (SvOK (sv)) 460 if (expect_false (!SvOK (sv))) return 0;
461
421 return SvPTR (sv, klass); 462 return SvPTR (sv, klass);
422 else
423 return 0;
424} 463}
425 464
465static long noinline
466SvPTR_ornull_client (SV *sv)
467{
468 if (expect_false (!SvOK (sv))) return 0;
469
470 if (!SvROK (sv)
471 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
472 && !sv_derived_from (sv, "cf::client")))
473 croak ("object of type cf::client expected");
474
475 return SvPTR_nc (sv);
476}
477
478static long noinline
479SvPTR_ornull_object (SV *sv)
480{
481 if (expect_false (!SvOK (sv))) return 0;
482
483 if (!SvROK (sv)
484 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
485 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
486 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
487 && !sv_derived_from (sv, "cf::object")))
488 croak ("object of type cf::object expected");
489
490 return SvPTR_nc (sv);
491}
492
493static long noinline
494SvPTR_ornull_maptile (SV *sv)
495{
496 if (expect_false (!SvOK (sv))) return 0;
497
498 if (!SvROK (sv)
499 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
500 && SvSTASH (SvRV (sv)) != stash_ext_map_world
501 && !sv_derived_from (sv, "cf::map")))
502 croak ("object of type cf::map expected");
503
504 return SvPTR_nc (sv);
505}
506
507static long noinline
508SvPTR_ornull_player (SV *sv)
509{
510 if (expect_false (!SvOK (sv))) return 0;
511
512 if (!SvROK (sv)
513 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
514 && !sv_derived_from (sv, "cf::player")))
515 croak ("object of type cf::player expected");
516
517 return SvPTR_nc (sv);
518}
519
426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 520static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
427inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 521static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
428inline SV *to_sv (bool v) { return newSViv (v); } 522static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 523static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 524static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 525static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 526static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 527static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 528static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 529static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 530static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 531static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 532static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 533static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 534static inline SV *to_sv (double v) { return newSVnv (v); }
441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 535static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
442inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 536static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
537// gcc dislikes noilnine on to_sv
443inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 538static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
539static inline SV *to_sv (object * v) { return to_sv_ni (v); }
444inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 540static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
445inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 541static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
446inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 542static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
447inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 543static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
448inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 544static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
449inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 545static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
546static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
450 547
451inline SV *to_sv (object & v) { return to_sv (&v); } 548static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 549static inline SV *to_sv (living & v) { return to_sv (&v); }
453 550
454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 551static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 552static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 553
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 554static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 555
459inline SV *to_sv (dynbuf * v) 556static inline SV *to_sv (dynbuf * v)
460{ 557{
461 SV *sv = newSV (0); 558 SV *sv = newSV (0);
462 559
463 sv_upgrade (sv, SVt_PV); 560 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1); 561 SvGROW (sv, v->size () + 1);
… …
468 *SvEND (sv) = 0; 565 *SvEND (sv) = 0;
469 566
470 return sv; 567 return sv;
471} 568}
472 569
473inline SV *to_sv (dynbuf_text * v) 570static inline SV *to_sv (dynbuf_text * v)
474{ 571{
475 SV *sv = to_sv (static_cast<dynbuf *> (v)); 572 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv); 573 SvUTF8_on (sv);
477 return sv; 574 return sv;
478} 575}
479 576
480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 577static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
481inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 578static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 582static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 583static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 584static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 585static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 586static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 587static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
491inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 588static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
492inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 589static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
493inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 590static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 591static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
495inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 592static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
496inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 593static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
497inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 594static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
595static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
498inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 596static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
499inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
500inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 597static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
501inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 598static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
502inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 599static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
503inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 600static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
504inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 601static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
602static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
505inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 603static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
506inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 604static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
507 605
508//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 606//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
509inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 607static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510 608
511template<class T> 609template<class T>
512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 610static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
513 611
514template<int N> 612template<int N>
515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 613static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516 614
517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 615static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
518inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 616static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
519inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 617static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 618static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 619
522inline void sv_to (SV *sv, std::string &v) 620static inline void sv_to (SV *sv, std::string &v)
523{ 621{
524 STRLEN len; 622 STRLEN len;
525 char *data = SvPVbyte (sv, len); 623 char *data = SvPVbyte (sv, len);
526 v.assign (data, len); 624 v.assign (data, len);
527} 625}
528 626
529inline void sv_to (SV *sv, UUID &v) 627static inline void sv_to (SV *sv, UUID &v)
530{ 628{
531 if (!v.parse (SvPV_nolen (sv))) 629 if (!v.parse (SvPV_nolen (sv)))
532 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 630 croak ("unparsable uuid: %s", SvPV_nolen (sv));
533} 631}
534 632
535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 633static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536 634
537static SV * 635static SV *
538newSVdt_va (va_list &ap, data_type type) 636newSVdt_va (va_list &ap, data_type type)
539{ 637{
540 SV *sv; 638 SV *sv;
… …
620template<class type> 718template<class type>
621static void noinline 719static void noinline
622cf_obj_to (SV *arg, type &var) 720cf_obj_to (SV *arg, type &var)
623{ 721{
624 sv_to (arg, var); 722 sv_to (arg, var);
625 if (!var) 723 if (expect_false (!var))
626 croak ("must not pass invalid/null cf_obj here"); 724 croak ("must not pass invalid/null cf_obj here");
627} 725}
628 726
629template<class object> 727template<class object>
630static void noinline 728static void noinline
631cf_obj_ornull_to (SV *arg, object *&var) 729cf_obj_ornull_to (SV *arg, object *&var)
632{ 730{
633 if (SvOK (arg)) 731 if (SvOK (arg))
634 { 732 {
635 sv_to (arg, var); 733 sv_to (arg, var);
636 if (!var) 734 if (expect_false (!var))
637 croak ("unable to convert perl object to C++ object"); 735 croak ("unable to convert perl object to C++ object");
638 } 736 }
639 else 737 else
640 var = 0; 738 var = 0;
641} 739}
642 740
643////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 741//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644 742
645SV * 743static SV *
646registry (attachable *ext) 744registry (attachable *ext)
647{ 745{
648 if (!ext->cb) 746 if (!ext->cb)
649 ext->cb = newAV (); 747 ext->cb = newAV ();
650 748
… …
676 exit (EXIT_FAILURE); 774 exit (EXIT_FAILURE);
677 } 775 }
678 776
679 eval_pv ( 777 eval_pv (
680 "#line 1 'cfperl init'\n" 778 "#line 1 'cfperl init'\n"
681 "use EV ();\n" 779 "use EV ();\n" // required by bootstrap
682 "use Coro ();\n" 780 "use Coro ();\n" // required by bootstrap
683 "cf->bootstrap;\n" 781 "cf->bootstrap;\n" // required for cf::datadir
684 "unshift @INC, cf::datadir ();\n" 782 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
685 "require cf;\n", 783 "require cf;\n",
686 0 784 0
687 ); 785 );
688 786
689 if (SvTRUE (ERRSV)) 787 if (SvTRUE (ERRSV))
… …
934 CALL_END; 1032 CALL_END;
935 1033
936 return count; 1034 return count;
937} 1035}
938 1036
939SV * 1037static SV *
940cfperl_result (int idx) 1038cfperl_result (int idx)
941{ 1039{
942 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1040 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943 if (!av) 1041 if (!av)
944 return &PL_sv_undef; 1042 return &PL_sv_undef;
… …
1010 CALL_CALL ("ext::books::make_book", G_VOID); 1108 CALL_CALL ("ext::books::make_book", G_VOID);
1011 CALL_END; 1109 CALL_END;
1012} 1110}
1013 1111
1014void 1112void
1015cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1113cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1016{ 1114{
1017 CALL_BEGIN (4); 1115 CALL_BEGIN (4);
1018 CALL_ARG (ns); 1116 CALL_ARG (ns);
1019 CALL_ARG (type); 1117 CALL_ARG (type);
1020 CALL_ARG_SV (newSVpv_utf8 (msg)); 1118 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1049 CALL_CALL ("cf::mapscript::activate", G_VOID); 1147 CALL_CALL ("cf::mapscript::activate", G_VOID);
1050 CALL_END; 1148 CALL_END;
1051} 1149}
1052 1150
1053player * 1151player *
1054player::find (const char *name) 1152player::find (const_utf8_string name)
1055{ 1153{
1056 CALL_BEGIN (1); 1154 CALL_BEGIN (1);
1057 CALL_ARG (name); 1155 CALL_ARG (name);
1058 CALL_CALL ("cf::player::find", G_SCALAR); 1156 CALL_CALL ("cf::player::find", G_SCALAR);
1059 1157
… …
1064 1162
1065 return retval; 1163 return retval;
1066} 1164}
1067 1165
1068maptile * 1166maptile *
1069find_style (const char *dirname, const char *stylename, int difficulty) 1167find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1070{ 1168{
1071 CALL_BEGIN (3); 1169 CALL_BEGIN (4);
1072 CALL_ARG (dirname); 1170 CALL_ARG (dirname);
1073 CALL_ARG (stylename); 1171 CALL_ARG (stylename);
1074 CALL_ARG (difficulty); 1172 CALL_ARG (difficulty);
1173 CALL_ARG (recurse);
1075 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1174 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1076 1175
1077 maptile *retval = 0; 1176 maptile *retval = 0;
1078 if (count) sv_to (POPs, retval); 1177 if (count) sv_to (POPs, retval);
1079 1178
… …
1081 1180
1082 return retval; 1181 return retval;
1083} 1182}
1084 1183
1085maptile * 1184maptile *
1086maptile::find_sync (const char *path, maptile *origin) 1185maptile::find_sync (const_utf8_string path, maptile *origin)
1087{ 1186{
1088 CALL_BEGIN (2); 1187 CALL_BEGIN (2);
1089 CALL_ARG (path); 1188 CALL_ARG (path);
1090 CALL_ARG (origin); 1189 CALL_ARG (origin);
1091 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1190 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1097 1196
1098 return retval; 1197 return retval;
1099} 1198}
1100 1199
1101maptile * 1200maptile *
1102maptile::find_async (const char *path, maptile *origin, bool load) 1201maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1103{ 1202{
1104 CALL_BEGIN (3); 1203 CALL_BEGIN (3);
1105 CALL_ARG (path); 1204 CALL_ARG (path);
1106 CALL_ARG (origin); 1205 CALL_ARG (origin);
1107 CALL_ARG (load); 1206 CALL_ARG (load);
… …
1136 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1235 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1137 CALL_END; 1236 CALL_END;
1138} 1237}
1139 1238
1140void 1239void
1141object::player_goto (const char *path, int x, int y) 1240object::player_goto (const_utf8_string path, int x, int y)
1142{ 1241{
1143 if (type != PLAYER) 1242 if (type != PLAYER)
1144 return; 1243 return;
1145 1244
1146 CALL_BEGIN (4); 1245 CALL_BEGIN (4);
… …
1150 CALL_ARG (y); 1249 CALL_ARG (y);
1151 CALL_CALL ("cf::object::player::goto", G_VOID); 1250 CALL_CALL ("cf::object::player::goto", G_VOID);
1152 CALL_END; 1251 CALL_END;
1153} 1252}
1154 1253
1155const char * 1254const_utf8_string
1156object::ref () const 1255object::ref () const
1157{ 1256{
1158 if (type == PLAYER) 1257 if (type == PLAYER)
1159 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1258 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1160 else 1259 else
1260 // TODO: should be able to save references within the same map, at least
1161 return 0; 1261 return 0;
1162} 1262}
1163 1263
1164object * 1264object *
1165object::deref (const char *ref) 1265object::deref (const_utf8_string ref)
1166{ 1266{
1167 object *retval = 0; 1267 object *retval = 0;
1168 1268
1169 if (ref) 1269 if (ref)
1170 { 1270 {
… …
1180 1280
1181 return retval; 1281 return retval;
1182} 1282}
1183 1283
1184void 1284void
1185log_backtrace (const char *msg) 1285log_backtrace (const_utf8_string msg)
1186{ 1286{
1187#if HAVE_BACKTRACE 1287#if HAVE_BACKTRACE
1188 void *addr [20]; 1288 void *addr [20];
1189 int size = backtrace (addr, 20); 1289 int size = backtrace (addr, 20);
1190 1290
… …
1196 CALL_END; 1296 CALL_END;
1197#endif 1297#endif
1198} 1298}
1199 1299
1200bool 1300bool
1201is_match_expr (const char *expr) 1301is_match_expr (const_utf8_string expr)
1202{ 1302{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1303 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204} 1304}
1205 1305
1206bool 1306bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator) 1307match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1208{ 1308{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1309 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1; 1310 expr += sizeof ("match ") - 1;
1211 1311
1212 CALL_BEGIN (5); 1312 CALL_BEGIN (5);
… …
1220 bool matched = count && SvTRUE (TOPs); 1320 bool matched = count && SvTRUE (TOPs);
1221 1321
1222 CALL_END; 1322 CALL_END;
1223 1323
1224 return matched; 1324 return matched;
1325}
1326
1327object *
1328match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1329{
1330 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1331 expr += sizeof ("match ") - 1;
1332
1333 CALL_BEGIN (5);
1334 CALL_ARG (expr);
1335 CALL_ARG (ob);
1336 CALL_ARG (self);
1337 CALL_ARG (source);
1338 CALL_ARG (originator);
1339 CALL_CALL (cv_cf_match_match, G_ARRAY);
1340
1341 object *one = 0;
1342
1343 if (count)
1344 sv_to (TOPs, one);
1345
1346 CALL_END;
1347
1348 return one;
1225} 1349}
1226 1350
1227///////////////////////////////////////////////////////////////////////////// 1351/////////////////////////////////////////////////////////////////////////////
1228 1352
1229struct EVAPI *evapi::GEVAPI; 1353struct EVAPI *evapi::GEVAPI;
… …
1277 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1401 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1278 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1402 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1279 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1403 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1280 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1404 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1281 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1405 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1406 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1407 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1282 1408
1283 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1409 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1284 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1410 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1411 sv_server_tick = get_sv ("cf::SERVER_TICK", 1); SvUPGRADE (sv_server_tick, SVt_IV);
1285 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1412 sv_tick_start = get_sv ("cf::TICK_START" , 1); SvUPGRADE (sv_tick_start , SVt_NV);
1286 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1413 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1287 1414
1288 cb_global = get_av ("cf::CB_GLOBAL", 1); 1415 cb_global = get_av ("cf::CB_GLOBAL", 1);
1289 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1416 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1290 cb_object = get_av ("cf::CB_OBJECT", 1); 1417 cb_object = get_av ("cf::CB_OBJECT", 1);
1291 cb_player = get_av ("cf::CB_PLAYER", 1); 1418 cb_player = get_av ("cf::CB_PLAYER", 1);
… …
1327 static const struct { 1454 static const struct {
1328 const char *name; 1455 const char *name;
1329 IV iv; 1456 IV iv;
1330 } *civ, const_iv[] = { 1457 } *civ, const_iv[] = {
1331# define const_iv(name) { # name, (IV)name }, 1458# define const_iv(name) { # name, (IV)name },
1332 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1459# include "const_iv.h"
1333 const_iv (logBacktrace) 1460# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1334 1461# include "attackinc.h"
1335 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1462# undef def
1463# define def(uc, flags) const_iv (SK_ ## uc)
1464# include "skillinc.h"
1465# undef def
1466# define def(name, use, nonuse) const_iv (body_ ## name)
1467# include "slotinc.h"
1468# undef def
1336 1469
1337 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1470 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1338 1471
1339 const_iv (MAX_TIME) 1472 const_iv (MAX_TIME)
1340 const_iv (MAXSOCKBUF) 1473 const_iv (MAXSOCKBUF)
1341 1474
1342 const_iv (NUM_BODY_LOCATIONS)
1343 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1344 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1345 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1346 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1347 const_iv (body_wrist) const_iv (body_waist)
1348
1349 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1350 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1351 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1352 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1353 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1354 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1355 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1356 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1357 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1358 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1359 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1360 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1361 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1362 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1363 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1364 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1365 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1366 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1367 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1368 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1369 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1370 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1371 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1372 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1373 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1374 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1375 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1376 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1377 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1378
1379 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1380
1381 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1382 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1383
1384 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1385 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1386 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1387 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1388 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1389 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1390 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1391
1392 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1393 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1394 const_iv (WEAP_BLUD)
1395
1396 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1397 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1398 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1399 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1400 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1401 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1402 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1403 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1404 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1405 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1406 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1407 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1408 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1409 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1410 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1411 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1412 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1413 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1414 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1415 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1416 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1417 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1418 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1419 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1420 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1421 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1422
1423 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1424 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1425 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1426 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1427 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1428 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1429
1430 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1475 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1431 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1476 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1432 1477
1433 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1478 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1434
1435 const_iv (SP_RAISE_DEAD)
1436 const_iv (SP_RUNE)
1437 const_iv (SP_MAKE_MARK)
1438 const_iv (SP_BOLT)
1439 const_iv (SP_BULLET)
1440 const_iv (SP_EXPLOSION)
1441 const_iv (SP_CONE)
1442 const_iv (SP_BOMB)
1443 const_iv (SP_WONDER)
1444 const_iv (SP_SMITE)
1445 const_iv (SP_MAGIC_MISSILE)
1446 const_iv (SP_SUMMON_GOLEM)
1447 const_iv (SP_DIMENSION_DOOR)
1448 const_iv (SP_MAGIC_MAPPING)
1449 const_iv (SP_MAGIC_WALL)
1450 const_iv (SP_DESTRUCTION)
1451 const_iv (SP_PERCEIVE_SELF)
1452 const_iv (SP_WORD_OF_RECALL)
1453 const_iv (SP_INVISIBLE)
1454 const_iv (SP_PROBE)
1455 const_iv (SP_HEALING)
1456 const_iv (SP_CREATE_FOOD)
1457 const_iv (SP_EARTH_TO_DUST)
1458 const_iv (SP_CHANGE_ABILITY)
1459 const_iv (SP_BLESS)
1460 const_iv (SP_CURSE)
1461 const_iv (SP_SUMMON_MONSTER)
1462 const_iv (SP_CHARGING)
1463 const_iv (SP_POLYMORPH)
1464 const_iv (SP_ALCHEMY)
1465 const_iv (SP_REMOVE_CURSE)
1466 const_iv (SP_IDENTIFY)
1467 const_iv (SP_DETECTION)
1468 const_iv (SP_MOOD_CHANGE)
1469 const_iv (SP_MOVING_BALL)
1470 const_iv (SP_SWARM)
1471 const_iv (SP_CHANGE_MANA)
1472 const_iv (SP_DISPEL_RUNE)
1473 const_iv (SP_CREATE_MISSILE)
1474 const_iv (SP_CONSECRATE)
1475 const_iv (SP_ANIMATE_WEAPON)
1476 const_iv (SP_LIGHT)
1477 const_iv (SP_CHANGE_MAP_LIGHT)
1478 const_iv (SP_FAERY_FIRE)
1479 const_iv (SP_CAUSE_DISEASE)
1480 const_iv (SP_AURA)
1481 const_iv (SP_TOWN_PORTAL)
1482 const_iv (SP_PARTY_SPELL)
1483 1479
1484 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1480 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1485 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1481 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1486 const_iv (F_LOCKED) 1482 const_iv (F_LOCKED)
1487 1483
1488 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1489
1490 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1484 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1491 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1485 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1492 1486
1493 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1494
1495 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1496 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1497
1498 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1499 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1500
1501 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1487 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1502
1503 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1504 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1505 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1506 const_iv (M_ICE) const_iv (M_SPECIAL)
1507 1488
1508 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1489 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1509 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1490 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1510 1491
1511 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1512 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1513 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1514 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1515 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1516 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1517 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1518 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1519 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1520 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1521 const_iv (SK_POISON_NAIL)
1522
1523 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1524 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1525 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1526 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1527 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1528 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1529
1530 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1531
1532 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1533 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1534 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1535 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1536 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1537 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1538 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1539
1540 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1541 const_iv (MAP_INACTIVE)
1542
1543 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1492 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1544 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1493 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1545 1494
1546 const_iv (VERSION_CS) const_iv (VERSION_SC)
1547
1548 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1495 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1549 1496
1550 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1551
1552 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1497 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1553
1554 // random map generator
1555 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1556 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1557
1558 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1559 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1560 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1561
1562 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1563 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1564
1565 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1566 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1567
1568 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1569 const_iv (FT_RSRC) const_iv (FT_NUM)
1570 }; 1498 };
1571 1499
1572 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1500 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1573 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1501 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1574 1502
1575 static const struct { 1503 static const struct {
1576 const char *name; 1504 const char *name;
1577 int skip; 1505 int skip;
… …
1583# undef def 1511# undef def
1584 }; 1512 };
1585 1513
1586 AV *av = get_av ("cf::EVENT", 1); 1514 AV *av = get_av ("cf::EVENT", 1);
1587 1515
1588 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1516 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1589 { 1517 {
1590 AV *event = newAV (); 1518 AV *event = newAV ();
1591 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1519 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1592 av_push (event, newSViv (eiv->klass)); 1520 av_push (event, newSViv (eiv->klass));
1593 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1521 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1628 1556
1629 for_all_objects (op) 1557 for_all_objects (op)
1630 op->reattach (); 1558 op->reattach ();
1631} 1559}
1632 1560
1633# support function for map-world.ext
1634void _quantise (SV *data_sv, SV *plt_sv)
1635 CODE:
1636{
1637 if (!SvROK (plt_sv) || SvTYPE (SvRV (plt_sv)) != SVt_PVAV)
1638 croak ("_quantise called with invalid agruments");
1639
1640 plt_sv = SvRV (plt_sv);
1641 SV **plt = AvARRAY (plt_sv);
1642 int plt_count = AvFILL (plt_sv) + 1;
1643
1644 STRLEN len;
1645 char *data = SvPVbyte (data_sv, len);
1646 char *dst = data;
1647
1648 while (len >= 3)
1649 {
1650 for (SV **val_sv = plt + plt_count; val_sv-- > plt; )
1651 {
1652 char *val = SvPVX (*val_sv);
1653
1654 if (val [0] == data [0]
1655 && val [1] == data [1]
1656 && val [2] == data [2])
1657 {
1658 *dst++ = val [3];
1659 goto next;
1660 }
1661 }
1662
1663 croak ("_quantise: color not found in palette: #%02x%02x%02x, at offset %d %d",
1664 (uint8_t)data [0], (uint8_t)data [1], (uint8_t)data [2],
1665 dst - SvPVX (data_sv), len);
1666
1667 next:
1668 data += 3;
1669 len -= 3;
1670 }
1671
1672 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1673}
1674
1675void init_anim () 1561void init_anim ()
1676 1562
1677void init_globals () 1563void init_globals ()
1678 1564
1679void init_experience ()
1680
1681void init_attackmess () 1565void init_attackmess ()
1682 1566
1683void init_dynamic () 1567void init_dynamic ()
1684 1568
1685void load_settings () 1569void load_settings ()
1686 1570
1571void reload_exp_table ()
1572
1687void load_materials () 1573void reload_materials ()
1688 1574
1689void init_uuid () 1575void init_uuid ()
1690 CODE: 1576 CODE:
1691 UUID::init (); 1577 UUID::init ();
1692 1578
1693void init_signals () 1579void init_signals ()
1694
1695void init_commands ()
1696 1580
1697void init_skills () 1581void init_skills ()
1698 1582
1699void init_beforeplay () 1583void init_beforeplay ()
1700 1584
… …
1727 { 1611 {
1728 ev_async_send (EV_DEFAULT, &tick_watcher); 1612 ev_async_send (EV_DEFAULT, &tick_watcher);
1729 coroapi::cede (); 1613 coroapi::cede ();
1730 } 1614 }
1731 1615
1732void server_tick () 1616void one_tick ()
1733 CODE: 1617 CODE:
1734{ 1618{
1619 ev_now_update (EV_DEFAULT);
1735 NOW = ev_now (EV_DEFAULT); 1620 NOW = ev_now (EV_DEFAULT);
1736 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1621 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1737 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1622 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1738 runtime = SvNVX (sv_runtime); 1623 runtime = SvNVX (sv_runtime);
1739 1624
1625 one_tick ();
1626
1740 server_tick (); 1627 ++server_tick;
1628 SvUV_set (sv_server_tick, server_tick); SvIOK_only_UV (sv_server_tick);
1741 1629
1742 NOW = ev_time (); 1630 ev_now_update (EV_DEFAULT);
1631 NOW = ev_now (EV_DEFAULT);
1743 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1632 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1633
1744 runtime += TICK; 1634 runtime += TICK;
1745 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1635 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1746} 1636}
1747 1637
1748NV floor (NV x) 1638NV floor (NV x)
… …
1758 switch (items) 1648 switch (items)
1759 { 1649 {
1760 case 0: RETVAL = gen (); break; 1650 case 0: RETVAL = gen (); break;
1761 case 1: RETVAL = gen (SvUV (ST (0))); break; 1651 case 1: RETVAL = gen (SvUV (ST (0))); break;
1762 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1652 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1763 default: croak ("cf::rndm requires none, one or two parameters."); break; 1653 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1764 } 1654 }
1765} 1655}
1766 OUTPUT: 1656 OUTPUT:
1767 RETVAL 1657 RETVAL
1768 1658
… …
1775NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1665NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1776 CODE: 1666 CODE:
1777 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1667 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1778 OUTPUT: 1668 OUTPUT:
1779 RETVAL 1669 RETVAL
1670
1671const char *ordinal (int i)
1780 1672
1781void weaken (...) 1673void weaken (...)
1782 PROTOTYPE: @ 1674 PROTOTYPE: @
1783 CODE: 1675 CODE:
1784 while (items > 0) 1676 while (items > 0)
1785 sv_rvweaken (ST (--items)); 1677 sv_rvweaken (ST (--items));
1786 1678
1787void 1679void log_suspend ()
1680
1681void log_resume ()
1682
1788log_backtrace (utf8_string msg) 1683void log_backtrace (utf8_string msg)
1789 1684
1790void
1791LOG (int flags, utf8_string msg) 1685void LOG (int flags, utf8_string msg)
1792 PROTOTYPE: $$ 1686 PROTOTYPE: $$
1793 C_ARGS: flags, "%s", msg 1687 C_ARGS: flags, "%s", msg
1794 1688
1795octet_string path_combine (octet_string base, octet_string path) 1689octet_string path_combine (octet_string base, octet_string path)
1796 PROTOTYPE: $$ 1690 PROTOTYPE: $$
… …
1843 1737
1844int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1738int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1845 INIT: 1739 INIT:
1846#if __GLIBC__ 1740#if __GLIBC__
1847 mallopt (M_TOP_PAD, 1024 * 1024); 1741 mallopt (M_TOP_PAD, 1024 * 1024);
1848 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128); 1742 mallopt (M_MMAP_THRESHOLD, 1024 * 1024);
1849 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory 1743 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1744 if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10))
1850 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1745 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1851#endif 1746#endif
1852 1747
1853int munlockall () 1748int munlockall ()
1854 1749
1855#endif 1750#endif
… …
1888 1783
1889int random_roll (int min, int max, object *op, int goodbad); 1784int random_roll (int min, int max, object *op, int goodbad);
1890 1785
1891const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1786const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1892 1787
1893int
1894exp_to_level (val64 exp) 1788int exp_to_level (val64 exp)
1789
1790val64 level_to_min_exp (int level)
1791
1792SV *
1793attacktype_name (int atnr)
1895 CODE: 1794 CODE:
1896{ 1795 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1897 int i = 0; 1796 ? newSVpv (attacktype_name [atnr], 0)
1898 1797 : &PL_sv_undef;
1899 RETVAL = settings.max_level;
1900
1901 for (i = 1; i <= settings.max_level; i++)
1902 {
1903 if (levels[i] > exp)
1904 {
1905 RETVAL = i - 1;
1906 break;
1907 }
1908 }
1909}
1910 OUTPUT: RETVAL 1798 OUTPUT: RETVAL
1911 1799
1912val64
1913level_to_min_exp (int level)
1914 CODE:
1915 if (level > settings.max_level)
1916 RETVAL = levels[settings.max_level];
1917 else if (level < 1)
1918 RETVAL = 0;
1919 else
1920 RETVAL = levels[level];
1921 OUTPUT: RETVAL
1922
1923SV * 1800SV *
1924resistance_to_string (int atnr) 1801attacktype_desc (int atnr)
1925 CODE: 1802 CODE:
1926 if (atnr >= 0 && atnr < NROFATTACKS) 1803 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1804 ? newSVpv (attacktype_desc [atnr], 0)
1805 : &PL_sv_undef;
1806 OUTPUT: RETVAL
1807
1808SV *
1809resist_plus (int atnr)
1810 CODE:
1811 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1927 RETVAL = newSVpv (resist_plus[atnr], 0); 1812 ? newSVpv (resist_plus [atnr], 0)
1928 else 1813 : &PL_sv_undef;
1929 XSRETURN_UNDEF; 1814 OUTPUT: RETVAL
1815
1816SV *
1817change_resist_msg (int atnr)
1818 CODE:
1819 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1820 ? newSVpv (change_resist_msg [atnr], 0)
1821 : &PL_sv_undef;
1930 OUTPUT: RETVAL 1822 OUTPUT: RETVAL
1931 1823
1932UUID 1824UUID
1933uuid_cur () 1825uuid_cur ()
1934 CODE: 1826 CODE:
… …
1984 CODE: 1876 CODE:
1985 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1877 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1986 OUTPUT: 1878 OUTPUT:
1987 RETVAL 1879 RETVAL
1988 1880
1881bool should_invoke (attachable *obj, int event)
1882 CODE:
1883 RETVAL = obj->should_invoke ((event_type)event);
1884 OUTPUT: RETVAL
1885
1989void 1886void
1990debug_trace (attachable *obj, bool on = true) 1887debug_trace (attachable *obj, bool on = true)
1991 CODE: 1888 CODE:
1992 obj->flags &= ~attachable::F_DEBUG_TRACE; 1889 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1993 if (on) 1890 if (on)
1994 obj->flags |= attachable::F_DEBUG_TRACE; 1891 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1995 1892
1996int mortals_size () 1893int mortals_size ()
1997 CODE: 1894 CODE:
1998 RETVAL = attachable::mortals.size (); 1895 RETVAL = attachable::mortals.size ();
1999 OUTPUT: RETVAL 1896 OUTPUT: RETVAL
… …
2001#object *mortals (U32 index) 1898#object *mortals (U32 index)
2002# CODE: 1899# CODE:
2003# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1900# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2004# OUTPUT: RETVAL 1901# OUTPUT: RETVAL
2005 1902
2006INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1903INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2007 1904
2008MODULE = cf PACKAGE = cf::global 1905MODULE = cf PACKAGE = cf::global
2009 1906
2010int invoke (SV *klass, int event, ...) 1907int invoke (SV *klass, int event, ...)
2011 CODE: 1908 CODE:
… …
2015 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1912 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2016 OUTPUT: RETVAL 1913 OUTPUT: RETVAL
2017 1914
2018MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1915MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2019 1916
2020INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1917INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2021 1918
2022int invoke (object *op, int event, ...) 1919int invoke (object *op, int event, ...)
2023 CODE: 1920 CODE:
2024 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1921 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2025 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1922 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2052int mortals_size () 1949int mortals_size ()
2053 CODE: 1950 CODE:
2054 RETVAL = attachable::mortals.size (); 1951 RETVAL = attachable::mortals.size ();
2055 OUTPUT: RETVAL 1952 OUTPUT: RETVAL
2056 1953
2057const char *slot_use_name (U32 slot) 1954const_utf8_string slot_name (U32 slot)
2058 ALIAS: 1955 ALIAS:
1956 slot_name = 0
1957 slot_use_name = 1
2059 slot_nonuse_name = 1 1958 slot_nonuse_name = 2
2060 CODE: 1959 CODE:
2061{ 1960{
2062 if (slot >= NUM_BODY_LOCATIONS) 1961 if (slot >= NUM_BODY_LOCATIONS)
2063 croak ("body slot index out of range"); 1962 croak ("body slot index out of range");
2064 1963
2065 switch (ix) 1964 switch (ix)
2066 { 1965 {
1966 case 0: RETVAL = body_locations[slot].name ; break;
2067 case 0: RETVAL = body_locations[slot].use_name; break; 1967 case 1: RETVAL = body_locations[slot].use_name ; break;
2068 case 1: RETVAL = body_locations[slot].nonuse_name; break; 1968 case 2: RETVAL = body_locations[slot].nonuse_name; break;
2069 } 1969 }
2070} 1970}
2071 OUTPUT: 1971 OUTPUT:
2072 RETVAL 1972 RETVAL
2073 1973
… …
2118 OUTPUT: 2018 OUTPUT:
2119 RETVAL 2019 RETVAL
2120 2020
2121object *find_best_object_match (object *op, utf8_string match) 2021object *find_best_object_match (object *op, utf8_string match)
2122 2022
2123object *find_marked_object (object *op)
2124
2125int need_identify (object *obj);
2126
2127int apply_shop_mat (object *shop_mat, object *op); 2023int apply_shop_mat (object *shop_mat, object *op);
2128 2024
2129int move (object *op, int dir, object *originator = op) 2025int move (object *op, int dir, object *originator = op)
2130 CODE: 2026 CODE:
2131 RETVAL = move_ob (op, dir, originator); 2027 RETVAL = op->move (dir, originator);
2132 OUTPUT: 2028 OUTPUT:
2133 RETVAL 2029 RETVAL
2134 2030
2135void apply (object *applier, object *applied, int flags = 0)
2136 CODE:
2137 manual_apply (applied, applier, flags);
2138
2139void apply_below (object *op) 2031void apply_below (object *op)
2140 CODE: 2032 CODE:
2141 player_apply_below (op); 2033 player_apply_below (op);
2142 2034
2143int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2035int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2036
2037int casting_level (object *caster, object *spell)
2144 2038
2145int pay_item (object *op, object *buyer) 2039int pay_item (object *op, object *buyer)
2146 CODE: 2040 CODE:
2147 RETVAL = pay_for_item (op, buyer); 2041 RETVAL = pay_for_item (op, buyer);
2148 OUTPUT: RETVAL 2042 OUTPUT: RETVAL
… …
2185 2079
2186void pick_up (object *who, object *op) 2080void pick_up (object *who, object *op)
2187 2081
2188void update_object (object *op, int action) 2082void update_object (object *op, int action)
2189 2083
2190void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2084void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2191 2085
2192void player_lvl_adj (object *who, object *skill = 0) 2086void player_lvl_adj (object *who, object *skill = 0)
2193 2087
2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2088int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2195 2089
2196int calc_skill_exp (object *who, object *op, object *skill); 2090int calc_skill_exp (object *who, object *op, object *skill)
2197 2091
2198void push_button (object *op, object *originator); 2092void push_button (object *op, object *originator)
2199 2093
2200void use_trigger (object *op, object *originator); 2094void use_trigger (object *op, object *originator)
2201 2095
2202void handle_apply_yield (object *op); 2096void handle_apply_yield (object *op)
2203 2097
2204int convert_item (object *item, object *converter); 2098int convert_item (object *item, object *converter)
2205 2099
2100void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2206 2101
2207MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2102MODULE = cf PACKAGE = cf::object PREFIX = cf_
2208 2103
2209# no clean way to get an object from an archetype - stupid idiotic 2104# no clean way to get an object from an archetype - stupid idiotic
2210# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2105# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2211 2106
2212object *new (utf8_string archetype = 0) 2107object *new (utf8_string archetype = 0)
2213 PROTOTYPE: ;$ 2108 PROTOTYPE: ;$
2214 CODE: 2109 CODE:
2215 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2110 RETVAL = archetype
2111 ? archetype::get (archetype)
2112 : object::create ();
2216 OUTPUT: 2113 OUTPUT:
2217 RETVAL 2114 RETVAL
2218 2115
2116object *generate (utf8_string arch, object *creator)
2117 CODE:
2118 object *obj = archetype::get (arch);
2119 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2120 RETVAL = obj;
2121 OUTPUT:
2122 RETVAL
2123
2219object *find_object (U32 tag) 2124object *find_object (U32 tag)
2125
2126object *find_object_uuid (UUID i)
2220 2127
2221# TODO: nuke 2128# TODO: nuke
2222object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2129object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2223 PROTOTYPE: $$$$$$ 2130 PROTOTYPE: $$$$$$
2224 CODE: 2131 CODE:
2225{ 2132{
2226 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2133 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2134
2135 if (RETVAL->destroyed ())
2136 RETVAL = 0;
2227} 2137}
2228 2138
2229shstr 2139shstr
2230object::kv_get (shstr key) 2140object::kv_get (shstr key)
2141 CODE:
2142 RETVAL = THIS->kv.get (key);
2143 OUTPUT:
2144 RETVAL
2231 2145
2232void 2146void
2233object::kv_del (shstr key) 2147object::kv_del (shstr key)
2148 CODE:
2149 THIS->kv.del (key);
2234 2150
2235void 2151void
2236object::kv_set (shstr key, shstr value) 2152object::kv_set (shstr key, shstr value)
2153 CODE:
2154 THIS->kv.set (key, value);
2237 2155
2238object *get_nearest_player (object *ob) 2156object *get_nearest_player (object *ob)
2239 ALIAS: nearest_player = 0 2157 ALIAS: nearest_player = 0
2240 PREINIT: 2158 PREINIT:
2241 extern object *get_nearest_player (object *); 2159 extern object *get_nearest_player (object *);
… …
2244 PROTOTYPE: $$;$ 2162 PROTOTYPE: $$;$
2245 PPCODE: 2163 PPCODE:
2246{ 2164{
2247 rv_vector rv; 2165 rv_vector rv;
2248 2166
2249 PUTBACK;
2250 get_rangevector (ob, other, &rv, flags); 2167 get_rangevector (ob, other, &rv, flags);
2251 SPAGAIN;
2252 2168
2253 EXTEND (SP, 5); 2169 EXTEND (SP, 5);
2254 PUSHs (newSVuv (rv.distance)); 2170 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2255 PUSHs (newSViv (rv.distance_x)); 2171 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2256 PUSHs (newSViv (rv.distance_y)); 2172 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2257 PUSHs (newSViv (rv.direction)); 2173 PUSHs (sv_2mortal (newSViv (rv.direction)));
2258 PUSHs (to_sv (rv.part)); 2174 PUSHs (sv_2mortal (to_sv (rv.part)));
2259} 2175}
2260 2176
2261bool on_same_map_as (object *ob, object *other) 2177bool on_same_map_as (object *ob, object *other)
2262 CODE: 2178 CODE:
2263 RETVAL = on_same_map (ob, other); 2179 RETVAL = on_same_map (ob, other);
… …
2283 RETVAL = op->contr; 2199 RETVAL = op->contr;
2284 OUTPUT: RETVAL 2200 OUTPUT: RETVAL
2285 2201
2286bool move_player (object *op, int dir) 2202bool move_player (object *op, int dir)
2287 2203
2288void check_score (object *op)
2289
2290void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2204void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2291 CODE: 2205 CODE:
2292 new_draw_info (flags, 0, op, txt); 2206 new_draw_info (flags, 0, op, txt);
2293 2207
2294void kill_player (object *op) 2208void kill_player (object *op)
… …
2306int command_arrest (object *op, utf8_string params) 2220int command_arrest (object *op, utf8_string params)
2307 2221
2308 2222
2309MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2223MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2310 2224
2311INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2225INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2312 2226
2313int invoke (player *pl, int event, ...) 2227int invoke (player *pl, int event, ...)
2314 CODE: 2228 CODE:
2315 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2229 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2316 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2230 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2408 if (op->tag) 2322 if (op->tag)
2409 XPUSHs (sv_2mortal (to_sv (op))); 2323 XPUSHs (sv_2mortal (to_sv (op)));
2410 } 2324 }
2411} 2325}
2412 2326
2413INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2327INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2414 2328
2415void 2329void
2416adjust_daylight () 2330adjust_daylight ()
2417 CODE: 2331 CODE:
2418 maptile::adjust_daylight (); 2332 maptile::adjust_daylight ();
… …
2448 if (pl->ob && pl->ob->map == THIS) 2362 if (pl->ob && pl->ob->map == THIS)
2449 PUSHs (sv_2mortal (to_sv (pl->ob))); 2363 PUSHs (sv_2mortal (to_sv (pl->ob)));
2450 } 2364 }
2451 2365
2452void 2366void
2367maptile::gen_quadmap (int x, int y, int z)
2368 CODE:
2369 gen_quadmap (THIS, x * 50, y * 50, z);
2370
2371void
2453maptile::add_underlay (SV *data, int offset, int stride, SV *palette) 2372maptile::add_underlay (SV *data, int offset, int stride, SV *palette)
2454 CODE: 2373 CODE:
2455{ 2374{
2456 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV) 2375 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV)
2457 croak ("maptile::add_underlay: palette must be arrayref"); 2376 croak ("maptile::add_underlay: palette must be arrayref");
… …
2464 for (int x = 0; x < THIS->width; ++x) 2383 for (int x = 0; x < THIS->width; ++x)
2465 for (int y = 0; y < THIS->height; ++y) 2384 for (int y = 0; y < THIS->height; ++y)
2466 { 2385 {
2467 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2386 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2468 if (op->flag [FLAG_IS_FLOOR]) 2387 if (op->flag [FLAG_IS_FLOOR])
2469 goto skip_space; 2388 goto skip;
2470 2389
2471 { 2390 {
2472 int offs = offset + y * stride + x; 2391 int offs = offset + y * stride + x;
2392
2473 if (IN_RANGE_EXC (offs, 0, idxlen)) 2393 if (IN_RANGE_EXC (offs, 0, idxlen))
2474 { 2394 {
2475 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2395 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2476 { 2396 {
2477 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2397 object *ob = archetype::get (cfSvPVutf8_nolen (*elem));
2478 ob->flag [FLAG_NO_MAP_SAVE] = true; 2398 ob->flag [FLAG_NO_MAP_SAVE] = true;
2479 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2399 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2480 2400
2481 if (ob->randomitems) 2401 if (ob->randomitems && !ob->above)
2482 { 2402 {
2483 if (!ob->above)
2484 {
2485 ob->create_treasure (ob->randomitems); 2403 ob->create_treasure (ob->randomitems);
2486 2404
2487 for (object *op = ob->above; op; op = op->above) 2405 for (object *op = ob->above; op; op = op->above)
2488 op->flag [FLAG_NO_MAP_SAVE] = true; 2406 op->flag [FLAG_NO_MAP_SAVE] = true;
2489 } 2407 // TODO: if this is a pickable object, then the item
2490 2408 // will at a bit weird - saving inside the player
2491 ob->randomitems = 0; 2409 // will clear the flag, but when the player drops
2410 // it without logging out, it keeps the flag.
2411 // nobody has reported this, but this can be rather
2412 // annoying on persistent maps.
2492 } 2413 }
2493 } 2414 }
2494 } 2415 }
2495 } 2416 }
2496
2497 skip_space: ; 2417 skip: ;
2498 } 2418 }
2499} 2419}
2500 2420
2501void 2421void
2502maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2422maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2512 2432
2513 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2433 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2514 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2434 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2515 2435
2516 for (int i = av_len ((AV *)palette) + 1; i--; ) 2436 for (int i = av_len ((AV *)palette) + 1; i--; )
2517 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2437 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2518 2438
2519 for (int y = 0; y < THIS->height; ++y) 2439 for (int y = 0; y < THIS->height; ++y)
2520 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2440 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2521 2441
2522 sfree (THIS->regions, THIS->size ()); 2442 sfree (THIS->regions, THIS->size ());
… …
2532 for (int x = 0; x < THIS->width; ++x) 2452 for (int x = 0; x < THIS->width; ++x)
2533 for (int y = 0; y < THIS->height; ++y) 2453 for (int y = 0; y < THIS->height; ++y)
2534 { 2454 {
2535 region *rgn = THIS->region (x, y); 2455 region *rgn = THIS->region (x, y);
2536 2456
2537 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2538 if (object *op = THIS->at (x, y).top) 2457 if (object *op = THIS->at (x, y).top)
2539 if (rgn->treasure && rndm () < rgn->treasure_density) 2458 if (rgn->treasure && rndm () < rgn->treasure_density)
2540 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2459 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2541 } 2460 }
2542 2461
… …
2548 if (oblinkpt *obp = map->find_link (connection)) 2467 if (oblinkpt *obp = map->find_link (connection))
2549 for (objectlink *ol = obp->link; ol; ol = ol->next) 2468 for (objectlink *ol = obp->link; ol; ol = ol->next)
2550 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2469 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2551 2470
2552void 2471void
2553get_map_flags (maptile *map, int x, int y) 2472xy_normalise (maptile *map, int x, int y, int dir = 0)
2554 PPCODE: 2473 PPCODE:
2555{ 2474{
2556 maptile *nmap = 0; 2475 mapxy pos (map, x, y);
2557 I16 nx = 0, ny = 0; 2476 if (!pos.move (dir).normalise ())
2477 XSRETURN_EMPTY;
2558 2478
2559 PUTBACK;
2560 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2561 SPAGAIN;
2562
2563 EXTEND (SP, 4); 2479 EXTEND (SP, 3);
2564 PUSHs (sv_2mortal (newSViv (flags)));
2565
2566 if (GIMME_V == G_ARRAY)
2567 {
2568 PUSHs (sv_2mortal (to_sv (nmap))); 2480 PUSHs (sv_2mortal (to_sv (pos.m)));
2569 PUSHs (sv_2mortal (newSViv (nx))); 2481 PUSHs (sv_2mortal (to_sv (pos.x)));
2570 PUSHs (sv_2mortal (newSViv (ny))); 2482 PUSHs (sv_2mortal (to_sv (pos.y)));
2571 }
2572} 2483}
2573 2484
2574mapspace * 2485mapspace *
2575ms (maptile *map, unsigned int x, unsigned int y) 2486ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2576 PROTOTYPE: $$$ 2487 PROTOTYPE: $$$;$
2577 CODE: 2488 CODE:
2578{ 2489{
2579 maptile *nmap = 0; 2490 mapxy pos (map, x, y);
2580 I16 nx, ny; 2491 if (!pos.move (dir).normalise ())
2581
2582 PUTBACK;
2583 get_map_flags (map, &nmap, x, y, &nx, &ny);
2584 SPAGAIN;
2585
2586 if (!nmap)
2587 XSRETURN_UNDEF; 2492 XSRETURN_UNDEF;
2588 2493
2589 RETVAL = &nmap->at (nx, ny); 2494 RETVAL = &*pos;
2590} 2495}
2591 OUTPUT: 2496 OUTPUT:
2592 RETVAL 2497 RETVAL
2593 2498
2594void 2499void
2595at (maptile *map, unsigned int x, unsigned int y) 2500at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2596 PROTOTYPE: $$$ 2501 PROTOTYPE: $$$;$
2597 PPCODE: 2502 PPCODE:
2598{ 2503 mapxy pos (map, x, y);
2599 maptile *nmap = 0; 2504 if (pos.move (dir).normalise ())
2600 I16 nx, ny;
2601
2602 PUTBACK;
2603 get_map_flags (map, &nmap, x, y, &nx, &ny);
2604 SPAGAIN;
2605
2606 if (nmap)
2607 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2505 for (object *o = pos->bot; o; o = o->above)
2608 XPUSHs (sv_2mortal (to_sv (o))); 2506 XPUSHs (sv_2mortal (to_sv (o)));
2609}
2610 2507
2611SV * 2508SV *
2612bot_at (maptile *map, unsigned int x, unsigned int y) 2509bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2613 PROTOTYPE: $$$ 2510 PROTOTYPE: $$$;$
2614 ALIAS: 2511 ALIAS:
2615 top_at = 1 2512 top_at = 1
2616 flags_at = 2 2513 flags_at = 2
2617 light_at = 3 2514 light_at = 3
2618 move_block_at = 4 2515 move_block_at = 4
2619 move_slow_at = 5 2516 move_slow_at = 5
2620 move_on_at = 6 2517 move_on_at = 6
2621 move_off_at = 7 2518 move_off_at = 7
2622 CODE: 2519 CODE:
2623{ 2520{
2624 sint16 nx = x; 2521 mapxy pos (map, x, y);
2625 sint16 ny = y; 2522 if (!pos.move (dir).normalise ())
2626
2627 if (!xy_normalise (map, nx, ny))
2628 XSRETURN_UNDEF; 2523 XSRETURN_UNDEF;
2629 2524
2630 mapspace &ms = map->at (nx, ny); 2525 mapspace &ms = *pos;
2631 2526
2632 ms.update (); 2527 ms.update ();
2633 2528
2634 switch (ix) 2529 switch (ix)
2635 { 2530 {
… …
2645} 2540}
2646 OUTPUT: RETVAL 2541 OUTPUT: RETVAL
2647 2542
2648# worst xs function of my life 2543# worst xs function of my life
2649bool 2544bool
2650_create_random_map (\ 2545_create_random_map (maptile *self, SV *options)
2651 maptile *self,\
2652 utf8_string wallstyle,\
2653 utf8_string wall_name,\
2654 utf8_string floorstyle,\
2655 utf8_string monsterstyle,\
2656 utf8_string treasurestyle,\
2657 utf8_string layoutstyle,\
2658 utf8_string doorstyle,\
2659 utf8_string decorstyle,\
2660 utf8_string origin_map,\
2661 utf8_string final_map,\
2662 utf8_string exitstyle,\
2663 utf8_string this_map,\
2664 utf8_string exit_on_final_map,\
2665 int xsize,\
2666 int ysize,\
2667 int expand2x,\
2668 int layoutoptions1,\
2669 int layoutoptions2,\
2670 int layoutoptions3,\
2671 int symmetry,\
2672 int difficulty,\
2673 int difficulty_given,\
2674 float difficulty_increase,\
2675 int dungeon_level,\
2676 int dungeon_depth,\
2677 int decoroptions,\
2678 int orientation,\
2679 int origin_y,\
2680 int origin_x,\
2681 U32 random_seed,\
2682 val64 total_map_hp,\
2683 int map_layout_style,\
2684 int treasureoptions,\
2685 int symmetry_used,\
2686 region *region,\
2687 utf8_string custom\
2688)
2689 CODE: 2546 CODE:
2690{ 2547{
2691 random_map_params rmp; 2548 random_map_params rmp ((HV *)SvRV (options));
2692
2693 assign (rmp.wallstyle , wallstyle);
2694 assign (rmp.wall_name , wall_name);
2695 assign (rmp.floorstyle , floorstyle);
2696 assign (rmp.monsterstyle , monsterstyle);
2697 assign (rmp.treasurestyle , treasurestyle);
2698 assign (rmp.layoutstyle , layoutstyle);
2699 assign (rmp.doorstyle , doorstyle);
2700 assign (rmp.decorstyle , decorstyle);
2701 assign (rmp.exitstyle , exitstyle);
2702 assign (rmp.exit_on_final_map, exit_on_final_map);
2703
2704 rmp.origin_map = origin_map;
2705 rmp.final_map = final_map;
2706 rmp.this_map = this_map;
2707 rmp.xsize = xsize;
2708 rmp.ysize = ysize;
2709 rmp.expand2x = expand2x;
2710 rmp.layoutoptions1 = layoutoptions1;
2711 rmp.layoutoptions2 = layoutoptions2;
2712 rmp.layoutoptions3 = layoutoptions3;
2713 rmp.symmetry = symmetry;
2714 rmp.difficulty = difficulty;
2715 rmp.difficulty_given = difficulty_given;
2716 rmp.difficulty_increase = difficulty_increase;
2717 rmp.dungeon_level = dungeon_level;
2718 rmp.dungeon_depth = dungeon_depth;
2719 rmp.decoroptions = decoroptions;
2720 rmp.orientation = orientation;
2721 rmp.origin_y = origin_y;
2722 rmp.origin_x = origin_x;
2723 rmp.random_seed = random_seed;
2724 rmp.total_map_hp = (uint64_t) total_map_hp;
2725 rmp.map_layout_style = map_layout_style;
2726 rmp.treasureoptions = treasureoptions;
2727 rmp.symmetry_used = symmetry_used;
2728 rmp.region = region;
2729 rmp.custom = custom;
2730
2731 RETVAL = self->generate_random_map (&rmp); 2549 RETVAL = self->generate_random_map (&rmp);
2732} 2550}
2733 OUTPUT: 2551 OUTPUT:
2734 RETVAL 2552 RETVAL
2735 2553
2736MODULE = cf PACKAGE = cf::mapspace 2554MODULE = cf PACKAGE = cf::mapspace
2737 2555
2738INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2556INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2739 2557
2740MODULE = cf PACKAGE = cf::arch 2558MODULE = cf PACKAGE = cf::arch
2741 2559
2742int archetypes_size () 2560int archetypes_size ()
2743 CODE: 2561 CODE:
… …
2747archetype *archetypes (U32 index) 2565archetype *archetypes (U32 index)
2748 CODE: 2566 CODE:
2749 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2567 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2750 OUTPUT: RETVAL 2568 OUTPUT: RETVAL
2751 2569
2752object *instantiate (archetype *arch)
2753 CODE:
2754 RETVAL = arch_to_object (arch);
2755 OUTPUT:
2756 RETVAL
2757
2758INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2570INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2759 2571
2760MODULE = cf PACKAGE = cf::party 2572MODULE = cf PACKAGE = cf::party
2761 2573
2762partylist *first () 2574partylist *first ()
2763 PROTOTYPE: 2575 PROTOTYPE:
2764 CODE: 2576 CODE:
2765 RETVAL = get_firstparty (); 2577 RETVAL = get_firstparty ();
2766 OUTPUT: RETVAL 2578 OUTPUT: RETVAL
2767 2579
2768INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2580INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2769 2581
2770MODULE = cf PACKAGE = cf::region 2582MODULE = cf PACKAGE = cf::region
2771 2583
2772void 2584void
2773list () 2585list ()
2774 PPCODE: 2586 PPCODE:
2775 for_all_regions (rgn) 2587 for_all_regions (rgn)
2776 XPUSHs (sv_2mortal (to_sv (rgn))); 2588 XPUSHs (sv_2mortal (to_sv (rgn)));
2777 2589
2778region *find (utf8_string name)
2779 PROTOTYPE: $
2780 CODE:
2781 RETVAL = region::find (name);
2782 OUTPUT: RETVAL
2783
2784int specificity (region *rgn) 2590int specificity (region *rgn)
2785 CODE: 2591 CODE:
2786 RETVAL = 0; 2592 RETVAL = 0;
2787 while (rgn = rgn->parent) 2593 while (rgn = rgn->parent)
2788 RETVAL++; 2594 RETVAL++;
2789 OUTPUT: RETVAL 2595 OUTPUT: RETVAL
2790 2596
2791INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2597INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2792 2598
2793MODULE = cf PACKAGE = cf::living 2599MODULE = cf PACKAGE = cf::living
2794 2600
2795INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2601INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2796 2602
2797MODULE = cf PACKAGE = cf::settings 2603MODULE = cf PACKAGE = cf::settings
2798 2604
2799INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2605INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2800 2606
2801MODULE = cf PACKAGE = cf::client 2607MODULE = cf PACKAGE = cf::client
2802 2608
2803INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2609INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2804 2610
2805int invoke (client *ns, int event, ...) 2611int invoke (client *ns, int event, ...)
2806 CODE: 2612 CODE:
2807 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2613 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2808 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2614 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2874 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2680 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2875 old_sound_index [idx] = face; 2681 old_sound_index [idx] = face;
2876 2682
2877MODULE = cf PACKAGE = cf::face PREFIX = face_ 2683MODULE = cf PACKAGE = cf::face PREFIX = face_
2878 2684
2879#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2685#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2880 2686
2881faceidx face_find (utf8_string name, faceidx defidx = 0) 2687faceidx face_find (utf8_string name, faceidx defidx = 0)
2882 2688
2883faceidx alloc (utf8_string name) 2689faceidx alloc (utf8_string name)
2884 CODE: 2690 CODE:
… …
2891 while (!RETVAL); // crude way to leave index 0 2697 while (!RETVAL); // crude way to leave index 0
2892 2698
2893 faces [RETVAL].name = name; 2699 faces [RETVAL].name = name;
2894 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2700 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2895 2701
2896 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2702 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2897 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2703 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2704 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2898} 2705}
2899 OUTPUT: RETVAL 2706 OUTPUT: RETVAL
2900 2707
2901void set_type (faceidx idx, int value) 2708void set_type (faceidx idx, int value)
2902 ALIAS: 2709 ALIAS:
… …
2918 2725
2919void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2726void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
2920 CODE: 2727 CODE:
2921{ 2728{
2922 faceinfo *f = face_info (idx); assert (f); 2729 faceinfo *f = face_info (idx); assert (f);
2923 facedata *d = &(faceset ? f->data64 : f->data32); 2730 facedata *d = f->face + faceset;
2924 sv_to (data, d->data); 2731 sv_to (data, d->data);
2925 STRLEN clen; 2732 STRLEN clen;
2926 char *cdata = SvPVbyte (chksum, clen); 2733 char *cdata = SvPVbyte (chksum, clen);
2927 clen = min (CHKSUM_SIZE, clen); 2734 clen = min (CHKSUM_MAXLEN, clen);
2928 2735
2736 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2737
2929 if (memcmp (d->chksum, cdata, clen)) 2738 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2930 { 2739 {
2740 d->chksum_len = clen;
2931 memcpy (d->chksum, cdata, clen); 2741 memcpy (d->chksum, cdata, clen);
2932 2742
2933 // invalidate existing client face info 2743 // invalidate existing client face info
2934 for_all_clients (ns) 2744 for_all_clients (ns)
2935 if (ns->faceset == faceset) 2745 if (ns->faceset == faceset)
… …
2950 2760
2951SV *get_chksum (faceidx idx, int faceset = 0) 2761SV *get_chksum (faceidx idx, int faceset = 0)
2952 CODE: 2762 CODE:
2953 facedata *d = face_data (idx, faceset); 2763 facedata *d = face_data (idx, faceset);
2954 if (!d) XSRETURN_UNDEF; 2764 if (!d) XSRETURN_UNDEF;
2955 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2765 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2956 OUTPUT: 2766 OUTPUT:
2957 RETVAL 2767 RETVAL
2958 2768
2959SV *get_data (faceidx idx, int faceset = 0) 2769SV *get_data (faceidx idx, int faceset = 0)
2960 CODE: 2770 CODE:
… …
2980 ns->force_newmap = true; 2790 ns->force_newmap = true;
2981 } 2791 }
2982 2792
2983MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2793MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2984 2794
2985#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2795#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2986 2796
2987animidx anim_find (utf8_string name) 2797animidx anim_find (utf8_string name)
2988 CODE: 2798 CODE:
2989 RETVAL = animation::find (name).number; 2799 RETVAL = animation::find (name).number;
2990 OUTPUT: RETVAL 2800 OUTPUT: RETVAL
… …
3005 } 2815 }
3006 else 2816 else
3007 anim = &animation::create (name, av_len (av) + 1, facings); 2817 anim = &animation::create (name, av_len (av) + 1, facings);
3008 2818
3009 for (int i = 0; i < anim->num_animations; ++i) 2819 for (int i = 0; i < anim->num_animations; ++i)
3010 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2820 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3011} 2821}
3012 OUTPUT: RETVAL 2822 OUTPUT: RETVAL
3013 2823
3014void invalidate_all () 2824void invalidate_all ()
3015 CODE: 2825 CODE:
3016 for_all_clients (ns) 2826 for_all_clients (ns)
3017 ns->anims_sent.reset (); 2827 ns->anims_sent.reset ();
3018 2828
3019MODULE = cf PACKAGE = cf::object::freezer 2829MODULE = cf PACKAGE = cf::object::freezer
3020 2830
3021INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2831INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3022 2832
3023SV * 2833SV *
3024new (char *klass) 2834new (char *klass)
3025 CODE: 2835 CODE:
3026 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2836 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3033 sv_to (sv, self); 2843 sv_to (sv, self);
3034 delete self; 2844 delete self;
3035 2845
3036MODULE = cf PACKAGE = cf::object::thawer 2846MODULE = cf PACKAGE = cf::object::thawer
3037 2847
3038INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2848INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2849
2850bool
2851errors_are_fatal (bool fatal)
2852 CODE:
2853 RETVAL = object_thawer::errors_are_fatal;
2854 object_thawer::errors_are_fatal = fatal;
2855 OUTPUT:
2856 RETVAL
3039 2857
3040SV * 2858SV *
3041new_from_file (char *klass, octet_string path) 2859new_from_file (char *klass, octet_string path)
3042 CODE: 2860 CODE:
3043 object_thawer *f = new object_thawer (path); 2861 object_thawer *f = new object_thawer (path);
… …
3069 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2887 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
3070 2888
3071 self->skip (); 2889 self->skip ();
3072 } 2890 }
3073 2891
2892MODULE = cf PACKAGE = cf::layout
2893
2894INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h |
2895

Diff Legend

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