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

Diff Legend

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