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

Diff Legend

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