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.325 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.391 by root, Sat Jul 3 01:49:18 2010 UTC

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

Diff Legend

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