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.317 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.391 by root, Sat Jul 3 01:49:18 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include "autoconf.h" 23#include "autoconf.h"
… …
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>
… …
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 56
59extern sint64 *levels; // the experience table
60
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;
65 61
… …
71static int tick_pending; 67static int tick_pending;
72 68
73global gbl_ev; 69global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 70static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 71static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
72static AV *av_reflect;
76 73
77bitset<NUM_EVENT_TYPES> ev_want_event; 74bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 75bitset<NUM_TYPES> ev_want_type;
79 76
80static HV 77static HV
… …
86 *stash_cf_mapspace_wrap, 83 *stash_cf_mapspace_wrap,
87 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
88 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 88 *stash_cf_living_wrap,
89 *stash_cf_layout_wrap,
90 *stash_ext_map_world;
91
92static SV
93 *cv_cf_do_invoke,
94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg,
96 *cv_cf_tick,
97 *cv_cf_match_match;
92 98
93#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
94static inline SV * 100static SV *
95newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
96{ 102{
97 if (!s) 103 if (!s)
98 return newSV (0); 104 return newSV (0);
99 105
… …
102 return sv; 108 return sv;
103} 109}
104#endif 110#endif
105 111
106#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
107static inline SV * 113static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 115{
110 if (!s) 116 if (!s)
111 return newSV (0); 117 return newSV (0);
112 118
… …
116 SvUTF8_on (sv); 122 SvUTF8_on (sv);
117 123
118 return sv; 124 return sv;
119} 125}
120#endif 126#endif
127
128noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
121 143
122// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
123template<class super> 145template<class super>
124static super * 146static super *
125is_a (attachable *at) 147is_a (attachable *at)
… …
202attachable::destroy () 224attachable::destroy ()
203{ 225{
204 if (destroyed ()) 226 if (destroyed ())
205 return; 227 return;
206 228
207 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
208 do_destroy (); 230 do_destroy ();
209 sever_self (); 231 sever_self ();
232}
233
234void
235attachable::do_delete ()
236{
237 delete this;
210} 238}
211 239
212void 240void
213attachable::check_mortals () 241attachable::check_mortals ()
214{ 242{
… …
230 258
231 if (0) 259 if (0)
232 { 260 {
233 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
234 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
235 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
236 } 265 }
237 } 266 }
238 } 267 }
239 268
… …
259 } 288 }
260 else 289 else
261 { 290 {
262 mortals.erase (i); 291 mortals.erase (i);
263 obj->sever_self (); 292 obj->sever_self ();
264 delete obj; 293 obj->do_delete ();
265 } 294 }
266 } 295 }
267} 296}
268 297
269void 298void
… …
286 315
287 attach = src.attach; 316 attach = src.attach;
288 return *this; 317 return *this;
289} 318}
290 319
320#if 0
291template<typename T> 321template<typename T>
292static bool 322static bool
293find_backref (void *ptr, T *obj) 323find_backref (void *ptr, T *obj)
294{ 324{
295 char *s = (char *)obj; 325 char *s = (char *)obj;
… …
303 333
304 return false; 334 return false;
305} 335}
306 336
307// for debugging, find "live" objects containing this ptr 337// for debugging, find "live" objects containing this ptr
308void 338static void
309find_backref (void *ptr) 339find_backref (void *ptr)
310{ 340{
311 for_all_objects (op) 341 for_all_objects (op)
312 if (find_backref (ptr, op)) 342 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 343 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
317 fprintf (stderr, "P %p\n", pl); 347 fprintf (stderr, "P %p\n", pl);
318 348
319 for_all_clients (ns) 349 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 350 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 351 fprintf (stderr, "C %p\n", ns);
322
323} 352}
353#endif
324 354
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 356
327static SV * 357static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv)
329{ 359{
330 SV *sv;
331
332 if (!ptr) 360 if (!ptr)
333 return newSV (0); 361 return newSV (0);
334 362
335 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 363 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
336 return sv_bless (newRV_noinc ((SV *)hv), stash); 364 return sv_bless (newRV_noinc ((SV *)hv), stash);
365}
366
367static SV * noinline
368newSVptr (void *ptr, HV *stash)
369{
370 return newSVptr (ptr, stash, newHV ());
337} 371}
338 372
339static int 373static int
340attachable_free (pTHX_ SV *sv, MAGIC *mg) 374attachable_free (pTHX_ SV *sv, MAGIC *mg)
341{ 375{
… …
353 return 0; 387 return 0;
354} 388}
355 389
356MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 390MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
357 391
358static SV * 392static SV * noinline
359newSVattachable (attachable *obj, HV *stash) 393newSVattachable (attachable *obj, HV *stash)
360{ 394{
361 if (!obj) 395 if (!obj)
362 return newSV (0); 396 return newSV (0);
363 397
… …
381 415
382 return sv; 416 return sv;
383 } 417 }
384} 418}
385 419
420#if 0 // unused
386static void 421static void
387clearSVptr (SV *sv) 422clearSVptr (SV *sv)
388{ 423{
389 if (SvROK (sv)) 424 if (SvROK (sv))
390 sv = SvRV (sv); 425 sv = SvRV (sv);
391 426
392 hv_clear ((HV *)sv); 427 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 428 sv_unmagic (sv, PERL_MAGIC_ext);
394} 429}
430#endif
431
432static long
433SvPTR_nc (SV *sv)
434{
435 sv = SvRV (sv);
436
437 // very important shortcut
438 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
439 return (long)SvMAGIC (sv)->mg_ptr;
440
441 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
442 return (long)mg->mg_ptr;
443
444 croak ("perl code used object, but C object is already destroyed, caught");
445}
395 446
396static long 447static long
397SvPTR (SV *sv, const char *klass) 448SvPTR (SV *sv, const char *klass)
398{ 449{
399 if (!sv_derived_from (sv, klass)) 450 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 451 croak ("object of type %s expected", klass);
401 452
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 453 return SvPTR_nc (sv);
403
404 if (!mg)
405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
406
407 return (long)mg->mg_ptr;
408} 454}
409 455
410static long noinline 456static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 457SvPTR_ornull (SV *sv, const char *klass)
412{ 458{
413 if (SvOK (sv)) 459 if (expect_false (!SvOK (sv))) return 0;
460
414 return SvPTR (sv, klass); 461 return SvPTR (sv, klass);
415 else
416 return 0;
417} 462}
418 463
464static long noinline
465SvPTR_ornull_client (SV *sv)
466{
467 if (expect_false (!SvOK (sv))) return 0;
468
469 if (!SvROK (sv)
470 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
471 && !sv_derived_from (sv, "cf::client")))
472 croak ("object of type cf::client expected");
473
474 return SvPTR_nc (sv);
475}
476
477static long noinline
478SvPTR_ornull_object (SV *sv)
479{
480 if (expect_false (!SvOK (sv))) return 0;
481
482 if (!SvROK (sv)
483 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
484 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
485 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
486 && !sv_derived_from (sv, "cf::object")))
487 croak ("object of type cf::object expected");
488
489 return SvPTR_nc (sv);
490}
491
492static long noinline
493SvPTR_ornull_maptile (SV *sv)
494{
495 if (expect_false (!SvOK (sv))) return 0;
496
497 if (!SvROK (sv)
498 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
499 && SvSTASH (SvRV (sv)) != stash_ext_map_world
500 && !sv_derived_from (sv, "cf::map")))
501 croak ("object of type cf::map expected");
502
503 return SvPTR_nc (sv);
504}
505
506static long noinline
507SvPTR_ornull_player (SV *sv)
508{
509 if (expect_false (!SvOK (sv))) return 0;
510
511 if (!SvROK (sv)
512 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
513 && !sv_derived_from (sv, "cf::player")))
514 croak ("object of type cf::player expected");
515
516 return SvPTR_nc (sv);
517}
518
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 519static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
420inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 520static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 521static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 522static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 523static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 524static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 525static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 526static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 527static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 528static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 529static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 530static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 531static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 532static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 533static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 534static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
435inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 535static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
536// gcc dislikes noilnine on to_sv
436inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 537static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
538static inline SV *to_sv (object * v) { return to_sv_ni (v); }
437inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 539static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
438inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 540static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
439inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 541static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
440inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 542static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
441inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 543static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
442inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 544static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
545static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
443 546
444inline SV *to_sv (object & v) { return to_sv (&v); } 547static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 548static inline SV *to_sv (living & v) { return to_sv (&v); }
446 549
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 550static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 551static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 552
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 553static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 554
452inline SV *to_sv (dynbuf * v) 555static inline SV *to_sv (dynbuf * v)
453{ 556{
454 SV *sv = newSV (0); 557 SV *sv = newSV (0);
455 558
456 sv_upgrade (sv, SVt_PV); 559 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 560 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 564 *SvEND (sv) = 0;
462 565
463 return sv; 566 return sv;
464} 567}
465 568
466inline SV *to_sv (dynbuf_text * v) 569static inline SV *to_sv (dynbuf_text * v)
467{ 570{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 571 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 572 SvUTF8_on (sv);
470 return sv; 573 return sv;
471} 574}
472 575
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 576static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 577static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 578static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 582static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 583static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 584static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 585static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 586static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
484inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 587static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
485inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 588static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
486inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 589static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 590static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
488inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 591static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
489inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 592static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
490inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 593static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
594static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
491inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 595static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
492inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 596static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
494inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 597static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
495inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 598static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
496inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 599static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
497inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 600static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
601static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 602static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
499inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 603static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 604
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 605//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
502inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 606static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 607
504template<class T> 608template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 609static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 610
507template<int N> 611template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 612static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 613
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 614static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
511inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 615static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
512inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 616static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 617static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 618
515inline void sv_to (SV *sv, std::string &v) 619static inline void sv_to (SV *sv, std::string &v)
516{ 620{
517 STRLEN len; 621 STRLEN len;
518 char *data = SvPVbyte (sv, len); 622 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 623 v.assign (data, len);
520} 624}
521 625
522inline void sv_to (SV *sv, UUID &v) 626static inline void sv_to (SV *sv, UUID &v)
523{ 627{
524 if (!v.parse (SvPV_nolen (sv))) 628 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 629 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 630}
527 631
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 632static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 633
530static SV * 634static SV *
531newSVdt_va (va_list &ap, data_type type) 635newSVdt_va (va_list &ap, data_type type)
532{ 636{
533 SV *sv; 637 SV *sv;
… …
613template<class type> 717template<class type>
614static void noinline 718static void noinline
615cf_obj_to (SV *arg, type &var) 719cf_obj_to (SV *arg, type &var)
616{ 720{
617 sv_to (arg, var); 721 sv_to (arg, var);
618 if (!var) 722 if (expect_false (!var))
619 croak ("must not pass invalid/null cf_obj here"); 723 croak ("must not pass invalid/null cf_obj here");
620} 724}
621 725
622template<class object> 726template<class object>
623static void noinline 727static void noinline
624cf_obj_ornull_to (SV *arg, object *&var) 728cf_obj_ornull_to (SV *arg, object *&var)
625{ 729{
626 if (SvOK (arg)) 730 if (SvOK (arg))
627 { 731 {
628 sv_to (arg, var); 732 sv_to (arg, var);
629 if (!var) 733 if (expect_false (!var))
630 croak ("unable to convert perl object to C++ object"); 734 croak ("unable to convert perl object to C++ object");
631 } 735 }
632 else 736 else
633 var = 0; 737 var = 0;
634} 738}
635 739
636////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 740//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
637 741
638SV * 742static SV *
639registry (attachable *ext) 743registry (attachable *ext)
640{ 744{
641 if (!ext->cb) 745 if (!ext->cb)
642 ext->cb = newAV (); 746 ext->cb = newAV ();
643 747
… …
669 exit (EXIT_FAILURE); 773 exit (EXIT_FAILURE);
670 } 774 }
671 775
672 eval_pv ( 776 eval_pv (
673 "#line 1 'cfperl init'\n" 777 "#line 1 'cfperl init'\n"
674 "use EV ();\n" 778 "use EV ();\n" // required by bootstrap
675 "use Coro ();\n" 779 "use Coro ();\n" // required by bootstrap
676 "cf->bootstrap;\n" 780 "cf->bootstrap;\n" // required for cf::datadir
677 "unshift @INC, cf::datadir ();\n" 781 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
678 "require cf;\n", 782 "require cf;\n",
679 0 783 0
680 ); 784 );
681 785
682 if (SvTRUE (ERRSV)) 786 if (SvTRUE (ERRSV))
… …
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 1023 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 1024 }
921 1025
922 va_end (ap); 1026 va_end (ap);
923 1027
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 1028 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 1029 count = count > 0 ? POPi : 0;
926 1030
927 CALL_END; 1031 CALL_END;
928 1032
929 return count; 1033 return count;
930} 1034}
931 1035
932SV * 1036static SV *
933cfperl_result (int idx) 1037cfperl_result (int idx)
934{ 1038{
935 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1039 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
936 if (!av) 1040 if (!av)
937 return &PL_sv_undef; 1041 return &PL_sv_undef;
… …
970 1074
971 dSP; 1075 dSP;
972 1076
973 PUSHMARK (SP); 1077 PUSHMARK (SP);
974 PUTBACK; 1078 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 1079 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 1080
977 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1081 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
978} 1082}
979 1083
980void 1084void
… …
1003 CALL_CALL ("ext::books::make_book", G_VOID); 1107 CALL_CALL ("ext::books::make_book", G_VOID);
1004 CALL_END; 1108 CALL_END;
1005} 1109}
1006 1110
1007void 1111void
1008cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1112cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1009{ 1113{
1010 CALL_BEGIN (4); 1114 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1115 CALL_ARG (ns);
1012 CALL_ARG (type); 1116 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1117 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1118 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1119 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1120 CALL_END;
1017} 1121}
1018 1122
1019int 1123int
1020cfperl_can_merge (object *ob1, object *ob2) 1124cfperl_can_merge (object *ob1, object *ob2)
… …
1022 int can; 1126 int can;
1023 1127
1024 CALL_BEGIN (2); 1128 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1129 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1130 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1131 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1132 can = count && SvTRUE (TOPs);
1029 CALL_END; 1133 CALL_END;
1030 1134
1031 return can; 1135 return can;
1032} 1136}
… …
1042 CALL_CALL ("cf::mapscript::activate", G_VOID); 1146 CALL_CALL ("cf::mapscript::activate", G_VOID);
1043 CALL_END; 1147 CALL_END;
1044} 1148}
1045 1149
1046player * 1150player *
1047player::find (const char *name) 1151player::find (const_utf8_string name)
1048{ 1152{
1049 CALL_BEGIN (1); 1153 CALL_BEGIN (1);
1050 CALL_ARG (name); 1154 CALL_ARG (name);
1051 CALL_CALL ("cf::player::find", G_SCALAR); 1155 CALL_CALL ("cf::player::find", G_SCALAR);
1052 1156
… …
1057 1161
1058 return retval; 1162 return retval;
1059} 1163}
1060 1164
1061maptile * 1165maptile *
1062find_style (const char *dirname, const char *stylename, int difficulty) 1166find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1063{ 1167{
1064 CALL_BEGIN (3); 1168 CALL_BEGIN (4);
1065 CALL_ARG (dirname); 1169 CALL_ARG (dirname);
1066 CALL_ARG (stylename); 1170 CALL_ARG (stylename);
1067 CALL_ARG (difficulty); 1171 CALL_ARG (difficulty);
1172 CALL_ARG (recurse);
1068 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1173 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1069 1174
1070 maptile *retval = 0; 1175 maptile *retval = 0;
1071 if (count) sv_to (POPs, retval); 1176 if (count) sv_to (POPs, retval);
1072 1177
… …
1074 1179
1075 return retval; 1180 return retval;
1076} 1181}
1077 1182
1078maptile * 1183maptile *
1079maptile::find_sync (const char *path, maptile *origin) 1184maptile::find_sync (const_utf8_string path, maptile *origin)
1080{ 1185{
1081 CALL_BEGIN (2); 1186 CALL_BEGIN (2);
1082 CALL_ARG (path); 1187 CALL_ARG (path);
1083 CALL_ARG (origin); 1188 CALL_ARG (origin);
1084 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1189 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1090 1195
1091 return retval; 1196 return retval;
1092} 1197}
1093 1198
1094maptile * 1199maptile *
1095maptile::find_async (const char *path, maptile *origin, bool load) 1200maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1096{ 1201{
1097 CALL_BEGIN (3); 1202 CALL_BEGIN (3);
1098 CALL_ARG (path); 1203 CALL_ARG (path);
1099 CALL_ARG (origin); 1204 CALL_ARG (origin);
1100 CALL_ARG (load); 1205 CALL_ARG (load);
… …
1129 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1234 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1130 CALL_END; 1235 CALL_END;
1131} 1236}
1132 1237
1133void 1238void
1134object::player_goto (const char *path, int x, int y) 1239object::player_goto (const_utf8_string path, int x, int y)
1135{ 1240{
1136 if (type != PLAYER) 1241 if (type != PLAYER)
1137 return; 1242 return;
1138 1243
1139 CALL_BEGIN (4); 1244 CALL_BEGIN (4);
… …
1143 CALL_ARG (y); 1248 CALL_ARG (y);
1144 CALL_CALL ("cf::object::player::goto", G_VOID); 1249 CALL_CALL ("cf::object::player::goto", G_VOID);
1145 CALL_END; 1250 CALL_END;
1146} 1251}
1147 1252
1148const char * 1253const_utf8_string
1149object::ref () const 1254object::ref () const
1150{ 1255{
1151 if (type == PLAYER) 1256 if (type == PLAYER)
1152 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1257 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1153 else 1258 else
1259 // TODO: should be able to save references within the same map, at least
1154 return 0; 1260 return 0;
1155} 1261}
1156 1262
1157object * 1263object *
1158object::deref (const char *ref) 1264object::deref (const_utf8_string ref)
1159{ 1265{
1160 object *retval = 0; 1266 object *retval = 0;
1161 1267
1162 if (ref) 1268 if (ref)
1163 { 1269 {
… …
1173 1279
1174 return retval; 1280 return retval;
1175} 1281}
1176 1282
1177void 1283void
1178log_backtrace (const char *msg) 1284log_backtrace (const_utf8_string msg)
1179{ 1285{
1180#if HAVE_BACKTRACE 1286#if HAVE_BACKTRACE
1181 void *addr [20]; 1287 void *addr [20];
1182 int size = backtrace (addr, 20); 1288 int size = backtrace (addr, 20);
1183 1289
… …
1188 CALL_CALL ("cf::_log_backtrace", G_VOID); 1294 CALL_CALL ("cf::_log_backtrace", G_VOID);
1189 CALL_END; 1295 CALL_END;
1190#endif 1296#endif
1191} 1297}
1192 1298
1299bool
1300is_match_expr (const_utf8_string expr)
1301{
1302 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1303}
1304
1305bool
1306match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1307{
1308 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1309 expr += sizeof ("match ") - 1;
1310
1311 CALL_BEGIN (5);
1312 CALL_ARG (expr);
1313 CALL_ARG (ob);
1314 CALL_ARG (self);
1315 CALL_ARG (source);
1316 CALL_ARG (originator);
1317 CALL_CALL (cv_cf_match_match, G_SCALAR);
1318
1319 bool matched = count && SvTRUE (TOPs);
1320
1321 CALL_END;
1322
1323 return matched;
1324}
1325
1326object *
1327match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1328{
1329 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1330 expr += sizeof ("match ") - 1;
1331
1332 CALL_BEGIN (5);
1333 CALL_ARG (expr);
1334 CALL_ARG (ob);
1335 CALL_ARG (self);
1336 CALL_ARG (source);
1337 CALL_ARG (originator);
1338 CALL_CALL (cv_cf_match_match, G_ARRAY);
1339
1340 object *one = 0;
1341
1342 if (count)
1343 sv_to (TOPs, one);
1344
1345 CALL_END;
1346
1347 return one;
1348}
1349
1193///////////////////////////////////////////////////////////////////////////// 1350/////////////////////////////////////////////////////////////////////////////
1194 1351
1195struct EVAPI *evapi::GEVAPI; 1352struct EVAPI *evapi::GEVAPI;
1196struct CoroAPI *coroapi::GCoroAPI; 1353struct CoroAPI *coroapi::GCoroAPI;
1197 1354
… …
1229 if (active) start (); 1386 if (active) start ();
1230 } 1387 }
1231} 1388}
1232 1389
1233static void 1390static void
1234_connect_to_perl () 1391_connect_to_perl_1 ()
1235{ 1392{
1236 stash_cf = gv_stashpv ("cf", 1); 1393 stash_cf = gv_stashpv ("cf", 1);
1237 1394
1238 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1395 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1239 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1396 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1243 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1400 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1244 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1401 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1245 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1402 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1246 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1247 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1404 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1405 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1406 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1248 1407
1249 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1408 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1250 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1409 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1251 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1410 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1252 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1411 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1258 cb_client = get_av ("cf::CB_CLIENT", 1); 1417 cb_client = get_av ("cf::CB_CLIENT", 1);
1259 cb_type = get_av ("cf::CB_TYPE" , 1); 1418 cb_type = get_av ("cf::CB_TYPE" , 1);
1260 cb_map = get_av ("cf::CB_MAP" , 1); 1419 cb_map = get_av ("cf::CB_MAP" , 1);
1261} 1420}
1262 1421
1422static void
1423_connect_to_perl_2 ()
1424{
1425 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1426 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1427 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1428 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1429 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1430}
1431
1263MODULE = cf PACKAGE = cf PREFIX = cf_ 1432MODULE = cf PACKAGE = cf PREFIX = cf_
1264 1433
1265BOOT: 1434BOOT:
1266{ 1435{
1267 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1436 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1268 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1437 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1269 1438
1270 _connect_to_perl (); 1439 _connect_to_perl_1 ();
1271 1440
1272 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1441 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1273 1442
1274 //{ 1443 //{
1275 // require_pv ("Time::HiRes"); 1444 // require_pv ("Time::HiRes");
… …
1283 static const struct { 1452 static const struct {
1284 const char *name; 1453 const char *name;
1285 IV iv; 1454 IV iv;
1286 } *civ, const_iv[] = { 1455 } *civ, const_iv[] = {
1287# define const_iv(name) { # name, (IV)name }, 1456# define const_iv(name) { # name, (IV)name },
1288 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1457# include "const_iv.h"
1289 const_iv (logBacktrace) 1458# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1459# include "attackinc.h"
1460# undef def
1461# define def(uc, flags) const_iv (SK_ ## uc)
1462# include "skillinc.h"
1463# undef def
1290 1464
1291 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1465 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1292 1466
1293 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1467 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1294 1468
1295 const_iv (MAX_TIME) 1469 const_iv (MAX_TIME)
1296 const_iv (MAXSOCKBUF) 1470 const_iv (MAXSOCKBUF)
1297 1471
1298 const_iv (NUM_BODY_LOCATIONS)
1299 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1300 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1301 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1302 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1303 const_iv (body_wrist) const_iv (body_waist)
1304
1305 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1306 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1307 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1308 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1309 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1310 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1311 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1312 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1313 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1314 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1315 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1316 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1317 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1318 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1319 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1320 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1321 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1322 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1323 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1324 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1325 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1326 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1327 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1328 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1329 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1330 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1331 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1332 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1333 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1334
1335 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1336
1337 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1338 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1339
1340 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1341 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1342 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1343 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1344 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1345 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1346 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1347
1348 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1349 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1350 const_iv (WEAP_BLUD)
1351
1352 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1353 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1354 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1355 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1356 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1357 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1358 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1359 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1360 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1361 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1362 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1363 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1364 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1365 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1366 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1367 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1368 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1369 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1370 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1371 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1372 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1373 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1374 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1375 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1376 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1377 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1378
1379 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1380 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1381 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1382 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1383 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1384 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1385
1386 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1472 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1387 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1473 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1388 1474
1389 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1475 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1390
1391 const_iv (SP_RAISE_DEAD)
1392 const_iv (SP_RUNE)
1393 const_iv (SP_MAKE_MARK)
1394 const_iv (SP_BOLT)
1395 const_iv (SP_BULLET)
1396 const_iv (SP_EXPLOSION)
1397 const_iv (SP_CONE)
1398 const_iv (SP_BOMB)
1399 const_iv (SP_WONDER)
1400 const_iv (SP_SMITE)
1401 const_iv (SP_MAGIC_MISSILE)
1402 const_iv (SP_SUMMON_GOLEM)
1403 const_iv (SP_DIMENSION_DOOR)
1404 const_iv (SP_MAGIC_MAPPING)
1405 const_iv (SP_MAGIC_WALL)
1406 const_iv (SP_DESTRUCTION)
1407 const_iv (SP_PERCEIVE_SELF)
1408 const_iv (SP_WORD_OF_RECALL)
1409 const_iv (SP_INVISIBLE)
1410 const_iv (SP_PROBE)
1411 const_iv (SP_HEALING)
1412 const_iv (SP_CREATE_FOOD)
1413 const_iv (SP_EARTH_TO_DUST)
1414 const_iv (SP_CHANGE_ABILITY)
1415 const_iv (SP_BLESS)
1416 const_iv (SP_CURSE)
1417 const_iv (SP_SUMMON_MONSTER)
1418 const_iv (SP_CHARGING)
1419 const_iv (SP_POLYMORPH)
1420 const_iv (SP_ALCHEMY)
1421 const_iv (SP_REMOVE_CURSE)
1422 const_iv (SP_IDENTIFY)
1423 const_iv (SP_DETECTION)
1424 const_iv (SP_MOOD_CHANGE)
1425 const_iv (SP_MOVING_BALL)
1426 const_iv (SP_SWARM)
1427 const_iv (SP_CHANGE_MANA)
1428 const_iv (SP_DISPEL_RUNE)
1429 const_iv (SP_CREATE_MISSILE)
1430 const_iv (SP_CONSECRATE)
1431 const_iv (SP_ANIMATE_WEAPON)
1432 const_iv (SP_LIGHT)
1433 const_iv (SP_CHANGE_MAP_LIGHT)
1434 const_iv (SP_FAERY_FIRE)
1435 const_iv (SP_CAUSE_DISEASE)
1436 const_iv (SP_AURA)
1437 const_iv (SP_TOWN_PORTAL)
1438 const_iv (SP_PARTY_SPELL)
1439 1476
1440 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1477 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1441 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1478 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1442 const_iv (F_LOCKED) 1479 const_iv (F_LOCKED)
1443 1480
1444 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1445
1446 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1481 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1447 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1482 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1448 1483
1449 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1450
1451 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1452 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1453
1454 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1455 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1456
1457 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1484 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1458
1459 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1460 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1461 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1462 const_iv (M_ICE) const_iv (M_SPECIAL)
1463 1485
1464 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1486 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1465 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1487 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1466 1488
1467 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1468 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1469 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1470 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1471 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1472 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1473 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1474 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1475 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1476 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1477 const_iv (SK_POISON_NAIL)
1478
1479 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1480 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1481 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1482 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1483 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1484 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1485
1486 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1487
1488 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1489 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1490 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1491 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1492 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1493 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1494 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1495
1496 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1489 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1497 const_iv (MAP_INACTIVE) 1490 const_iv (MAP_INACTIVE)
1498 1491
1499 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1492 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1500 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1493 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1501 1494
1502 const_iv (VERSION_CS) const_iv (VERSION_SC)
1503
1504 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1495 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1505 1496
1506 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1507
1508 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1497 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1509
1510 // random map generator
1511 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1512 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1513
1514 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1515 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1516 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1517
1518 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1519 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1520
1521 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1522 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1523
1524 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1525 const_iv (FT_RSRC) const_iv (FT_NUM)
1526 }; 1498 };
1527 1499
1528 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1500 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1529 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1501 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1530 1502
1531 static const struct { 1503 static const struct {
1532 const char *name; 1504 const char *name;
1533 int skip; 1505 int skip;
… …
1539# undef def 1511# undef def
1540 }; 1512 };
1541 1513
1542 AV *av = get_av ("cf::EVENT", 1); 1514 AV *av = get_av ("cf::EVENT", 1);
1543 1515
1544 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1516 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1545 { 1517 {
1546 AV *event = newAV (); 1518 AV *event = newAV ();
1547 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1519 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1548 av_push (event, newSViv (eiv->klass)); 1520 av_push (event, newSViv (eiv->klass));
1549 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1521 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1550 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1522 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1551 } 1523 }
1524
1525 // used by autogenerated BOOT sections from genacc
1526 av_reflect = get_av ("cf::REFLECT", 1);
1552} 1527}
1553 1528
1554void _gv_clear (SV *gv) 1529void _gv_clear (SV *gv)
1555 CODE: 1530 CODE:
1556 assert (SvTYPE (gv) == SVt_PVGV); 1531 assert (SvTYPE (gv) == SVt_PVGV);
… …
1563 f (GvGP (gv)->gp_cv); 1538 f (GvGP (gv)->gp_cv);
1564 GvCVGEN (gv) = 0; 1539 GvCVGEN (gv) = 0;
1565 GvMULTI_off (gv); 1540 GvMULTI_off (gv);
1566# undef f 1541# undef f
1567 1542
1568void _connect_to_perl () 1543void _connect_to_perl_1 ()
1544
1545void _connect_to_perl_2 ()
1569 1546
1570void _recalc_want () 1547void _recalc_want ()
1571 1548
1572# not used by default anymore 1549# not used by default anymore
1573void _global_reattach () 1550void _global_reattach ()
… …
1625 1602
1626void init_anim () 1603void init_anim ()
1627 1604
1628void init_globals () 1605void init_globals ()
1629 1606
1630void init_experience ()
1631
1632void init_attackmess () 1607void init_attackmess ()
1633 1608
1634void init_dynamic () 1609void init_dynamic ()
1635 1610
1636void load_settings () 1611void load_settings ()
1637 1612
1613void reload_exp_table ()
1614
1638void load_materials () 1615void reload_materials ()
1639 1616
1640void init_uuid () 1617void init_uuid ()
1641 CODE: 1618 CODE:
1642 UUID::init (); 1619 UUID::init ();
1643 1620
1644void init_signals () 1621void init_signals ()
1645
1646void init_commands ()
1647 1622
1648void init_skills () 1623void init_skills ()
1649 1624
1650void init_beforeplay () 1625void init_beforeplay ()
1651 1626
… …
1681 } 1656 }
1682 1657
1683void server_tick () 1658void server_tick ()
1684 CODE: 1659 CODE:
1685{ 1660{
1661 ev_now_update (EV_DEFAULT);
1686 NOW = ev_now (EV_DEFAULT); 1662 NOW = ev_now (EV_DEFAULT);
1687 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1663 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1688 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1664 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1689 runtime = SvNVX (sv_runtime); 1665 runtime = SvNVX (sv_runtime);
1690 1666
1691 server_tick (); 1667 server_tick ();
1692 1668
1693 NOW = ev_time (); 1669 ev_now_update (EV_DEFAULT);
1670 NOW = ev_now (EV_DEFAULT);
1694 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1671 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1695 runtime += TICK; 1672 runtime += TICK;
1696 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1673 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1697} 1674}
1698 1675
… …
1709 switch (items) 1686 switch (items)
1710 { 1687 {
1711 case 0: RETVAL = gen (); break; 1688 case 0: RETVAL = gen (); break;
1712 case 1: RETVAL = gen (SvUV (ST (0))); break; 1689 case 1: RETVAL = gen (SvUV (ST (0))); break;
1713 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1690 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1714 default: croak ("cf::rndm requires none, one or two parameters."); break; 1691 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1715 } 1692 }
1716} 1693}
1717 OUTPUT: 1694 OUTPUT:
1718 RETVAL 1695 RETVAL
1719 1696
… …
1726NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1703NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1727 CODE: 1704 CODE:
1728 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1705 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1729 OUTPUT: 1706 OUTPUT:
1730 RETVAL 1707 RETVAL
1708
1709const char *ordinal (int i)
1731 1710
1732void weaken (...) 1711void weaken (...)
1733 PROTOTYPE: @ 1712 PROTOTYPE: @
1734 CODE: 1713 CODE:
1735 while (items > 0) 1714 while (items > 0)
1736 sv_rvweaken (ST (--items)); 1715 sv_rvweaken (ST (--items));
1737 1716
1738void 1717void log_suspend ()
1718
1719void log_resume ()
1720
1739log_backtrace (utf8_string msg) 1721void log_backtrace (utf8_string msg)
1740 1722
1741void
1742LOG (int flags, utf8_string msg) 1723void LOG (int flags, utf8_string msg)
1743 PROTOTYPE: $$ 1724 PROTOTYPE: $$
1744 C_ARGS: flags, "%s", msg 1725 C_ARGS: flags, "%s", msg
1745 1726
1746octet_string path_combine (octet_string base, octet_string path) 1727octet_string path_combine (octet_string base, octet_string path)
1747 PROTOTYPE: $$ 1728 PROTOTYPE: $$
… …
1839 1820
1840int random_roll (int min, int max, object *op, int goodbad); 1821int random_roll (int min, int max, object *op, int goodbad);
1841 1822
1842const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1823const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1843 1824
1844int
1845exp_to_level (val64 exp) 1825int exp_to_level (val64 exp)
1846 CODE:
1847{
1848 int i = 0;
1849 1826
1850 RETVAL = settings.max_level;
1851
1852 for (i = 1; i <= settings.max_level; i++)
1853 {
1854 if (levels[i] > exp)
1855 {
1856 RETVAL = i - 1;
1857 break;
1858 }
1859 }
1860}
1861 OUTPUT: RETVAL
1862
1863val64
1864level_to_min_exp (int level) 1827val64 level_to_min_exp (int level)
1865 CODE:
1866 if (level > settings.max_level)
1867 RETVAL = levels[settings.max_level];
1868 else if (level < 1)
1869 RETVAL = 0;
1870 else
1871 RETVAL = levels[level];
1872 OUTPUT: RETVAL
1873 1828
1874SV * 1829SV *
1875resistance_to_string (int atnr) 1830resistance_to_string (int atnr)
1876 CODE: 1831 CODE:
1877 if (atnr >= 0 && atnr < NROFATTACKS) 1832 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1935 CODE: 1890 CODE:
1936 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1891 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1937 OUTPUT: 1892 OUTPUT:
1938 RETVAL 1893 RETVAL
1939 1894
1895bool should_invoke (attachable *obj, int event)
1896 CODE:
1897 RETVAL = obj->should_invoke ((event_type)event);
1898 OUTPUT: RETVAL
1899
1940void 1900void
1941debug_trace (attachable *obj, bool on = true) 1901debug_trace (attachable *obj, bool on = true)
1942 CODE: 1902 CODE:
1943 obj->flags &= ~attachable::F_DEBUG_TRACE; 1903 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1944 if (on) 1904 if (on)
1945 obj->flags |= attachable::F_DEBUG_TRACE; 1905 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1946 1906
1947int mortals_size () 1907int mortals_size ()
1948 CODE: 1908 CODE:
1949 RETVAL = attachable::mortals.size (); 1909 RETVAL = attachable::mortals.size ();
1950 OUTPUT: RETVAL 1910 OUTPUT: RETVAL
… …
1952#object *mortals (U32 index) 1912#object *mortals (U32 index)
1953# CODE: 1913# CODE:
1954# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1914# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1955# OUTPUT: RETVAL 1915# OUTPUT: RETVAL
1956 1916
1957INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1917INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1958 1918
1959MODULE = cf PACKAGE = cf::global 1919MODULE = cf PACKAGE = cf::global
1960 1920
1961int invoke (SV *klass, int event, ...) 1921int invoke (SV *klass, int event, ...)
1962 CODE: 1922 CODE:
… …
1966 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1926 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1967 OUTPUT: RETVAL 1927 OUTPUT: RETVAL
1968 1928
1969MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1929MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1970 1930
1971INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1931INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1972 1932
1973int invoke (object *op, int event, ...) 1933int invoke (object *op, int event, ...)
1974 CODE: 1934 CODE:
1975 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1935 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1976 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1936 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2003int mortals_size () 1963int mortals_size ()
2004 CODE: 1964 CODE:
2005 RETVAL = attachable::mortals.size (); 1965 RETVAL = attachable::mortals.size ();
2006 OUTPUT: RETVAL 1966 OUTPUT: RETVAL
2007 1967
2008const char *slot_use_name (U32 slot) 1968const_utf8_string slot_use_name (U32 slot)
2009 ALIAS: 1969 ALIAS:
2010 slot_nonuse_name = 1 1970 slot_nonuse_name = 1
2011 CODE: 1971 CODE:
2012{ 1972{
2013 if (slot >= NUM_BODY_LOCATIONS) 1973 if (slot >= NUM_BODY_LOCATIONS)
… …
2069 OUTPUT: 2029 OUTPUT:
2070 RETVAL 2030 RETVAL
2071 2031
2072object *find_best_object_match (object *op, utf8_string match) 2032object *find_best_object_match (object *op, utf8_string match)
2073 2033
2074object *find_marked_object (object *op)
2075
2076int need_identify (object *obj);
2077
2078int apply_shop_mat (object *shop_mat, object *op); 2034int apply_shop_mat (object *shop_mat, object *op);
2079 2035
2080int move (object *op, int dir, object *originator = op) 2036int move (object *op, int dir, object *originator = op)
2081 CODE: 2037 CODE:
2082 RETVAL = move_ob (op, dir, originator); 2038 RETVAL = op->move (dir, originator);
2083 OUTPUT: 2039 OUTPUT:
2084 RETVAL 2040 RETVAL
2085 2041
2086void apply (object *applier, object *applied, int flags = 0)
2087 CODE:
2088 manual_apply (applied, applier, flags);
2089
2090void apply_below (object *op) 2042void apply_below (object *op)
2091 CODE: 2043 CODE:
2092 player_apply_below (op); 2044 player_apply_below (op);
2093 2045
2094int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2046int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2047
2048int casting_level (object *caster, object *spell)
2095 2049
2096int pay_item (object *op, object *buyer) 2050int pay_item (object *op, object *buyer)
2097 CODE: 2051 CODE:
2098 RETVAL = pay_for_item (op, buyer); 2052 RETVAL = pay_for_item (op, buyer);
2099 OUTPUT: RETVAL 2053 OUTPUT: RETVAL
… …
2136 2090
2137void pick_up (object *who, object *op) 2091void pick_up (object *who, object *op)
2138 2092
2139void update_object (object *op, int action) 2093void update_object (object *op, int action)
2140 2094
2141void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2095void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2142 2096
2143void player_lvl_adj (object *who, object *skill = 0) 2097void player_lvl_adj (object *who, object *skill = 0)
2144 2098
2145int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2099int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2146 2100
2147int calc_skill_exp (object *who, object *op, object *skill); 2101int calc_skill_exp (object *who, object *op, object *skill)
2148 2102
2149void push_button (object *op, object *originator); 2103void push_button (object *op, object *originator)
2150 2104
2151void use_trigger (object *op, object *originator); 2105void use_trigger (object *op, object *originator)
2152 2106
2153void handle_apply_yield (object *op); 2107void handle_apply_yield (object *op)
2154 2108
2109int convert_item (object *item, object *converter)
2110
2111void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2155 2112
2156MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2113MODULE = cf PACKAGE = cf::object PREFIX = cf_
2157 2114
2158# no clean way to get an object from an archetype - stupid idiotic 2115# no clean way to get an object from an archetype - stupid idiotic
2159# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2116# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2163 CODE: 2120 CODE:
2164 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2121 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2165 OUTPUT: 2122 OUTPUT:
2166 RETVAL 2123 RETVAL
2167 2124
2125object *generate (utf8_string arch, object *creator)
2126 CODE:
2127 object *obj = get_archetype (arch);
2128 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2129 RETVAL = obj;
2130 OUTPUT:
2131 RETVAL
2132
2168object *find_object (U32 tag) 2133object *find_object (U32 tag)
2134
2135object *find_object_uuid (UUID i)
2169 2136
2170# TODO: nuke 2137# TODO: nuke
2171object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2138object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2172 PROTOTYPE: $$$$$$ 2139 PROTOTYPE: $$$$$$
2173 CODE: 2140 CODE:
2174{ 2141{
2175 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2142 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2143
2144 if (RETVAL->destroyed ())
2145 RETVAL = 0;
2176} 2146}
2177 2147
2178shstr 2148shstr
2179object::kv_get (shstr key) 2149object::kv_get (shstr key)
2180 2150
… …
2193 PROTOTYPE: $$;$ 2163 PROTOTYPE: $$;$
2194 PPCODE: 2164 PPCODE:
2195{ 2165{
2196 rv_vector rv; 2166 rv_vector rv;
2197 2167
2198 PUTBACK;
2199 get_rangevector (ob, other, &rv, flags); 2168 get_rangevector (ob, other, &rv, flags);
2200 SPAGAIN;
2201 2169
2202 EXTEND (SP, 5); 2170 EXTEND (SP, 5);
2203 PUSHs (newSVuv (rv.distance)); 2171 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2204 PUSHs (newSViv (rv.distance_x)); 2172 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2205 PUSHs (newSViv (rv.distance_y)); 2173 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2206 PUSHs (newSViv (rv.direction)); 2174 PUSHs (sv_2mortal (newSViv (rv.direction)));
2207 PUSHs (to_sv (rv.part)); 2175 PUSHs (sv_2mortal (to_sv (rv.part)));
2208} 2176}
2209 2177
2210bool on_same_map_as (object *ob, object *other) 2178bool on_same_map_as (object *ob, object *other)
2211 CODE: 2179 CODE:
2212 RETVAL = on_same_map (ob, other); 2180 RETVAL = on_same_map (ob, other);
… …
2232 RETVAL = op->contr; 2200 RETVAL = op->contr;
2233 OUTPUT: RETVAL 2201 OUTPUT: RETVAL
2234 2202
2235bool move_player (object *op, int dir) 2203bool move_player (object *op, int dir)
2236 2204
2237void check_score (object *op)
2238
2239void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2205void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2240 CODE: 2206 CODE:
2241 new_draw_info (flags, 0, op, txt); 2207 new_draw_info (flags, 0, op, txt);
2242 2208
2243void kill_player (object *op) 2209void kill_player (object *op)
… …
2255int command_arrest (object *op, utf8_string params) 2221int command_arrest (object *op, utf8_string params)
2256 2222
2257 2223
2258MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2224MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2259 2225
2260INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2226INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2261 2227
2262int invoke (player *pl, int event, ...) 2228int invoke (player *pl, int event, ...)
2263 CODE: 2229 CODE:
2264 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2230 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2265 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2231 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2357 if (op->tag) 2323 if (op->tag)
2358 XPUSHs (sv_2mortal (to_sv (op))); 2324 XPUSHs (sv_2mortal (to_sv (op)));
2359 } 2325 }
2360} 2326}
2361 2327
2362INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2328INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2363 2329
2364void 2330void
2365adjust_daylight () 2331adjust_daylight ()
2366 CODE: 2332 CODE:
2367 maptile::adjust_daylight (); 2333 maptile::adjust_daylight ();
2334
2335int
2336outdoor_darkness (int darkness = 0)
2337 CODE:
2338 RETVAL = maptile::outdoor_darkness;
2339 if (items)
2340 maptile::outdoor_darkness = darkness;
2341 OUTPUT:
2342 RETVAL
2368 2343
2369void 2344void
2370maptile::instantiate () 2345maptile::instantiate ()
2371 2346
2372maptile *new () 2347maptile *new ()
… …
2404 for (int x = 0; x < THIS->width; ++x) 2379 for (int x = 0; x < THIS->width; ++x)
2405 for (int y = 0; y < THIS->height; ++y) 2380 for (int y = 0; y < THIS->height; ++y)
2406 { 2381 {
2407 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2382 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2408 if (op->flag [FLAG_IS_FLOOR]) 2383 if (op->flag [FLAG_IS_FLOOR])
2409 goto skip_space; 2384 goto skip;
2410 2385
2411 { 2386 {
2412 int offs = offset + y * stride + x; 2387 int offs = offset + y * stride + x;
2388
2413 if (IN_RANGE_EXC (offs, 0, idxlen)) 2389 if (IN_RANGE_EXC (offs, 0, idxlen))
2414 { 2390 {
2415 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2391 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2416 { 2392 {
2417 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2393 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2418 ob->flag [FLAG_NO_MAP_SAVE] = true; 2394 ob->flag [FLAG_NO_MAP_SAVE] = true;
2419 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2395 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2420 2396
2421 if (ob->randomitems) 2397 if (ob->randomitems && !ob->above)
2422 { 2398 {
2423 if (!ob->above)
2424 {
2425 ob->create_treasure (ob->randomitems); 2399 ob->create_treasure (ob->randomitems);
2426 2400
2427 for (object *op = ob->above; op; op = op->above) 2401 for (object *op = ob->above; op; op = op->above)
2428 op->flag [FLAG_NO_MAP_SAVE] = true; 2402 op->flag [FLAG_NO_MAP_SAVE] = true;
2429 } 2403 // TODO: if this is a pickable object, then the item
2430 2404 // will at a bit weird - saving inside the player
2431 ob->randomitems = 0; 2405 // will clear the flag, but when the player drops
2406 // it without logging out, it keeps the flag.
2407 // nobody ahs reported this, but this can be rather
2408 // annoying on persistent maps.
2432 } 2409 }
2433 } 2410 }
2434 } 2411 }
2435 } 2412 }
2436 2413
2437 skip_space: ; 2414 skip: ;
2438 } 2415 }
2439} 2416}
2440 2417
2441void 2418void
2442maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2419maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2452 2429
2453 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2430 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2454 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2431 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2455 2432
2456 for (int i = av_len ((AV *)palette) + 1; i--; ) 2433 for (int i = av_len ((AV *)palette) + 1; i--; )
2457 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2434 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2458 2435
2459 for (int y = 0; y < THIS->height; ++y) 2436 for (int y = 0; y < THIS->height; ++y)
2460 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2437 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2461 2438
2462 sfree (THIS->regions, THIS->size ()); 2439 sfree (THIS->regions, THIS->size ());
… …
2488 if (oblinkpt *obp = map->find_link (connection)) 2465 if (oblinkpt *obp = map->find_link (connection))
2489 for (objectlink *ol = obp->link; ol; ol = ol->next) 2466 for (objectlink *ol = obp->link; ol; ol = ol->next)
2490 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2467 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2491 2468
2492void 2469void
2493get_map_flags (maptile *map, int x, int y) 2470xy_normalise (maptile *map, int x, int y, int dir = 0)
2494 PPCODE: 2471 PPCODE:
2495{ 2472{
2496 maptile *nmap = 0; 2473 mapxy pos (map, x, y);
2497 I16 nx = 0, ny = 0; 2474 if (!pos.move (dir).normalise ())
2475 XSRETURN_EMPTY;
2498 2476
2499 PUTBACK;
2500 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2501 SPAGAIN;
2502
2503 EXTEND (SP, 4); 2477 EXTEND (SP, 3);
2504 PUSHs (sv_2mortal (newSViv (flags)));
2505
2506 if (GIMME_V == G_ARRAY)
2507 {
2508 PUSHs (sv_2mortal (to_sv (nmap))); 2478 PUSHs (sv_2mortal (to_sv (pos.m)));
2509 PUSHs (sv_2mortal (newSViv (nx))); 2479 PUSHs (sv_2mortal (to_sv (pos.x)));
2510 PUSHs (sv_2mortal (newSViv (ny))); 2480 PUSHs (sv_2mortal (to_sv (pos.y)));
2511 }
2512} 2481}
2513 2482
2514mapspace * 2483mapspace *
2515ms (maptile *map, unsigned int x, unsigned int y) 2484ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2516 PROTOTYPE: $$$ 2485 PROTOTYPE: $$$;$
2517 CODE: 2486 CODE:
2518{ 2487{
2519 maptile *nmap = 0; 2488 mapxy pos (map, x, y);
2520 I16 nx, ny; 2489 if (!pos.move (dir).normalise ())
2521
2522 PUTBACK;
2523 get_map_flags (map, &nmap, x, y, &nx, &ny);
2524 SPAGAIN;
2525
2526 if (!nmap)
2527 XSRETURN_UNDEF; 2490 XSRETURN_UNDEF;
2528 2491
2529 RETVAL = &nmap->at (nx, ny); 2492 RETVAL = &*pos;
2530} 2493}
2531 OUTPUT: 2494 OUTPUT:
2532 RETVAL 2495 RETVAL
2533 2496
2534void 2497void
2535at (maptile *map, unsigned int x, unsigned int y) 2498at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2536 PROTOTYPE: $$$ 2499 PROTOTYPE: $$$;$
2537 PPCODE: 2500 PPCODE:
2538{ 2501 mapxy pos (map, x, y);
2539 maptile *nmap = 0; 2502 if (pos.move (dir).normalise ())
2540 I16 nx, ny;
2541
2542 PUTBACK;
2543 get_map_flags (map, &nmap, x, y, &nx, &ny);
2544 SPAGAIN;
2545
2546 if (nmap)
2547 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2503 for (object *o = pos->bot; o; o = o->above)
2548 XPUSHs (sv_2mortal (to_sv (o))); 2504 XPUSHs (sv_2mortal (to_sv (o)));
2549}
2550 2505
2551SV * 2506SV *
2552bot_at (maptile *map, unsigned int x, unsigned int y) 2507bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2553 PROTOTYPE: $$$ 2508 PROTOTYPE: $$$;$
2554 ALIAS: 2509 ALIAS:
2555 top_at = 1 2510 top_at = 1
2556 flags_at = 2 2511 flags_at = 2
2557 light_at = 3 2512 light_at = 3
2558 move_block_at = 4 2513 move_block_at = 4
2559 move_slow_at = 5 2514 move_slow_at = 5
2560 move_on_at = 6 2515 move_on_at = 6
2561 move_off_at = 7 2516 move_off_at = 7
2562 CODE: 2517 CODE:
2563{ 2518{
2564 sint16 nx = x; 2519 mapxy pos (map, x, y);
2565 sint16 ny = y; 2520 if (!pos.move (dir).normalise ())
2566
2567 if (!xy_normalise (map, nx, ny))
2568 XSRETURN_UNDEF; 2521 XSRETURN_UNDEF;
2569 2522
2570 mapspace &ms = map->at (nx, ny); 2523 mapspace &ms = *pos;
2571 2524
2572 ms.update (); 2525 ms.update ();
2573 2526
2574 switch (ix) 2527 switch (ix)
2575 { 2528 {
… …
2583 case 7: RETVAL = newSVuv (ms.move_off ); break; 2536 case 7: RETVAL = newSVuv (ms.move_off ); break;
2584 } 2537 }
2585} 2538}
2586 OUTPUT: RETVAL 2539 OUTPUT: RETVAL
2587 2540
2588void fix_walls (maptile *map, int x, int y)
2589
2590void fix_walls_around (maptile *map, int x, int y)
2591
2592# worst xs function of my life 2541# worst xs function of my life
2593bool 2542bool
2594_create_random_map (\ 2543_create_random_map (maptile *self, SV *options)
2595 maptile *self,\
2596 utf8_string wallstyle,\
2597 utf8_string wall_name,\
2598 utf8_string floorstyle,\
2599 utf8_string monsterstyle,\
2600 utf8_string treasurestyle,\
2601 utf8_string layoutstyle,\
2602 utf8_string doorstyle,\
2603 utf8_string decorstyle,\
2604 utf8_string origin_map,\
2605 utf8_string final_map,\
2606 utf8_string exitstyle,\
2607 utf8_string this_map,\
2608 utf8_string exit_on_final_map,\
2609 int xsize,\
2610 int ysize,\
2611 int expand2x,\
2612 int layoutoptions1,\
2613 int layoutoptions2,\
2614 int layoutoptions3,\
2615 int symmetry,\
2616 int difficulty,\
2617 int difficulty_given,\
2618 float difficulty_increase,\
2619 int dungeon_level,\
2620 int dungeon_depth,\
2621 int decoroptions,\
2622 int orientation,\
2623 int origin_y,\
2624 int origin_x,\
2625 U32 random_seed,\
2626 val64 total_map_hp,\
2627 int map_layout_style,\
2628 int treasureoptions,\
2629 int symmetry_used,\
2630 region *region,\
2631 utf8_string custom\
2632)
2633 CODE: 2544 CODE:
2634{ 2545{
2635 random_map_params rmp; 2546 random_map_params rmp ((HV *)SvRV (options));
2636
2637 assign (rmp.wallstyle , wallstyle);
2638 assign (rmp.wall_name , wall_name);
2639 assign (rmp.floorstyle , floorstyle);
2640 assign (rmp.monsterstyle , monsterstyle);
2641 assign (rmp.treasurestyle , treasurestyle);
2642 assign (rmp.layoutstyle , layoutstyle);
2643 assign (rmp.doorstyle , doorstyle);
2644 assign (rmp.decorstyle , decorstyle);
2645 assign (rmp.exitstyle , exitstyle);
2646 assign (rmp.exit_on_final_map, exit_on_final_map);
2647
2648 rmp.origin_map = origin_map;
2649 rmp.final_map = final_map;
2650 rmp.this_map = this_map;
2651 rmp.xsize = xsize;
2652 rmp.ysize = ysize;
2653 rmp.expand2x = expand2x;
2654 rmp.layoutoptions1 = layoutoptions1;
2655 rmp.layoutoptions2 = layoutoptions2;
2656 rmp.layoutoptions3 = layoutoptions3;
2657 rmp.symmetry = symmetry;
2658 rmp.difficulty = difficulty;
2659 rmp.difficulty_given = difficulty_given;
2660 rmp.difficulty_increase = difficulty_increase;
2661 rmp.dungeon_level = dungeon_level;
2662 rmp.dungeon_depth = dungeon_depth;
2663 rmp.decoroptions = decoroptions;
2664 rmp.orientation = orientation;
2665 rmp.origin_y = origin_y;
2666 rmp.origin_x = origin_x;
2667 rmp.random_seed = random_seed;
2668 rmp.total_map_hp = (uint64_t) total_map_hp;
2669 rmp.map_layout_style = map_layout_style;
2670 rmp.treasureoptions = treasureoptions;
2671 rmp.symmetry_used = symmetry_used;
2672 rmp.region = region;
2673 rmp.custom = custom;
2674
2675 RETVAL = self->generate_random_map (&rmp); 2547 RETVAL = self->generate_random_map (&rmp);
2676} 2548}
2677 OUTPUT: 2549 OUTPUT:
2678 RETVAL 2550 RETVAL
2679 2551
2680MODULE = cf PACKAGE = cf::mapspace 2552MODULE = cf PACKAGE = cf::mapspace
2681 2553
2682INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2554INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2683 2555
2684MODULE = cf PACKAGE = cf::arch 2556MODULE = cf PACKAGE = cf::arch
2685 2557
2686int archetypes_size () 2558int archetypes_size ()
2687 CODE: 2559 CODE:
… …
2691archetype *archetypes (U32 index) 2563archetype *archetypes (U32 index)
2692 CODE: 2564 CODE:
2693 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2565 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2694 OUTPUT: RETVAL 2566 OUTPUT: RETVAL
2695 2567
2696object *instantiate (archetype *arch)
2697 CODE:
2698 RETVAL = arch_to_object (arch);
2699 OUTPUT:
2700 RETVAL
2701
2702INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2568INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2703 2569
2704MODULE = cf PACKAGE = cf::party 2570MODULE = cf PACKAGE = cf::party
2705 2571
2706partylist *first () 2572partylist *first ()
2707 PROTOTYPE: 2573 PROTOTYPE:
2708 CODE: 2574 CODE:
2709 RETVAL = get_firstparty (); 2575 RETVAL = get_firstparty ();
2710 OUTPUT: RETVAL 2576 OUTPUT: RETVAL
2711 2577
2712INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2578INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2713 2579
2714MODULE = cf PACKAGE = cf::region 2580MODULE = cf PACKAGE = cf::region
2715 2581
2716void 2582void
2717list () 2583list ()
2718 PPCODE: 2584 PPCODE:
2719 for_all_regions (rgn) 2585 for_all_regions (rgn)
2720 XPUSHs (sv_2mortal (to_sv (rgn))); 2586 XPUSHs (sv_2mortal (to_sv (rgn)));
2721 2587
2722region *find (utf8_string name)
2723 PROTOTYPE: $
2724 CODE:
2725 RETVAL = region::find (name);
2726 OUTPUT: RETVAL
2727
2728int specificity (region *rgn) 2588int specificity (region *rgn)
2729 CODE: 2589 CODE:
2730 RETVAL = 0; 2590 RETVAL = 0;
2731 while (rgn = rgn->parent) 2591 while (rgn = rgn->parent)
2732 RETVAL++; 2592 RETVAL++;
2733 OUTPUT: RETVAL 2593 OUTPUT: RETVAL
2734 2594
2735INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2595INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2736 2596
2737MODULE = cf PACKAGE = cf::living 2597MODULE = cf PACKAGE = cf::living
2738 2598
2739INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2599INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2740 2600
2741MODULE = cf PACKAGE = cf::settings 2601MODULE = cf PACKAGE = cf::settings
2742 2602
2743INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2603INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2744 2604
2745MODULE = cf PACKAGE = cf::client 2605MODULE = cf PACKAGE = cf::client
2746 2606
2747INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2607INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2748 2608
2749int invoke (client *ns, int event, ...) 2609int invoke (client *ns, int event, ...)
2750 CODE: 2610 CODE:
2751 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2611 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2752 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2612 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2818 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2678 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2819 old_sound_index [idx] = face; 2679 old_sound_index [idx] = face;
2820 2680
2821MODULE = cf PACKAGE = cf::face PREFIX = face_ 2681MODULE = cf PACKAGE = cf::face PREFIX = face_
2822 2682
2823#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2683#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2824 2684
2825faceidx face_find (utf8_string name, faceidx defidx = 0) 2685faceidx face_find (utf8_string name, faceidx defidx = 0)
2826 2686
2827faceidx alloc (utf8_string name) 2687faceidx alloc (utf8_string name)
2828 CODE: 2688 CODE:
… …
2835 while (!RETVAL); // crude way to leave index 0 2695 while (!RETVAL); // crude way to leave index 0
2836 2696
2837 faces [RETVAL].name = name; 2697 faces [RETVAL].name = name;
2838 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2698 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2839 2699
2840 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2700 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2841 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2701 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2702 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2842} 2703}
2843 OUTPUT: RETVAL 2704 OUTPUT: RETVAL
2844 2705
2845void set_type (faceidx idx, int value) 2706void set_type (faceidx idx, int value)
2846 ALIAS: 2707 ALIAS:
… …
2866 faceinfo *f = face_info (idx); assert (f); 2727 faceinfo *f = face_info (idx); assert (f);
2867 facedata *d = &(faceset ? f->data64 : f->data32); 2728 facedata *d = &(faceset ? f->data64 : f->data32);
2868 sv_to (data, d->data); 2729 sv_to (data, d->data);
2869 STRLEN clen; 2730 STRLEN clen;
2870 char *cdata = SvPVbyte (chksum, clen); 2731 char *cdata = SvPVbyte (chksum, clen);
2871 clen = min (CHKSUM_SIZE, clen); 2732 clen = min (CHKSUM_MAXLEN, clen);
2872 2733
2734 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2735
2873 if (memcmp (d->chksum, cdata, clen)) 2736 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2874 { 2737 {
2738 d->chksum_len = clen;
2875 memcpy (d->chksum, cdata, clen); 2739 memcpy (d->chksum, cdata, clen);
2876 2740
2877 // invalidate existing client face info 2741 // invalidate existing client face info
2878 for_all_clients (ns) 2742 for_all_clients (ns)
2879 if (ns->faceset == faceset) 2743 if (ns->faceset == faceset)
… …
2894 2758
2895SV *get_chksum (faceidx idx, int faceset = 0) 2759SV *get_chksum (faceidx idx, int faceset = 0)
2896 CODE: 2760 CODE:
2897 facedata *d = face_data (idx, faceset); 2761 facedata *d = face_data (idx, faceset);
2898 if (!d) XSRETURN_UNDEF; 2762 if (!d) XSRETURN_UNDEF;
2899 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2763 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2900 OUTPUT: 2764 OUTPUT:
2901 RETVAL 2765 RETVAL
2902 2766
2903SV *get_data (faceidx idx, int faceset = 0) 2767SV *get_data (faceidx idx, int faceset = 0)
2904 CODE: 2768 CODE:
… …
2924 ns->force_newmap = true; 2788 ns->force_newmap = true;
2925 } 2789 }
2926 2790
2927MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2791MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2928 2792
2929#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2793#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2930 2794
2931animidx anim_find (utf8_string name) 2795animidx anim_find (utf8_string name)
2932 CODE: 2796 CODE:
2933 RETVAL = animation::find (name).number; 2797 RETVAL = animation::find (name).number;
2934 OUTPUT: RETVAL 2798 OUTPUT: RETVAL
… …
2949 } 2813 }
2950 else 2814 else
2951 anim = &animation::create (name, av_len (av) + 1, facings); 2815 anim = &animation::create (name, av_len (av) + 1, facings);
2952 2816
2953 for (int i = 0; i < anim->num_animations; ++i) 2817 for (int i = 0; i < anim->num_animations; ++i)
2954 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2818 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2955} 2819}
2956 OUTPUT: RETVAL 2820 OUTPUT: RETVAL
2957 2821
2958void invalidate_all () 2822void invalidate_all ()
2959 CODE: 2823 CODE:
2960 for_all_clients (ns) 2824 for_all_clients (ns)
2961 ns->anims_sent.reset (); 2825 ns->anims_sent.reset ();
2962 2826
2963MODULE = cf PACKAGE = cf::object::freezer 2827MODULE = cf PACKAGE = cf::object::freezer
2964 2828
2965INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2829INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2966 2830
2967SV * 2831SV *
2968new (char *klass) 2832new (char *klass)
2969 CODE: 2833 CODE:
2970 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2834 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2977 sv_to (sv, self); 2841 sv_to (sv, self);
2978 delete self; 2842 delete self;
2979 2843
2980MODULE = cf PACKAGE = cf::object::thawer 2844MODULE = cf PACKAGE = cf::object::thawer
2981 2845
2982INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2846INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2847
2848bool
2849errors_are_fatal (bool fatal)
2850 CODE:
2851 RETVAL = object_thawer::errors_are_fatal;
2852 object_thawer::errors_are_fatal = fatal;
2853 OUTPUT:
2854 RETVAL
2983 2855
2984SV * 2856SV *
2985new_from_file (char *klass, octet_string path) 2857new_from_file (char *klass, octet_string path)
2986 CODE: 2858 CODE:
2987 object_thawer *f = new object_thawer (path); 2859 object_thawer *f = new object_thawer (path);
… …
3013 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2885 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
3014 2886
3015 self->skip (); 2887 self->skip ();
3016 } 2888 }
3017 2889
2890MODULE = cf PACKAGE = cf::layout
2891
2892INCLUDE: $PERL $srcdir/genacc layout $srcdir/../random_maps/random_map.h |
2893

Diff Legend

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