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

Diff Legend

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