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.388 by root, Wed Jun 30 01:57:54 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 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"
35#include "../random_maps/random_map.h" 33#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>
… …
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_ext_map_world;
93 90
94static SV 91static SV
95 *cv_cf_do_invoke, 92 *cv_cf_do_invoke,
96 *cv_cf__can_merge, 93 *cv_cf__can_merge,
97 *cv_cf_client_send_msg, 94 *cv_cf_client_send_msg,
98 *cv_cf_tick, 95 *cv_cf_tick,
99 *cv_cf_match_match; 96 *cv_cf_match_match;
100 97
101#ifndef newSVpv_utf8 98#ifndef newSVpv_utf8
102static inline SV * 99static SV *
103newSVpv_utf8 (const char *s) 100newSVpv_utf8 (const char *s)
104{ 101{
105 if (!s) 102 if (!s)
106 return newSV (0); 103 return newSV (0);
107 104
… …
110 return sv; 107 return sv;
111} 108}
112#endif 109#endif
113 110
114#ifndef newSVpvn_utf8 111#ifndef newSVpvn_utf8
115static inline SV * 112static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 113newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 114{
118 if (!s) 115 if (!s)
119 return newSV (0); 116 return newSV (0);
120 117
… …
124 SvUTF8_on (sv); 121 SvUTF8_on (sv);
125 122
126 return sv; 123 return sv;
127} 124}
128#endif 125#endif
126
127noinline utf8_string
128cfSvPVutf8_nolen (SV *sv)
129{
130 SvGETMAGIC (sv);
131
132 if (SvPOK (sv))
133 {
134 if (!SvUTF8 (sv))
135 sv_utf8_upgrade_nomg (sv);
136
137 return SvPVX (sv);
138 }
139
140 return SvPV_nolen (sv);
141}
129 142
130// helper cast function, returns super class * or 0 143// helper cast function, returns super class * or 0
131template<class super> 144template<class super>
132static super * 145static super *
133is_a (attachable *at) 146is_a (attachable *at)
… …
216 do_destroy (); 229 do_destroy ();
217 sever_self (); 230 sever_self ();
218} 231}
219 232
220void 233void
234attachable::do_delete ()
235{
236 delete this;
237}
238
239void
221attachable::check_mortals () 240attachable::check_mortals ()
222{ 241{
223 static int i = 0; 242 static int i = 0;
224 243
225 for (;;) 244 for (;;)
… …
238 257
239 if (0) 258 if (0)
240 { 259 {
241 for (int j = 0; j < mortals.size (); ++j)//D 260 for (int j = 0; j < mortals.size (); ++j)//D
242 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 261 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
262
243 fprintf (stderr, "\n");//D 263 fprintf (stderr, "\n");//D
244 } 264 }
245 } 265 }
246 } 266 }
247 267
… …
267 } 287 }
268 else 288 else
269 { 289 {
270 mortals.erase (i); 290 mortals.erase (i);
271 obj->sever_self (); 291 obj->sever_self ();
272 delete obj; 292 obj->do_delete ();
273 } 293 }
274 } 294 }
275} 295}
276 296
277void 297void
… …
332#endif 352#endif
333 353
334////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 354//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
335 355
336static SV * 356static SV *
337newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 357newSVptr (void *ptr, HV *stash, HV *hv)
338{ 358{
339 SV *sv;
340
341 if (!ptr) 359 if (!ptr)
342 return newSV (0); 360 return newSV (0);
343 361
344 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 362 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
345 return sv_bless (newRV_noinc ((SV *)hv), stash); 363 return sv_bless (newRV_noinc ((SV *)hv), stash);
364}
365
366static SV * noinline
367newSVptr (void *ptr, HV *stash)
368{
369 return newSVptr (ptr, stash, newHV ());
346} 370}
347 371
348static int 372static int
349attachable_free (pTHX_ SV *sv, MAGIC *mg) 373attachable_free (pTHX_ SV *sv, MAGIC *mg)
350{ 374{
… …
362 return 0; 386 return 0;
363} 387}
364 388
365MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 389MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
366 390
367static SV * 391static SV * noinline
368newSVattachable (attachable *obj, HV *stash) 392newSVattachable (attachable *obj, HV *stash)
369{ 393{
370 if (!obj) 394 if (!obj)
371 return newSV (0); 395 return newSV (0);
372 396
… …
458 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap 482 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
459 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap 483 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
460 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap 484 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
461 && !sv_derived_from (sv, "cf::object"))) 485 && !sv_derived_from (sv, "cf::object")))
462 croak ("object of type cf::object expected"); 486 croak ("object of type cf::object expected");
487
488 return SvPTR_nc (sv);
489}
490
491static long noinline
492SvPTR_ornull_maptile (SV *sv)
493{
494 if (expect_false (!SvOK (sv))) return 0;
495
496 if (!SvROK (sv)
497 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
498 && SvSTASH (SvRV (sv)) != stash_ext_map_world
499 && !sv_derived_from (sv, "cf::map")))
500 croak ("object of type cf::map expected");
463 501
464 return SvPTR_nc (sv); 502 return SvPTR_nc (sv);
465} 503}
466 504
467static long noinline 505static long noinline
… …
492static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 530static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
493static inline SV *to_sv (float v) { return newSVnv (v); } 531static inline SV *to_sv (float v) { return newSVnv (v); }
494static inline SV *to_sv (double v) { return newSVnv (v); } 532static inline SV *to_sv (double v) { return newSVnv (v); }
495static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 533static 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); } 534static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
535// 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); } 536static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
537static 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); } 538static 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); } 539static 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); } 540static 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); } 541static 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); } 542static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
… …
529 SV *sv = to_sv (static_cast<dynbuf *> (v)); 569 SV *sv = to_sv (static_cast<dynbuf *> (v));
530 SvUTF8_on (sv); 570 SvUTF8_on (sv);
531 return sv; 571 return sv;
532} 572}
533 573
534static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 574static 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; } 575static 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); } 576static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
537static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 577static 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); } 578static 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); } 579static 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); } 584static 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); } 585static 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); } 586static 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); } 587static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
548static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 588static 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); } 589static 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); } 590static 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); } 591static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
592static 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"); } 593static 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"); } 594static 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"); } 595static 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"); } 596static 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"); } 597static 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"); } 598static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
… …
674template<class type> 714template<class type>
675static void noinline 715static void noinline
676cf_obj_to (SV *arg, type &var) 716cf_obj_to (SV *arg, type &var)
677{ 717{
678 sv_to (arg, var); 718 sv_to (arg, var);
679 if (!var) 719 if (expect_false (!var))
680 croak ("must not pass invalid/null cf_obj here"); 720 croak ("must not pass invalid/null cf_obj here");
681} 721}
682 722
683template<class object> 723template<class object>
684static void noinline 724static void noinline
685cf_obj_ornull_to (SV *arg, object *&var) 725cf_obj_ornull_to (SV *arg, object *&var)
686{ 726{
687 if (SvOK (arg)) 727 if (SvOK (arg))
688 { 728 {
689 sv_to (arg, var); 729 sv_to (arg, var);
690 if (!var) 730 if (expect_false (!var))
691 croak ("unable to convert perl object to C++ object"); 731 croak ("unable to convert perl object to C++ object");
692 } 732 }
693 else 733 else
694 var = 0; 734 var = 0;
695} 735}
… …
730 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
731 } 771 }
732 772
733 eval_pv ( 773 eval_pv (
734 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
735 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
736 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
737 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
738 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
739 "require cf;\n", 779 "require cf;\n",
740 0 780 0
741 ); 781 );
742 782
743 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
… …
1064 CALL_CALL ("ext::books::make_book", G_VOID); 1104 CALL_CALL ("ext::books::make_book", G_VOID);
1065 CALL_END; 1105 CALL_END;
1066} 1106}
1067 1107
1068void 1108void
1069cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1109cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1070{ 1110{
1071 CALL_BEGIN (4); 1111 CALL_BEGIN (4);
1072 CALL_ARG (ns); 1112 CALL_ARG (ns);
1073 CALL_ARG (type); 1113 CALL_ARG (type);
1074 CALL_ARG_SV (newSVpv_utf8 (msg)); 1114 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1103 CALL_CALL ("cf::mapscript::activate", G_VOID); 1143 CALL_CALL ("cf::mapscript::activate", G_VOID);
1104 CALL_END; 1144 CALL_END;
1105} 1145}
1106 1146
1107player * 1147player *
1108player::find (const char *name) 1148player::find (const_utf8_string name)
1109{ 1149{
1110 CALL_BEGIN (1); 1150 CALL_BEGIN (1);
1111 CALL_ARG (name); 1151 CALL_ARG (name);
1112 CALL_CALL ("cf::player::find", G_SCALAR); 1152 CALL_CALL ("cf::player::find", G_SCALAR);
1113 1153
… …
1118 1158
1119 return retval; 1159 return retval;
1120} 1160}
1121 1161
1122maptile * 1162maptile *
1123find_style (const char *dirname, const char *stylename, int difficulty) 1163find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1124{ 1164{
1125 CALL_BEGIN (3); 1165 CALL_BEGIN (4);
1126 CALL_ARG (dirname); 1166 CALL_ARG (dirname);
1127 CALL_ARG (stylename); 1167 CALL_ARG (stylename);
1128 CALL_ARG (difficulty); 1168 CALL_ARG (difficulty);
1169 CALL_ARG (recurse);
1129 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1170 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1130 1171
1131 maptile *retval = 0; 1172 maptile *retval = 0;
1132 if (count) sv_to (POPs, retval); 1173 if (count) sv_to (POPs, retval);
1133 1174
… …
1135 1176
1136 return retval; 1177 return retval;
1137} 1178}
1138 1179
1139maptile * 1180maptile *
1140maptile::find_sync (const char *path, maptile *origin) 1181maptile::find_sync (const_utf8_string path, maptile *origin)
1141{ 1182{
1142 CALL_BEGIN (2); 1183 CALL_BEGIN (2);
1143 CALL_ARG (path); 1184 CALL_ARG (path);
1144 CALL_ARG (origin); 1185 CALL_ARG (origin);
1145 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1186 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1151 1192
1152 return retval; 1193 return retval;
1153} 1194}
1154 1195
1155maptile * 1196maptile *
1156maptile::find_async (const char *path, maptile *origin, bool load) 1197maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1157{ 1198{
1158 CALL_BEGIN (3); 1199 CALL_BEGIN (3);
1159 CALL_ARG (path); 1200 CALL_ARG (path);
1160 CALL_ARG (origin); 1201 CALL_ARG (origin);
1161 CALL_ARG (load); 1202 CALL_ARG (load);
… …
1190 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1231 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1191 CALL_END; 1232 CALL_END;
1192} 1233}
1193 1234
1194void 1235void
1195object::player_goto (const char *path, int x, int y) 1236object::player_goto (const_utf8_string path, int x, int y)
1196{ 1237{
1197 if (type != PLAYER) 1238 if (type != PLAYER)
1198 return; 1239 return;
1199 1240
1200 CALL_BEGIN (4); 1241 CALL_BEGIN (4);
… …
1204 CALL_ARG (y); 1245 CALL_ARG (y);
1205 CALL_CALL ("cf::object::player::goto", G_VOID); 1246 CALL_CALL ("cf::object::player::goto", G_VOID);
1206 CALL_END; 1247 CALL_END;
1207} 1248}
1208 1249
1209const char * 1250const_utf8_string
1210object::ref () const 1251object::ref () const
1211{ 1252{
1212 if (type == PLAYER) 1253 if (type == PLAYER)
1213 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1254 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1214 else 1255 else
1256 // TODO: should be able to save references within the same map, at least
1215 return 0; 1257 return 0;
1216} 1258}
1217 1259
1218object * 1260object *
1219object::deref (const char *ref) 1261object::deref (const_utf8_string ref)
1220{ 1262{
1221 object *retval = 0; 1263 object *retval = 0;
1222 1264
1223 if (ref) 1265 if (ref)
1224 { 1266 {
… …
1234 1276
1235 return retval; 1277 return retval;
1236} 1278}
1237 1279
1238void 1280void
1239log_backtrace (const char *msg) 1281log_backtrace (const_utf8_string msg)
1240{ 1282{
1241#if HAVE_BACKTRACE 1283#if HAVE_BACKTRACE
1242 void *addr [20]; 1284 void *addr [20];
1243 int size = backtrace (addr, 20); 1285 int size = backtrace (addr, 20);
1244 1286
… …
1250 CALL_END; 1292 CALL_END;
1251#endif 1293#endif
1252} 1294}
1253 1295
1254bool 1296bool
1255is_match_expr (const char *expr) 1297is_match_expr (const_utf8_string expr)
1256{ 1298{
1257 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1299 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1258} 1300}
1259 1301
1260bool 1302bool
1261match (const char *expr, object *ob, object *self, object *source, object *originator) 1303match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1262{ 1304{
1263 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1305 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1264 expr += sizeof ("match ") - 1; 1306 expr += sizeof ("match ") - 1;
1265 1307
1266 CALL_BEGIN (5); 1308 CALL_BEGIN (5);
… …
1277 1319
1278 return matched; 1320 return matched;
1279} 1321}
1280 1322
1281object * 1323object *
1282match_one (const char *expr, object *ob, object *self, object *source, object *originator) 1324match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1283{ 1325{
1284 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1326 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1285 expr += sizeof ("match ") - 1; 1327 expr += sizeof ("match ") - 1;
1286 1328
1287 CALL_BEGIN (5); 1329 CALL_BEGIN (5);
… …
1355 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1397 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1356 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1398 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1357 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1399 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1358 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1400 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1359 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1401 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1402 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1360 1403
1361 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1404 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); 1405 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); 1406 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); 1407 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1405 static const struct { 1448 static const struct {
1406 const char *name; 1449 const char *name;
1407 IV iv; 1450 IV iv;
1408 } *civ, const_iv[] = { 1451 } *civ, const_iv[] = {
1409# define const_iv(name) { # name, (IV)name }, 1452# define const_iv(name) { # name, (IV)name },
1410 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1453# include "const_iv.h"
1411 const_iv (logBacktrace) 1454# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1455# include "attackinc.h"
1456# undef def
1457# define def(uc, flags) const_iv (SK_ ## uc)
1458# include "skillinc.h"
1459# undef def
1412 1460
1413 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1414 1462
1415 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1416 1464
1417 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
1418 const_iv (MAXSOCKBUF) 1466 const_iv (MAXSOCKBUF)
1419 1467
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) 1468 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) 1469 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1510 1470
1511 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1471 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 1472
1562 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1473 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) 1474 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1564 const_iv (F_LOCKED) 1475 const_iv (F_LOCKED)
1565 1476
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) 1477 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) 1478 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1570 1479
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) 1480 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 1481
1586 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1482 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) 1483 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1588 1484
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) 1485 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1619 const_iv (MAP_INACTIVE) 1486 const_iv (MAP_INACTIVE)
1620 1487
1621 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1488 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) 1489 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1623 1490
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) 1491 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1627 1492
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) 1493 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 }; 1494 };
1649 1495
1650 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1496 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1651 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1652 1498
1653 static const struct { 1499 static const struct {
1654 const char *name; 1500 const char *name;
1655 int skip; 1501 int skip;
… …
1661# undef def 1507# undef def
1662 }; 1508 };
1663 1509
1664 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1665 1511
1666 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1512 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1667 { 1513 {
1668 AV *event = newAV (); 1514 AV *event = newAV ();
1669 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1670 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1671 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1752 1598
1753void init_anim () 1599void init_anim ()
1754 1600
1755void init_globals () 1601void init_globals ()
1756 1602
1757void init_experience ()
1758
1759void init_attackmess () 1603void init_attackmess ()
1760 1604
1761void init_dynamic () 1605void init_dynamic ()
1762 1606
1763void load_settings () 1607void load_settings ()
1764 1608
1609void reload_exp_table ()
1610
1765void load_materials () 1611void reload_materials ()
1766 1612
1767void init_uuid () 1613void init_uuid ()
1768 CODE: 1614 CODE:
1769 UUID::init (); 1615 UUID::init ();
1770 1616
1771void init_signals () 1617void init_signals ()
1772
1773void init_commands ()
1774 1618
1775void init_skills () 1619void init_skills ()
1776 1620
1777void init_beforeplay () 1621void init_beforeplay ()
1778 1622
… …
1808 } 1652 }
1809 1653
1810void server_tick () 1654void server_tick ()
1811 CODE: 1655 CODE:
1812{ 1656{
1657 ev_now_update (EV_DEFAULT);
1813 NOW = ev_now (EV_DEFAULT); 1658 NOW = ev_now (EV_DEFAULT);
1814 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1659 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1815 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1660 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1816 runtime = SvNVX (sv_runtime); 1661 runtime = SvNVX (sv_runtime);
1817 1662
1818 server_tick (); 1663 server_tick ();
1819 1664
1820 NOW = ev_time (); 1665 ev_now_update (EV_DEFAULT);
1666 NOW = ev_now (EV_DEFAULT);
1821 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1667 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1822 runtime += TICK; 1668 runtime += TICK;
1823 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1669 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1824} 1670}
1825 1671
… …
1836 switch (items) 1682 switch (items)
1837 { 1683 {
1838 case 0: RETVAL = gen (); break; 1684 case 0: RETVAL = gen (); break;
1839 case 1: RETVAL = gen (SvUV (ST (0))); break; 1685 case 1: RETVAL = gen (SvUV (ST (0))); break;
1840 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1686 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1841 default: croak ("cf::rndm requires none, one or two parameters."); break; 1687 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1842 } 1688 }
1843} 1689}
1844 OUTPUT: 1690 OUTPUT:
1845 RETVAL 1691 RETVAL
1846 1692
… …
1853NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1699NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1854 CODE: 1700 CODE:
1855 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1701 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1856 OUTPUT: 1702 OUTPUT:
1857 RETVAL 1703 RETVAL
1704
1705const char *ordinal (int i)
1858 1706
1859void weaken (...) 1707void weaken (...)
1860 PROTOTYPE: @ 1708 PROTOTYPE: @
1861 CODE: 1709 CODE:
1862 while (items > 0) 1710 while (items > 0)
1863 sv_rvweaken (ST (--items)); 1711 sv_rvweaken (ST (--items));
1864 1712
1865void 1713void log_suspend ()
1714
1715void log_resume ()
1716
1866log_backtrace (utf8_string msg) 1717void log_backtrace (utf8_string msg)
1867 1718
1868void
1869LOG (int flags, utf8_string msg) 1719void LOG (int flags, utf8_string msg)
1870 PROTOTYPE: $$ 1720 PROTOTYPE: $$
1871 C_ARGS: flags, "%s", msg 1721 C_ARGS: flags, "%s", msg
1872 1722
1873octet_string path_combine (octet_string base, octet_string path) 1723octet_string path_combine (octet_string base, octet_string path)
1874 PROTOTYPE: $$ 1724 PROTOTYPE: $$
… …
1966 1816
1967int random_roll (int min, int max, object *op, int goodbad); 1817int random_roll (int min, int max, object *op, int goodbad);
1968 1818
1969const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1819const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1970 1820
1971int
1972exp_to_level (val64 exp) 1821int exp_to_level (val64 exp)
1973 CODE:
1974{
1975 int i = 0;
1976 1822
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
1989
1990val64
1991level_to_min_exp (int level) 1823val64 level_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 1824
2001SV * 1825SV *
2002resistance_to_string (int atnr) 1826resistance_to_string (int atnr)
2003 CODE: 1827 CODE:
2004 if (atnr >= 0 && atnr < NROFATTACKS) 1828 if (atnr >= 0 && atnr < NROFATTACKS)
… …
2062 CODE: 1886 CODE:
2063 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1887 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
2064 OUTPUT: 1888 OUTPUT:
2065 RETVAL 1889 RETVAL
2066 1890
1891bool should_invoke (attachable *obj, int event)
1892 CODE:
1893 RETVAL = obj->should_invoke ((event_type)event);
1894 OUTPUT: RETVAL
1895
2067void 1896void
2068debug_trace (attachable *obj, bool on = true) 1897debug_trace (attachable *obj, bool on = true)
2069 CODE: 1898 CODE:
2070 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1899 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2071 if (on) 1900 if (on)
… …
2079#object *mortals (U32 index) 1908#object *mortals (U32 index)
2080# CODE: 1909# CODE:
2081# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1910# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2082# OUTPUT: RETVAL 1911# OUTPUT: RETVAL
2083 1912
2084INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1913INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2085 1914
2086MODULE = cf PACKAGE = cf::global 1915MODULE = cf PACKAGE = cf::global
2087 1916
2088int invoke (SV *klass, int event, ...) 1917int invoke (SV *klass, int event, ...)
2089 CODE: 1918 CODE:
… …
2093 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1922 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2094 OUTPUT: RETVAL 1923 OUTPUT: RETVAL
2095 1924
2096MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1925MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2097 1926
2098INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1927INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2099 1928
2100int invoke (object *op, int event, ...) 1929int invoke (object *op, int event, ...)
2101 CODE: 1930 CODE:
2102 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1931 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2103 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1932 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2130int mortals_size () 1959int mortals_size ()
2131 CODE: 1960 CODE:
2132 RETVAL = attachable::mortals.size (); 1961 RETVAL = attachable::mortals.size ();
2133 OUTPUT: RETVAL 1962 OUTPUT: RETVAL
2134 1963
2135const char *slot_use_name (U32 slot) 1964const_utf8_string slot_use_name (U32 slot)
2136 ALIAS: 1965 ALIAS:
2137 slot_nonuse_name = 1 1966 slot_nonuse_name = 1
2138 CODE: 1967 CODE:
2139{ 1968{
2140 if (slot >= NUM_BODY_LOCATIONS) 1969 if (slot >= NUM_BODY_LOCATIONS)
… …
2196 OUTPUT: 2025 OUTPUT:
2197 RETVAL 2026 RETVAL
2198 2027
2199object *find_best_object_match (object *op, utf8_string match) 2028object *find_best_object_match (object *op, utf8_string match)
2200 2029
2201object *find_marked_object (object *op)
2202
2203int need_identify (object *obj);
2204
2205int apply_shop_mat (object *shop_mat, object *op); 2030int apply_shop_mat (object *shop_mat, object *op);
2206 2031
2207int move (object *op, int dir, object *originator = op) 2032int move (object *op, int dir, object *originator = op)
2208 CODE: 2033 CODE:
2209 RETVAL = move_ob (op, dir, originator); 2034 RETVAL = op->move (dir, originator);
2210 OUTPUT: 2035 OUTPUT:
2211 RETVAL 2036 RETVAL
2212 2037
2213void apply (object *applier, object *applied, int flags = 0)
2214 CODE:
2215 manual_apply (applied, applier, flags);
2216
2217void apply_below (object *op) 2038void apply_below (object *op)
2218 CODE: 2039 CODE:
2219 player_apply_below (op); 2040 player_apply_below (op);
2220 2041
2221int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2042int cast_heal (object *op, object *caster, object *spell, int dir = 0)
… …
2265 2086
2266void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
2267 2088
2268void update_object (object *op, int action) 2089void update_object (object *op, int action)
2269 2090
2270void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2091void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2271 2092
2272void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
2273 2094
2274int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2275 2096
… …
2281 2102
2282void handle_apply_yield (object *op) 2103void handle_apply_yield (object *op)
2283 2104
2284int convert_item (object *item, object *converter) 2105int convert_item (object *item, object *converter)
2285 2106
2107void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2286 2108
2287MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2109MODULE = cf PACKAGE = cf::object PREFIX = cf_
2288 2110
2289# no clean way to get an object from an archetype - stupid idiotic 2111# no clean way to get an object from an archetype - stupid idiotic
2290# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2112# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2294 CODE: 2116 CODE:
2295 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2117 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2296 OUTPUT: 2118 OUTPUT:
2297 RETVAL 2119 RETVAL
2298 2120
2121object *generate (utf8_string arch, object *creator)
2122 CODE:
2123 object *obj = get_archetype (arch);
2124 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2125 RETVAL = obj;
2126 OUTPUT:
2127 RETVAL
2128
2299object *find_object (U32 tag) 2129object *find_object (U32 tag)
2130
2131object *find_object_uuid (UUID i)
2300 2132
2301# TODO: nuke 2133# TODO: nuke
2302object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2134object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2303 PROTOTYPE: $$$$$$ 2135 PROTOTYPE: $$$$$$
2304 CODE: 2136 CODE:
… …
2327 PROTOTYPE: $$;$ 2159 PROTOTYPE: $$;$
2328 PPCODE: 2160 PPCODE:
2329{ 2161{
2330 rv_vector rv; 2162 rv_vector rv;
2331 2163
2332 PUTBACK;
2333 get_rangevector (ob, other, &rv, flags); 2164 get_rangevector (ob, other, &rv, flags);
2334 SPAGAIN;
2335 2165
2336 EXTEND (SP, 5); 2166 EXTEND (SP, 5);
2337 PUSHs (newSVuv (rv.distance)); 2167 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2338 PUSHs (newSViv (rv.distance_x)); 2168 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2339 PUSHs (newSViv (rv.distance_y)); 2169 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2340 PUSHs (newSViv (rv.direction)); 2170 PUSHs (sv_2mortal (newSViv (rv.direction)));
2341 PUSHs (to_sv (rv.part)); 2171 PUSHs (sv_2mortal (to_sv (rv.part)));
2342} 2172}
2343 2173
2344bool on_same_map_as (object *ob, object *other) 2174bool on_same_map_as (object *ob, object *other)
2345 CODE: 2175 CODE:
2346 RETVAL = on_same_map (ob, other); 2176 RETVAL = on_same_map (ob, other);
… …
2366 RETVAL = op->contr; 2196 RETVAL = op->contr;
2367 OUTPUT: RETVAL 2197 OUTPUT: RETVAL
2368 2198
2369bool move_player (object *op, int dir) 2199bool move_player (object *op, int dir)
2370 2200
2371void check_score (object *op)
2372
2373void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2201void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2374 CODE: 2202 CODE:
2375 new_draw_info (flags, 0, op, txt); 2203 new_draw_info (flags, 0, op, txt);
2376 2204
2377void kill_player (object *op) 2205void kill_player (object *op)
… …
2389int command_arrest (object *op, utf8_string params) 2217int command_arrest (object *op, utf8_string params)
2390 2218
2391 2219
2392MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2220MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2393 2221
2394INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2222INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2395 2223
2396int invoke (player *pl, int event, ...) 2224int invoke (player *pl, int event, ...)
2397 CODE: 2225 CODE:
2398 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2226 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2399 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2227 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2491 if (op->tag) 2319 if (op->tag)
2492 XPUSHs (sv_2mortal (to_sv (op))); 2320 XPUSHs (sv_2mortal (to_sv (op)));
2493 } 2321 }
2494} 2322}
2495 2323
2496INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2324INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2497 2325
2498void 2326void
2499adjust_daylight () 2327adjust_daylight ()
2500 CODE: 2328 CODE:
2501 maptile::adjust_daylight (); 2329 maptile::adjust_daylight ();
… …
2556 2384
2557 if (IN_RANGE_EXC (offs, 0, idxlen)) 2385 if (IN_RANGE_EXC (offs, 0, idxlen))
2558 { 2386 {
2559 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2387 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2560 { 2388 {
2561 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2389 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2562 ob->flag [FLAG_NO_MAP_SAVE] = true; 2390 ob->flag [FLAG_NO_MAP_SAVE] = true;
2563 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2391 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2564 2392
2565 if (ob->randomitems && !ob->above) 2393 if (ob->randomitems && !ob->above)
2566 { 2394 {
… …
2597 2425
2598 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2426 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2599 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2427 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2600 2428
2601 for (int i = av_len ((AV *)palette) + 1; i--; ) 2429 for (int i = av_len ((AV *)palette) + 1; i--; )
2602 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2430 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2603 2431
2604 for (int y = 0; y < THIS->height; ++y) 2432 for (int y = 0; y < THIS->height; ++y)
2605 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2433 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2606 2434
2607 sfree (THIS->regions, THIS->size ()); 2435 sfree (THIS->regions, THIS->size ());
… …
2633 if (oblinkpt *obp = map->find_link (connection)) 2461 if (oblinkpt *obp = map->find_link (connection))
2634 for (objectlink *ol = obp->link; ol; ol = ol->next) 2462 for (objectlink *ol = obp->link; ol; ol = ol->next)
2635 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2463 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2636 2464
2637void 2465void
2638get_map_flags (maptile *map, int x, int y) 2466xy_normalise (maptile *map, int x, int y, int dir = 0)
2639 PPCODE: 2467 PPCODE:
2640{ 2468{
2641 maptile *nmap = 0; 2469 mapxy pos (map, x, y);
2642 I16 nx = 0, ny = 0; 2470 if (!pos.move (dir).normalise ())
2471 XSRETURN_EMPTY;
2643 2472
2644 PUTBACK;
2645 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2646 SPAGAIN;
2647
2648 EXTEND (SP, 4); 2473 EXTEND (SP, 3);
2649 PUSHs (sv_2mortal (newSViv (flags)));
2650
2651 if (GIMME_V == G_ARRAY)
2652 {
2653 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (pos.m)));
2654 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (to_sv (pos.x)));
2655 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (to_sv (pos.y)));
2656 }
2657} 2477}
2658 2478
2659mapspace * 2479mapspace *
2660ms (maptile *map, unsigned int x, unsigned int y) 2480ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2661 PROTOTYPE: $$$ 2481 PROTOTYPE: $$$;$
2662 CODE: 2482 CODE:
2663{ 2483{
2664 maptile *nmap = 0; 2484 mapxy pos (map, x, y);
2665 I16 nx, ny; 2485 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; 2486 XSRETURN_UNDEF;
2673 2487
2674 RETVAL = &nmap->at (nx, ny); 2488 RETVAL = &*pos;
2675} 2489}
2676 OUTPUT: 2490 OUTPUT:
2677 RETVAL 2491 RETVAL
2678 2492
2679void 2493void
2680at (maptile *map, unsigned int x, unsigned int y) 2494at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2681 PROTOTYPE: $$$ 2495 PROTOTYPE: $$$;$
2682 PPCODE: 2496 PPCODE:
2683{ 2497 mapxy pos (map, x, y);
2684 maptile *nmap = 0; 2498 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) 2499 for (object *o = pos->bot; o; o = o->above)
2693 XPUSHs (sv_2mortal (to_sv (o))); 2500 XPUSHs (sv_2mortal (to_sv (o)));
2694}
2695 2501
2696SV * 2502SV *
2697bot_at (maptile *map, unsigned int x, unsigned int y) 2503bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2698 PROTOTYPE: $$$ 2504 PROTOTYPE: $$$;$
2699 ALIAS: 2505 ALIAS:
2700 top_at = 1 2506 top_at = 1
2701 flags_at = 2 2507 flags_at = 2
2702 light_at = 3 2508 light_at = 3
2703 move_block_at = 4 2509 move_block_at = 4
2704 move_slow_at = 5 2510 move_slow_at = 5
2705 move_on_at = 6 2511 move_on_at = 6
2706 move_off_at = 7 2512 move_off_at = 7
2707 CODE: 2513 CODE:
2708{ 2514{
2709 sint16 nx = x; 2515 mapxy pos (map, x, y);
2710 sint16 ny = y; 2516 if (!pos.move (dir).normalise ())
2711
2712 if (!xy_normalise (map, nx, ny))
2713 XSRETURN_UNDEF; 2517 XSRETURN_UNDEF;
2714 2518
2715 mapspace &ms = map->at (nx, ny); 2519 mapspace &ms = *pos;
2716 2520
2717 ms.update (); 2521 ms.update ();
2718 2522
2719 switch (ix) 2523 switch (ix)
2720 { 2524 {
… …
2732 2536
2733# worst xs function of my life 2537# worst xs function of my life
2734bool 2538bool
2735_create_random_map (\ 2539_create_random_map (\
2736 maptile *self,\ 2540 maptile *self,\
2737 utf8_string wallstyle,\ 2541 SV *options,\
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,\ 2542 val64 total_map_hp,\
2768 int map_layout_style,\
2769 int treasureoptions,\
2770 int symmetry_used,\
2771 region *region,\ 2543 region *region\
2772 utf8_string custom\
2773) 2544)
2774 CODE: 2545 CODE:
2775{ 2546{
2776 random_map_params rmp; 2547 random_map_params rmp;
2777 2548
2778 assign (rmp.wallstyle , wallstyle); 2549 rmp.hv = (HV *)SvREFCNT_inc_NN (SvRV (options));
2550
2779 assign (rmp.wall_name , wall_name); 2551 assign (rmp.wall_name , rmp.get_str ("wall_name"));
2780 assign (rmp.floorstyle , floorstyle);
2781 assign (rmp.monsterstyle , monsterstyle); 2552 assign (rmp.monsterstyle , rmp.get_str ("monsterstyle"));
2782 assign (rmp.treasurestyle , treasurestyle);
2783 assign (rmp.layoutstyle , layoutstyle); 2553 assign (rmp.layoutstyle , rmp.get_str ("layoutstyle"));
2784 assign (rmp.doorstyle , doorstyle); 2554 assign (rmp.doorstyle , rmp.get_str ("doorstyle"));
2785 assign (rmp.decorstyle , decorstyle);
2786 assign (rmp.exitstyle , exitstyle);
2787 assign (rmp.exit_on_final_map, exit_on_final_map); 2555 assign (rmp.exit_on_final_map, rmp.get_str ("exit_on_final_map"));
2788 2556
2789 rmp.origin_map = origin_map; 2557 rmp.origin_map = rmp.get_str ("origin_map");
2558 rmp.origin_x = rmp.get_iv ("origin_x");
2559 rmp.origin_y = rmp.get_iv ("origin_y");
2790 rmp.final_map = final_map; 2560 rmp.final_map = rmp.get_str ("final_map");
2791 rmp.this_map = this_map; 2561 rmp.this_map = rmp.get_str ("this_map");
2792 rmp.xsize = xsize; 2562 rmp.xsize = rmp.get_iv ("xsize");
2793 rmp.ysize = ysize; 2563 rmp.ysize = rmp.get_iv ("ysize");
2794 rmp.expand2x = expand2x; 2564 rmp.expand2x = rmp.get_iv ("expand2x");
2795 rmp.layoutoptions1 = layoutoptions1; 2565 rmp.layoutoptions1 = rmp.get_iv ("layoutoptions1");
2796 rmp.layoutoptions2 = layoutoptions2; 2566 rmp.layoutoptions2 = rmp.get_iv ("layoutoptions2");
2797 rmp.layoutoptions3 = layoutoptions3; 2567 rmp.layoutoptions3 = rmp.get_iv ("layoutoptions3");
2798 rmp.symmetry = symmetry; 2568 rmp.symmetry = rmp.get_iv ("symmetry");
2799 rmp.difficulty = difficulty; 2569 rmp.difficulty = rmp.get_iv ("difficulty");
2800 rmp.difficulty_given = difficulty_given; 2570 rmp.difficulty_given = rmp.get_iv ("difficulty_given");
2801 rmp.difficulty_increase = difficulty_increase; 2571 rmp.difficulty_increase = rmp.get_nv ("difficulty_increase");
2802 rmp.dungeon_level = dungeon_level; 2572 rmp.dungeon_level = rmp.get_iv ("dungeon_level");
2803 rmp.dungeon_depth = dungeon_depth; 2573 rmp.dungeon_depth = rmp.get_iv ("dungeon_depth");
2804 rmp.decoroptions = decoroptions;
2805 rmp.orientation = orientation; 2574 rmp.orientation = rmp.get_iv ("orientation");
2806 rmp.origin_y = origin_y;
2807 rmp.origin_x = origin_x;
2808 rmp.random_seed = random_seed; 2575 rmp.random_seed = rmp.get_uv ("random_seed");
2809 rmp.total_map_hp = (uint64_t) total_map_hp; 2576 rmp.total_map_hp = (uint64_t)total_map_hp;
2810 rmp.map_layout_style = map_layout_style; 2577 rmp.map_layout_style = rmp.get_iv ("map_layout_style");
2811 rmp.treasureoptions = treasureoptions;
2812 rmp.symmetry_used = symmetry_used; 2578 rmp.symmetry_used = rmp.get_iv ("symmetry_used");
2813 rmp.region = region; 2579 rmp.region = region;
2814 rmp.custom = custom;
2815 2580
2816 RETVAL = self->generate_random_map (&rmp); 2581 RETVAL = self->generate_random_map (&rmp);
2817} 2582}
2818 OUTPUT: 2583 OUTPUT:
2819 RETVAL 2584 RETVAL
2820 2585
2821MODULE = cf PACKAGE = cf::mapspace 2586MODULE = cf PACKAGE = cf::mapspace
2822 2587
2823INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2588INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2824 2589
2825MODULE = cf PACKAGE = cf::arch 2590MODULE = cf PACKAGE = cf::arch
2826 2591
2827int archetypes_size () 2592int archetypes_size ()
2828 CODE: 2593 CODE:
… …
2832archetype *archetypes (U32 index) 2597archetype *archetypes (U32 index)
2833 CODE: 2598 CODE:
2834 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2599 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2835 OUTPUT: RETVAL 2600 OUTPUT: RETVAL
2836 2601
2837INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2602INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2838 2603
2839MODULE = cf PACKAGE = cf::party 2604MODULE = cf PACKAGE = cf::party
2840 2605
2841partylist *first () 2606partylist *first ()
2842 PROTOTYPE: 2607 PROTOTYPE:
2843 CODE: 2608 CODE:
2844 RETVAL = get_firstparty (); 2609 RETVAL = get_firstparty ();
2845 OUTPUT: RETVAL 2610 OUTPUT: RETVAL
2846 2611
2847INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2612INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2848 2613
2849MODULE = cf PACKAGE = cf::region 2614MODULE = cf PACKAGE = cf::region
2850 2615
2851void 2616void
2852list () 2617list ()
2853 PPCODE: 2618 PPCODE:
2854 for_all_regions (rgn) 2619 for_all_regions (rgn)
2855 XPUSHs (sv_2mortal (to_sv (rgn))); 2620 XPUSHs (sv_2mortal (to_sv (rgn)));
2856 2621
2857region *find (utf8_string name)
2858 PROTOTYPE: $
2859 CODE:
2860 RETVAL = region::find (name);
2861 OUTPUT: RETVAL
2862
2863int specificity (region *rgn) 2622int specificity (region *rgn)
2864 CODE: 2623 CODE:
2865 RETVAL = 0; 2624 RETVAL = 0;
2866 while (rgn = rgn->parent) 2625 while (rgn = rgn->parent)
2867 RETVAL++; 2626 RETVAL++;
2868 OUTPUT: RETVAL 2627 OUTPUT: RETVAL
2869 2628
2870INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2629INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2871 2630
2872MODULE = cf PACKAGE = cf::living 2631MODULE = cf PACKAGE = cf::living
2873 2632
2874INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2633INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2875 2634
2876MODULE = cf PACKAGE = cf::settings 2635MODULE = cf PACKAGE = cf::settings
2877 2636
2878INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2637INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2879 2638
2880MODULE = cf PACKAGE = cf::client 2639MODULE = cf PACKAGE = cf::client
2881 2640
2882INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2641INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2883 2642
2884int invoke (client *ns, int event, ...) 2643int invoke (client *ns, int event, ...)
2885 CODE: 2644 CODE:
2886 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2645 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2887 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2646 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2953 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2712 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2954 old_sound_index [idx] = face; 2713 old_sound_index [idx] = face;
2955 2714
2956MODULE = cf PACKAGE = cf::face PREFIX = face_ 2715MODULE = cf PACKAGE = cf::face PREFIX = face_
2957 2716
2958#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2717#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2959 2718
2960faceidx face_find (utf8_string name, faceidx defidx = 0) 2719faceidx face_find (utf8_string name, faceidx defidx = 0)
2961 2720
2962faceidx alloc (utf8_string name) 2721faceidx alloc (utf8_string name)
2963 CODE: 2722 CODE:
… …
2970 while (!RETVAL); // crude way to leave index 0 2729 while (!RETVAL); // crude way to leave index 0
2971 2730
2972 faces [RETVAL].name = name; 2731 faces [RETVAL].name = name;
2973 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2732 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2974 2733
2975 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2734 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2976 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2735 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2736 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2977} 2737}
2978 OUTPUT: RETVAL 2738 OUTPUT: RETVAL
2979 2739
2980void set_type (faceidx idx, int value) 2740void set_type (faceidx idx, int value)
2981 ALIAS: 2741 ALIAS:
… …
3003 sv_to (data, d->data); 2763 sv_to (data, d->data);
3004 STRLEN clen; 2764 STRLEN clen;
3005 char *cdata = SvPVbyte (chksum, clen); 2765 char *cdata = SvPVbyte (chksum, clen);
3006 clen = min (CHKSUM_MAXLEN, clen); 2766 clen = min (CHKSUM_MAXLEN, clen);
3007 2767
2768 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2769
3008 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen)) 2770 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
3009 { 2771 {
3010 d->chksum_len = clen; 2772 d->chksum_len = clen;
3011 memcpy (d->chksum, cdata, clen); 2773 memcpy (d->chksum, cdata, clen);
3012 2774
… …
3060 ns->force_newmap = true; 2822 ns->force_newmap = true;
3061 } 2823 }
3062 2824
3063MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2825MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3064 2826
3065#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2827#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3066 2828
3067animidx anim_find (utf8_string name) 2829animidx anim_find (utf8_string name)
3068 CODE: 2830 CODE:
3069 RETVAL = animation::find (name).number; 2831 RETVAL = animation::find (name).number;
3070 OUTPUT: RETVAL 2832 OUTPUT: RETVAL
… …
3085 } 2847 }
3086 else 2848 else
3087 anim = &animation::create (name, av_len (av) + 1, facings); 2849 anim = &animation::create (name, av_len (av) + 1, facings);
3088 2850
3089 for (int i = 0; i < anim->num_animations; ++i) 2851 for (int i = 0; i < anim->num_animations; ++i)
3090 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2852 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3091} 2853}
3092 OUTPUT: RETVAL 2854 OUTPUT: RETVAL
3093 2855
3094void invalidate_all () 2856void invalidate_all ()
3095 CODE: 2857 CODE:
3096 for_all_clients (ns) 2858 for_all_clients (ns)
3097 ns->anims_sent.reset (); 2859 ns->anims_sent.reset ();
3098 2860
3099MODULE = cf PACKAGE = cf::object::freezer 2861MODULE = cf PACKAGE = cf::object::freezer
3100 2862
3101INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2863INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3102 2864
3103SV * 2865SV *
3104new (char *klass) 2866new (char *klass)
3105 CODE: 2867 CODE:
3106 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2868 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3113 sv_to (sv, self); 2875 sv_to (sv, self);
3114 delete self; 2876 delete self;
3115 2877
3116MODULE = cf PACKAGE = cf::object::thawer 2878MODULE = cf PACKAGE = cf::object::thawer
3117 2879
3118INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2880INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2881
2882bool
2883errors_are_fatal (bool fatal)
2884 CODE:
2885 RETVAL = object_thawer::errors_are_fatal;
2886 object_thawer::errors_are_fatal = fatal;
2887 OUTPUT:
2888 RETVAL
3119 2889
3120SV * 2890SV *
3121new_from_file (char *klass, octet_string path) 2891new_from_file (char *klass, octet_string path)
3122 CODE: 2892 CODE:
3123 object_thawer *f = new object_thawer (path); 2893 object_thawer *f = new object_thawer (path);

Diff Legend

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