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.341 by root, Sun Nov 29 17:41:08 2009 UTC vs.
Revision 1.384 by root, Fri Apr 30 21:00:40 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
127static noinline 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; 359 SV *sv;
340 360
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 *
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{
… …
402 hv_clear ((HV *)sv); 428 hv_clear ((HV *)sv);
403 sv_unmagic (sv, PERL_MAGIC_ext); 429 sv_unmagic (sv, PERL_MAGIC_ext);
404} 430}
405#endif 431#endif
406 432
407static long SvPTR_nc (SV *sv) 433static long
434SvPTR_nc (SV *sv)
408{ 435{
409 sv = SvRV (sv); 436 sv = SvRV (sv);
410 437
411 // very important shortcut 438 // very important shortcut
412 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext)) 439 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
… …
457 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap 484 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
458 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap 485 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
459 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap 486 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
460 && !sv_derived_from (sv, "cf::object"))) 487 && !sv_derived_from (sv, "cf::object")))
461 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");
462 503
463 return SvPTR_nc (sv); 504 return SvPTR_nc (sv);
464} 505}
465 506
466static long noinline 507static long noinline
… …
528 SV *sv = to_sv (static_cast<dynbuf *> (v)); 569 SV *sv = to_sv (static_cast<dynbuf *> (v));
529 SvUTF8_on (sv); 570 SvUTF8_on (sv);
530 return sv; 571 return sv;
531} 572}
532 573
533static 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; }
534static 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; }
535static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 576static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
536static 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); }
537static 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); }
538static 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); }
… …
543static 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); }
544static 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); }
545static 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); }
546static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 587static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
547static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 588static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
548static 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); }
549static 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); }
550static 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); }
551static 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"); }
552static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
553static 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"); }
554static 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"); }
555static 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"); }
556static 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"); }
557static 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"); }
… …
673template<class type> 714template<class type>
674static void noinline 715static void noinline
675cf_obj_to (SV *arg, type &var) 716cf_obj_to (SV *arg, type &var)
676{ 717{
677 sv_to (arg, var); 718 sv_to (arg, var);
678 if (!var) 719 if (expect_false (!var))
679 croak ("must not pass invalid/null cf_obj here"); 720 croak ("must not pass invalid/null cf_obj here");
680} 721}
681 722
682template<class object> 723template<class object>
683static void noinline 724static void noinline
684cf_obj_ornull_to (SV *arg, object *&var) 725cf_obj_ornull_to (SV *arg, object *&var)
685{ 726{
686 if (SvOK (arg)) 727 if (SvOK (arg))
687 { 728 {
688 sv_to (arg, var); 729 sv_to (arg, var);
689 if (!var) 730 if (expect_false (!var))
690 croak ("unable to convert perl object to C++ object"); 731 croak ("unable to convert perl object to C++ object");
691 } 732 }
692 else 733 else
693 var = 0; 734 var = 0;
694} 735}
… …
729 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
730 } 771 }
731 772
732 eval_pv ( 773 eval_pv (
733 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
734 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
735 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
736 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
737 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
738 "require cf;\n", 779 "require cf;\n",
739 0 780 0
740 ); 781 );
741 782
742 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
… …
1063 CALL_CALL ("ext::books::make_book", G_VOID); 1104 CALL_CALL ("ext::books::make_book", G_VOID);
1064 CALL_END; 1105 CALL_END;
1065} 1106}
1066 1107
1067void 1108void
1068cfperl_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)
1069{ 1110{
1070 CALL_BEGIN (4); 1111 CALL_BEGIN (4);
1071 CALL_ARG (ns); 1112 CALL_ARG (ns);
1072 CALL_ARG (type); 1113 CALL_ARG (type);
1073 CALL_ARG_SV (newSVpv_utf8 (msg)); 1114 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1102 CALL_CALL ("cf::mapscript::activate", G_VOID); 1143 CALL_CALL ("cf::mapscript::activate", G_VOID);
1103 CALL_END; 1144 CALL_END;
1104} 1145}
1105 1146
1106player * 1147player *
1107player::find (const char *name) 1148player::find (const_utf8_string name)
1108{ 1149{
1109 CALL_BEGIN (1); 1150 CALL_BEGIN (1);
1110 CALL_ARG (name); 1151 CALL_ARG (name);
1111 CALL_CALL ("cf::player::find", G_SCALAR); 1152 CALL_CALL ("cf::player::find", G_SCALAR);
1112 1153
… …
1117 1158
1118 return retval; 1159 return retval;
1119} 1160}
1120 1161
1121maptile * 1162maptile *
1122find_style (const char *dirname, const char *stylename, int difficulty) 1163find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1123{ 1164{
1124 CALL_BEGIN (3); 1165 CALL_BEGIN (4);
1125 CALL_ARG (dirname); 1166 CALL_ARG (dirname);
1126 CALL_ARG (stylename); 1167 CALL_ARG (stylename);
1127 CALL_ARG (difficulty); 1168 CALL_ARG (difficulty);
1169 CALL_ARG (recurse);
1128 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1170 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1129 1171
1130 maptile *retval = 0; 1172 maptile *retval = 0;
1131 if (count) sv_to (POPs, retval); 1173 if (count) sv_to (POPs, retval);
1132 1174
… …
1134 1176
1135 return retval; 1177 return retval;
1136} 1178}
1137 1179
1138maptile * 1180maptile *
1139maptile::find_sync (const char *path, maptile *origin) 1181maptile::find_sync (const_utf8_string path, maptile *origin)
1140{ 1182{
1141 CALL_BEGIN (2); 1183 CALL_BEGIN (2);
1142 CALL_ARG (path); 1184 CALL_ARG (path);
1143 CALL_ARG (origin); 1185 CALL_ARG (origin);
1144 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1186 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1150 1192
1151 return retval; 1193 return retval;
1152} 1194}
1153 1195
1154maptile * 1196maptile *
1155maptile::find_async (const char *path, maptile *origin, bool load) 1197maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1156{ 1198{
1157 CALL_BEGIN (3); 1199 CALL_BEGIN (3);
1158 CALL_ARG (path); 1200 CALL_ARG (path);
1159 CALL_ARG (origin); 1201 CALL_ARG (origin);
1160 CALL_ARG (load); 1202 CALL_ARG (load);
… …
1189 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1231 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1190 CALL_END; 1232 CALL_END;
1191} 1233}
1192 1234
1193void 1235void
1194object::player_goto (const char *path, int x, int y) 1236object::player_goto (const_utf8_string path, int x, int y)
1195{ 1237{
1196 if (type != PLAYER) 1238 if (type != PLAYER)
1197 return; 1239 return;
1198 1240
1199 CALL_BEGIN (4); 1241 CALL_BEGIN (4);
… …
1203 CALL_ARG (y); 1245 CALL_ARG (y);
1204 CALL_CALL ("cf::object::player::goto", G_VOID); 1246 CALL_CALL ("cf::object::player::goto", G_VOID);
1205 CALL_END; 1247 CALL_END;
1206} 1248}
1207 1249
1208const char * 1250const_utf8_string
1209object::ref () const 1251object::ref () const
1210{ 1252{
1211 if (type == PLAYER) 1253 if (type == PLAYER)
1212 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);
1213 else 1255 else
1256 // TODO: should be able to save references within the same map, at least
1214 return 0; 1257 return 0;
1215} 1258}
1216 1259
1217object * 1260object *
1218object::deref (const char *ref) 1261object::deref (const_utf8_string ref)
1219{ 1262{
1220 object *retval = 0; 1263 object *retval = 0;
1221 1264
1222 if (ref) 1265 if (ref)
1223 { 1266 {
… …
1233 1276
1234 return retval; 1277 return retval;
1235} 1278}
1236 1279
1237void 1280void
1238log_backtrace (const char *msg) 1281log_backtrace (const_utf8_string msg)
1239{ 1282{
1240#if HAVE_BACKTRACE 1283#if HAVE_BACKTRACE
1241 void *addr [20]; 1284 void *addr [20];
1242 int size = backtrace (addr, 20); 1285 int size = backtrace (addr, 20);
1243 1286
… …
1249 CALL_END; 1292 CALL_END;
1250#endif 1293#endif
1251} 1294}
1252 1295
1253bool 1296bool
1254is_match_expr (const char *expr) 1297is_match_expr (const_utf8_string expr)
1255{ 1298{
1256 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1299 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1257} 1300}
1258 1301
1259bool 1302bool
1260match (const char *expr, object *ob, object *self, object *source, object *originator) 1303match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1261{ 1304{
1262 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1305 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1263 expr += sizeof ("match ") - 1; 1306 expr += sizeof ("match ") - 1;
1264 1307
1265 CALL_BEGIN (5); 1308 CALL_BEGIN (5);
… …
1276 1319
1277 return matched; 1320 return matched;
1278} 1321}
1279 1322
1280object * 1323object *
1281match_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)
1282{ 1325{
1283 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1326 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1284 expr += sizeof ("match ") - 1; 1327 expr += sizeof ("match ") - 1;
1285 1328
1286 CALL_BEGIN (5); 1329 CALL_BEGIN (5);
… …
1354 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1397 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1355 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1398 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1356 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1399 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1357 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1400 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1358 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);
1359 1403
1360 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);
1361 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);
1362 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);
1363 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);
… …
1404 static const struct { 1448 static const struct {
1405 const char *name; 1449 const char *name;
1406 IV iv; 1450 IV iv;
1407 } *civ, const_iv[] = { 1451 } *civ, const_iv[] = {
1408# define const_iv(name) { # name, (IV)name }, 1452# define const_iv(name) { # name, (IV)name },
1409 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1453# include "const_iv.h"
1410 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
1411 1460
1412 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1413 1462
1414 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1415 1464
1416 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
1417 const_iv (MAXSOCKBUF) 1466 const_iv (MAXSOCKBUF)
1418 1467
1419 const_iv (NUM_BODY_LOCATIONS)
1420 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1421 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1422 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1423 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1424 const_iv (body_wrist) const_iv (body_waist)
1425
1426 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1427 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1428 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1429 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1430 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1431 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1432 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1433 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1434 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1435 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1436 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1437 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1438 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1439 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1440 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1441 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1442 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1443 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1444 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1445 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1446 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1447 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1448 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1449 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1450 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1451 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1452 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1453 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1454 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1455
1456 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1457
1458 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1459 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1460
1461 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1462 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1463 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1464 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1465 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1466 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1467 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1468
1469 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1470 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1471 const_iv (WEAP_BLUD)
1472
1473 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1474 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1475 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1476 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1477 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1478 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1479 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1480 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1481 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1482 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1483 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1484 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1485 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1486 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1487 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1488 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1489 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1490 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1491 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1492 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1493 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1494 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1495 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1496 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1497 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1498 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1499
1500 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1501 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1502 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1503 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1504 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1505 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1506
1507 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)
1508 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)
1509 1470
1510 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)
1511
1512 const_iv (SP_RAISE_DEAD)
1513 const_iv (SP_RUNE)
1514 const_iv (SP_MAKE_MARK)
1515 const_iv (SP_BOLT)
1516 const_iv (SP_BULLET)
1517 const_iv (SP_EXPLOSION)
1518 const_iv (SP_CONE)
1519 const_iv (SP_BOMB)
1520 const_iv (SP_WONDER)
1521 const_iv (SP_SMITE)
1522 const_iv (SP_MAGIC_MISSILE)
1523 const_iv (SP_SUMMON_GOLEM)
1524 const_iv (SP_DIMENSION_DOOR)
1525 const_iv (SP_MAGIC_MAPPING)
1526 const_iv (SP_MAGIC_WALL)
1527 const_iv (SP_DESTRUCTION)
1528 const_iv (SP_PERCEIVE_SELF)
1529 const_iv (SP_WORD_OF_RECALL)
1530 const_iv (SP_INVISIBLE)
1531 const_iv (SP_PROBE)
1532 const_iv (SP_HEALING)
1533 const_iv (SP_CREATE_FOOD)
1534 const_iv (SP_EARTH_TO_DUST)
1535 const_iv (SP_CHANGE_ABILITY)
1536 const_iv (SP_BLESS)
1537 const_iv (SP_CURSE)
1538 const_iv (SP_SUMMON_MONSTER)
1539 const_iv (SP_CHARGING)
1540 const_iv (SP_POLYMORPH)
1541 const_iv (SP_ALCHEMY)
1542 const_iv (SP_REMOVE_CURSE)
1543 const_iv (SP_IDENTIFY)
1544 const_iv (SP_DETECTION)
1545 const_iv (SP_MOOD_CHANGE)
1546 const_iv (SP_MOVING_BALL)
1547 const_iv (SP_SWARM)
1548 const_iv (SP_CHANGE_MANA)
1549 const_iv (SP_DISPEL_RUNE)
1550 const_iv (SP_CREATE_MISSILE)
1551 const_iv (SP_CONSECRATE)
1552 const_iv (SP_ANIMATE_WEAPON)
1553 const_iv (SP_LIGHT)
1554 const_iv (SP_CHANGE_MAP_LIGHT)
1555 const_iv (SP_FAERY_FIRE)
1556 const_iv (SP_CAUSE_DISEASE)
1557 const_iv (SP_AURA)
1558 const_iv (SP_TOWN_PORTAL)
1559 const_iv (SP_PARTY_SPELL)
1560 1472
1561 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)
1562 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)
1563 const_iv (F_LOCKED) 1475 const_iv (F_LOCKED)
1564 1476
1565 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1566
1567 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)
1568 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)
1569 1479
1570 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1571
1572 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1573 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1574
1575 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1576 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1577
1578 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1480 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1579
1580 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1581 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1582 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1583 const_iv (M_ICE) const_iv (M_SPECIAL)
1584 1481
1585 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)
1586 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)
1587 1484
1588 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1589 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1590 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1591 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1592 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1593 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1594 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1595 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1596 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1597 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1598 const_iv (SK_POISON_NAIL)
1599
1600 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1601 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1602 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1603 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1604 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1605 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1606
1607 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1608
1609 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1610 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1611 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1612 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1613 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1614 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1615 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1616
1617 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)
1618 const_iv (MAP_INACTIVE) 1486 const_iv (MAP_INACTIVE)
1619 1487
1620 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)
1621 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)
1622 1490
1623 const_iv (VERSION_CS) const_iv (VERSION_SC)
1624
1625 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)
1626 1492
1627 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1628
1629 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)
1630
1631 // random map generator
1632 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1633 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1634
1635 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1636 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1637 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1638
1639 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1640 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1641
1642 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1643 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1644
1645 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1646 const_iv (FT_RSRC) const_iv (FT_NUM)
1647 }; 1494 };
1648 1495
1649 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; )
1650 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1651 1498
1652 static const struct { 1499 static const struct {
1653 const char *name; 1500 const char *name;
1654 int skip; 1501 int skip;
… …
1660# undef def 1507# undef def
1661 }; 1508 };
1662 1509
1663 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1664 1511
1665 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; )
1666 { 1513 {
1667 AV *event = newAV (); 1514 AV *event = newAV ();
1668 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1669 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1670 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1767 CODE: 1614 CODE:
1768 UUID::init (); 1615 UUID::init ();
1769 1616
1770void init_signals () 1617void init_signals ()
1771 1618
1772void init_commands ()
1773
1774void init_skills () 1619void init_skills ()
1775 1620
1776void init_beforeplay () 1621void init_beforeplay ()
1777 1622
1778void evthread_start (int aiofd) 1623void evthread_start (int aiofd)
… …
1807 } 1652 }
1808 1653
1809void server_tick () 1654void server_tick ()
1810 CODE: 1655 CODE:
1811{ 1656{
1657 ev_now_update (EV_DEFAULT);
1812 NOW = ev_now (EV_DEFAULT); 1658 NOW = ev_now (EV_DEFAULT);
1813 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1659 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1814 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1660 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1815 runtime = SvNVX (sv_runtime); 1661 runtime = SvNVX (sv_runtime);
1816 1662
1817 server_tick (); 1663 server_tick ();
1818 1664
1819 NOW = ev_time (); 1665 ev_now_update (EV_DEFAULT);
1666 NOW = ev_now (EV_DEFAULT);
1820 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1667 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1821 runtime += TICK; 1668 runtime += TICK;
1822 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1669 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1823} 1670}
1824 1671
… …
1835 switch (items) 1682 switch (items)
1836 { 1683 {
1837 case 0: RETVAL = gen (); break; 1684 case 0: RETVAL = gen (); break;
1838 case 1: RETVAL = gen (SvUV (ST (0))); break; 1685 case 1: RETVAL = gen (SvUV (ST (0))); break;
1839 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1686 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1840 default: croak ("cf::rndm requires none, one or two parameters."); break; 1687 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1841 } 1688 }
1842} 1689}
1843 OUTPUT: 1690 OUTPUT:
1844 RETVAL 1691 RETVAL
1845 1692
… …
1852NV 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)
1853 CODE: 1700 CODE:
1854 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1701 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1855 OUTPUT: 1702 OUTPUT:
1856 RETVAL 1703 RETVAL
1704
1705const char *ordinal (int i)
1857 1706
1858void weaken (...) 1707void weaken (...)
1859 PROTOTYPE: @ 1708 PROTOTYPE: @
1860 CODE: 1709 CODE:
1861 while (items > 0) 1710 while (items > 0)
1862 sv_rvweaken (ST (--items)); 1711 sv_rvweaken (ST (--items));
1863 1712
1864void 1713void log_suspend ()
1714
1715void log_resume ()
1716
1865log_backtrace (utf8_string msg) 1717void log_backtrace (utf8_string msg)
1866 1718
1867void
1868LOG (int flags, utf8_string msg) 1719void LOG (int flags, utf8_string msg)
1869 PROTOTYPE: $$ 1720 PROTOTYPE: $$
1870 C_ARGS: flags, "%s", msg 1721 C_ARGS: flags, "%s", msg
1871 1722
1872octet_string path_combine (octet_string base, octet_string path) 1723octet_string path_combine (octet_string base, octet_string path)
1873 PROTOTYPE: $$ 1724 PROTOTYPE: $$
… …
1965 1816
1966int random_roll (int min, int max, object *op, int goodbad); 1817int random_roll (int min, int max, object *op, int goodbad);
1967 1818
1968const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1819const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1969 1820
1970int
1971exp_to_level (val64 exp) 1821int exp_to_level (val64 exp)
1972 CODE:
1973{
1974 int i = 0;
1975 1822
1976 RETVAL = settings.max_level;
1977
1978 for (i = 1; i <= settings.max_level; i++)
1979 {
1980 if (levels[i] > exp)
1981 {
1982 RETVAL = i - 1;
1983 break;
1984 }
1985 }
1986}
1987 OUTPUT: RETVAL
1988
1989val64
1990level_to_min_exp (int level) 1823val64 level_to_min_exp (int level)
1991 CODE:
1992 if (level > settings.max_level)
1993 RETVAL = levels[settings.max_level];
1994 else if (level < 1)
1995 RETVAL = 0;
1996 else
1997 RETVAL = levels[level];
1998 OUTPUT: RETVAL
1999 1824
2000SV * 1825SV *
2001resistance_to_string (int atnr) 1826resistance_to_string (int atnr)
2002 CODE: 1827 CODE:
2003 if (atnr >= 0 && atnr < NROFATTACKS) 1828 if (atnr >= 0 && atnr < NROFATTACKS)
… …
2061 CODE: 1886 CODE:
2062 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1887 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
2063 OUTPUT: 1888 OUTPUT:
2064 RETVAL 1889 RETVAL
2065 1890
1891bool should_invoke (attachable *obj, int event)
1892 CODE:
1893 RETVAL = obj->should_invoke ((event_type)event);
1894 OUTPUT: RETVAL
1895
2066void 1896void
2067debug_trace (attachable *obj, bool on = true) 1897debug_trace (attachable *obj, bool on = true)
2068 CODE: 1898 CODE:
2069 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1899 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2070 if (on) 1900 if (on)
… …
2078#object *mortals (U32 index) 1908#object *mortals (U32 index)
2079# CODE: 1909# CODE:
2080# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1910# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2081# OUTPUT: RETVAL 1911# OUTPUT: RETVAL
2082 1912
2083INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1913INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2084 1914
2085MODULE = cf PACKAGE = cf::global 1915MODULE = cf PACKAGE = cf::global
2086 1916
2087int invoke (SV *klass, int event, ...) 1917int invoke (SV *klass, int event, ...)
2088 CODE: 1918 CODE:
… …
2092 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);
2093 OUTPUT: RETVAL 1923 OUTPUT: RETVAL
2094 1924
2095MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1925MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2096 1926
2097INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1927INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2098 1928
2099int invoke (object *op, int event, ...) 1929int invoke (object *op, int event, ...)
2100 CODE: 1930 CODE:
2101 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");
2102 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1932 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2129int mortals_size () 1959int mortals_size ()
2130 CODE: 1960 CODE:
2131 RETVAL = attachable::mortals.size (); 1961 RETVAL = attachable::mortals.size ();
2132 OUTPUT: RETVAL 1962 OUTPUT: RETVAL
2133 1963
2134const char *slot_use_name (U32 slot) 1964const_utf8_string slot_use_name (U32 slot)
2135 ALIAS: 1965 ALIAS:
2136 slot_nonuse_name = 1 1966 slot_nonuse_name = 1
2137 CODE: 1967 CODE:
2138{ 1968{
2139 if (slot >= NUM_BODY_LOCATIONS) 1969 if (slot >= NUM_BODY_LOCATIONS)
… …
2195 OUTPUT: 2025 OUTPUT:
2196 RETVAL 2026 RETVAL
2197 2027
2198object *find_best_object_match (object *op, utf8_string match) 2028object *find_best_object_match (object *op, utf8_string match)
2199 2029
2200object *find_marked_object (object *op)
2201
2202int need_identify (object *obj);
2203
2204int apply_shop_mat (object *shop_mat, object *op); 2030int apply_shop_mat (object *shop_mat, object *op);
2205 2031
2206int move (object *op, int dir, object *originator = op) 2032int move (object *op, int dir, object *originator = op)
2207 CODE: 2033 CODE:
2208 RETVAL = move_ob (op, dir, originator); 2034 RETVAL = op->move (dir, originator);
2209 OUTPUT: 2035 OUTPUT:
2210 RETVAL 2036 RETVAL
2211 2037
2212void apply (object *applier, object *applied, int flags = 0)
2213 CODE:
2214 manual_apply (applied, applier, flags);
2215
2216void apply_below (object *op) 2038void apply_below (object *op)
2217 CODE: 2039 CODE:
2218 player_apply_below (op); 2040 player_apply_below (op);
2219 2041
2220int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2042int cast_heal (object *op, object *caster, object *spell, int dir = 0)
… …
2264 2086
2265void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
2266 2088
2267void update_object (object *op, int action) 2089void update_object (object *op, int action)
2268 2090
2269void 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)
2270 2092
2271void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
2272 2094
2273int 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)
2274 2096
… …
2280 2102
2281void handle_apply_yield (object *op) 2103void handle_apply_yield (object *op)
2282 2104
2283int convert_item (object *item, object *converter) 2105int convert_item (object *item, object *converter)
2284 2106
2107void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2285 2108
2286MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2109MODULE = cf PACKAGE = cf::object PREFIX = cf_
2287 2110
2288# 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
2289# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2112# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2293 CODE: 2116 CODE:
2294 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2117 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2295 OUTPUT: 2118 OUTPUT:
2296 RETVAL 2119 RETVAL
2297 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
2298object *find_object (U32 tag) 2129object *find_object (U32 tag)
2130
2131object *find_object_uuid (UUID i)
2299 2132
2300# TODO: nuke 2133# TODO: nuke
2301object *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)
2302 PROTOTYPE: $$$$$$ 2135 PROTOTYPE: $$$$$$
2303 CODE: 2136 CODE:
… …
2326 PROTOTYPE: $$;$ 2159 PROTOTYPE: $$;$
2327 PPCODE: 2160 PPCODE:
2328{ 2161{
2329 rv_vector rv; 2162 rv_vector rv;
2330 2163
2331 PUTBACK;
2332 get_rangevector (ob, other, &rv, flags); 2164 get_rangevector (ob, other, &rv, flags);
2333 SPAGAIN;
2334 2165
2335 EXTEND (SP, 5); 2166 EXTEND (SP, 5);
2336 PUSHs (newSVuv (rv.distance)); 2167 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2337 PUSHs (newSViv (rv.distance_x)); 2168 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2338 PUSHs (newSViv (rv.distance_y)); 2169 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2339 PUSHs (newSViv (rv.direction)); 2170 PUSHs (sv_2mortal (newSViv (rv.direction)));
2340 PUSHs (to_sv (rv.part)); 2171 PUSHs (sv_2mortal (to_sv (rv.part)));
2341} 2172}
2342 2173
2343bool on_same_map_as (object *ob, object *other) 2174bool on_same_map_as (object *ob, object *other)
2344 CODE: 2175 CODE:
2345 RETVAL = on_same_map (ob, other); 2176 RETVAL = on_same_map (ob, other);
… …
2365 RETVAL = op->contr; 2196 RETVAL = op->contr;
2366 OUTPUT: RETVAL 2197 OUTPUT: RETVAL
2367 2198
2368bool move_player (object *op, int dir) 2199bool move_player (object *op, int dir)
2369 2200
2370void check_score (object *op)
2371
2372void 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)
2373 CODE: 2202 CODE:
2374 new_draw_info (flags, 0, op, txt); 2203 new_draw_info (flags, 0, op, txt);
2375 2204
2376void kill_player (object *op) 2205void kill_player (object *op)
… …
2388int command_arrest (object *op, utf8_string params) 2217int command_arrest (object *op, utf8_string params)
2389 2218
2390 2219
2391MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2220MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2392 2221
2393INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2222INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2394 2223
2395int invoke (player *pl, int event, ...) 2224int invoke (player *pl, int event, ...)
2396 CODE: 2225 CODE:
2397 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");
2398 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2227 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2490 if (op->tag) 2319 if (op->tag)
2491 XPUSHs (sv_2mortal (to_sv (op))); 2320 XPUSHs (sv_2mortal (to_sv (op)));
2492 } 2321 }
2493} 2322}
2494 2323
2495INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2324INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2496 2325
2497void 2326void
2498adjust_daylight () 2327adjust_daylight ()
2499 CODE: 2328 CODE:
2500 maptile::adjust_daylight (); 2329 maptile::adjust_daylight ();
… …
2555 2384
2556 if (IN_RANGE_EXC (offs, 0, idxlen)) 2385 if (IN_RANGE_EXC (offs, 0, idxlen))
2557 { 2386 {
2558 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2387 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2559 { 2388 {
2560 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2389 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2561 ob->flag [FLAG_NO_MAP_SAVE] = true; 2390 ob->flag [FLAG_NO_MAP_SAVE] = true;
2562 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2391 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2563 2392
2564 if (ob->randomitems && !ob->above) 2393 if (ob->randomitems && !ob->above)
2565 { 2394 {
… …
2596 2425
2597 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2426 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2598 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2427 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2599 2428
2600 for (int i = av_len ((AV *)palette) + 1; i--; ) 2429 for (int i = av_len ((AV *)palette) + 1; i--; )
2601 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)));
2602 2431
2603 for (int y = 0; y < THIS->height; ++y) 2432 for (int y = 0; y < THIS->height; ++y)
2604 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2433 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2605 2434
2606 sfree (THIS->regions, THIS->size ()); 2435 sfree (THIS->regions, THIS->size ());
… …
2632 if (oblinkpt *obp = map->find_link (connection)) 2461 if (oblinkpt *obp = map->find_link (connection))
2633 for (objectlink *ol = obp->link; ol; ol = ol->next) 2462 for (objectlink *ol = obp->link; ol; ol = ol->next)
2634 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2463 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2635 2464
2636void 2465void
2637get_map_flags (maptile *map, int x, int y) 2466xy_normalise (maptile *map, int x, int y, int dir = 0)
2638 PPCODE: 2467 PPCODE:
2639{ 2468{
2640 maptile *nmap = 0; 2469 mapxy pos (map, x, y);
2641 I16 nx = 0, ny = 0; 2470 if (!pos.move (dir).normalise ())
2471 XSRETURN_EMPTY;
2642 2472
2643 PUTBACK;
2644 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2645 SPAGAIN;
2646
2647 EXTEND (SP, 4); 2473 EXTEND (SP, 3);
2648 PUSHs (sv_2mortal (newSViv (flags)));
2649
2650 if (GIMME_V == G_ARRAY)
2651 {
2652 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (pos.m)));
2653 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (to_sv (pos.x)));
2654 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (to_sv (pos.y)));
2655 }
2656} 2477}
2657 2478
2658mapspace * 2479mapspace *
2659ms (maptile *map, unsigned int x, unsigned int y) 2480ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2660 PROTOTYPE: $$$ 2481 PROTOTYPE: $$$;$
2661 CODE: 2482 CODE:
2662{ 2483{
2663 maptile *nmap = 0; 2484 mapxy pos (map, x, y);
2664 I16 nx, ny; 2485 if (!pos.move (dir).normalise ())
2665
2666 PUTBACK;
2667 get_map_flags (map, &nmap, x, y, &nx, &ny);
2668 SPAGAIN;
2669
2670 if (!nmap)
2671 XSRETURN_UNDEF; 2486 XSRETURN_UNDEF;
2672 2487
2673 RETVAL = &nmap->at (nx, ny); 2488 RETVAL = &*pos;
2674} 2489}
2675 OUTPUT: 2490 OUTPUT:
2676 RETVAL 2491 RETVAL
2677 2492
2678void 2493void
2679at (maptile *map, unsigned int x, unsigned int y) 2494at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2680 PROTOTYPE: $$$ 2495 PROTOTYPE: $$$;$
2681 PPCODE: 2496 PPCODE:
2682{ 2497 mapxy pos (map, x, y);
2683 maptile *nmap = 0; 2498 if (pos.move (dir).normalise ())
2684 I16 nx, ny;
2685
2686 PUTBACK;
2687 get_map_flags (map, &nmap, x, y, &nx, &ny);
2688 SPAGAIN;
2689
2690 if (nmap)
2691 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2499 for (object *o = pos->bot; o; o = o->above)
2692 XPUSHs (sv_2mortal (to_sv (o))); 2500 XPUSHs (sv_2mortal (to_sv (o)));
2693}
2694 2501
2695SV * 2502SV *
2696bot_at (maptile *map, unsigned int x, unsigned int y) 2503bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2697 PROTOTYPE: $$$ 2504 PROTOTYPE: $$$;$
2698 ALIAS: 2505 ALIAS:
2699 top_at = 1 2506 top_at = 1
2700 flags_at = 2 2507 flags_at = 2
2701 light_at = 3 2508 light_at = 3
2702 move_block_at = 4 2509 move_block_at = 4
2703 move_slow_at = 5 2510 move_slow_at = 5
2704 move_on_at = 6 2511 move_on_at = 6
2705 move_off_at = 7 2512 move_off_at = 7
2706 CODE: 2513 CODE:
2707{ 2514{
2708 sint16 nx = x; 2515 mapxy pos (map, x, y);
2709 sint16 ny = y; 2516 if (!pos.move (dir).normalise ())
2710
2711 if (!xy_normalise (map, nx, ny))
2712 XSRETURN_UNDEF; 2517 XSRETURN_UNDEF;
2713 2518
2714 mapspace &ms = map->at (nx, ny); 2519 mapspace &ms = *pos;
2715 2520
2716 ms.update (); 2521 ms.update ();
2717 2522
2718 switch (ix) 2523 switch (ix)
2719 { 2524 {
… …
2739 utf8_string monsterstyle,\ 2544 utf8_string monsterstyle,\
2740 utf8_string treasurestyle,\ 2545 utf8_string treasurestyle,\
2741 utf8_string layoutstyle,\ 2546 utf8_string layoutstyle,\
2742 utf8_string doorstyle,\ 2547 utf8_string doorstyle,\
2743 utf8_string decorstyle,\ 2548 utf8_string decorstyle,\
2549 utf8_string miningstyle,\
2744 utf8_string origin_map,\ 2550 utf8_string origin_map,\
2745 utf8_string final_map,\ 2551 utf8_string final_map,\
2746 utf8_string exitstyle,\ 2552 utf8_string exitstyle,\
2747 utf8_string this_map,\ 2553 utf8_string this_map,\
2748 utf8_string exit_on_final_map,\ 2554 utf8_string exit_on_final_map,\
… …
2780 assign (rmp.monsterstyle , monsterstyle); 2586 assign (rmp.monsterstyle , monsterstyle);
2781 assign (rmp.treasurestyle , treasurestyle); 2587 assign (rmp.treasurestyle , treasurestyle);
2782 assign (rmp.layoutstyle , layoutstyle); 2588 assign (rmp.layoutstyle , layoutstyle);
2783 assign (rmp.doorstyle , doorstyle); 2589 assign (rmp.doorstyle , doorstyle);
2784 assign (rmp.decorstyle , decorstyle); 2590 assign (rmp.decorstyle , decorstyle);
2591 assign (rmp.miningstyle , miningstyle);
2785 assign (rmp.exitstyle , exitstyle); 2592 assign (rmp.exitstyle , exitstyle);
2786 assign (rmp.exit_on_final_map, exit_on_final_map); 2593 assign (rmp.exit_on_final_map, exit_on_final_map);
2787 2594
2788 rmp.origin_map = origin_map; 2595 rmp.origin_map = origin_map;
2789 rmp.final_map = final_map; 2596 rmp.final_map = final_map;
… …
2817 OUTPUT: 2624 OUTPUT:
2818 RETVAL 2625 RETVAL
2819 2626
2820MODULE = cf PACKAGE = cf::mapspace 2627MODULE = cf PACKAGE = cf::mapspace
2821 2628
2822INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2629INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2823 2630
2824MODULE = cf PACKAGE = cf::arch 2631MODULE = cf PACKAGE = cf::arch
2825 2632
2826int archetypes_size () 2633int archetypes_size ()
2827 CODE: 2634 CODE:
… …
2831archetype *archetypes (U32 index) 2638archetype *archetypes (U32 index)
2832 CODE: 2639 CODE:
2833 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2640 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2834 OUTPUT: RETVAL 2641 OUTPUT: RETVAL
2835 2642
2836INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2643INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2837 2644
2838MODULE = cf PACKAGE = cf::party 2645MODULE = cf PACKAGE = cf::party
2839 2646
2840partylist *first () 2647partylist *first ()
2841 PROTOTYPE: 2648 PROTOTYPE:
2842 CODE: 2649 CODE:
2843 RETVAL = get_firstparty (); 2650 RETVAL = get_firstparty ();
2844 OUTPUT: RETVAL 2651 OUTPUT: RETVAL
2845 2652
2846INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2653INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2847 2654
2848MODULE = cf PACKAGE = cf::region 2655MODULE = cf PACKAGE = cf::region
2849 2656
2850void 2657void
2851list () 2658list ()
2852 PPCODE: 2659 PPCODE:
2853 for_all_regions (rgn) 2660 for_all_regions (rgn)
2854 XPUSHs (sv_2mortal (to_sv (rgn))); 2661 XPUSHs (sv_2mortal (to_sv (rgn)));
2855 2662
2856region *find (utf8_string name)
2857 PROTOTYPE: $
2858 CODE:
2859 RETVAL = region::find (name);
2860 OUTPUT: RETVAL
2861
2862int specificity (region *rgn) 2663int specificity (region *rgn)
2863 CODE: 2664 CODE:
2864 RETVAL = 0; 2665 RETVAL = 0;
2865 while (rgn = rgn->parent) 2666 while (rgn = rgn->parent)
2866 RETVAL++; 2667 RETVAL++;
2867 OUTPUT: RETVAL 2668 OUTPUT: RETVAL
2868 2669
2869INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2670INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2870 2671
2871MODULE = cf PACKAGE = cf::living 2672MODULE = cf PACKAGE = cf::living
2872 2673
2873INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2674INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2874 2675
2875MODULE = cf PACKAGE = cf::settings 2676MODULE = cf PACKAGE = cf::settings
2876 2677
2877INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2678INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2878 2679
2879MODULE = cf PACKAGE = cf::client 2680MODULE = cf PACKAGE = cf::client
2880 2681
2881INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2682INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2882 2683
2883int invoke (client *ns, int event, ...) 2684int invoke (client *ns, int event, ...)
2884 CODE: 2685 CODE:
2885 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2686 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2886 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2687 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2952 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2753 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2953 old_sound_index [idx] = face; 2754 old_sound_index [idx] = face;
2954 2755
2955MODULE = cf PACKAGE = cf::face PREFIX = face_ 2756MODULE = cf PACKAGE = cf::face PREFIX = face_
2956 2757
2957#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2758#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2958 2759
2959faceidx face_find (utf8_string name, faceidx defidx = 0) 2760faceidx face_find (utf8_string name, faceidx defidx = 0)
2960 2761
2961faceidx alloc (utf8_string name) 2762faceidx alloc (utf8_string name)
2962 CODE: 2763 CODE:
… …
2969 while (!RETVAL); // crude way to leave index 0 2770 while (!RETVAL); // crude way to leave index 0
2970 2771
2971 faces [RETVAL].name = name; 2772 faces [RETVAL].name = name;
2972 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2773 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2973 2774
2974 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2775 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2975 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2776 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2777 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2976} 2778}
2977 OUTPUT: RETVAL 2779 OUTPUT: RETVAL
2978 2780
2979void set_type (faceidx idx, int value) 2781void set_type (faceidx idx, int value)
2980 ALIAS: 2782 ALIAS:
… …
3002 sv_to (data, d->data); 2804 sv_to (data, d->data);
3003 STRLEN clen; 2805 STRLEN clen;
3004 char *cdata = SvPVbyte (chksum, clen); 2806 char *cdata = SvPVbyte (chksum, clen);
3005 clen = min (CHKSUM_MAXLEN, clen); 2807 clen = min (CHKSUM_MAXLEN, clen);
3006 2808
2809 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2810
3007 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen)) 2811 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
3008 { 2812 {
3009 d->chksum_len = clen; 2813 d->chksum_len = clen;
3010 memcpy (d->chksum, cdata, clen); 2814 memcpy (d->chksum, cdata, clen);
3011 2815
… …
3059 ns->force_newmap = true; 2863 ns->force_newmap = true;
3060 } 2864 }
3061 2865
3062MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2866MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3063 2867
3064#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2868#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3065 2869
3066animidx anim_find (utf8_string name) 2870animidx anim_find (utf8_string name)
3067 CODE: 2871 CODE:
3068 RETVAL = animation::find (name).number; 2872 RETVAL = animation::find (name).number;
3069 OUTPUT: RETVAL 2873 OUTPUT: RETVAL
… …
3084 } 2888 }
3085 else 2889 else
3086 anim = &animation::create (name, av_len (av) + 1, facings); 2890 anim = &animation::create (name, av_len (av) + 1, facings);
3087 2891
3088 for (int i = 0; i < anim->num_animations; ++i) 2892 for (int i = 0; i < anim->num_animations; ++i)
3089 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2893 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3090} 2894}
3091 OUTPUT: RETVAL 2895 OUTPUT: RETVAL
3092 2896
3093void invalidate_all () 2897void invalidate_all ()
3094 CODE: 2898 CODE:
3095 for_all_clients (ns) 2899 for_all_clients (ns)
3096 ns->anims_sent.reset (); 2900 ns->anims_sent.reset ();
3097 2901
3098MODULE = cf PACKAGE = cf::object::freezer 2902MODULE = cf PACKAGE = cf::object::freezer
3099 2903
3100INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2904INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3101 2905
3102SV * 2906SV *
3103new (char *klass) 2907new (char *klass)
3104 CODE: 2908 CODE:
3105 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2909 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
3112 sv_to (sv, self); 2916 sv_to (sv, self);
3113 delete self; 2917 delete self;
3114 2918
3115MODULE = cf PACKAGE = cf::object::thawer 2919MODULE = cf PACKAGE = cf::object::thawer
3116 2920
3117INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2921INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2922
2923bool
2924errors_are_fatal (bool fatal)
2925 CODE:
2926 RETVAL = object_thawer::errors_are_fatal;
2927 object_thawer::errors_are_fatal = fatal;
2928 OUTPUT:
2929 RETVAL
3118 2930
3119SV * 2931SV *
3120new_from_file (char *klass, octet_string path) 2932new_from_file (char *klass, octet_string path)
3121 CODE: 2933 CODE:
3122 object_thawer *f = new object_thawer (path); 2934 object_thawer *f = new object_thawer (path);

Diff Legend

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