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.400 by root, Sat Apr 23 04:46:27 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
… …
53#include <perl.h> 52#include <perl.h>
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
59extern sint64 *levels; // the experience table
60 57
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;
… …
87 *stash_cf_mapspace_wrap, 84 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 85 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 86 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 87 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 88 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 89 *stash_cf_living_wrap,
90 *stash_cf_layout_wrap,
91 *stash_ext_map_world;
93 92
94static SV 93static SV
95 *cv_cf_do_invoke, 94 *cv_cf_do_invoke,
96 *cv_cf__can_merge, 95 *cv_cf__can_merge,
97 *cv_cf_client_send_msg, 96 *cv_cf_client_send_msg,
98 *cv_cf_tick, 97 *cv_cf_tick,
99 *cv_cf_match_match; 98 *cv_cf_match_match;
100 99
101#ifndef newSVpv_utf8 100#ifndef newSVpv_utf8
102static inline SV * 101static SV *
103newSVpv_utf8 (const char *s) 102newSVpv_utf8 (const char *s)
104{ 103{
105 if (!s) 104 if (!s)
106 return newSV (0); 105 return newSV (0);
107 106
… …
110 return sv; 109 return sv;
111} 110}
112#endif 111#endif
113 112
114#ifndef newSVpvn_utf8 113#ifndef newSVpvn_utf8
115static inline SV * 114static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 115newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 116{
118 if (!s) 117 if (!s)
119 return newSV (0); 118 return newSV (0);
120 119
… …
124 SvUTF8_on (sv); 123 SvUTF8_on (sv);
125 124
126 return sv; 125 return sv;
127} 126}
128#endif 127#endif
128
129noinline utf8_string
130cfSvPVutf8_nolen (SV *sv)
131{
132 SvGETMAGIC (sv);
133
134 if (SvPOK (sv))
135 {
136 if (!SvUTF8 (sv))
137 sv_utf8_upgrade_nomg (sv);
138
139 return SvPVX (sv);
140 }
141
142 return SvPV_nolen (sv);
143}
129 144
130// helper cast function, returns super class * or 0 145// helper cast function, returns super class * or 0
131template<class super> 146template<class super>
132static super * 147static super *
133is_a (attachable *at) 148is_a (attachable *at)
… …
210attachable::destroy () 225attachable::destroy ()
211{ 226{
212 if (destroyed ()) 227 if (destroyed ())
213 return; 228 return;
214 229
215 flags |= F_DESTROYED; 230 attachable_flags |= F_DESTROYED;
216 do_destroy (); 231 do_destroy ();
217 sever_self (); 232 sever_self ();
233}
234
235void
236attachable::do_delete ()
237{
238 delete this;
218} 239}
219 240
220void 241void
221attachable::check_mortals () 242attachable::check_mortals ()
222{ 243{
… …
238 259
239 if (0) 260 if (0)
240 { 261 {
241 for (int j = 0; j < mortals.size (); ++j)//D 262 for (int j = 0; j < mortals.size (); ++j)//D
242 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 263 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
264
243 fprintf (stderr, "\n");//D 265 fprintf (stderr, "\n");//D
244 } 266 }
245 } 267 }
246 } 268 }
247 269
… …
267 } 289 }
268 else 290 else
269 { 291 {
270 mortals.erase (i); 292 mortals.erase (i);
271 obj->sever_self (); 293 obj->sever_self ();
272 delete obj; 294 obj->do_delete ();
273 } 295 }
274 } 296 }
275} 297}
276 298
277void 299void
… …
294 316
295 attach = src.attach; 317 attach = src.attach;
296 return *this; 318 return *this;
297} 319}
298 320
321#if 0
299template<typename T> 322template<typename T>
300static bool 323static bool
301find_backref (void *ptr, T *obj) 324find_backref (void *ptr, T *obj)
302{ 325{
303 char *s = (char *)obj; 326 char *s = (char *)obj;
… …
311 334
312 return false; 335 return false;
313} 336}
314 337
315// for debugging, find "live" objects containing this ptr 338// for debugging, find "live" objects containing this ptr
316void 339static void
317find_backref (void *ptr) 340find_backref (void *ptr)
318{ 341{
319 for_all_objects (op) 342 for_all_objects (op)
320 if (find_backref (ptr, op)) 343 if (find_backref (ptr, op))
321 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 344 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
326 349
327 for_all_clients (ns) 350 for_all_clients (ns)
328 if (find_backref (ptr, ns)) 351 if (find_backref (ptr, ns))
329 fprintf (stderr, "C %p\n", ns); 352 fprintf (stderr, "C %p\n", ns);
330} 353}
354#endif
331 355
332////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 356//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333 357
334static SV * 358static SV *
335newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 359newSVptr (void *ptr, HV *stash, HV *hv)
336{ 360{
337 SV *sv;
338
339 if (!ptr) 361 if (!ptr)
340 return newSV (0); 362 return newSV (0);
341 363
342 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
343 return sv_bless (newRV_noinc ((SV *)hv), stash); 365 return sv_bless (newRV_noinc ((SV *)hv), stash);
366}
367
368static SV * noinline
369newSVptr (void *ptr, HV *stash)
370{
371 return newSVptr (ptr, stash, newHV ());
344} 372}
345 373
346static int 374static int
347attachable_free (pTHX_ SV *sv, MAGIC *mg) 375attachable_free (pTHX_ SV *sv, MAGIC *mg)
348{ 376{
… …
360 return 0; 388 return 0;
361} 389}
362 390
363MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 391MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
364 392
365static SV * 393static SV * noinline
366newSVattachable (attachable *obj, HV *stash) 394newSVattachable (attachable *obj, HV *stash)
367{ 395{
368 if (!obj) 396 if (!obj)
369 return newSV (0); 397 return newSV (0);
370 398
… …
388 416
389 return sv; 417 return sv;
390 } 418 }
391} 419}
392 420
421#if 0 // unused
393static void 422static void
394clearSVptr (SV *sv) 423clearSVptr (SV *sv)
395{ 424{
396 if (SvROK (sv)) 425 if (SvROK (sv))
397 sv = SvRV (sv); 426 sv = SvRV (sv);
398 427
399 hv_clear ((HV *)sv); 428 hv_clear ((HV *)sv);
400 sv_unmagic (sv, PERL_MAGIC_ext); 429 sv_unmagic (sv, PERL_MAGIC_ext);
401} 430}
431#endif
432
433static long
434SvPTR_nc (SV *sv)
435{
436 sv = SvRV (sv);
437
438 // very important shortcut
439 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
440 return (long)SvMAGIC (sv)->mg_ptr;
441
442 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
443 return (long)mg->mg_ptr;
444
445 croak ("perl code used object, but C object is already destroyed, caught");
446}
402 447
403static long 448static long
404SvPTR (SV *sv, const char *klass) 449SvPTR (SV *sv, const char *klass)
405{ 450{
406 if (!sv_derived_from (sv, klass)) 451 if (!sv_derived_from (sv, klass))
407 croak ("object of type %s expected", klass); 452 croak ("object of type %s expected", klass);
408 453
409 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 454 return SvPTR_nc (sv);
410
411 if (!mg)
412 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
413
414 return (long)mg->mg_ptr;
415} 455}
416 456
417static long noinline 457static long noinline
418SvPTR_ornull (SV *sv, const char *klass) 458SvPTR_ornull (SV *sv, const char *klass)
419{ 459{
420 if (SvOK (sv)) 460 if (expect_false (!SvOK (sv))) return 0;
461
421 return SvPTR (sv, klass); 462 return SvPTR (sv, klass);
422 else
423 return 0;
424} 463}
425 464
465static long noinline
466SvPTR_ornull_client (SV *sv)
467{
468 if (expect_false (!SvOK (sv))) return 0;
469
470 if (!SvROK (sv)
471 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
472 && !sv_derived_from (sv, "cf::client")))
473 croak ("object of type cf::client expected");
474
475 return SvPTR_nc (sv);
476}
477
478static long noinline
479SvPTR_ornull_object (SV *sv)
480{
481 if (expect_false (!SvOK (sv))) return 0;
482
483 if (!SvROK (sv)
484 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
485 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
486 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
487 && !sv_derived_from (sv, "cf::object")))
488 croak ("object of type cf::object expected");
489
490 return SvPTR_nc (sv);
491}
492
493static long noinline
494SvPTR_ornull_maptile (SV *sv)
495{
496 if (expect_false (!SvOK (sv))) return 0;
497
498 if (!SvROK (sv)
499 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
500 && SvSTASH (SvRV (sv)) != stash_ext_map_world
501 && !sv_derived_from (sv, "cf::map")))
502 croak ("object of type cf::map expected");
503
504 return SvPTR_nc (sv);
505}
506
507static long noinline
508SvPTR_ornull_player (SV *sv)
509{
510 if (expect_false (!SvOK (sv))) return 0;
511
512 if (!SvROK (sv)
513 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
514 && !sv_derived_from (sv, "cf::player")))
515 croak ("object of type cf::player expected");
516
517 return SvPTR_nc (sv);
518}
519
426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 520static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
427inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 521static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
428inline SV *to_sv (bool v) { return newSViv (v); } 522static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 523static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 524static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 525static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 526static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 527static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 528static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 529static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 530static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 531static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 532static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 533static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 534static inline SV *to_sv (double v) { return newSVnv (v); }
441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 535static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
442inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 536static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
537// gcc dislikes noilnine on to_sv
443inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 538static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
539static inline SV *to_sv (object * v) { return to_sv_ni (v); }
444inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 540static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
445inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 541static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
446inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 542static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
447inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 543static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
448inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 544static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
449inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 545static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
546static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
450 547
451inline SV *to_sv (object & v) { return to_sv (&v); } 548static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 549static inline SV *to_sv (living & v) { return to_sv (&v); }
453 550
454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 551static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 552static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 553
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 554static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 555
459inline SV *to_sv (dynbuf * v) 556static inline SV *to_sv (dynbuf * v)
460{ 557{
461 SV *sv = newSV (0); 558 SV *sv = newSV (0);
462 559
463 sv_upgrade (sv, SVt_PV); 560 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1); 561 SvGROW (sv, v->size () + 1);
… …
468 *SvEND (sv) = 0; 565 *SvEND (sv) = 0;
469 566
470 return sv; 567 return sv;
471} 568}
472 569
473inline SV *to_sv (dynbuf_text * v) 570static inline SV *to_sv (dynbuf_text * v)
474{ 571{
475 SV *sv = to_sv (static_cast<dynbuf *> (v)); 572 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv); 573 SvUTF8_on (sv);
477 return sv; 574 return sv;
478} 575}
479 576
480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 577static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
481inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 578static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 582static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 583static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 584static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 585static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 586static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 587static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
491inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 588static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
492inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 589static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
493inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 590static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 591static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
495inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 592static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
496inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 593static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
497inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 594static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
595static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
498inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 596static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
499inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
500inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 597static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
501inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 598static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
502inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 599static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
503inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 600static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
504inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 601static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
602static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
505inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 603static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
506inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 604static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
507 605
508//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 606//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
509inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 607static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
510 608
511template<class T> 609template<class T>
512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 610static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
513 611
514template<int N> 612template<int N>
515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 613static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
516 614
517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 615static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
518inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 616static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
519inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 617static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 618static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 619
522inline void sv_to (SV *sv, std::string &v) 620static inline void sv_to (SV *sv, std::string &v)
523{ 621{
524 STRLEN len; 622 STRLEN len;
525 char *data = SvPVbyte (sv, len); 623 char *data = SvPVbyte (sv, len);
526 v.assign (data, len); 624 v.assign (data, len);
527} 625}
528 626
529inline void sv_to (SV *sv, UUID &v) 627static inline void sv_to (SV *sv, UUID &v)
530{ 628{
531 if (!v.parse (SvPV_nolen (sv))) 629 if (!v.parse (SvPV_nolen (sv)))
532 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 630 croak ("unparsable uuid: %s", SvPV_nolen (sv));
533} 631}
534 632
535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 633static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
536 634
537static SV * 635static SV *
538newSVdt_va (va_list &ap, data_type type) 636newSVdt_va (va_list &ap, data_type type)
539{ 637{
540 SV *sv; 638 SV *sv;
… …
620template<class type> 718template<class type>
621static void noinline 719static void noinline
622cf_obj_to (SV *arg, type &var) 720cf_obj_to (SV *arg, type &var)
623{ 721{
624 sv_to (arg, var); 722 sv_to (arg, var);
625 if (!var) 723 if (expect_false (!var))
626 croak ("must not pass invalid/null cf_obj here"); 724 croak ("must not pass invalid/null cf_obj here");
627} 725}
628 726
629template<class object> 727template<class object>
630static void noinline 728static void noinline
631cf_obj_ornull_to (SV *arg, object *&var) 729cf_obj_ornull_to (SV *arg, object *&var)
632{ 730{
633 if (SvOK (arg)) 731 if (SvOK (arg))
634 { 732 {
635 sv_to (arg, var); 733 sv_to (arg, var);
636 if (!var) 734 if (expect_false (!var))
637 croak ("unable to convert perl object to C++ object"); 735 croak ("unable to convert perl object to C++ object");
638 } 736 }
639 else 737 else
640 var = 0; 738 var = 0;
641} 739}
642 740
643////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 741//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644 742
645SV * 743static SV *
646registry (attachable *ext) 744registry (attachable *ext)
647{ 745{
648 if (!ext->cb) 746 if (!ext->cb)
649 ext->cb = newAV (); 747 ext->cb = newAV ();
650 748
… …
676 exit (EXIT_FAILURE); 774 exit (EXIT_FAILURE);
677 } 775 }
678 776
679 eval_pv ( 777 eval_pv (
680 "#line 1 'cfperl init'\n" 778 "#line 1 'cfperl init'\n"
681 "use EV ();\n" 779 "use EV ();\n" // required by bootstrap
682 "use Coro ();\n" 780 "use Coro ();\n" // required by bootstrap
683 "cf->bootstrap;\n" 781 "cf->bootstrap;\n" // required for cf::datadir
684 "unshift @INC, cf::datadir ();\n" 782 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
685 "require cf;\n", 783 "require cf;\n",
686 0 784 0
687 ); 785 );
688 786
689 if (SvTRUE (ERRSV)) 787 if (SvTRUE (ERRSV))
… …
934 CALL_END; 1032 CALL_END;
935 1033
936 return count; 1034 return count;
937} 1035}
938 1036
939SV * 1037static SV *
940cfperl_result (int idx) 1038cfperl_result (int idx)
941{ 1039{
942 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1040 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943 if (!av) 1041 if (!av)
944 return &PL_sv_undef; 1042 return &PL_sv_undef;
… …
1010 CALL_CALL ("ext::books::make_book", G_VOID); 1108 CALL_CALL ("ext::books::make_book", G_VOID);
1011 CALL_END; 1109 CALL_END;
1012} 1110}
1013 1111
1014void 1112void
1015cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1113cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1016{ 1114{
1017 CALL_BEGIN (4); 1115 CALL_BEGIN (4);
1018 CALL_ARG (ns); 1116 CALL_ARG (ns);
1019 CALL_ARG (type); 1117 CALL_ARG (type);
1020 CALL_ARG_SV (newSVpv_utf8 (msg)); 1118 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1049 CALL_CALL ("cf::mapscript::activate", G_VOID); 1147 CALL_CALL ("cf::mapscript::activate", G_VOID);
1050 CALL_END; 1148 CALL_END;
1051} 1149}
1052 1150
1053player * 1151player *
1054player::find (const char *name) 1152player::find (const_utf8_string name)
1055{ 1153{
1056 CALL_BEGIN (1); 1154 CALL_BEGIN (1);
1057 CALL_ARG (name); 1155 CALL_ARG (name);
1058 CALL_CALL ("cf::player::find", G_SCALAR); 1156 CALL_CALL ("cf::player::find", G_SCALAR);
1059 1157
… …
1064 1162
1065 return retval; 1163 return retval;
1066} 1164}
1067 1165
1068maptile * 1166maptile *
1069find_style (const char *dirname, const char *stylename, int difficulty) 1167find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1070{ 1168{
1071 CALL_BEGIN (3); 1169 CALL_BEGIN (4);
1072 CALL_ARG (dirname); 1170 CALL_ARG (dirname);
1073 CALL_ARG (stylename); 1171 CALL_ARG (stylename);
1074 CALL_ARG (difficulty); 1172 CALL_ARG (difficulty);
1173 CALL_ARG (recurse);
1075 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1174 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1076 1175
1077 maptile *retval = 0; 1176 maptile *retval = 0;
1078 if (count) sv_to (POPs, retval); 1177 if (count) sv_to (POPs, retval);
1079 1178
… …
1081 1180
1082 return retval; 1181 return retval;
1083} 1182}
1084 1183
1085maptile * 1184maptile *
1086maptile::find_sync (const char *path, maptile *origin) 1185maptile::find_sync (const_utf8_string path, maptile *origin)
1087{ 1186{
1088 CALL_BEGIN (2); 1187 CALL_BEGIN (2);
1089 CALL_ARG (path); 1188 CALL_ARG (path);
1090 CALL_ARG (origin); 1189 CALL_ARG (origin);
1091 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1190 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1097 1196
1098 return retval; 1197 return retval;
1099} 1198}
1100 1199
1101maptile * 1200maptile *
1102maptile::find_async (const char *path, maptile *origin, bool load) 1201maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1103{ 1202{
1104 CALL_BEGIN (3); 1203 CALL_BEGIN (3);
1105 CALL_ARG (path); 1204 CALL_ARG (path);
1106 CALL_ARG (origin); 1205 CALL_ARG (origin);
1107 CALL_ARG (load); 1206 CALL_ARG (load);
… …
1136 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1235 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1137 CALL_END; 1236 CALL_END;
1138} 1237}
1139 1238
1140void 1239void
1141object::player_goto (const char *path, int x, int y) 1240object::player_goto (const_utf8_string path, int x, int y)
1142{ 1241{
1143 if (type != PLAYER) 1242 if (type != PLAYER)
1144 return; 1243 return;
1145 1244
1146 CALL_BEGIN (4); 1245 CALL_BEGIN (4);
… …
1150 CALL_ARG (y); 1249 CALL_ARG (y);
1151 CALL_CALL ("cf::object::player::goto", G_VOID); 1250 CALL_CALL ("cf::object::player::goto", G_VOID);
1152 CALL_END; 1251 CALL_END;
1153} 1252}
1154 1253
1155const char * 1254const_utf8_string
1156object::ref () const 1255object::ref () const
1157{ 1256{
1158 if (type == PLAYER) 1257 if (type == PLAYER)
1159 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1258 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1160 else 1259 else
1260 // TODO: should be able to save references within the same map, at least
1161 return 0; 1261 return 0;
1162} 1262}
1163 1263
1164object * 1264object *
1165object::deref (const char *ref) 1265object::deref (const_utf8_string ref)
1166{ 1266{
1167 object *retval = 0; 1267 object *retval = 0;
1168 1268
1169 if (ref) 1269 if (ref)
1170 { 1270 {
… …
1180 1280
1181 return retval; 1281 return retval;
1182} 1282}
1183 1283
1184void 1284void
1185log_backtrace (const char *msg) 1285log_backtrace (const_utf8_string msg)
1186{ 1286{
1187#if HAVE_BACKTRACE 1287#if HAVE_BACKTRACE
1188 void *addr [20]; 1288 void *addr [20];
1189 int size = backtrace (addr, 20); 1289 int size = backtrace (addr, 20);
1190 1290
… …
1196 CALL_END; 1296 CALL_END;
1197#endif 1297#endif
1198} 1298}
1199 1299
1200bool 1300bool
1201is_match_expr (const char *expr) 1301is_match_expr (const_utf8_string expr)
1202{ 1302{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1303 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204} 1304}
1205 1305
1206bool 1306bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator) 1307match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1208{ 1308{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1309 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1; 1310 expr += sizeof ("match ") - 1;
1211 1311
1212 CALL_BEGIN (5); 1312 CALL_BEGIN (5);
… …
1223 1323
1224 return matched; 1324 return matched;
1225} 1325}
1226 1326
1227object * 1327object *
1228match_one (const char *expr, object *ob, object *self, object *source, object *originator) 1328match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1229{ 1329{
1230 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1330 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1231 expr += sizeof ("match ") - 1; 1331 expr += sizeof ("match ") - 1;
1232 1332
1233 CALL_BEGIN (5); 1333 CALL_BEGIN (5);
… …
1301 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1401 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1302 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1402 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1303 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1403 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1304 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1404 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1305 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1405 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1406 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1407 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1306 1408
1307 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1409 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1308 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1410 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1309 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1411 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); 1412 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1351 static const struct { 1453 static const struct {
1352 const char *name; 1454 const char *name;
1353 IV iv; 1455 IV iv;
1354 } *civ, const_iv[] = { 1456 } *civ, const_iv[] = {
1355# define const_iv(name) { # name, (IV)name }, 1457# define const_iv(name) { # name, (IV)name },
1356 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1458# include "const_iv.h"
1357 const_iv (logBacktrace) 1459# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1358 1460# include "attackinc.h"
1359 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461# undef def
1462# define def(uc, flags) const_iv (SK_ ## uc)
1463# include "skillinc.h"
1464# undef def
1465# define def(name, use, nonuse) const_iv (body_ ## name)
1466# include "slotinc.h"
1467# undef def
1360 1468
1361 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1469 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1362 1470
1363 const_iv (MAX_TIME) 1471 const_iv (MAX_TIME)
1364 const_iv (MAXSOCKBUF) 1472 const_iv (MAXSOCKBUF)
1365 1473
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) 1474 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) 1475 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1456 1476
1457 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1477 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 1478
1508 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1479 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) 1480 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1510 const_iv (F_LOCKED) 1481 const_iv (F_LOCKED)
1511 1482
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) 1483 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) 1484 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1516 1485
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) 1486 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 1487
1532 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1488 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) 1489 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1534 1490
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) 1491 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1565 const_iv (MAP_INACTIVE) 1492 const_iv (MAP_INACTIVE)
1566 1493
1567 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1494 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) 1495 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1569 1496
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) 1497 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1573 1498
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) 1499 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 }; 1500 };
1595 1501
1596 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1502 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1597 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1503 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1598 1504
1599 static const struct { 1505 static const struct {
1600 const char *name; 1506 const char *name;
1601 int skip; 1507 int skip;
… …
1607# undef def 1513# undef def
1608 }; 1514 };
1609 1515
1610 AV *av = get_av ("cf::EVENT", 1); 1516 AV *av = get_av ("cf::EVENT", 1);
1611 1517
1612 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1518 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1613 { 1519 {
1614 AV *event = newAV (); 1520 AV *event = newAV ();
1615 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1521 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1616 av_push (event, newSViv (eiv->klass)); 1522 av_push (event, newSViv (eiv->klass));
1617 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1523 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1652 1558
1653 for_all_objects (op) 1559 for_all_objects (op)
1654 op->reattach (); 1560 op->reattach ();
1655} 1561}
1656 1562
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 () 1563void init_anim ()
1700 1564
1701void init_globals () 1565void init_globals ()
1702 1566
1703void init_experience ()
1704
1705void init_attackmess () 1567void init_attackmess ()
1706 1568
1707void init_dynamic () 1569void init_dynamic ()
1708 1570
1709void load_settings () 1571void load_settings ()
1710 1572
1573void reload_exp_table ()
1574
1711void load_materials () 1575void reload_materials ()
1712 1576
1713void init_uuid () 1577void init_uuid ()
1714 CODE: 1578 CODE:
1715 UUID::init (); 1579 UUID::init ();
1716 1580
1717void init_signals () 1581void init_signals ()
1718
1719void init_commands ()
1720 1582
1721void init_skills () 1583void init_skills ()
1722 1584
1723void init_beforeplay () 1585void init_beforeplay ()
1724 1586
… …
1754 } 1616 }
1755 1617
1756void server_tick () 1618void server_tick ()
1757 CODE: 1619 CODE:
1758{ 1620{
1621 ev_now_update (EV_DEFAULT);
1759 NOW = ev_now (EV_DEFAULT); 1622 NOW = ev_now (EV_DEFAULT);
1760 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1623 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1761 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1624 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1762 runtime = SvNVX (sv_runtime); 1625 runtime = SvNVX (sv_runtime);
1763 1626
1764 server_tick (); 1627 server_tick ();
1765 1628
1766 NOW = ev_time (); 1629 ev_now_update (EV_DEFAULT);
1630 NOW = ev_now (EV_DEFAULT);
1767 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1631 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1768 runtime += TICK; 1632 runtime += TICK;
1769 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1633 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1770} 1634}
1771 1635
… …
1782 switch (items) 1646 switch (items)
1783 { 1647 {
1784 case 0: RETVAL = gen (); break; 1648 case 0: RETVAL = gen (); break;
1785 case 1: RETVAL = gen (SvUV (ST (0))); break; 1649 case 1: RETVAL = gen (SvUV (ST (0))); break;
1786 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1650 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1787 default: croak ("cf::rndm requires none, one or two parameters."); break; 1651 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1788 } 1652 }
1789} 1653}
1790 OUTPUT: 1654 OUTPUT:
1791 RETVAL 1655 RETVAL
1792 1656
… …
1799NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1663NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1800 CODE: 1664 CODE:
1801 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1665 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1802 OUTPUT: 1666 OUTPUT:
1803 RETVAL 1667 RETVAL
1668
1669const char *ordinal (int i)
1804 1670
1805void weaken (...) 1671void weaken (...)
1806 PROTOTYPE: @ 1672 PROTOTYPE: @
1807 CODE: 1673 CODE:
1808 while (items > 0) 1674 while (items > 0)
1809 sv_rvweaken (ST (--items)); 1675 sv_rvweaken (ST (--items));
1810 1676
1811void 1677void log_suspend ()
1678
1679void log_resume ()
1680
1812log_backtrace (utf8_string msg) 1681void log_backtrace (utf8_string msg)
1813 1682
1814void
1815LOG (int flags, utf8_string msg) 1683void LOG (int flags, utf8_string msg)
1816 PROTOTYPE: $$ 1684 PROTOTYPE: $$
1817 C_ARGS: flags, "%s", msg 1685 C_ARGS: flags, "%s", msg
1818 1686
1819octet_string path_combine (octet_string base, octet_string path) 1687octet_string path_combine (octet_string base, octet_string path)
1820 PROTOTYPE: $$ 1688 PROTOTYPE: $$
… …
1867 1735
1868int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1736int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1869 INIT: 1737 INIT:
1870#if __GLIBC__ 1738#if __GLIBC__
1871 mallopt (M_TOP_PAD, 1024 * 1024); 1739 mallopt (M_TOP_PAD, 1024 * 1024);
1872 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128); 1740 mallopt (M_MMAP_THRESHOLD, 1024 * 1024);
1873 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory 1741 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1742 if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10))
1874 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1743 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1875#endif 1744#endif
1876 1745
1877int munlockall () 1746int munlockall ()
1878 1747
1879#endif 1748#endif
… …
1912 1781
1913int random_roll (int min, int max, object *op, int goodbad); 1782int random_roll (int min, int max, object *op, int goodbad);
1914 1783
1915const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1784const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1916 1785
1917int
1918exp_to_level (val64 exp) 1786int exp_to_level (val64 exp)
1787
1788val64 level_to_min_exp (int level)
1789
1790SV *
1791attacktype_name (int atnr)
1919 CODE: 1792 CODE:
1920{ 1793 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1921 int i = 0; 1794 ? newSVpv (attacktype_name [atnr], 0)
1922 1795 : &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 1796 OUTPUT: RETVAL
1935 1797
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 * 1798SV *
1948resistance_to_string (int atnr) 1799attacktype_desc (int atnr)
1949 CODE: 1800 CODE:
1950 if (atnr >= 0 && atnr < NROFATTACKS) 1801 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1802 ? newSVpv (attacktype_desc [atnr], 0)
1803 : &PL_sv_undef;
1804 OUTPUT: RETVAL
1805
1806SV *
1807resist_plus (int atnr)
1808 CODE:
1809 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1951 RETVAL = newSVpv (resist_plus[atnr], 0); 1810 ? newSVpv (resist_plus [atnr], 0)
1952 else 1811 : &PL_sv_undef;
1953 XSRETURN_UNDEF; 1812 OUTPUT: RETVAL
1813
1814SV *
1815change_resist_msg (int atnr)
1816 CODE:
1817 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1818 ? newSVpv (change_resist_msg [atnr], 0)
1819 : &PL_sv_undef;
1954 OUTPUT: RETVAL 1820 OUTPUT: RETVAL
1955 1821
1956UUID 1822UUID
1957uuid_cur () 1823uuid_cur ()
1958 CODE: 1824 CODE:
… …
2008 CODE: 1874 CODE:
2009 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1875 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
2010 OUTPUT: 1876 OUTPUT:
2011 RETVAL 1877 RETVAL
2012 1878
1879bool should_invoke (attachable *obj, int event)
1880 CODE:
1881 RETVAL = obj->should_invoke ((event_type)event);
1882 OUTPUT: RETVAL
1883
2013void 1884void
2014debug_trace (attachable *obj, bool on = true) 1885debug_trace (attachable *obj, bool on = true)
2015 CODE: 1886 CODE:
2016 obj->flags &= ~attachable::F_DEBUG_TRACE; 1887 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2017 if (on) 1888 if (on)
2018 obj->flags |= attachable::F_DEBUG_TRACE; 1889 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
2019 1890
2020int mortals_size () 1891int mortals_size ()
2021 CODE: 1892 CODE:
2022 RETVAL = attachable::mortals.size (); 1893 RETVAL = attachable::mortals.size ();
2023 OUTPUT: RETVAL 1894 OUTPUT: RETVAL
… …
2025#object *mortals (U32 index) 1896#object *mortals (U32 index)
2026# CODE: 1897# CODE:
2027# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1898# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2028# OUTPUT: RETVAL 1899# OUTPUT: RETVAL
2029 1900
2030INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1901INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2031 1902
2032MODULE = cf PACKAGE = cf::global 1903MODULE = cf PACKAGE = cf::global
2033 1904
2034int invoke (SV *klass, int event, ...) 1905int invoke (SV *klass, int event, ...)
2035 CODE: 1906 CODE:
… …
2039 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1910 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2040 OUTPUT: RETVAL 1911 OUTPUT: RETVAL
2041 1912
2042MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1913MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2043 1914
2044INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1915INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2045 1916
2046int invoke (object *op, int event, ...) 1917int invoke (object *op, int event, ...)
2047 CODE: 1918 CODE:
2048 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1919 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2049 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1920 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2076int mortals_size () 1947int mortals_size ()
2077 CODE: 1948 CODE:
2078 RETVAL = attachable::mortals.size (); 1949 RETVAL = attachable::mortals.size ();
2079 OUTPUT: RETVAL 1950 OUTPUT: RETVAL
2080 1951
2081const char *slot_use_name (U32 slot) 1952const_utf8_string slot_name (U32 slot)
2082 ALIAS: 1953 ALIAS:
1954 slot_name = 0
1955 slot_use_name = 1
2083 slot_nonuse_name = 1 1956 slot_nonuse_name = 2
2084 CODE: 1957 CODE:
2085{ 1958{
2086 if (slot >= NUM_BODY_LOCATIONS) 1959 if (slot >= NUM_BODY_LOCATIONS)
2087 croak ("body slot index out of range"); 1960 croak ("body slot index out of range");
2088 1961
2089 switch (ix) 1962 switch (ix)
2090 { 1963 {
1964 case 0: RETVAL = body_locations[slot].name ; break;
2091 case 0: RETVAL = body_locations[slot].use_name; break; 1965 case 1: RETVAL = body_locations[slot].use_name ; break;
2092 case 1: RETVAL = body_locations[slot].nonuse_name; break; 1966 case 2: RETVAL = body_locations[slot].nonuse_name; break;
2093 } 1967 }
2094} 1968}
2095 OUTPUT: 1969 OUTPUT:
2096 RETVAL 1970 RETVAL
2097 1971
… …
2142 OUTPUT: 2016 OUTPUT:
2143 RETVAL 2017 RETVAL
2144 2018
2145object *find_best_object_match (object *op, utf8_string match) 2019object *find_best_object_match (object *op, utf8_string match)
2146 2020
2147object *find_marked_object (object *op)
2148
2149int need_identify (object *obj);
2150
2151int apply_shop_mat (object *shop_mat, object *op); 2021int apply_shop_mat (object *shop_mat, object *op);
2152 2022
2153int move (object *op, int dir, object *originator = op) 2023int move (object *op, int dir, object *originator = op)
2154 CODE: 2024 CODE:
2155 RETVAL = move_ob (op, dir, originator); 2025 RETVAL = op->move (dir, originator);
2156 OUTPUT: 2026 OUTPUT:
2157 RETVAL 2027 RETVAL
2158 2028
2159void apply (object *applier, object *applied, int flags = 0)
2160 CODE:
2161 manual_apply (applied, applier, flags);
2162
2163void apply_below (object *op) 2029void apply_below (object *op)
2164 CODE: 2030 CODE:
2165 player_apply_below (op); 2031 player_apply_below (op);
2166 2032
2167int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2033int cast_heal (object *op, object *caster, object *spell, int dir = 0)
… …
2211 2077
2212void pick_up (object *who, object *op) 2078void pick_up (object *who, object *op)
2213 2079
2214void update_object (object *op, int action) 2080void update_object (object *op, int action)
2215 2081
2216void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2082void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2217 2083
2218void player_lvl_adj (object *who, object *skill = 0) 2084void player_lvl_adj (object *who, object *skill = 0)
2219 2085
2220int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2086int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2221 2087
2222int calc_skill_exp (object *who, object *op, object *skill); 2088int calc_skill_exp (object *who, object *op, object *skill)
2223 2089
2224void push_button (object *op, object *originator); 2090void push_button (object *op, object *originator)
2225 2091
2226void use_trigger (object *op, object *originator); 2092void use_trigger (object *op, object *originator)
2227 2093
2228void handle_apply_yield (object *op); 2094void handle_apply_yield (object *op)
2229 2095
2230int convert_item (object *item, object *converter); 2096int convert_item (object *item, object *converter)
2231 2097
2098void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2232 2099
2233MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2100MODULE = cf PACKAGE = cf::object PREFIX = cf_
2234 2101
2235# no clean way to get an object from an archetype - stupid idiotic 2102# no clean way to get an object from an archetype - stupid idiotic
2236# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2103# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2240 CODE: 2107 CODE:
2241 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2108 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2242 OUTPUT: 2109 OUTPUT:
2243 RETVAL 2110 RETVAL
2244 2111
2112object *generate (utf8_string arch, object *creator)
2113 CODE:
2114 object *obj = get_archetype (arch);
2115 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2116 RETVAL = obj;
2117 OUTPUT:
2118 RETVAL
2119
2245object *find_object (U32 tag) 2120object *find_object (U32 tag)
2121
2122object *find_object_uuid (UUID i)
2246 2123
2247# TODO: nuke 2124# TODO: nuke
2248object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2125object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2249 PROTOTYPE: $$$$$$ 2126 PROTOTYPE: $$$$$$
2250 CODE: 2127 CODE:
… …
2273 PROTOTYPE: $$;$ 2150 PROTOTYPE: $$;$
2274 PPCODE: 2151 PPCODE:
2275{ 2152{
2276 rv_vector rv; 2153 rv_vector rv;
2277 2154
2278 PUTBACK;
2279 get_rangevector (ob, other, &rv, flags); 2155 get_rangevector (ob, other, &rv, flags);
2280 SPAGAIN;
2281 2156
2282 EXTEND (SP, 5); 2157 EXTEND (SP, 5);
2283 PUSHs (newSVuv (rv.distance)); 2158 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2284 PUSHs (newSViv (rv.distance_x)); 2159 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2285 PUSHs (newSViv (rv.distance_y)); 2160 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2286 PUSHs (newSViv (rv.direction)); 2161 PUSHs (sv_2mortal (newSViv (rv.direction)));
2287 PUSHs (to_sv (rv.part)); 2162 PUSHs (sv_2mortal (to_sv (rv.part)));
2288} 2163}
2289 2164
2290bool on_same_map_as (object *ob, object *other) 2165bool on_same_map_as (object *ob, object *other)
2291 CODE: 2166 CODE:
2292 RETVAL = on_same_map (ob, other); 2167 RETVAL = on_same_map (ob, other);
… …
2312 RETVAL = op->contr; 2187 RETVAL = op->contr;
2313 OUTPUT: RETVAL 2188 OUTPUT: RETVAL
2314 2189
2315bool move_player (object *op, int dir) 2190bool move_player (object *op, int dir)
2316 2191
2317void check_score (object *op)
2318
2319void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2192void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2320 CODE: 2193 CODE:
2321 new_draw_info (flags, 0, op, txt); 2194 new_draw_info (flags, 0, op, txt);
2322 2195
2323void kill_player (object *op) 2196void kill_player (object *op)
… …
2335int command_arrest (object *op, utf8_string params) 2208int command_arrest (object *op, utf8_string params)
2336 2209
2337 2210
2338MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2211MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2339 2212
2340INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2213INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2341 2214
2342int invoke (player *pl, int event, ...) 2215int invoke (player *pl, int event, ...)
2343 CODE: 2216 CODE:
2344 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2217 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2345 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2218 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2437 if (op->tag) 2310 if (op->tag)
2438 XPUSHs (sv_2mortal (to_sv (op))); 2311 XPUSHs (sv_2mortal (to_sv (op)));
2439 } 2312 }
2440} 2313}
2441 2314
2442INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2315INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2443 2316
2444void 2317void
2445adjust_daylight () 2318adjust_daylight ()
2446 CODE: 2319 CODE:
2447 maptile::adjust_daylight (); 2320 maptile::adjust_daylight ();
… …
2477 if (pl->ob && pl->ob->map == THIS) 2350 if (pl->ob && pl->ob->map == THIS)
2478 PUSHs (sv_2mortal (to_sv (pl->ob))); 2351 PUSHs (sv_2mortal (to_sv (pl->ob)));
2479 } 2352 }
2480 2353
2481void 2354void
2482maptile::add_underlay (SV *data, int offset, int stride, SV *palette) 2355maptile::add_quadland (int mx, int my, int mz, SV *biome_map, SV *biome_plt)
2483 CODE: 2356 CODE:
2484{ 2357{
2358 static frac_gen<vec2d> frac;
2359
2485 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV) 2360 if (!SvROK (biome_plt) || SvTYPE (SvRV (biome_plt)) != SVt_PVAV)
2486 croak ("maptile::add_underlay: palette must be arrayref"); 2361 croak ("maptile::add_quadland: biome_plt must be arrayref");
2487 2362
2488 palette = SvRV (palette); 2363 biome_plt = SvRV (biome_plt);
2489 2364
2490 STRLEN idxlen;
2491 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2365 const uint8_t *bmap = (const uint8_t *)SvPVbyte_nolen (biome_map);
2492 2366
2493 for (int x = 0; x < THIS->width; ++x) 2367 for (int x = 0; x < THIS->width; ++x)
2494 for (int y = 0; y < THIS->height; ++y) 2368 for (int y = 0; y < THIS->height; ++y)
2495 { 2369 {
2496 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2370 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2497 if (op->flag [FLAG_IS_FLOOR]) 2371 if (op->flag [FLAG_IS_FLOOR])
2498 goto skip_space; 2372 goto skip;
2373
2374 {
2375 float fx = mx * THIS->width + x;
2376 float fy = my * THIS->height + y;
2377
2378 int temp = clamp (int (32 * frac.fBm (vec2d (fx * 0.001, fy * 0.001), 2) ) - 8, 0, 15);
2379 int rain = clamp (int (16 * frac.ridgedmultifractal (vec2d (fx * 0.01, fy * 0.01), 3, 1.03, 2)) - 8, 0, 15);
2380
2381 rain = lerp (rain, 0, 15, 0, temp);
2382 printf ("rain %d\n", temp);//D
2383
2384 int biome = bmap [rain * 16 + temp];
2385
2386 //printf ("%2d %2d => %s\n", temp, rain, SvPV_nolen (AvARRAY ((AV *)biome_plt)[biome]));//D
2387#if 1
2388 if (SV **elem = av_fetch ((AV *)biome_plt, bmap [rain * 16 + temp], 0))
2389 {
2390 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2391 ob->flag [FLAG_NO_MAP_SAVE] = true;
2392 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2393
2394 if (ob->randomitems && !ob->above)
2395 {
2396 ob->create_treasure (ob->randomitems);
2397
2398 for (object *op = ob->above; op; op = op->above)
2399 op->flag [FLAG_NO_MAP_SAVE] = true;
2400 }
2401 }
2402#endif
2403 }
2404 skip: ;
2405 }
2406}
2407
2408void
2409maptile::add_underlay (SV *data, int offset, int stride, SV *palette)
2410 CODE:
2411{
2412 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV)
2413 croak ("maptile::add_underlay: palette must be arrayref");
2414
2415 palette = SvRV (palette);
2416
2417 STRLEN idxlen;
2418 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2419
2420 for (int x = 0; x < THIS->width; ++x)
2421 for (int y = 0; y < THIS->height; ++y)
2422 {
2423 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2424 if (op->flag [FLAG_IS_FLOOR])
2425 goto skip;
2499 2426
2500 { 2427 {
2501 int offs = offset + y * stride + x; 2428 int offs = offset + y * stride + x;
2429
2502 if (IN_RANGE_EXC (offs, 0, idxlen)) 2430 if (IN_RANGE_EXC (offs, 0, idxlen))
2503 { 2431 {
2504 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2432 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2505 { 2433 {
2506 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2434 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2507 ob->flag [FLAG_NO_MAP_SAVE] = true; 2435 ob->flag [FLAG_NO_MAP_SAVE] = true;
2508 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2436 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2509 2437
2510 if (ob->randomitems) 2438 if (ob->randomitems && !ob->above)
2511 { 2439 {
2512 if (!ob->above)
2513 {
2514 ob->create_treasure (ob->randomitems); 2440 ob->create_treasure (ob->randomitems);
2515 2441
2516 for (object *op = ob->above; op; op = op->above) 2442 for (object *op = ob->above; op; op = op->above)
2517 op->flag [FLAG_NO_MAP_SAVE] = true; 2443 op->flag [FLAG_NO_MAP_SAVE] = true;
2518 } 2444 // TODO: if this is a pickable object, then the item
2519 2445 // will at a bit weird - saving inside the player
2520 ob->randomitems = 0; 2446 // will clear the flag, but when the player drops
2447 // it without logging out, it keeps the flag.
2448 // nobody has reported this, but this can be rather
2449 // annoying on persistent maps.
2521 } 2450 }
2522 } 2451 }
2523 } 2452 }
2524 } 2453 }
2525
2526 skip_space: ; 2454 skip: ;
2527 } 2455 }
2528} 2456}
2529 2457
2530void 2458void
2531maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2459maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2541 2469
2542 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2470 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2543 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2471 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2544 2472
2545 for (int i = av_len ((AV *)palette) + 1; i--; ) 2473 for (int i = av_len ((AV *)palette) + 1; i--; )
2546 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2474 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2547 2475
2548 for (int y = 0; y < THIS->height; ++y) 2476 for (int y = 0; y < THIS->height; ++y)
2549 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2477 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2550 2478
2551 sfree (THIS->regions, THIS->size ()); 2479 sfree (THIS->regions, THIS->size ());
… …
2561 for (int x = 0; x < THIS->width; ++x) 2489 for (int x = 0; x < THIS->width; ++x)
2562 for (int y = 0; y < THIS->height; ++y) 2490 for (int y = 0; y < THIS->height; ++y)
2563 { 2491 {
2564 region *rgn = THIS->region (x, y); 2492 region *rgn = THIS->region (x, y);
2565 2493
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) 2494 if (object *op = THIS->at (x, y).top)
2568 if (rgn->treasure && rndm () < rgn->treasure_density) 2495 if (rgn->treasure && rndm () < rgn->treasure_density)
2569 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2496 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2570 } 2497 }
2571 2498
… …
2577 if (oblinkpt *obp = map->find_link (connection)) 2504 if (oblinkpt *obp = map->find_link (connection))
2578 for (objectlink *ol = obp->link; ol; ol = ol->next) 2505 for (objectlink *ol = obp->link; ol; ol = ol->next)
2579 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2506 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2580 2507
2581void 2508void
2582get_map_flags (maptile *map, int x, int y) 2509xy_normalise (maptile *map, int x, int y, int dir = 0)
2583 PPCODE: 2510 PPCODE:
2584{ 2511{
2585 maptile *nmap = 0; 2512 mapxy pos (map, x, y);
2586 I16 nx = 0, ny = 0; 2513 if (!pos.move (dir).normalise ())
2514 XSRETURN_EMPTY;
2587 2515
2588 PUTBACK;
2589 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2590 SPAGAIN;
2591
2592 EXTEND (SP, 4); 2516 EXTEND (SP, 3);
2593 PUSHs (sv_2mortal (newSViv (flags)));
2594
2595 if (GIMME_V == G_ARRAY)
2596 {
2597 PUSHs (sv_2mortal (to_sv (nmap))); 2517 PUSHs (sv_2mortal (to_sv (pos.m)));
2598 PUSHs (sv_2mortal (newSViv (nx))); 2518 PUSHs (sv_2mortal (to_sv (pos.x)));
2599 PUSHs (sv_2mortal (newSViv (ny))); 2519 PUSHs (sv_2mortal (to_sv (pos.y)));
2600 }
2601} 2520}
2602 2521
2603mapspace * 2522mapspace *
2604ms (maptile *map, unsigned int x, unsigned int y) 2523ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2605 PROTOTYPE: $$$ 2524 PROTOTYPE: $$$;$
2606 CODE: 2525 CODE:
2607{ 2526{
2608 maptile *nmap = 0; 2527 mapxy pos (map, x, y);
2609 I16 nx, ny; 2528 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; 2529 XSRETURN_UNDEF;
2617 2530
2618 RETVAL = &nmap->at (nx, ny); 2531 RETVAL = &*pos;
2619} 2532}
2620 OUTPUT: 2533 OUTPUT:
2621 RETVAL 2534 RETVAL
2622 2535
2623void 2536void
2624at (maptile *map, unsigned int x, unsigned int y) 2537at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2625 PROTOTYPE: $$$ 2538 PROTOTYPE: $$$;$
2626 PPCODE: 2539 PPCODE:
2627{ 2540 mapxy pos (map, x, y);
2628 maptile *nmap = 0; 2541 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) 2542 for (object *o = pos->bot; o; o = o->above)
2637 XPUSHs (sv_2mortal (to_sv (o))); 2543 XPUSHs (sv_2mortal (to_sv (o)));
2638}
2639 2544
2640SV * 2545SV *
2641bot_at (maptile *map, unsigned int x, unsigned int y) 2546bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2642 PROTOTYPE: $$$ 2547 PROTOTYPE: $$$;$
2643 ALIAS: 2548 ALIAS:
2644 top_at = 1 2549 top_at = 1
2645 flags_at = 2 2550 flags_at = 2
2646 light_at = 3 2551 light_at = 3
2647 move_block_at = 4 2552 move_block_at = 4
2648 move_slow_at = 5 2553 move_slow_at = 5
2649 move_on_at = 6 2554 move_on_at = 6
2650 move_off_at = 7 2555 move_off_at = 7
2651 CODE: 2556 CODE:
2652{ 2557{
2653 sint16 nx = x; 2558 mapxy pos (map, x, y);
2654 sint16 ny = y; 2559 if (!pos.move (dir).normalise ())
2655
2656 if (!xy_normalise (map, nx, ny))
2657 XSRETURN_UNDEF; 2560 XSRETURN_UNDEF;
2658 2561
2659 mapspace &ms = map->at (nx, ny); 2562 mapspace &ms = *pos;
2660 2563
2661 ms.update (); 2564 ms.update ();
2662 2565
2663 switch (ix) 2566 switch (ix)
2664 { 2567 {
… …
2674} 2577}
2675 OUTPUT: RETVAL 2578 OUTPUT: RETVAL
2676 2579
2677# worst xs function of my life 2580# worst xs function of my life
2678bool 2581bool
2679_create_random_map (\ 2582_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: 2583 CODE:
2719{ 2584{
2720 random_map_params rmp; 2585 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); 2586 RETVAL = self->generate_random_map (&rmp);
2761} 2587}
2762 OUTPUT: 2588 OUTPUT:
2763 RETVAL 2589 RETVAL
2764 2590
2765MODULE = cf PACKAGE = cf::mapspace 2591MODULE = cf PACKAGE = cf::mapspace
2766 2592
2767INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2593INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2768 2594
2769MODULE = cf PACKAGE = cf::arch 2595MODULE = cf PACKAGE = cf::arch
2770 2596
2771int archetypes_size () 2597int archetypes_size ()
2772 CODE: 2598 CODE:
… …
2776archetype *archetypes (U32 index) 2602archetype *archetypes (U32 index)
2777 CODE: 2603 CODE:
2778 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2604 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2779 OUTPUT: RETVAL 2605 OUTPUT: RETVAL
2780 2606
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 | 2607INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2788 2608
2789MODULE = cf PACKAGE = cf::party 2609MODULE = cf PACKAGE = cf::party
2790 2610
2791partylist *first () 2611partylist *first ()
2792 PROTOTYPE: 2612 PROTOTYPE:
2793 CODE: 2613 CODE:
2794 RETVAL = get_firstparty (); 2614 RETVAL = get_firstparty ();
2795 OUTPUT: RETVAL 2615 OUTPUT: RETVAL
2796 2616
2797INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2617INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2798 2618
2799MODULE = cf PACKAGE = cf::region 2619MODULE = cf PACKAGE = cf::region
2800 2620
2801void 2621void
2802list () 2622list ()
2803 PPCODE: 2623 PPCODE:
2804 for_all_regions (rgn) 2624 for_all_regions (rgn)
2805 XPUSHs (sv_2mortal (to_sv (rgn))); 2625 XPUSHs (sv_2mortal (to_sv (rgn)));
2806 2626
2807region *find (utf8_string name)
2808 PROTOTYPE: $
2809 CODE:
2810 RETVAL = region::find (name);
2811 OUTPUT: RETVAL
2812
2813int specificity (region *rgn) 2627int specificity (region *rgn)
2814 CODE: 2628 CODE:
2815 RETVAL = 0; 2629 RETVAL = 0;
2816 while (rgn = rgn->parent) 2630 while (rgn = rgn->parent)
2817 RETVAL++; 2631 RETVAL++;
2818 OUTPUT: RETVAL 2632 OUTPUT: RETVAL
2819 2633
2820INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2634INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2821 2635
2822MODULE = cf PACKAGE = cf::living 2636MODULE = cf PACKAGE = cf::living
2823 2637
2824INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2638INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2825 2639
2826MODULE = cf PACKAGE = cf::settings 2640MODULE = cf PACKAGE = cf::settings
2827 2641
2828INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2642INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2829 2643
2830MODULE = cf PACKAGE = cf::client 2644MODULE = cf PACKAGE = cf::client
2831 2645
2832INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2646INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2833 2647
2834int invoke (client *ns, int event, ...) 2648int invoke (client *ns, int event, ...)
2835 CODE: 2649 CODE:
2836 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2650 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2837 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2651 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2903 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2717 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2904 old_sound_index [idx] = face; 2718 old_sound_index [idx] = face;
2905 2719
2906MODULE = cf PACKAGE = cf::face PREFIX = face_ 2720MODULE = cf PACKAGE = cf::face PREFIX = face_
2907 2721
2908#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2722#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2909 2723
2910faceidx face_find (utf8_string name, faceidx defidx = 0) 2724faceidx face_find (utf8_string name, faceidx defidx = 0)
2911 2725
2912faceidx alloc (utf8_string name) 2726faceidx alloc (utf8_string name)
2913 CODE: 2727 CODE:
… …
2920 while (!RETVAL); // crude way to leave index 0 2734 while (!RETVAL); // crude way to leave index 0
2921 2735
2922 faces [RETVAL].name = name; 2736 faces [RETVAL].name = name;
2923 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2737 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2924 2738
2925 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2739 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2926 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2740 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2741 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2927} 2742}
2928 OUTPUT: RETVAL 2743 OUTPUT: RETVAL
2929 2744
2930void set_type (faceidx idx, int value) 2745void set_type (faceidx idx, int value)
2931 ALIAS: 2746 ALIAS:
… …
2947 2762
2948void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2763void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
2949 CODE: 2764 CODE:
2950{ 2765{
2951 faceinfo *f = face_info (idx); assert (f); 2766 faceinfo *f = face_info (idx); assert (f);
2952 facedata *d = &(faceset ? f->data64 : f->data32); 2767 facedata *d = f->face + faceset;
2953 sv_to (data, d->data); 2768 sv_to (data, d->data);
2954 STRLEN clen; 2769 STRLEN clen;
2955 char *cdata = SvPVbyte (chksum, clen); 2770 char *cdata = SvPVbyte (chksum, clen);
2956 clen = min (CHKSUM_SIZE, clen); 2771 clen = min (CHKSUM_MAXLEN, clen);
2957 2772
2773 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2774
2958 if (memcmp (d->chksum, cdata, clen)) 2775 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2959 { 2776 {
2777 d->chksum_len = clen;
2960 memcpy (d->chksum, cdata, clen); 2778 memcpy (d->chksum, cdata, clen);
2961 2779
2962 // invalidate existing client face info 2780 // invalidate existing client face info
2963 for_all_clients (ns) 2781 for_all_clients (ns)
2964 if (ns->faceset == faceset) 2782 if (ns->faceset == faceset)
… …
2979 2797
2980SV *get_chksum (faceidx idx, int faceset = 0) 2798SV *get_chksum (faceidx idx, int faceset = 0)
2981 CODE: 2799 CODE:
2982 facedata *d = face_data (idx, faceset); 2800 facedata *d = face_data (idx, faceset);
2983 if (!d) XSRETURN_UNDEF; 2801 if (!d) XSRETURN_UNDEF;
2984 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2802 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2985 OUTPUT: 2803 OUTPUT:
2986 RETVAL 2804 RETVAL
2987 2805
2988SV *get_data (faceidx idx, int faceset = 0) 2806SV *get_data (faceidx idx, int faceset = 0)
2989 CODE: 2807 CODE:
… …
3009 ns->force_newmap = true; 2827 ns->force_newmap = true;
3010 } 2828 }
3011 2829
3012MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2830MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3013 2831
3014#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2832#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3015 2833
3016animidx anim_find (utf8_string name) 2834animidx anim_find (utf8_string name)
3017 CODE: 2835 CODE:
3018 RETVAL = animation::find (name).number; 2836 RETVAL = animation::find (name).number;
3019 OUTPUT: RETVAL 2837 OUTPUT: RETVAL
… …
3034 } 2852 }
3035 else 2853 else
3036 anim = &animation::create (name, av_len (av) + 1, facings); 2854 anim = &animation::create (name, av_len (av) + 1, facings);
3037 2855
3038 for (int i = 0; i < anim->num_animations; ++i) 2856 for (int i = 0; i < anim->num_animations; ++i)
3039 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2857 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3040} 2858}
3041 OUTPUT: RETVAL 2859 OUTPUT: RETVAL
3042 2860
3043void invalidate_all () 2861void invalidate_all ()
3044 CODE: 2862 CODE:
3045 for_all_clients (ns) 2863 for_all_clients (ns)
3046 ns->anims_sent.reset (); 2864 ns->anims_sent.reset ();
3047 2865
3048MODULE = cf PACKAGE = cf::object::freezer 2866MODULE = cf PACKAGE = cf::object::freezer
3049 2867
3050INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2868INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3051 2869
3052SV * 2870SV *
3053new (char *klass) 2871new (char *klass)
3054 CODE: 2872 CODE:
3055 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2873 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3062 sv_to (sv, self); 2880 sv_to (sv, self);
3063 delete self; 2881 delete self;
3064 2882
3065MODULE = cf PACKAGE = cf::object::thawer 2883MODULE = cf PACKAGE = cf::object::thawer
3066 2884
3067INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2885INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2886
2887bool
2888errors_are_fatal (bool fatal)
2889 CODE:
2890 RETVAL = object_thawer::errors_are_fatal;
2891 object_thawer::errors_are_fatal = fatal;
2892 OUTPUT:
2893 RETVAL
3068 2894
3069SV * 2895SV *
3070new_from_file (char *klass, octet_string path) 2896new_from_file (char *klass, octet_string path)
3071 CODE: 2897 CODE:
3072 object_thawer *f = new object_thawer (path); 2898 object_thawer *f = new object_thawer (path);
… …
3098 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2924 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
3099 2925
3100 self->skip (); 2926 self->skip ();
3101 } 2927 }
3102 2928
2929MODULE = cf PACKAGE = cf::layout
2930
2931INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h |
2932

Diff Legend

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