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.342 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.402 by root, Sun May 1 13:18:24 2011 UTC

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

Diff Legend

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