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.337 by root, Thu Nov 12 01:11:52 2009 UTC vs.
Revision 1.399 by root, Fri Apr 22 02:03:12 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 9 * option) any later version.
… …
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h" 33#include "rmg.h"
35#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
40#if _POSIX_MEMLOCK 38#if _POSIX_MEMLOCK
… …
53#include <perl.h> 51#include <perl.h>
54#include <XSUB.h> 52#include <XSUB.h>
55 53
56#include "CoroAPI.h" 54#include "CoroAPI.h"
57#include "perlxsi.c" 55#include "perlxsi.c"
58
59extern sint64 *levels; // the experience table
60 56
61typedef object_thawer &object_thawer_ref; 57typedef object_thawer &object_thawer_ref;
62typedef object_freezer &object_freezer_ref; 58typedef object_freezer &object_freezer_ref;
63 59
64typedef std::string std__string; 60typedef std::string std__string;
… …
87 *stash_cf_mapspace_wrap, 83 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 88 *stash_cf_living_wrap,
89 *stash_cf_layout_wrap,
90 *stash_ext_map_world;
93 91
94static SV 92static SV
95 *cv_cf_do_invoke, 93 *cv_cf_do_invoke,
96 *cv_cf__can_merge, 94 *cv_cf__can_merge,
97 *cv_cf_client_send_msg, 95 *cv_cf_client_send_msg,
98 *cv_cf_tick, 96 *cv_cf_tick,
99 *cv_cf_match_match; 97 *cv_cf_match_match;
100 98
101#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
102static inline SV * 100static SV *
103newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
104{ 102{
105 if (!s) 103 if (!s)
106 return newSV (0); 104 return newSV (0);
107 105
… …
110 return sv; 108 return sv;
111} 109}
112#endif 110#endif
113 111
114#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
115static inline SV * 113static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 115{
118 if (!s) 116 if (!s)
119 return newSV (0); 117 return newSV (0);
120 118
… …
124 SvUTF8_on (sv); 122 SvUTF8_on (sv);
125 123
126 return sv; 124 return sv;
127} 125}
128#endif 126#endif
127
128noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
129 143
130// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
131template<class super> 145template<class super>
132static super * 146static super *
133is_a (attachable *at) 147is_a (attachable *at)
… …
216 do_destroy (); 230 do_destroy ();
217 sever_self (); 231 sever_self ();
218} 232}
219 233
220void 234void
235attachable::do_delete ()
236{
237 delete this;
238}
239
240void
221attachable::check_mortals () 241attachable::check_mortals ()
222{ 242{
223 static int i = 0; 243 static int i = 0;
224 244
225 for (;;) 245 for (;;)
… …
238 258
239 if (0) 259 if (0)
240 { 260 {
241 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
242 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
243 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
244 } 265 }
245 } 266 }
246 } 267 }
247 268
… …
267 } 288 }
268 else 289 else
269 { 290 {
270 mortals.erase (i); 291 mortals.erase (i);
271 obj->sever_self (); 292 obj->sever_self ();
272 delete obj; 293 obj->do_delete ();
273 } 294 }
274 } 295 }
275} 296}
276 297
277void 298void
… …
332#endif 353#endif
333 354
334////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
335 356
336static SV * 357static SV *
337newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv)
338{ 359{
339 SV *sv;
340
341 if (!ptr) 360 if (!ptr)
342 return newSV (0); 361 return newSV (0);
343 362
344 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);
345 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 ());
346} 371}
347 372
348static int 373static int
349attachable_free (pTHX_ SV *sv, MAGIC *mg) 374attachable_free (pTHX_ SV *sv, MAGIC *mg)
350{ 375{
… …
362 return 0; 387 return 0;
363} 388}
364 389
365MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 390MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
366 391
367static SV * 392static SV * noinline
368newSVattachable (attachable *obj, HV *stash) 393newSVattachable (attachable *obj, HV *stash)
369{ 394{
370 if (!obj) 395 if (!obj)
371 return newSV (0); 396 return newSV (0);
372 397
… …
402 hv_clear ((HV *)sv); 427 hv_clear ((HV *)sv);
403 sv_unmagic (sv, PERL_MAGIC_ext); 428 sv_unmagic (sv, PERL_MAGIC_ext);
404} 429}
405#endif 430#endif
406 431
407static long SvPTR_nc (SV *sv) 432static long
433SvPTR_nc (SV *sv)
408{ 434{
409 sv = SvRV (sv); 435 sv = SvRV (sv);
410 436
411 // very important shortcut 437 // very important shortcut
412 if (expect_true (SvMAGIC (sv)->mg_type == PERL_MAGIC_ext)) 438 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
413 return (long)SvMAGIC (sv)->mg_ptr; 439 return (long)SvMAGIC (sv)->mg_ptr;
414 440
415 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext)) 441 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
416 return (long)mg->mg_ptr; 442 return (long)mg->mg_ptr;
417 443
… …
462 488
463 return SvPTR_nc (sv); 489 return SvPTR_nc (sv);
464} 490}
465 491
466static long noinline 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
467SvPTR_ornull_player (SV *sv) 507SvPTR_ornull_player (SV *sv)
468{ 508{
469 if (expect_false (!SvOK (sv))) return 0; 509 if (expect_false (!SvOK (sv))) return 0;
470 510
471 if (!SvROK (sv) 511 if (!SvROK (sv)
472 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap 512 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
473 && !sv_derived_from (sv, "cf::player"))) 513 && !sv_derived_from (sv, "cf::player")))
474 croak ("object of type cf::player expected"); 514 croak ("object of type cf::player expected");
475
476 if (SvSTASH (SvRV (sv)) != stash_cf_player_wrap)
477 printf ("unexpected stash %s:%s\n", HvNAME(SvSTASH(SvRV(sv))));//D
478
479 515
480 return SvPTR_nc (sv); 516 return SvPTR_nc (sv);
481} 517}
482 518
483static inline 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); }
… …
495static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 531static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
496static inline SV *to_sv (float v) { return newSVnv (v); } 532static inline SV *to_sv (float v) { return newSVnv (v); }
497static inline SV *to_sv (double v) { return newSVnv (v); } 533static inline SV *to_sv (double v) { return newSVnv (v); }
498static inline 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); }
499static inline 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
500static inline 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); }
501static inline 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); }
502static inline 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); }
503static inline 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); }
504static inline 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); }
505static inline 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); }
506static inline 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); }
507 546
508static inline SV *to_sv (object & v) { return to_sv (&v); } 547static inline SV *to_sv (object & v) { return to_sv (&v); }
509static inline SV *to_sv (living & v) { return to_sv (&v); } 548static inline SV *to_sv (living & v) { return to_sv (&v); }
510 549
511static inline 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 ()); }
… …
532 SV *sv = to_sv (static_cast<dynbuf *> (v)); 571 SV *sv = to_sv (static_cast<dynbuf *> (v));
533 SvUTF8_on (sv); 572 SvUTF8_on (sv);
534 return sv; 573 return sv;
535} 574}
536 575
537static inline 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; }
538static inline 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; }
539static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 578static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
540static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
541static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
542static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
… …
547static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 586static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
548static inline 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); }
549static inline 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); }
550static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 589static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
551static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 590static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
552static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); } 591static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
553static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); } 592static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
554static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); } 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); }
555static inline 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"); }
556static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
557static inline 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"); }
558static inline 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"); }
559static inline 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"); }
560static inline 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"); }
561static inline 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"); }
562static inline 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"); }
563static inline 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" ); }
564 604
565//static 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)]; }
566static inline 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)); }
… …
677template<class type> 717template<class type>
678static void noinline 718static void noinline
679cf_obj_to (SV *arg, type &var) 719cf_obj_to (SV *arg, type &var)
680{ 720{
681 sv_to (arg, var); 721 sv_to (arg, var);
682 if (!var) 722 if (expect_false (!var))
683 croak ("must not pass invalid/null cf_obj here"); 723 croak ("must not pass invalid/null cf_obj here");
684} 724}
685 725
686template<class object> 726template<class object>
687static void noinline 727static void noinline
688cf_obj_ornull_to (SV *arg, object *&var) 728cf_obj_ornull_to (SV *arg, object *&var)
689{ 729{
690 if (SvOK (arg)) 730 if (SvOK (arg))
691 { 731 {
692 sv_to (arg, var); 732 sv_to (arg, var);
693 if (!var) 733 if (expect_false (!var))
694 croak ("unable to convert perl object to C++ object"); 734 croak ("unable to convert perl object to C++ object");
695 } 735 }
696 else 736 else
697 var = 0; 737 var = 0;
698} 738}
… …
733 exit (EXIT_FAILURE); 773 exit (EXIT_FAILURE);
734 } 774 }
735 775
736 eval_pv ( 776 eval_pv (
737 "#line 1 'cfperl init'\n" 777 "#line 1 'cfperl init'\n"
738 "use EV ();\n" 778 "use EV ();\n" // required by bootstrap
739 "use Coro ();\n" 779 "use Coro ();\n" // required by bootstrap
740 "cf->bootstrap;\n" 780 "cf->bootstrap;\n" // required for cf::datadir
741 "unshift @INC, cf::datadir ();\n" 781 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
742 "require cf;\n", 782 "require cf;\n",
743 0 783 0
744 ); 784 );
745 785
746 if (SvTRUE (ERRSV)) 786 if (SvTRUE (ERRSV))
… …
1067 CALL_CALL ("ext::books::make_book", G_VOID); 1107 CALL_CALL ("ext::books::make_book", G_VOID);
1068 CALL_END; 1108 CALL_END;
1069} 1109}
1070 1110
1071void 1111void
1072cfperl_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)
1073{ 1113{
1074 CALL_BEGIN (4); 1114 CALL_BEGIN (4);
1075 CALL_ARG (ns); 1115 CALL_ARG (ns);
1076 CALL_ARG (type); 1116 CALL_ARG (type);
1077 CALL_ARG_SV (newSVpv_utf8 (msg)); 1117 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1106 CALL_CALL ("cf::mapscript::activate", G_VOID); 1146 CALL_CALL ("cf::mapscript::activate", G_VOID);
1107 CALL_END; 1147 CALL_END;
1108} 1148}
1109 1149
1110player * 1150player *
1111player::find (const char *name) 1151player::find (const_utf8_string name)
1112{ 1152{
1113 CALL_BEGIN (1); 1153 CALL_BEGIN (1);
1114 CALL_ARG (name); 1154 CALL_ARG (name);
1115 CALL_CALL ("cf::player::find", G_SCALAR); 1155 CALL_CALL ("cf::player::find", G_SCALAR);
1116 1156
… …
1121 1161
1122 return retval; 1162 return retval;
1123} 1163}
1124 1164
1125maptile * 1165maptile *
1126find_style (const char *dirname, const char *stylename, int difficulty) 1166find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1127{ 1167{
1128 CALL_BEGIN (3); 1168 CALL_BEGIN (4);
1129 CALL_ARG (dirname); 1169 CALL_ARG (dirname);
1130 CALL_ARG (stylename); 1170 CALL_ARG (stylename);
1131 CALL_ARG (difficulty); 1171 CALL_ARG (difficulty);
1172 CALL_ARG (recurse);
1132 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1173 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1133 1174
1134 maptile *retval = 0; 1175 maptile *retval = 0;
1135 if (count) sv_to (POPs, retval); 1176 if (count) sv_to (POPs, retval);
1136 1177
… …
1138 1179
1139 return retval; 1180 return retval;
1140} 1181}
1141 1182
1142maptile * 1183maptile *
1143maptile::find_sync (const char *path, maptile *origin) 1184maptile::find_sync (const_utf8_string path, maptile *origin)
1144{ 1185{
1145 CALL_BEGIN (2); 1186 CALL_BEGIN (2);
1146 CALL_ARG (path); 1187 CALL_ARG (path);
1147 CALL_ARG (origin); 1188 CALL_ARG (origin);
1148 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1189 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1154 1195
1155 return retval; 1196 return retval;
1156} 1197}
1157 1198
1158maptile * 1199maptile *
1159maptile::find_async (const char *path, maptile *origin, bool load) 1200maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1160{ 1201{
1161 CALL_BEGIN (3); 1202 CALL_BEGIN (3);
1162 CALL_ARG (path); 1203 CALL_ARG (path);
1163 CALL_ARG (origin); 1204 CALL_ARG (origin);
1164 CALL_ARG (load); 1205 CALL_ARG (load);
… …
1193 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1234 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1194 CALL_END; 1235 CALL_END;
1195} 1236}
1196 1237
1197void 1238void
1198object::player_goto (const char *path, int x, int y) 1239object::player_goto (const_utf8_string path, int x, int y)
1199{ 1240{
1200 if (type != PLAYER) 1241 if (type != PLAYER)
1201 return; 1242 return;
1202 1243
1203 CALL_BEGIN (4); 1244 CALL_BEGIN (4);
… …
1207 CALL_ARG (y); 1248 CALL_ARG (y);
1208 CALL_CALL ("cf::object::player::goto", G_VOID); 1249 CALL_CALL ("cf::object::player::goto", G_VOID);
1209 CALL_END; 1250 CALL_END;
1210} 1251}
1211 1252
1212const char * 1253const_utf8_string
1213object::ref () const 1254object::ref () const
1214{ 1255{
1215 if (type == PLAYER) 1256 if (type == PLAYER)
1216 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);
1217 else 1258 else
1259 // TODO: should be able to save references within the same map, at least
1218 return 0; 1260 return 0;
1219} 1261}
1220 1262
1221object * 1263object *
1222object::deref (const char *ref) 1264object::deref (const_utf8_string ref)
1223{ 1265{
1224 object *retval = 0; 1266 object *retval = 0;
1225 1267
1226 if (ref) 1268 if (ref)
1227 { 1269 {
… …
1237 1279
1238 return retval; 1280 return retval;
1239} 1281}
1240 1282
1241void 1283void
1242log_backtrace (const char *msg) 1284log_backtrace (const_utf8_string msg)
1243{ 1285{
1244#if HAVE_BACKTRACE 1286#if HAVE_BACKTRACE
1245 void *addr [20]; 1287 void *addr [20];
1246 int size = backtrace (addr, 20); 1288 int size = backtrace (addr, 20);
1247 1289
… …
1253 CALL_END; 1295 CALL_END;
1254#endif 1296#endif
1255} 1297}
1256 1298
1257bool 1299bool
1258is_match_expr (const char *expr) 1300is_match_expr (const_utf8_string expr)
1259{ 1301{
1260 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1302 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1261} 1303}
1262 1304
1263bool 1305bool
1264match (const char *expr, object *ob, object *self, object *source, object *originator) 1306match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1265{ 1307{
1266 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1308 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1267 expr += sizeof ("match ") - 1; 1309 expr += sizeof ("match ") - 1;
1268 1310
1269 CALL_BEGIN (5); 1311 CALL_BEGIN (5);
… …
1280 1322
1281 return matched; 1323 return matched;
1282} 1324}
1283 1325
1284object * 1326object *
1285match_one (const char *expr, object *ob, object *self, object *source, object *originator) 1327match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1286{ 1328{
1287 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1329 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1288 expr += sizeof ("match ") - 1; 1330 expr += sizeof ("match ") - 1;
1289 1331
1290 CALL_BEGIN (5); 1332 CALL_BEGIN (5);
… …
1358 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1400 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1359 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1401 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1360 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1402 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1361 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1362 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);
1363 1407
1364 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);
1365 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);
1366 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);
1367 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);
… …
1408 static const struct { 1452 static const struct {
1409 const char *name; 1453 const char *name;
1410 IV iv; 1454 IV iv;
1411 } *civ, const_iv[] = { 1455 } *civ, const_iv[] = {
1412# define const_iv(name) { # name, (IV)name }, 1456# define const_iv(name) { # name, (IV)name },
1413 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1457# include "const_iv.h"
1414 const_iv (logBacktrace) 1458# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1415 1459# include "attackinc.h"
1416 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1460# undef def
1461# define def(uc, flags) const_iv (SK_ ## uc)
1462# include "skillinc.h"
1463# undef def
1464# define def(name, use, nonuse) const_iv (body_ ## name)
1465# include "slotinc.h"
1466# undef def
1417 1467
1418 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1468 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1419 1469
1420 const_iv (MAX_TIME) 1470 const_iv (MAX_TIME)
1421 const_iv (MAXSOCKBUF) 1471 const_iv (MAXSOCKBUF)
1422 1472
1423 const_iv (NUM_BODY_LOCATIONS)
1424 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1425 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1426 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1427 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1428 const_iv (body_wrist) const_iv (body_waist)
1429
1430 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1431 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1432 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1433 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1434 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1435 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1436 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1437 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1438 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1439 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1440 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1441 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1442 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1443 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1444 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1445 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1446 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1447 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1448 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1449 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1450 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1451 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1452 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1453 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1454 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1455 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1456 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1457 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1458 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1459
1460 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1461
1462 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1463 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1464
1465 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1466 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1467 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1468 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1469 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1470 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1471 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1472
1473 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1474 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1475 const_iv (WEAP_BLUD)
1476
1477 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1478 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1479 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1480 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1481 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1482 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1483 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1484 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1485 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1486 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1487 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1488 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1489 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1490 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1491 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1492 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1493 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1494 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1495 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1496 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1497 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1498 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1499 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1500 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1501 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1502 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1503
1504 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1505 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1506 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1507 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1508 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1509 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1510
1511 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1473 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1512 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1474 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1513 1475
1514 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1476 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1515
1516 const_iv (SP_RAISE_DEAD)
1517 const_iv (SP_RUNE)
1518 const_iv (SP_MAKE_MARK)
1519 const_iv (SP_BOLT)
1520 const_iv (SP_BULLET)
1521 const_iv (SP_EXPLOSION)
1522 const_iv (SP_CONE)
1523 const_iv (SP_BOMB)
1524 const_iv (SP_WONDER)
1525 const_iv (SP_SMITE)
1526 const_iv (SP_MAGIC_MISSILE)
1527 const_iv (SP_SUMMON_GOLEM)
1528 const_iv (SP_DIMENSION_DOOR)
1529 const_iv (SP_MAGIC_MAPPING)
1530 const_iv (SP_MAGIC_WALL)
1531 const_iv (SP_DESTRUCTION)
1532 const_iv (SP_PERCEIVE_SELF)
1533 const_iv (SP_WORD_OF_RECALL)
1534 const_iv (SP_INVISIBLE)
1535 const_iv (SP_PROBE)
1536 const_iv (SP_HEALING)
1537 const_iv (SP_CREATE_FOOD)
1538 const_iv (SP_EARTH_TO_DUST)
1539 const_iv (SP_CHANGE_ABILITY)
1540 const_iv (SP_BLESS)
1541 const_iv (SP_CURSE)
1542 const_iv (SP_SUMMON_MONSTER)
1543 const_iv (SP_CHARGING)
1544 const_iv (SP_POLYMORPH)
1545 const_iv (SP_ALCHEMY)
1546 const_iv (SP_REMOVE_CURSE)
1547 const_iv (SP_IDENTIFY)
1548 const_iv (SP_DETECTION)
1549 const_iv (SP_MOOD_CHANGE)
1550 const_iv (SP_MOVING_BALL)
1551 const_iv (SP_SWARM)
1552 const_iv (SP_CHANGE_MANA)
1553 const_iv (SP_DISPEL_RUNE)
1554 const_iv (SP_CREATE_MISSILE)
1555 const_iv (SP_CONSECRATE)
1556 const_iv (SP_ANIMATE_WEAPON)
1557 const_iv (SP_LIGHT)
1558 const_iv (SP_CHANGE_MAP_LIGHT)
1559 const_iv (SP_FAERY_FIRE)
1560 const_iv (SP_CAUSE_DISEASE)
1561 const_iv (SP_AURA)
1562 const_iv (SP_TOWN_PORTAL)
1563 const_iv (SP_PARTY_SPELL)
1564 1477
1565 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1478 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1566 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1479 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1567 const_iv (F_LOCKED) 1480 const_iv (F_LOCKED)
1568 1481
1569 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1570
1571 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1482 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1572 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1483 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1573 1484
1574 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1575
1576 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1577 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1578
1579 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1580 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1581
1582 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1485 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1583
1584 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1585 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1586 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1587 const_iv (M_ICE) const_iv (M_SPECIAL)
1588 1486
1589 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1487 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1590 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1488 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1591 1489
1592 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1593 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1594 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1595 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1596 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1597 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1598 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1599 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1600 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1601 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1602 const_iv (SK_POISON_NAIL)
1603
1604 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1605 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1606 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1607 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1608 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1609 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1610
1611 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1612
1613 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1614 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1615 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1616 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1617 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1618 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1619 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1620
1621 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1490 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1622 const_iv (MAP_INACTIVE) 1491 const_iv (MAP_INACTIVE)
1623 1492
1624 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1493 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1625 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1494 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1626 1495
1627 const_iv (VERSION_CS) const_iv (VERSION_SC)
1628
1629 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1496 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1630 1497
1631 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1632
1633 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1498 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1634
1635 // random map generator
1636 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1637 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1638
1639 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1640 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1641 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1642
1643 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1644 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1645
1646 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1647 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1648
1649 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1650 const_iv (FT_RSRC) const_iv (FT_NUM)
1651 }; 1499 };
1652 1500
1653 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1501 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1654 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1502 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1655 1503
1656 static const struct { 1504 static const struct {
1657 const char *name; 1505 const char *name;
1658 int skip; 1506 int skip;
… …
1664# undef def 1512# undef def
1665 }; 1513 };
1666 1514
1667 AV *av = get_av ("cf::EVENT", 1); 1515 AV *av = get_av ("cf::EVENT", 1);
1668 1516
1669 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1517 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1670 { 1518 {
1671 AV *event = newAV (); 1519 AV *event = newAV ();
1672 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1520 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1673 av_push (event, newSViv (eiv->klass)); 1521 av_push (event, newSViv (eiv->klass));
1674 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1522 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1709 1557
1710 for_all_objects (op) 1558 for_all_objects (op)
1711 op->reattach (); 1559 op->reattach ();
1712} 1560}
1713 1561
1714# support function for map-world.ext
1715void _quantise (SV *data_sv, SV *plt_sv)
1716 CODE:
1717{
1718 if (!SvROK (plt_sv) || SvTYPE (SvRV (plt_sv)) != SVt_PVAV)
1719 croak ("_quantise called with invalid agruments");
1720
1721 plt_sv = SvRV (plt_sv);
1722 SV **plt = AvARRAY (plt_sv);
1723 int plt_count = AvFILL (plt_sv) + 1;
1724
1725 STRLEN len;
1726 char *data = SvPVbyte (data_sv, len);
1727 char *dst = data;
1728
1729 while (len >= 3)
1730 {
1731 for (SV **val_sv = plt + plt_count; val_sv-- > plt; )
1732 {
1733 char *val = SvPVX (*val_sv);
1734
1735 if (val [0] == data [0]
1736 && val [1] == data [1]
1737 && val [2] == data [2])
1738 {
1739 *dst++ = val [3];
1740 goto next;
1741 }
1742 }
1743
1744 croak ("_quantise: color not found in palette: #%02x%02x%02x, at offset %d %d",
1745 (uint8_t)data [0], (uint8_t)data [1], (uint8_t)data [2],
1746 dst - SvPVX (data_sv), len);
1747
1748 next:
1749 data += 3;
1750 len -= 3;
1751 }
1752
1753 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1754}
1755
1756void init_anim () 1562void init_anim ()
1757 1563
1758void init_globals () 1564void init_globals ()
1759 1565
1760void init_experience ()
1761
1762void init_attackmess () 1566void init_attackmess ()
1763 1567
1764void init_dynamic () 1568void init_dynamic ()
1765 1569
1766void load_settings () 1570void load_settings ()
1767 1571
1572void reload_exp_table ()
1573
1768void load_materials () 1574void reload_materials ()
1769 1575
1770void init_uuid () 1576void init_uuid ()
1771 CODE: 1577 CODE:
1772 UUID::init (); 1578 UUID::init ();
1773 1579
1774void init_signals () 1580void init_signals ()
1775
1776void init_commands ()
1777 1581
1778void init_skills () 1582void init_skills ()
1779 1583
1780void init_beforeplay () 1584void init_beforeplay ()
1781 1585
… …
1811 } 1615 }
1812 1616
1813void server_tick () 1617void server_tick ()
1814 CODE: 1618 CODE:
1815{ 1619{
1620 ev_now_update (EV_DEFAULT);
1816 NOW = ev_now (EV_DEFAULT); 1621 NOW = ev_now (EV_DEFAULT);
1817 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1622 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1818 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1623 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1819 runtime = SvNVX (sv_runtime); 1624 runtime = SvNVX (sv_runtime);
1820 1625
1821 server_tick (); 1626 server_tick ();
1822 1627
1823 NOW = ev_time (); 1628 ev_now_update (EV_DEFAULT);
1629 NOW = ev_now (EV_DEFAULT);
1824 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1630 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1825 runtime += TICK; 1631 runtime += TICK;
1826 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1632 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1827} 1633}
1828 1634
… …
1839 switch (items) 1645 switch (items)
1840 { 1646 {
1841 case 0: RETVAL = gen (); break; 1647 case 0: RETVAL = gen (); break;
1842 case 1: RETVAL = gen (SvUV (ST (0))); break; 1648 case 1: RETVAL = gen (SvUV (ST (0))); break;
1843 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1649 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1844 default: croak ("cf::rndm requires none, one or two parameters."); break; 1650 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1845 } 1651 }
1846} 1652}
1847 OUTPUT: 1653 OUTPUT:
1848 RETVAL 1654 RETVAL
1849 1655
… …
1856NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1662NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1857 CODE: 1663 CODE:
1858 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1664 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1859 OUTPUT: 1665 OUTPUT:
1860 RETVAL 1666 RETVAL
1667
1668const char *ordinal (int i)
1861 1669
1862void weaken (...) 1670void weaken (...)
1863 PROTOTYPE: @ 1671 PROTOTYPE: @
1864 CODE: 1672 CODE:
1865 while (items > 0) 1673 while (items > 0)
1866 sv_rvweaken (ST (--items)); 1674 sv_rvweaken (ST (--items));
1867 1675
1868void 1676void log_suspend ()
1677
1678void log_resume ()
1679
1869log_backtrace (utf8_string msg) 1680void log_backtrace (utf8_string msg)
1870 1681
1871void
1872LOG (int flags, utf8_string msg) 1682void LOG (int flags, utf8_string msg)
1873 PROTOTYPE: $$ 1683 PROTOTYPE: $$
1874 C_ARGS: flags, "%s", msg 1684 C_ARGS: flags, "%s", msg
1875 1685
1876octet_string path_combine (octet_string base, octet_string path) 1686octet_string path_combine (octet_string base, octet_string path)
1877 PROTOTYPE: $$ 1687 PROTOTYPE: $$
… …
1924 1734
1925int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1735int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1926 INIT: 1736 INIT:
1927#if __GLIBC__ 1737#if __GLIBC__
1928 mallopt (M_TOP_PAD, 1024 * 1024); 1738 mallopt (M_TOP_PAD, 1024 * 1024);
1929 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128); 1739 mallopt (M_MMAP_THRESHOLD, 1024 * 1024);
1930 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory 1740 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1741 if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10))
1931 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1742 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1932#endif 1743#endif
1933 1744
1934int munlockall () 1745int munlockall ()
1935 1746
1936#endif 1747#endif
… …
1969 1780
1970int random_roll (int min, int max, object *op, int goodbad); 1781int random_roll (int min, int max, object *op, int goodbad);
1971 1782
1972const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1783const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1973 1784
1974int
1975exp_to_level (val64 exp) 1785int exp_to_level (val64 exp)
1786
1787val64 level_to_min_exp (int level)
1788
1789SV *
1790attacktype_name (int atnr)
1976 CODE: 1791 CODE:
1977{ 1792 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1978 int i = 0; 1793 ? newSVpv (attacktype_name [atnr], 0)
1979 1794 : &PL_sv_undef;
1980 RETVAL = settings.max_level;
1981
1982 for (i = 1; i <= settings.max_level; i++)
1983 {
1984 if (levels[i] > exp)
1985 {
1986 RETVAL = i - 1;
1987 break;
1988 }
1989 }
1990}
1991 OUTPUT: RETVAL 1795 OUTPUT: RETVAL
1992 1796
1993val64
1994level_to_min_exp (int level)
1995 CODE:
1996 if (level > settings.max_level)
1997 RETVAL = levels[settings.max_level];
1998 else if (level < 1)
1999 RETVAL = 0;
2000 else
2001 RETVAL = levels[level];
2002 OUTPUT: RETVAL
2003
2004SV * 1797SV *
2005resistance_to_string (int atnr) 1798attacktype_desc (int atnr)
2006 CODE: 1799 CODE:
2007 if (atnr >= 0 && atnr < NROFATTACKS) 1800 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1801 ? newSVpv (attacktype_desc [atnr], 0)
1802 : &PL_sv_undef;
1803 OUTPUT: RETVAL
1804
1805SV *
1806resist_plus (int atnr)
1807 CODE:
1808 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
2008 RETVAL = newSVpv (resist_plus[atnr], 0); 1809 ? newSVpv (resist_plus [atnr], 0)
2009 else 1810 : &PL_sv_undef;
2010 XSRETURN_UNDEF; 1811 OUTPUT: RETVAL
1812
1813SV *
1814change_resist_msg (int atnr)
1815 CODE:
1816 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
1817 ? newSVpv (change_resist_msg [atnr], 0)
1818 : &PL_sv_undef;
2011 OUTPUT: RETVAL 1819 OUTPUT: RETVAL
2012 1820
2013UUID 1821UUID
2014uuid_cur () 1822uuid_cur ()
2015 CODE: 1823 CODE:
… …
2065 CODE: 1873 CODE:
2066 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1874 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
2067 OUTPUT: 1875 OUTPUT:
2068 RETVAL 1876 RETVAL
2069 1877
1878bool should_invoke (attachable *obj, int event)
1879 CODE:
1880 RETVAL = obj->should_invoke ((event_type)event);
1881 OUTPUT: RETVAL
1882
2070void 1883void
2071debug_trace (attachable *obj, bool on = true) 1884debug_trace (attachable *obj, bool on = true)
2072 CODE: 1885 CODE:
2073 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1886 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2074 if (on) 1887 if (on)
… …
2082#object *mortals (U32 index) 1895#object *mortals (U32 index)
2083# CODE: 1896# CODE:
2084# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1897# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2085# OUTPUT: RETVAL 1898# OUTPUT: RETVAL
2086 1899
2087INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1900INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2088 1901
2089MODULE = cf PACKAGE = cf::global 1902MODULE = cf PACKAGE = cf::global
2090 1903
2091int invoke (SV *klass, int event, ...) 1904int invoke (SV *klass, int event, ...)
2092 CODE: 1905 CODE:
… …
2096 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1909 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2097 OUTPUT: RETVAL 1910 OUTPUT: RETVAL
2098 1911
2099MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1912MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2100 1913
2101INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1914INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2102 1915
2103int invoke (object *op, int event, ...) 1916int invoke (object *op, int event, ...)
2104 CODE: 1917 CODE:
2105 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1918 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2106 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1919 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2133int mortals_size () 1946int mortals_size ()
2134 CODE: 1947 CODE:
2135 RETVAL = attachable::mortals.size (); 1948 RETVAL = attachable::mortals.size ();
2136 OUTPUT: RETVAL 1949 OUTPUT: RETVAL
2137 1950
2138const char *slot_use_name (U32 slot) 1951const_utf8_string slot_name (U32 slot)
2139 ALIAS: 1952 ALIAS:
1953 slot_name = 0
1954 slot_use_name = 1
2140 slot_nonuse_name = 1 1955 slot_nonuse_name = 2
2141 CODE: 1956 CODE:
2142{ 1957{
2143 if (slot >= NUM_BODY_LOCATIONS) 1958 if (slot >= NUM_BODY_LOCATIONS)
2144 croak ("body slot index out of range"); 1959 croak ("body slot index out of range");
2145 1960
2146 switch (ix) 1961 switch (ix)
2147 { 1962 {
1963 case 0: RETVAL = body_locations[slot].name ; break;
2148 case 0: RETVAL = body_locations[slot].use_name; break; 1964 case 1: RETVAL = body_locations[slot].use_name ; break;
2149 case 1: RETVAL = body_locations[slot].nonuse_name; break; 1965 case 2: RETVAL = body_locations[slot].nonuse_name; break;
2150 } 1966 }
2151} 1967}
2152 OUTPUT: 1968 OUTPUT:
2153 RETVAL 1969 RETVAL
2154 1970
… …
2199 OUTPUT: 2015 OUTPUT:
2200 RETVAL 2016 RETVAL
2201 2017
2202object *find_best_object_match (object *op, utf8_string match) 2018object *find_best_object_match (object *op, utf8_string match)
2203 2019
2204object *find_marked_object (object *op)
2205
2206int need_identify (object *obj);
2207
2208int apply_shop_mat (object *shop_mat, object *op); 2020int apply_shop_mat (object *shop_mat, object *op);
2209 2021
2210int move (object *op, int dir, object *originator = op) 2022int move (object *op, int dir, object *originator = op)
2211 CODE: 2023 CODE:
2212 RETVAL = move_ob (op, dir, originator); 2024 RETVAL = op->move (dir, originator);
2213 OUTPUT: 2025 OUTPUT:
2214 RETVAL 2026 RETVAL
2215 2027
2216void apply (object *applier, object *applied, int flags = 0)
2217 CODE:
2218 manual_apply (applied, applier, flags);
2219
2220void apply_below (object *op) 2028void apply_below (object *op)
2221 CODE: 2029 CODE:
2222 player_apply_below (op); 2030 player_apply_below (op);
2223 2031
2224int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2032int cast_heal (object *op, object *caster, object *spell, int dir = 0)
… …
2268 2076
2269void pick_up (object *who, object *op) 2077void pick_up (object *who, object *op)
2270 2078
2271void update_object (object *op, int action) 2079void update_object (object *op, int action)
2272 2080
2273void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2081void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2274 2082
2275void player_lvl_adj (object *who, object *skill = 0) 2083void player_lvl_adj (object *who, object *skill = 0)
2276 2084
2277int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2085int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2278 2086
… …
2284 2092
2285void handle_apply_yield (object *op) 2093void handle_apply_yield (object *op)
2286 2094
2287int convert_item (object *item, object *converter) 2095int convert_item (object *item, object *converter)
2288 2096
2097void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2289 2098
2290MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2099MODULE = cf PACKAGE = cf::object PREFIX = cf_
2291 2100
2292# no clean way to get an object from an archetype - stupid idiotic 2101# no clean way to get an object from an archetype - stupid idiotic
2293# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2102# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2297 CODE: 2106 CODE:
2298 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2107 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2299 OUTPUT: 2108 OUTPUT:
2300 RETVAL 2109 RETVAL
2301 2110
2111object *generate (utf8_string arch, object *creator)
2112 CODE:
2113 object *obj = get_archetype (arch);
2114 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2115 RETVAL = obj;
2116 OUTPUT:
2117 RETVAL
2118
2302object *find_object (U32 tag) 2119object *find_object (U32 tag)
2120
2121object *find_object_uuid (UUID i)
2303 2122
2304# TODO: nuke 2123# TODO: nuke
2305object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2124object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2306 PROTOTYPE: $$$$$$ 2125 PROTOTYPE: $$$$$$
2307 CODE: 2126 CODE:
… …
2330 PROTOTYPE: $$;$ 2149 PROTOTYPE: $$;$
2331 PPCODE: 2150 PPCODE:
2332{ 2151{
2333 rv_vector rv; 2152 rv_vector rv;
2334 2153
2335 PUTBACK;
2336 get_rangevector (ob, other, &rv, flags); 2154 get_rangevector (ob, other, &rv, flags);
2337 SPAGAIN;
2338 2155
2339 EXTEND (SP, 5); 2156 EXTEND (SP, 5);
2340 PUSHs (newSVuv (rv.distance)); 2157 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2341 PUSHs (newSViv (rv.distance_x)); 2158 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2342 PUSHs (newSViv (rv.distance_y)); 2159 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2343 PUSHs (newSViv (rv.direction)); 2160 PUSHs (sv_2mortal (newSViv (rv.direction)));
2344 PUSHs (to_sv (rv.part)); 2161 PUSHs (sv_2mortal (to_sv (rv.part)));
2345} 2162}
2346 2163
2347bool on_same_map_as (object *ob, object *other) 2164bool on_same_map_as (object *ob, object *other)
2348 CODE: 2165 CODE:
2349 RETVAL = on_same_map (ob, other); 2166 RETVAL = on_same_map (ob, other);
… …
2369 RETVAL = op->contr; 2186 RETVAL = op->contr;
2370 OUTPUT: RETVAL 2187 OUTPUT: RETVAL
2371 2188
2372bool move_player (object *op, int dir) 2189bool move_player (object *op, int dir)
2373 2190
2374void check_score (object *op)
2375
2376void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2191void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2377 CODE: 2192 CODE:
2378 new_draw_info (flags, 0, op, txt); 2193 new_draw_info (flags, 0, op, txt);
2379 2194
2380void kill_player (object *op) 2195void kill_player (object *op)
… …
2392int command_arrest (object *op, utf8_string params) 2207int command_arrest (object *op, utf8_string params)
2393 2208
2394 2209
2395MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2210MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2396 2211
2397INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2212INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2398 2213
2399int invoke (player *pl, int event, ...) 2214int invoke (player *pl, int event, ...)
2400 CODE: 2215 CODE:
2401 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2216 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2402 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2217 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2494 if (op->tag) 2309 if (op->tag)
2495 XPUSHs (sv_2mortal (to_sv (op))); 2310 XPUSHs (sv_2mortal (to_sv (op)));
2496 } 2311 }
2497} 2312}
2498 2313
2499INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2314INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2500 2315
2501void 2316void
2502adjust_daylight () 2317adjust_daylight ()
2503 CODE: 2318 CODE:
2504 maptile::adjust_daylight (); 2319 maptile::adjust_daylight ();
… …
2550 for (int x = 0; x < THIS->width; ++x) 2365 for (int x = 0; x < THIS->width; ++x)
2551 for (int y = 0; y < THIS->height; ++y) 2366 for (int y = 0; y < THIS->height; ++y)
2552 { 2367 {
2553 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2368 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2554 if (op->flag [FLAG_IS_FLOOR]) 2369 if (op->flag [FLAG_IS_FLOOR])
2555 goto skip_space; 2370 goto skip;
2556 2371
2557 { 2372 {
2558 int offs = offset + y * stride + x; 2373 int offs = offset + y * stride + x;
2374
2559 if (IN_RANGE_EXC (offs, 0, idxlen)) 2375 if (IN_RANGE_EXC (offs, 0, idxlen))
2560 { 2376 {
2561 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2377 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2562 { 2378 {
2563 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2379 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2564 ob->flag [FLAG_NO_MAP_SAVE] = true; 2380 ob->flag [FLAG_NO_MAP_SAVE] = true;
2565 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2381 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2566 2382
2567 if (ob->randomitems) 2383 if (ob->randomitems && !ob->above)
2568 { 2384 {
2569 if (!ob->above)
2570 {
2571 ob->create_treasure (ob->randomitems); 2385 ob->create_treasure (ob->randomitems);
2572 2386
2573 for (object *op = ob->above; op; op = op->above) 2387 for (object *op = ob->above; op; op = op->above)
2574 op->flag [FLAG_NO_MAP_SAVE] = true; 2388 op->flag [FLAG_NO_MAP_SAVE] = true;
2575 } 2389 // TODO: if this is a pickable object, then the item
2576 2390 // will at a bit weird - saving inside the player
2577 ob->randomitems = 0; 2391 // will clear the flag, but when the player drops
2392 // it without logging out, it keeps the flag.
2393 // nobody ahs reported this, but this can be rather
2394 // annoying on persistent maps.
2578 } 2395 }
2579 } 2396 }
2580 } 2397 }
2581 } 2398 }
2582 2399
2583 skip_space: ; 2400 skip: ;
2584 } 2401 }
2585} 2402}
2586 2403
2587void 2404void
2588maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2405maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2598 2415
2599 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2416 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2600 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2417 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2601 2418
2602 for (int i = av_len ((AV *)palette) + 1; i--; ) 2419 for (int i = av_len ((AV *)palette) + 1; i--; )
2603 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2420 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2604 2421
2605 for (int y = 0; y < THIS->height; ++y) 2422 for (int y = 0; y < THIS->height; ++y)
2606 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2423 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2607 2424
2608 sfree (THIS->regions, THIS->size ()); 2425 sfree (THIS->regions, THIS->size ());
… …
2618 for (int x = 0; x < THIS->width; ++x) 2435 for (int x = 0; x < THIS->width; ++x)
2619 for (int y = 0; y < THIS->height; ++y) 2436 for (int y = 0; y < THIS->height; ++y)
2620 { 2437 {
2621 region *rgn = THIS->region (x, y); 2438 region *rgn = THIS->region (x, y);
2622 2439
2623 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2624 if (object *op = THIS->at (x, y).top) 2440 if (object *op = THIS->at (x, y).top)
2625 if (rgn->treasure && rndm () < rgn->treasure_density) 2441 if (rgn->treasure && rndm () < rgn->treasure_density)
2626 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2442 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2627 } 2443 }
2628 2444
… …
2634 if (oblinkpt *obp = map->find_link (connection)) 2450 if (oblinkpt *obp = map->find_link (connection))
2635 for (objectlink *ol = obp->link; ol; ol = ol->next) 2451 for (objectlink *ol = obp->link; ol; ol = ol->next)
2636 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2452 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2637 2453
2638void 2454void
2639get_map_flags (maptile *map, int x, int y) 2455xy_normalise (maptile *map, int x, int y, int dir = 0)
2640 PPCODE: 2456 PPCODE:
2641{ 2457{
2642 maptile *nmap = 0; 2458 mapxy pos (map, x, y);
2643 I16 nx = 0, ny = 0; 2459 if (!pos.move (dir).normalise ())
2460 XSRETURN_EMPTY;
2644 2461
2645 PUTBACK;
2646 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2647 SPAGAIN;
2648
2649 EXTEND (SP, 4); 2462 EXTEND (SP, 3);
2650 PUSHs (sv_2mortal (newSViv (flags)));
2651
2652 if (GIMME_V == G_ARRAY)
2653 {
2654 PUSHs (sv_2mortal (to_sv (nmap))); 2463 PUSHs (sv_2mortal (to_sv (pos.m)));
2655 PUSHs (sv_2mortal (newSViv (nx))); 2464 PUSHs (sv_2mortal (to_sv (pos.x)));
2656 PUSHs (sv_2mortal (newSViv (ny))); 2465 PUSHs (sv_2mortal (to_sv (pos.y)));
2657 }
2658} 2466}
2659 2467
2660mapspace * 2468mapspace *
2661ms (maptile *map, unsigned int x, unsigned int y) 2469ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2662 PROTOTYPE: $$$ 2470 PROTOTYPE: $$$;$
2663 CODE: 2471 CODE:
2664{ 2472{
2665 maptile *nmap = 0; 2473 mapxy pos (map, x, y);
2666 I16 nx, ny; 2474 if (!pos.move (dir).normalise ())
2667
2668 PUTBACK;
2669 get_map_flags (map, &nmap, x, y, &nx, &ny);
2670 SPAGAIN;
2671
2672 if (!nmap)
2673 XSRETURN_UNDEF; 2475 XSRETURN_UNDEF;
2674 2476
2675 RETVAL = &nmap->at (nx, ny); 2477 RETVAL = &*pos;
2676} 2478}
2677 OUTPUT: 2479 OUTPUT:
2678 RETVAL 2480 RETVAL
2679 2481
2680void 2482void
2681at (maptile *map, unsigned int x, unsigned int y) 2483at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2682 PROTOTYPE: $$$ 2484 PROTOTYPE: $$$;$
2683 PPCODE: 2485 PPCODE:
2684{ 2486 mapxy pos (map, x, y);
2685 maptile *nmap = 0; 2487 if (pos.move (dir).normalise ())
2686 I16 nx, ny;
2687
2688 PUTBACK;
2689 get_map_flags (map, &nmap, x, y, &nx, &ny);
2690 SPAGAIN;
2691
2692 if (nmap)
2693 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2488 for (object *o = pos->bot; o; o = o->above)
2694 XPUSHs (sv_2mortal (to_sv (o))); 2489 XPUSHs (sv_2mortal (to_sv (o)));
2695}
2696 2490
2697SV * 2491SV *
2698bot_at (maptile *map, unsigned int x, unsigned int y) 2492bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2699 PROTOTYPE: $$$ 2493 PROTOTYPE: $$$;$
2700 ALIAS: 2494 ALIAS:
2701 top_at = 1 2495 top_at = 1
2702 flags_at = 2 2496 flags_at = 2
2703 light_at = 3 2497 light_at = 3
2704 move_block_at = 4 2498 move_block_at = 4
2705 move_slow_at = 5 2499 move_slow_at = 5
2706 move_on_at = 6 2500 move_on_at = 6
2707 move_off_at = 7 2501 move_off_at = 7
2708 CODE: 2502 CODE:
2709{ 2503{
2710 sint16 nx = x; 2504 mapxy pos (map, x, y);
2711 sint16 ny = y; 2505 if (!pos.move (dir).normalise ())
2712
2713 if (!xy_normalise (map, nx, ny))
2714 XSRETURN_UNDEF; 2506 XSRETURN_UNDEF;
2715 2507
2716 mapspace &ms = map->at (nx, ny); 2508 mapspace &ms = *pos;
2717 2509
2718 ms.update (); 2510 ms.update ();
2719 2511
2720 switch (ix) 2512 switch (ix)
2721 { 2513 {
… …
2731} 2523}
2732 OUTPUT: RETVAL 2524 OUTPUT: RETVAL
2733 2525
2734# worst xs function of my life 2526# worst xs function of my life
2735bool 2527bool
2736_create_random_map (\ 2528_create_random_map (maptile *self, SV *options)
2737 maptile *self,\
2738 utf8_string wallstyle,\
2739 utf8_string wall_name,\
2740 utf8_string floorstyle,\
2741 utf8_string monsterstyle,\
2742 utf8_string treasurestyle,\
2743 utf8_string layoutstyle,\
2744 utf8_string doorstyle,\
2745 utf8_string decorstyle,\
2746 utf8_string origin_map,\
2747 utf8_string final_map,\
2748 utf8_string exitstyle,\
2749 utf8_string this_map,\
2750 utf8_string exit_on_final_map,\
2751 int xsize,\
2752 int ysize,\
2753 int expand2x,\
2754 int layoutoptions1,\
2755 int layoutoptions2,\
2756 int layoutoptions3,\
2757 int symmetry,\
2758 int difficulty,\
2759 int difficulty_given,\
2760 float difficulty_increase,\
2761 int dungeon_level,\
2762 int dungeon_depth,\
2763 int decoroptions,\
2764 int orientation,\
2765 int origin_y,\
2766 int origin_x,\
2767 U32 random_seed,\
2768 val64 total_map_hp,\
2769 int map_layout_style,\
2770 int treasureoptions,\
2771 int symmetry_used,\
2772 region *region,\
2773 utf8_string custom\
2774)
2775 CODE: 2529 CODE:
2776{ 2530{
2777 random_map_params rmp; 2531 random_map_params rmp ((HV *)SvRV (options));
2778
2779 assign (rmp.wallstyle , wallstyle);
2780 assign (rmp.wall_name , wall_name);
2781 assign (rmp.floorstyle , floorstyle);
2782 assign (rmp.monsterstyle , monsterstyle);
2783 assign (rmp.treasurestyle , treasurestyle);
2784 assign (rmp.layoutstyle , layoutstyle);
2785 assign (rmp.doorstyle , doorstyle);
2786 assign (rmp.decorstyle , decorstyle);
2787 assign (rmp.exitstyle , exitstyle);
2788 assign (rmp.exit_on_final_map, exit_on_final_map);
2789
2790 rmp.origin_map = origin_map;
2791 rmp.final_map = final_map;
2792 rmp.this_map = this_map;
2793 rmp.xsize = xsize;
2794 rmp.ysize = ysize;
2795 rmp.expand2x = expand2x;
2796 rmp.layoutoptions1 = layoutoptions1;
2797 rmp.layoutoptions2 = layoutoptions2;
2798 rmp.layoutoptions3 = layoutoptions3;
2799 rmp.symmetry = symmetry;
2800 rmp.difficulty = difficulty;
2801 rmp.difficulty_given = difficulty_given;
2802 rmp.difficulty_increase = difficulty_increase;
2803 rmp.dungeon_level = dungeon_level;
2804 rmp.dungeon_depth = dungeon_depth;
2805 rmp.decoroptions = decoroptions;
2806 rmp.orientation = orientation;
2807 rmp.origin_y = origin_y;
2808 rmp.origin_x = origin_x;
2809 rmp.random_seed = random_seed;
2810 rmp.total_map_hp = (uint64_t) total_map_hp;
2811 rmp.map_layout_style = map_layout_style;
2812 rmp.treasureoptions = treasureoptions;
2813 rmp.symmetry_used = symmetry_used;
2814 rmp.region = region;
2815 rmp.custom = custom;
2816
2817 RETVAL = self->generate_random_map (&rmp); 2532 RETVAL = self->generate_random_map (&rmp);
2818} 2533}
2819 OUTPUT: 2534 OUTPUT:
2820 RETVAL 2535 RETVAL
2821 2536
2822MODULE = cf PACKAGE = cf::mapspace 2537MODULE = cf PACKAGE = cf::mapspace
2823 2538
2824INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2539INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2825 2540
2826MODULE = cf PACKAGE = cf::arch 2541MODULE = cf PACKAGE = cf::arch
2827 2542
2828int archetypes_size () 2543int archetypes_size ()
2829 CODE: 2544 CODE:
… …
2833archetype *archetypes (U32 index) 2548archetype *archetypes (U32 index)
2834 CODE: 2549 CODE:
2835 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2550 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2836 OUTPUT: RETVAL 2551 OUTPUT: RETVAL
2837 2552
2838object *instantiate (archetype *arch)
2839 CODE:
2840 RETVAL = arch_to_object (arch);
2841 OUTPUT:
2842 RETVAL
2843
2844INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2553INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2845 2554
2846MODULE = cf PACKAGE = cf::party 2555MODULE = cf PACKAGE = cf::party
2847 2556
2848partylist *first () 2557partylist *first ()
2849 PROTOTYPE: 2558 PROTOTYPE:
2850 CODE: 2559 CODE:
2851 RETVAL = get_firstparty (); 2560 RETVAL = get_firstparty ();
2852 OUTPUT: RETVAL 2561 OUTPUT: RETVAL
2853 2562
2854INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2563INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2855 2564
2856MODULE = cf PACKAGE = cf::region 2565MODULE = cf PACKAGE = cf::region
2857 2566
2858void 2567void
2859list () 2568list ()
2860 PPCODE: 2569 PPCODE:
2861 for_all_regions (rgn) 2570 for_all_regions (rgn)
2862 XPUSHs (sv_2mortal (to_sv (rgn))); 2571 XPUSHs (sv_2mortal (to_sv (rgn)));
2863 2572
2864region *find (utf8_string name)
2865 PROTOTYPE: $
2866 CODE:
2867 RETVAL = region::find (name);
2868 OUTPUT: RETVAL
2869
2870int specificity (region *rgn) 2573int specificity (region *rgn)
2871 CODE: 2574 CODE:
2872 RETVAL = 0; 2575 RETVAL = 0;
2873 while (rgn = rgn->parent) 2576 while (rgn = rgn->parent)
2874 RETVAL++; 2577 RETVAL++;
2875 OUTPUT: RETVAL 2578 OUTPUT: RETVAL
2876 2579
2877INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2580INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2878 2581
2879MODULE = cf PACKAGE = cf::living 2582MODULE = cf PACKAGE = cf::living
2880 2583
2881INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2584INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2882 2585
2883MODULE = cf PACKAGE = cf::settings 2586MODULE = cf PACKAGE = cf::settings
2884 2587
2885INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2588INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2886 2589
2887MODULE = cf PACKAGE = cf::client 2590MODULE = cf PACKAGE = cf::client
2888 2591
2889INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2592INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2890 2593
2891int invoke (client *ns, int event, ...) 2594int invoke (client *ns, int event, ...)
2892 CODE: 2595 CODE:
2893 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2596 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2894 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2597 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2960 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2663 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2961 old_sound_index [idx] = face; 2664 old_sound_index [idx] = face;
2962 2665
2963MODULE = cf PACKAGE = cf::face PREFIX = face_ 2666MODULE = cf PACKAGE = cf::face PREFIX = face_
2964 2667
2965#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2668#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2966 2669
2967faceidx face_find (utf8_string name, faceidx defidx = 0) 2670faceidx face_find (utf8_string name, faceidx defidx = 0)
2968 2671
2969faceidx alloc (utf8_string name) 2672faceidx alloc (utf8_string name)
2970 CODE: 2673 CODE:
… …
2977 while (!RETVAL); // crude way to leave index 0 2680 while (!RETVAL); // crude way to leave index 0
2978 2681
2979 faces [RETVAL].name = name; 2682 faces [RETVAL].name = name;
2980 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2683 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2981 2684
2982 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2685 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2983 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2686 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2687 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2984} 2688}
2985 OUTPUT: RETVAL 2689 OUTPUT: RETVAL
2986 2690
2987void set_type (faceidx idx, int value) 2691void set_type (faceidx idx, int value)
2988 ALIAS: 2692 ALIAS:
… …
3004 2708
3005void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2709void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
3006 CODE: 2710 CODE:
3007{ 2711{
3008 faceinfo *f = face_info (idx); assert (f); 2712 faceinfo *f = face_info (idx); assert (f);
3009 facedata *d = &(faceset ? f->data64 : f->data32); 2713 facedata *d = f->face + faceset;
3010 sv_to (data, d->data); 2714 sv_to (data, d->data);
3011 STRLEN clen; 2715 STRLEN clen;
3012 char *cdata = SvPVbyte (chksum, clen); 2716 char *cdata = SvPVbyte (chksum, clen);
3013 clen = min (CHKSUM_SIZE, clen); 2717 clen = min (CHKSUM_MAXLEN, clen);
3014 2718
2719 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2720
3015 if (memcmp (d->chksum, cdata, clen)) 2721 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
3016 { 2722 {
2723 d->chksum_len = clen;
3017 memcpy (d->chksum, cdata, clen); 2724 memcpy (d->chksum, cdata, clen);
3018 2725
3019 // invalidate existing client face info 2726 // invalidate existing client face info
3020 for_all_clients (ns) 2727 for_all_clients (ns)
3021 if (ns->faceset == faceset) 2728 if (ns->faceset == faceset)
… …
3036 2743
3037SV *get_chksum (faceidx idx, int faceset = 0) 2744SV *get_chksum (faceidx idx, int faceset = 0)
3038 CODE: 2745 CODE:
3039 facedata *d = face_data (idx, faceset); 2746 facedata *d = face_data (idx, faceset);
3040 if (!d) XSRETURN_UNDEF; 2747 if (!d) XSRETURN_UNDEF;
3041 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2748 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
3042 OUTPUT: 2749 OUTPUT:
3043 RETVAL 2750 RETVAL
3044 2751
3045SV *get_data (faceidx idx, int faceset = 0) 2752SV *get_data (faceidx idx, int faceset = 0)
3046 CODE: 2753 CODE:
… …
3066 ns->force_newmap = true; 2773 ns->force_newmap = true;
3067 } 2774 }
3068 2775
3069MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2776MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3070 2777
3071#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2778#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3072 2779
3073animidx anim_find (utf8_string name) 2780animidx anim_find (utf8_string name)
3074 CODE: 2781 CODE:
3075 RETVAL = animation::find (name).number; 2782 RETVAL = animation::find (name).number;
3076 OUTPUT: RETVAL 2783 OUTPUT: RETVAL
… …
3091 } 2798 }
3092 else 2799 else
3093 anim = &animation::create (name, av_len (av) + 1, facings); 2800 anim = &animation::create (name, av_len (av) + 1, facings);
3094 2801
3095 for (int i = 0; i < anim->num_animations; ++i) 2802 for (int i = 0; i < anim->num_animations; ++i)
3096 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2803 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3097} 2804}
3098 OUTPUT: RETVAL 2805 OUTPUT: RETVAL
3099 2806
3100void invalidate_all () 2807void invalidate_all ()
3101 CODE: 2808 CODE:
3102 for_all_clients (ns) 2809 for_all_clients (ns)
3103 ns->anims_sent.reset (); 2810 ns->anims_sent.reset ();
3104 2811
3105MODULE = cf PACKAGE = cf::object::freezer 2812MODULE = cf PACKAGE = cf::object::freezer
3106 2813
3107INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2814INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3108 2815
3109SV * 2816SV *
3110new (char *klass) 2817new (char *klass)
3111 CODE: 2818 CODE:
3112 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2819 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3119 sv_to (sv, self); 2826 sv_to (sv, self);
3120 delete self; 2827 delete self;
3121 2828
3122MODULE = cf PACKAGE = cf::object::thawer 2829MODULE = cf PACKAGE = cf::object::thawer
3123 2830
3124INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2831INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2832
2833bool
2834errors_are_fatal (bool fatal)
2835 CODE:
2836 RETVAL = object_thawer::errors_are_fatal;
2837 object_thawer::errors_are_fatal = fatal;
2838 OUTPUT:
2839 RETVAL
3125 2840
3126SV * 2841SV *
3127new_from_file (char *klass, octet_string path) 2842new_from_file (char *klass, octet_string path)
3128 CODE: 2843 CODE:
3129 object_thawer *f = new object_thawer (path); 2844 object_thawer *f = new object_thawer (path);
… …
3155 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2870 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
3156 2871
3157 self->skip (); 2872 self->skip ();
3158 } 2873 }
3159 2874
2875MODULE = cf PACKAGE = cf::layout
2876
2877INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h |
2878

Diff Legend

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