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.312 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.373 by root, Thu Apr 15 04:56:47 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
… …
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;
92 89
90static SV
91 *cv_cf_do_invoke,
92 *cv_cf__can_merge,
93 *cv_cf_client_send_msg,
94 *cv_cf_tick,
95 *cv_cf_match_match;
96
93#ifndef newSVpv_utf8 97#ifndef newSVpv_utf8
94static inline SV * 98static SV *
95newSVpv_utf8 (const char *s) 99newSVpv_utf8 (const char *s)
96{ 100{
97 if (!s) 101 if (!s)
98 return newSV (0); 102 return newSV (0);
99 103
… …
102 return sv; 106 return sv;
103} 107}
104#endif 108#endif
105 109
106#ifndef newSVpvn_utf8 110#ifndef newSVpvn_utf8
107static inline SV * 111static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 112newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 113{
110 if (!s) 114 if (!s)
111 return newSV (0); 115 return newSV (0);
112 116
… …
116 SvUTF8_on (sv); 120 SvUTF8_on (sv);
117 121
118 return sv; 122 return sv;
119} 123}
120#endif 124#endif
125
126static noinline utf8_string
127cfSvPVutf8_nolen (SV *sv)
128{
129 SvGETMAGIC (sv);
130
131 if (SvPOK (sv))
132 {
133 if (!SvUTF8 (sv))
134 sv_utf8_upgrade_nomg (sv);
135
136 return SvPVX (sv);
137 }
138
139 return SvPV_nolen (sv);
140}
121 141
122// helper cast function, returns super class * or 0 142// helper cast function, returns super class * or 0
123template<class super> 143template<class super>
124static super * 144static super *
125is_a (attachable *at) 145is_a (attachable *at)
… …
158 SvREFCNT_inc (self); 178 SvREFCNT_inc (self);
159 hv_clear (self); 179 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 180 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 181 SvREFCNT_dec (self);
162 182
163 // self *must* be null now because thats sv_unmagic's job. 183 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 184 assert (!this->self);
165 } 185 }
166} 186}
167 187
168void 188void
… …
202attachable::destroy () 222attachable::destroy ()
203{ 223{
204 if (destroyed ()) 224 if (destroyed ())
205 return; 225 return;
206 226
207 flags |= F_DESTROYED; 227 attachable_flags |= F_DESTROYED;
208 do_destroy (); 228 do_destroy ();
209 sever_self (); 229 sever_self ();
230}
231
232void
233attachable::do_delete ()
234{
235 delete this;
210} 236}
211 237
212void 238void
213attachable::check_mortals () 239attachable::check_mortals ()
214{ 240{
… …
230 256
231 if (0) 257 if (0)
232 { 258 {
233 for (int j = 0; j < mortals.size (); ++j)//D 259 for (int j = 0; j < mortals.size (); ++j)//D
234 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 260 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
261
235 fprintf (stderr, "\n");//D 262 fprintf (stderr, "\n");//D
236 } 263 }
237 } 264 }
238 } 265 }
239 266
… …
259 } 286 }
260 else 287 else
261 { 288 {
262 mortals.erase (i); 289 mortals.erase (i);
263 obj->sever_self (); 290 obj->sever_self ();
264 delete obj; 291 obj->do_delete ();
265 } 292 }
266 } 293 }
267} 294}
268 295
269void 296void
… …
286 313
287 attach = src.attach; 314 attach = src.attach;
288 return *this; 315 return *this;
289} 316}
290 317
318#if 0
291template<typename T> 319template<typename T>
292static bool 320static bool
293find_backref (void *ptr, T *obj) 321find_backref (void *ptr, T *obj)
294{ 322{
295 char *s = (char *)obj; 323 char *s = (char *)obj;
… …
303 331
304 return false; 332 return false;
305} 333}
306 334
307// for debugging, find "live" objects containing this ptr 335// for debugging, find "live" objects containing this ptr
308void 336static void
309find_backref (void *ptr) 337find_backref (void *ptr)
310{ 338{
311 for_all_objects (op) 339 for_all_objects (op)
312 if (find_backref (ptr, op)) 340 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 341 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
317 fprintf (stderr, "P %p\n", pl); 345 fprintf (stderr, "P %p\n", pl);
318 346
319 for_all_clients (ns) 347 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 348 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 349 fprintf (stderr, "C %p\n", ns);
322
323} 350}
351#endif
324 352
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 353//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 354
327static SV * 355static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 356newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
381 409
382 return sv; 410 return sv;
383 } 411 }
384} 412}
385 413
414#if 0 // unused
386static void 415static void
387clearSVptr (SV *sv) 416clearSVptr (SV *sv)
388{ 417{
389 if (SvROK (sv)) 418 if (SvROK (sv))
390 sv = SvRV (sv); 419 sv = SvRV (sv);
391 420
392 hv_clear ((HV *)sv); 421 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 422 sv_unmagic (sv, PERL_MAGIC_ext);
394} 423}
424#endif
425
426static long
427SvPTR_nc (SV *sv)
428{
429 sv = SvRV (sv);
430
431 // very important shortcut
432 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
433 return (long)SvMAGIC (sv)->mg_ptr;
434
435 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
436 return (long)mg->mg_ptr;
437
438 croak ("perl code used object, but C object is already destroyed, caught");
439}
395 440
396static long 441static long
397SvPTR (SV *sv, const char *klass) 442SvPTR (SV *sv, const char *klass)
398{ 443{
399 if (!sv_derived_from (sv, klass)) 444 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 445 croak ("object of type %s expected", klass);
401 446
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 447 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} 448}
409 449
410static long 450static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 451SvPTR_ornull (SV *sv, const char *klass)
412{ 452{
413 if (SvOK (sv)) 453 if (expect_false (!SvOK (sv))) return 0;
454
414 return SvPTR (sv, klass); 455 return SvPTR (sv, klass);
415 else
416 return 0;
417} 456}
418 457
458static long noinline
459SvPTR_ornull_client (SV *sv)
460{
461 if (expect_false (!SvOK (sv))) return 0;
462
463 if (!SvROK (sv)
464 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
465 && !sv_derived_from (sv, "cf::client")))
466 croak ("object of type cf::client expected");
467
468 return SvPTR_nc (sv);
469}
470
471static long noinline
472SvPTR_ornull_object (SV *sv)
473{
474 if (expect_false (!SvOK (sv))) return 0;
475
476 if (!SvROK (sv)
477 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
478 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
479 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
480 && !sv_derived_from (sv, "cf::object")))
481 croak ("object of type cf::object expected");
482
483 return SvPTR_nc (sv);
484}
485
486static long noinline
487SvPTR_ornull_player (SV *sv)
488{
489 if (expect_false (!SvOK (sv))) return 0;
490
491 if (!SvROK (sv)
492 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
493 && !sv_derived_from (sv, "cf::player")))
494 croak ("object of type cf::player expected");
495
496 return SvPTR_nc (sv);
497}
498
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 499static 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); } 500static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 501static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 502static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 503static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 504static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 505static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 506static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 507static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 508static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 509static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 510static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 511static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 512static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 513static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 514static 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); } 515static 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); } 516static 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); } 517static 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); } 518static 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); } 519static 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); } 520static 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); } 521static 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); } 522static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
443 523
444inline SV *to_sv (object & v) { return to_sv (&v); } 524static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 525static inline SV *to_sv (living & v) { return to_sv (&v); }
446 526
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 527static 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); } 528static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 529
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 530static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 531
452inline SV *to_sv (dynbuf * v) 532static inline SV *to_sv (dynbuf * v)
453{ 533{
454 SV *sv = newSV (0); 534 SV *sv = newSV (0);
455 535
456 sv_upgrade (sv, SVt_PV); 536 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 537 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 541 *SvEND (sv) = 0;
462 542
463 return sv; 543 return sv;
464} 544}
465 545
466inline SV *to_sv (dynbuf_text * v) 546static inline SV *to_sv (dynbuf_text * v)
467{ 547{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 548 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 549 SvUTF8_on (sv);
470 return sv; 550 return sv;
471} 551}
472 552
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 553static 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; } 554static 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); } 555static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 556static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 558static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 559static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 560static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 561static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 562static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 563static 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); } 564static 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); } 565static 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); } 566static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 567static 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"); } 568static 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"); } 569static 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"); } 570static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
491inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 571static 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"); } 572static inline 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"); } 573static 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"); } 574static 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"); } 575static 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"); } 576static 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"); } 577static 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"); } 578static 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" ); } 579static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 580
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 581//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)); } 582static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 583
504template<class T> 584template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 585static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 586
507template<int N> 587template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 588static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 589
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 590static 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); } 591static 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); } 592static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 593static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 594
515inline void sv_to (SV *sv, std::string &v) 595static inline void sv_to (SV *sv, std::string &v)
516{ 596{
517 STRLEN len; 597 STRLEN len;
518 char *data = SvPVbyte (sv, len); 598 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 599 v.assign (data, len);
520} 600}
521 601
522inline void sv_to (SV *sv, UUID &v) 602static inline void sv_to (SV *sv, UUID &v)
523{ 603{
524 if (!v.parse (SvPV_nolen (sv))) 604 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 605 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 606}
527 607
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 608static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 609
530static SV * 610static SV *
531newSVdt_va (va_list &ap, data_type type) 611newSVdt_va (va_list &ap, data_type type)
532{ 612{
533 SV *sv; 613 SV *sv;
… …
607 va_end (ap); 687 va_end (ap);
608 688
609 return sv; 689 return sv;
610} 690}
611 691
692// typemap support, mostly to avoid excessive inlining
693template<class type>
694static void noinline
695cf_obj_to (SV *arg, type &var)
696{
697 sv_to (arg, var);
698 if (!var)
699 croak ("must not pass invalid/null cf_obj here");
700}
701
702template<class object>
703static void noinline
704cf_obj_ornull_to (SV *arg, object *&var)
705{
706 if (SvOK (arg))
707 {
708 sv_to (arg, var);
709 if (!var)
710 croak ("unable to convert perl object to C++ object");
711 }
712 else
713 var = 0;
714}
715
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 716//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 717
614SV * 718static SV *
615registry (attachable *ext) 719registry (attachable *ext)
616{ 720{
617 if (!ext->cb) 721 if (!ext->cb)
618 ext->cb = newAV (); 722 ext->cb = newAV ();
619 723
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 764 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 765 exit (EXIT_FAILURE);
662 } 766 }
663} 767}
664 768
769void
665void cfperl_main () 770cfperl_main ()
666{ 771{
667 dSP; 772 dSP;
668 773
669 PUSHMARK (SP); 774 PUSHMARK (SP);
670 PUTBACK; 775 PUTBACK;
… …
695# undef def 800# undef def
696}; 801};
697 802
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 803#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 804
700static void 805static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 806gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 807{
703 // event must be in array 808 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 809 if (event >= 0 && event <= AvFILLp (registry))
705 { 810 {
… …
791{ 896{
792 attachable::gather_callbacks (callbacks, event); 897 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 898 ::gather_callbacks (callbacks, cb_map, event);
794} 899}
795 900
796void 901static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 902_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 903{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 904 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 905 {
801 SV *cbs_ = AvARRAY (registry)[event]; 906 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 916 }
812 } 917 }
813} 918}
814 919
815// very slow and inefficient way to recalculate the global want bitsets 920// very slow and inefficient way to recalculate the global want bitsets
816void 921static void
817_recalc_want () 922_recalc_want ()
818{ 923{
819 ev_want_event.reset (); 924 ev_want_event.reset ();
820 925
821 _recalc_want (ev_want_event, cb_global); 926 _recalc_want (ev_want_event, cb_global);
… …
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 999 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 1000 }
896 1001
897 va_end (ap); 1002 va_end (ap);
898 1003
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 1004 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 1005 count = count > 0 ? POPi : 0;
901 1006
902 CALL_END; 1007 CALL_END;
903 1008
904 return count; 1009 return count;
905} 1010}
906 1011
907SV * 1012static SV *
908cfperl_result (int idx) 1013cfperl_result (int idx)
909{ 1014{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1015 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 1016 if (!av)
912 return &PL_sv_undef; 1017 return &PL_sv_undef;
… …
931} 1036}
932 1037
933///////////////////////////////////////////////////////////////////////////// 1038/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 1039// various c++ => perl glue functions
935 1040
1041void
936void cfperl_tick () 1042cfperl_tick ()
937{ 1043{
938 tick_pending = 1; 1044 tick_pending = 1;
939 1045
940 if (tick_inhibit) 1046 if (tick_inhibit)
941 return; 1047 return;
… …
944 1050
945 dSP; 1051 dSP;
946 1052
947 PUSHMARK (SP); 1053 PUSHMARK (SP);
948 PUTBACK; 1054 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 1055 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 1056
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1057 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 1058}
953 1059
954void 1060void
… …
977 CALL_CALL ("ext::books::make_book", G_VOID); 1083 CALL_CALL ("ext::books::make_book", G_VOID);
978 CALL_END; 1084 CALL_END;
979} 1085}
980 1086
981void 1087void
982cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1088cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
983{ 1089{
984 CALL_BEGIN (4); 1090 CALL_BEGIN (4);
985 CALL_ARG (ns); 1091 CALL_ARG (ns);
986 CALL_ARG (type); 1092 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1093 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1094 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1095 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1096 CALL_END;
991} 1097}
992 1098
993int 1099int
994cfperl_can_merge (object *ob1, object *ob2) 1100cfperl_can_merge (object *ob1, object *ob2)
… …
996 int can; 1102 int can;
997 1103
998 CALL_BEGIN (2); 1104 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1105 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1106 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1107 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1108 can = count && SvTRUE (TOPs);
1003 CALL_END; 1109 CALL_END;
1004 1110
1005 return can; 1111 return can;
1006} 1112}
1007 1113
1114void
1115cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1116{
1117 CALL_BEGIN (4);
1118 CALL_ARG (ob);
1119 CALL_ARG (state);
1120 CALL_ARG (activator);
1121 CALL_ARG (originator);
1122 CALL_CALL ("cf::mapscript::activate", G_VOID);
1123 CALL_END;
1124}
1125
1008player * 1126player *
1009player::find (const char *name) 1127player::find (const_utf8_string name)
1010{ 1128{
1011 CALL_BEGIN (1); 1129 CALL_BEGIN (1);
1012 CALL_ARG (name); 1130 CALL_ARG (name);
1013 CALL_CALL ("cf::player::find", G_SCALAR); 1131 CALL_CALL ("cf::player::find", G_SCALAR);
1014 1132
… …
1019 1137
1020 return retval; 1138 return retval;
1021} 1139}
1022 1140
1023maptile * 1141maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty) 1142find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1025{ 1143{
1026 CALL_BEGIN (3); 1144 CALL_BEGIN (4);
1027 CALL_ARG (dirname); 1145 CALL_ARG (dirname);
1028 CALL_ARG (stylename); 1146 CALL_ARG (stylename);
1029 CALL_ARG (difficulty); 1147 CALL_ARG (difficulty);
1148 CALL_ARG (recurse);
1030 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1149 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1031 1150
1032 maptile *retval = 0; 1151 maptile *retval = 0;
1033 if (count) sv_to (POPs, retval); 1152 if (count) sv_to (POPs, retval);
1034 1153
… …
1036 1155
1037 return retval; 1156 return retval;
1038} 1157}
1039 1158
1040maptile * 1159maptile *
1041maptile::find_sync (const char *path, maptile *origin) 1160maptile::find_sync (const_utf8_string path, maptile *origin)
1042{ 1161{
1043 CALL_BEGIN (2); 1162 CALL_BEGIN (2);
1044 CALL_ARG (path); 1163 CALL_ARG (path);
1045 CALL_ARG (origin); 1164 CALL_ARG (origin);
1046 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1165 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1052 1171
1053 return retval; 1172 return retval;
1054} 1173}
1055 1174
1056maptile * 1175maptile *
1057maptile::find_async (const char *path, maptile *origin, bool load) 1176maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1058{ 1177{
1059 CALL_BEGIN (3); 1178 CALL_BEGIN (3);
1060 CALL_ARG (path); 1179 CALL_ARG (path);
1061 CALL_ARG (origin); 1180 CALL_ARG (origin);
1062 CALL_ARG (load); 1181 CALL_ARG (load);
… …
1091 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1210 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1092 CALL_END; 1211 CALL_END;
1093} 1212}
1094 1213
1095void 1214void
1096object::player_goto (const char *path, int x, int y) 1215object::player_goto (const_utf8_string path, int x, int y)
1097{ 1216{
1098 if (type != PLAYER) 1217 if (type != PLAYER)
1099 return; 1218 return;
1100 1219
1101 CALL_BEGIN (4); 1220 CALL_BEGIN (4);
… …
1105 CALL_ARG (y); 1224 CALL_ARG (y);
1106 CALL_CALL ("cf::object::player::goto", G_VOID); 1225 CALL_CALL ("cf::object::player::goto", G_VOID);
1107 CALL_END; 1226 CALL_END;
1108} 1227}
1109 1228
1110const char * 1229const_utf8_string
1111object::ref () const 1230object::ref () const
1112{ 1231{
1113 if (type == PLAYER) 1232 if (type == PLAYER)
1114 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1233 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1115 else 1234 else
1235 // TODO: should be able to save references within the same map, at least
1116 return 0; 1236 return 0;
1117} 1237}
1118 1238
1119object * 1239object *
1120object::deref (const char *ref) 1240object::deref (const_utf8_string ref)
1121{ 1241{
1122 object *retval = 0; 1242 object *retval = 0;
1123 1243
1124 if (ref) 1244 if (ref)
1125 { 1245 {
… …
1135 1255
1136 return retval; 1256 return retval;
1137} 1257}
1138 1258
1139void 1259void
1140log_backtrace (const char *msg) 1260log_backtrace (const_utf8_string msg)
1141{ 1261{
1142#if HAVE_BACKTRACE 1262#if HAVE_BACKTRACE
1143 void *addr [20]; 1263 void *addr [20];
1144 int size = backtrace (addr, 20); 1264 int size = backtrace (addr, 20);
1145 1265
… …
1150 CALL_CALL ("cf::_log_backtrace", G_VOID); 1270 CALL_CALL ("cf::_log_backtrace", G_VOID);
1151 CALL_END; 1271 CALL_END;
1152#endif 1272#endif
1153} 1273}
1154 1274
1275bool
1276is_match_expr (const_utf8_string expr)
1277{
1278 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1279}
1280
1281bool
1282match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1283{
1284 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1285 expr += sizeof ("match ") - 1;
1286
1287 CALL_BEGIN (5);
1288 CALL_ARG (expr);
1289 CALL_ARG (ob);
1290 CALL_ARG (self);
1291 CALL_ARG (source);
1292 CALL_ARG (originator);
1293 CALL_CALL (cv_cf_match_match, G_SCALAR);
1294
1295 bool matched = count && SvTRUE (TOPs);
1296
1297 CALL_END;
1298
1299 return matched;
1300}
1301
1302object *
1303match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1304{
1305 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1306 expr += sizeof ("match ") - 1;
1307
1308 CALL_BEGIN (5);
1309 CALL_ARG (expr);
1310 CALL_ARG (ob);
1311 CALL_ARG (self);
1312 CALL_ARG (source);
1313 CALL_ARG (originator);
1314 CALL_CALL (cv_cf_match_match, G_ARRAY);
1315
1316 object *one = 0;
1317
1318 if (count)
1319 sv_to (TOPs, one);
1320
1321 CALL_END;
1322
1323 return one;
1324}
1325
1155///////////////////////////////////////////////////////////////////////////// 1326/////////////////////////////////////////////////////////////////////////////
1156 1327
1157struct EVAPI *evapi::GEVAPI; 1328struct EVAPI *evapi::GEVAPI;
1158struct CoroAPI *coroapi::GCoroAPI; 1329struct CoroAPI *coroapi::GCoroAPI;
1159 1330
1331void
1160void coroapi::do_cede_to_tick () 1332coroapi::do_cede_to_tick ()
1161{ 1333{
1162 cede_pending = 0; 1334 cede_pending = 0;
1163 cede (); 1335 cede ();
1164} 1336}
1165 1337
… …
1189 ev_io_set ((ev_io *)this, fd, events); 1361 ev_io_set ((ev_io *)this, fd, events);
1190 if (active) start (); 1362 if (active) start ();
1191 } 1363 }
1192} 1364}
1193 1365
1194void 1366static void
1195_connect_to_perl () 1367_connect_to_perl_1 ()
1196{ 1368{
1197 stash_cf = gv_stashpv ("cf", 1); 1369 stash_cf = gv_stashpv ("cf", 1);
1198 1370
1199 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1371 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1200 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1372 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1219 cb_client = get_av ("cf::CB_CLIENT", 1); 1391 cb_client = get_av ("cf::CB_CLIENT", 1);
1220 cb_type = get_av ("cf::CB_TYPE" , 1); 1392 cb_type = get_av ("cf::CB_TYPE" , 1);
1221 cb_map = get_av ("cf::CB_MAP" , 1); 1393 cb_map = get_av ("cf::CB_MAP" , 1);
1222} 1394}
1223 1395
1396static void
1397_connect_to_perl_2 ()
1398{
1399 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1400 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1401 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1402 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1403 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1404}
1405
1224MODULE = cf PACKAGE = cf PREFIX = cf_ 1406MODULE = cf PACKAGE = cf PREFIX = cf_
1225 1407
1226BOOT: 1408BOOT:
1227{ 1409{
1228 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1410 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1229 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1411 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1230 1412
1231 _connect_to_perl (); 1413 _connect_to_perl_1 ();
1232 1414
1233 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1415 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1234 1416
1235 //{ 1417 //{
1236 // require_pv ("Time::HiRes"); 1418 // require_pv ("Time::HiRes");
… …
1244 static const struct { 1426 static const struct {
1245 const char *name; 1427 const char *name;
1246 IV iv; 1428 IV iv;
1247 } *civ, const_iv[] = { 1429 } *civ, const_iv[] = {
1248# define const_iv(name) { # name, (IV)name }, 1430# define const_iv(name) { # name, (IV)name },
1431# include "const_iv.h"
1432# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1433# include "attackinc.h"
1434# undef def
1435# define def(uc, flags) const_iv (SK_ ## uc)
1436# include "skillinc.h"
1437# undef def
1438
1249 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1439 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1250 const_iv (logBacktrace) 1440 const_iv (logBacktrace)
1251 1441
1252 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1442 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1253 1443
1254 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1444 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1255 1445
1256 const_iv (MAX_TIME) 1446 const_iv (MAX_TIME)
1257 const_iv (MAXSOCKBUF) 1447 const_iv (MAXSOCKBUF)
1258 1448
1259 const_iv (NUM_BODY_LOCATIONS)
1260 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1261 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1262 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1263 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1264 const_iv (body_wrist) const_iv (body_waist)
1265
1266 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1267 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1268 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1269 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1270 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1271 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1272 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1273 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1274 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1275 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1276 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1277 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1278 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1279 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1280 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1281 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1282 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1283 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1284 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1285 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1286 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1287 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1288 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1289 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1290 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1291 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1292 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1293 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1294
1295 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1296
1297 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1298 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1299
1300 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1301 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1302 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1303 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1304 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1305 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1306 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1307
1308 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1309 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1310 const_iv (WEAP_BLUD)
1311
1312 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1313 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1314 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1315 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1316 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1317 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1318 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1319 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1320 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1321 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1322 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1323 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1324 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1325 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1326 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1327 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1328 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1329 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1330 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1331 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1332 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1333 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1334 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1335 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1336 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1337 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1338
1339 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1340 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1341 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1342 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1343 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1344 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1345
1346 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1449 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1347 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1450 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1348 1451
1349 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1452 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1350
1351 const_iv (SP_RAISE_DEAD)
1352 const_iv (SP_RUNE)
1353 const_iv (SP_MAKE_MARK)
1354 const_iv (SP_BOLT)
1355 const_iv (SP_BULLET)
1356 const_iv (SP_EXPLOSION)
1357 const_iv (SP_CONE)
1358 const_iv (SP_BOMB)
1359 const_iv (SP_WONDER)
1360 const_iv (SP_SMITE)
1361 const_iv (SP_MAGIC_MISSILE)
1362 const_iv (SP_SUMMON_GOLEM)
1363 const_iv (SP_DIMENSION_DOOR)
1364 const_iv (SP_MAGIC_MAPPING)
1365 const_iv (SP_MAGIC_WALL)
1366 const_iv (SP_DESTRUCTION)
1367 const_iv (SP_PERCEIVE_SELF)
1368 const_iv (SP_WORD_OF_RECALL)
1369 const_iv (SP_INVISIBLE)
1370 const_iv (SP_PROBE)
1371 const_iv (SP_HEALING)
1372 const_iv (SP_CREATE_FOOD)
1373 const_iv (SP_EARTH_TO_DUST)
1374 const_iv (SP_CHANGE_ABILITY)
1375 const_iv (SP_BLESS)
1376 const_iv (SP_CURSE)
1377 const_iv (SP_SUMMON_MONSTER)
1378 const_iv (SP_CHARGING)
1379 const_iv (SP_POLYMORPH)
1380 const_iv (SP_ALCHEMY)
1381 const_iv (SP_REMOVE_CURSE)
1382 const_iv (SP_IDENTIFY)
1383 const_iv (SP_DETECTION)
1384 const_iv (SP_MOOD_CHANGE)
1385 const_iv (SP_MOVING_BALL)
1386 const_iv (SP_SWARM)
1387 const_iv (SP_CHANGE_MANA)
1388 const_iv (SP_DISPEL_RUNE)
1389 const_iv (SP_CREATE_MISSILE)
1390 const_iv (SP_CONSECRATE)
1391 const_iv (SP_ANIMATE_WEAPON)
1392 const_iv (SP_LIGHT)
1393 const_iv (SP_CHANGE_MAP_LIGHT)
1394 const_iv (SP_FAERY_FIRE)
1395 const_iv (SP_CAUSE_DISEASE)
1396 const_iv (SP_AURA)
1397 const_iv (SP_TOWN_PORTAL)
1398 const_iv (SP_PARTY_SPELL)
1399 1453
1400 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1454 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1401 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1455 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1402 const_iv (F_LOCKED) 1456 const_iv (F_LOCKED)
1403 1457
1404 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1405
1406 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1458 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1407 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1459 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1408 1460
1409 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1410
1411 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1412 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1413
1414 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1415 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1416
1417 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1461 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1418
1419 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1420 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1421 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1422 const_iv (M_ICE) const_iv (M_SPECIAL)
1423 1462
1424 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1463 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1425 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1464 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1426 1465
1427 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1428 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1429 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1430 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1431 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1432 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1433 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1434 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1435 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1436 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1437 const_iv (SK_POISON_NAIL)
1438
1439 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1440 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1441 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1442 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1443 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1444 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1445
1446 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1447
1448 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1449 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1450 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1451 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1452 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1453 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1454 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1455
1456 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1466 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1457 const_iv (MAP_INACTIVE) 1467 const_iv (MAP_INACTIVE)
1458 1468
1459 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1469 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1460 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1470 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1461 1471
1462 const_iv (VERSION_CS) const_iv (VERSION_SC)
1463
1464 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1472 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1465 1473
1466 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1467
1468 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1474 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1469
1470 // random map generator
1471 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1472 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1473
1474 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1475 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1476 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1477
1478 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1479 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1480
1481 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1482 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1483
1484 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1485 const_iv (FT_RSRC) const_iv (FT_NUM)
1486 }; 1475 };
1487 1476
1488 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1489 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1478 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1490 1479
… …
1507 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1496 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1508 av_push (event, newSViv (eiv->klass)); 1497 av_push (event, newSViv (eiv->klass));
1509 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1498 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1510 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1499 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1511 } 1500 }
1501
1502 // used by autogenerated BOOT sections from genacc
1503 av_reflect = get_av ("cf::REFLECT", 1);
1512} 1504}
1513 1505
1514void _gv_clear (SV *gv) 1506void _gv_clear (SV *gv)
1515 CODE: 1507 CODE:
1516 assert (SvTYPE (gv) == SVt_PVGV); 1508 assert (SvTYPE (gv) == SVt_PVGV);
… …
1523 f (GvGP (gv)->gp_cv); 1515 f (GvGP (gv)->gp_cv);
1524 GvCVGEN (gv) = 0; 1516 GvCVGEN (gv) = 0;
1525 GvMULTI_off (gv); 1517 GvMULTI_off (gv);
1526# undef f 1518# undef f
1527 1519
1528void _connect_to_perl () 1520void _connect_to_perl_1 ()
1521
1522void _connect_to_perl_2 ()
1529 1523
1530void _recalc_want () 1524void _recalc_want ()
1531 1525
1532# not used by default anymore 1526# not used by default anymore
1533void _global_reattach () 1527void _global_reattach ()
… …
1601 CODE: 1595 CODE:
1602 UUID::init (); 1596 UUID::init ();
1603 1597
1604void init_signals () 1598void init_signals ()
1605 1599
1606void init_commands ()
1607
1608void init_skills () 1600void init_skills ()
1609 1601
1610void init_beforeplay () 1602void init_beforeplay ()
1611 1603
1612void evthread_start (int aiofd) 1604void evthread_start (int aiofd)
… …
1641 } 1633 }
1642 1634
1643void server_tick () 1635void server_tick ()
1644 CODE: 1636 CODE:
1645{ 1637{
1638 ev_now_update (EV_DEFAULT);
1646 NOW = ev_now (EV_DEFAULT); 1639 NOW = ev_now (EV_DEFAULT);
1647 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1640 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1648 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1641 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1649 runtime = SvNVX (sv_runtime); 1642 runtime = SvNVX (sv_runtime);
1650 1643
1651 server_tick (); 1644 server_tick ();
1652 1645
1653 NOW = ev_time (); 1646 ev_now_update (EV_DEFAULT);
1647 NOW = ev_now (EV_DEFAULT);
1654 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1648 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1655 runtime += TICK; 1649 runtime += TICK;
1656 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1650 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1657} 1651}
1658 1652
… …
1669 switch (items) 1663 switch (items)
1670 { 1664 {
1671 case 0: RETVAL = gen (); break; 1665 case 0: RETVAL = gen (); break;
1672 case 1: RETVAL = gen (SvUV (ST (0))); break; 1666 case 1: RETVAL = gen (SvUV (ST (0))); break;
1673 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1667 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1674 default: croak ("cf::rndm requires none, one or two parameters."); break; 1668 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1675 } 1669 }
1676} 1670}
1677 OUTPUT: 1671 OUTPUT:
1678 RETVAL 1672 RETVAL
1679 1673
… …
1686NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1680NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1687 CODE: 1681 CODE:
1688 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1682 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1689 OUTPUT: 1683 OUTPUT:
1690 RETVAL 1684 RETVAL
1685
1686const char *ordinal (int i)
1691 1687
1692void weaken (...) 1688void weaken (...)
1693 PROTOTYPE: @ 1689 PROTOTYPE: @
1694 CODE: 1690 CODE:
1695 while (items > 0) 1691 while (items > 0)
1696 sv_rvweaken (ST (--items)); 1692 sv_rvweaken (ST (--items));
1697 1693
1698void 1694void log_suspend ()
1695
1696void log_resume ()
1697
1699log_backtrace (utf8_string msg) 1698void log_backtrace (utf8_string msg)
1700 1699
1701void
1702LOG (int flags, utf8_string msg) 1700void LOG (int flags, utf8_string msg)
1703 PROTOTYPE: $$ 1701 PROTOTYPE: $$
1704 C_ARGS: flags, "%s", msg 1702 C_ARGS: flags, "%s", msg
1705 1703
1706octet_string path_combine (octet_string base, octet_string path) 1704octet_string path_combine (octet_string base, octet_string path)
1707 PROTOTYPE: $$ 1705 PROTOTYPE: $$
… …
1799 1797
1800int random_roll (int min, int max, object *op, int goodbad); 1798int random_roll (int min, int max, object *op, int goodbad);
1801 1799
1802const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1800const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1803 1801
1804int
1805exp_to_level (val64 exp) 1802int exp_to_level (val64 exp)
1806 CODE:
1807{
1808 int i = 0;
1809 1803
1810 RETVAL = settings.max_level;
1811
1812 for (i = 1; i <= settings.max_level; i++)
1813 {
1814 if (levels[i] > exp)
1815 {
1816 RETVAL = i - 1;
1817 break;
1818 }
1819 }
1820}
1821 OUTPUT: RETVAL
1822
1823val64
1824level_to_min_exp (int level) 1804val64 level_to_min_exp (int level)
1825 CODE:
1826 if (level > settings.max_level)
1827 RETVAL = levels[settings.max_level];
1828 else if (level < 1)
1829 RETVAL = 0;
1830 else
1831 RETVAL = levels[level];
1832 OUTPUT: RETVAL
1833 1805
1834SV * 1806SV *
1835resistance_to_string (int atnr) 1807resistance_to_string (int atnr)
1836 CODE: 1808 CODE:
1837 if (atnr >= 0 && atnr < NROFATTACKS) 1809 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1898 RETVAL 1870 RETVAL
1899 1871
1900void 1872void
1901debug_trace (attachable *obj, bool on = true) 1873debug_trace (attachable *obj, bool on = true)
1902 CODE: 1874 CODE:
1903 obj->flags &= ~attachable::F_DEBUG_TRACE; 1875 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1904 if (on) 1876 if (on)
1905 obj->flags |= attachable::F_DEBUG_TRACE; 1877 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1906 1878
1907int mortals_size () 1879int mortals_size ()
1908 CODE: 1880 CODE:
1909 RETVAL = attachable::mortals.size (); 1881 RETVAL = attachable::mortals.size ();
1910 OUTPUT: RETVAL 1882 OUTPUT: RETVAL
… …
1912#object *mortals (U32 index) 1884#object *mortals (U32 index)
1913# CODE: 1885# CODE:
1914# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1886# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1915# OUTPUT: RETVAL 1887# OUTPUT: RETVAL
1916 1888
1917INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1889INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1918 1890
1919MODULE = cf PACKAGE = cf::global 1891MODULE = cf PACKAGE = cf::global
1920 1892
1921int invoke (SV *klass, int event, ...) 1893int invoke (SV *klass, int event, ...)
1922 CODE: 1894 CODE:
… …
1926 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1898 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1927 OUTPUT: RETVAL 1899 OUTPUT: RETVAL
1928 1900
1929MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1901MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1930 1902
1931INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1903INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1932 1904
1933int invoke (object *op, int event, ...) 1905int invoke (object *op, int event, ...)
1934 CODE: 1906 CODE:
1935 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1907 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1936 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1908 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1963int mortals_size () 1935int mortals_size ()
1964 CODE: 1936 CODE:
1965 RETVAL = attachable::mortals.size (); 1937 RETVAL = attachable::mortals.size ();
1966 OUTPUT: RETVAL 1938 OUTPUT: RETVAL
1967 1939
1968const char *slot_use_name (U32 slot) 1940const_utf8_string slot_use_name (U32 slot)
1969 ALIAS: 1941 ALIAS:
1970 slot_nonuse_name = 1 1942 slot_nonuse_name = 1
1971 CODE: 1943 CODE:
1972{ 1944{
1973 if (slot >= NUM_BODY_LOCATIONS) 1945 if (slot >= NUM_BODY_LOCATIONS)
… …
2029 OUTPUT: 2001 OUTPUT:
2030 RETVAL 2002 RETVAL
2031 2003
2032object *find_best_object_match (object *op, utf8_string match) 2004object *find_best_object_match (object *op, utf8_string match)
2033 2005
2034object *find_marked_object (object *op)
2035
2036int need_identify (object *obj);
2037
2038int apply_shop_mat (object *shop_mat, object *op); 2006int apply_shop_mat (object *shop_mat, object *op);
2039 2007
2040int move (object *op, int dir, object *originator = op) 2008int move (object *op, int dir, object *originator = op)
2041 CODE: 2009 CODE:
2042 RETVAL = move_ob (op, dir, originator); 2010 RETVAL = op->move (dir, originator);
2043 OUTPUT: 2011 OUTPUT:
2044 RETVAL 2012 RETVAL
2045 2013
2046void apply (object *applier, object *applied, int flags = 0)
2047 CODE:
2048 manual_apply (applied, applier, flags);
2049
2050void apply_below (object *op) 2014void apply_below (object *op)
2051 CODE: 2015 CODE:
2052 player_apply_below (op); 2016 player_apply_below (op);
2053 2017
2054int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2018int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2019
2020int casting_level (object *caster, object *spell)
2055 2021
2056int pay_item (object *op, object *buyer) 2022int pay_item (object *op, object *buyer)
2057 CODE: 2023 CODE:
2058 RETVAL = pay_for_item (op, buyer); 2024 RETVAL = pay_for_item (op, buyer);
2059 OUTPUT: RETVAL 2025 OUTPUT: RETVAL
… …
2102 2068
2103void player_lvl_adj (object *who, object *skill = 0) 2069void player_lvl_adj (object *who, object *skill = 0)
2104 2070
2105int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2071int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2106 2072
2107int calc_skill_exp (object *who, object *op, object *skill); 2073int calc_skill_exp (object *who, object *op, object *skill)
2108 2074
2109void push_button (object *op); 2075void push_button (object *op, object *originator)
2110 2076
2111void use_trigger (object *op); 2077void use_trigger (object *op, object *originator)
2112 2078
2113void add_button_link (object *button, maptile *map, int connected);
2114
2115void remove_button_link (object *op);
2116
2117void handle_apply_yield (object *op); 2079void handle_apply_yield (object *op)
2118 2080
2081int convert_item (object *item, object *converter)
2082
2083void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2119 2084
2120MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2085MODULE = cf PACKAGE = cf::object PREFIX = cf_
2121 2086
2122# no clean way to get an object from an archetype - stupid idiotic 2087# no clean way to get an object from an archetype - stupid idiotic
2123# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2088# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2127 CODE: 2092 CODE:
2128 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2093 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2129 OUTPUT: 2094 OUTPUT:
2130 RETVAL 2095 RETVAL
2131 2096
2097object *generate (utf8_string arch, object *creator)
2098 CODE:
2099 object *obj = get_archetype (arch);
2100 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2101 RETVAL = obj;
2102 OUTPUT:
2103 RETVAL
2104
2132object *find_object (U32 tag) 2105object *find_object (U32 tag)
2106
2107object *find_object_uuid (UUID i)
2133 2108
2134# TODO: nuke 2109# TODO: nuke
2135object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2110object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2136 PROTOTYPE: $$$$$$ 2111 PROTOTYPE: $$$$$$
2137 CODE: 2112 CODE:
2138{ 2113{
2139 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2114 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2115
2116 if (RETVAL->destroyed ())
2117 RETVAL = 0;
2140} 2118}
2141 2119
2142shstr 2120shstr
2143object::kv_get (shstr key) 2121object::kv_get (shstr key)
2144 2122
… …
2157 PROTOTYPE: $$;$ 2135 PROTOTYPE: $$;$
2158 PPCODE: 2136 PPCODE:
2159{ 2137{
2160 rv_vector rv; 2138 rv_vector rv;
2161 2139
2162 PUTBACK;
2163 get_rangevector (ob, other, &rv, flags); 2140 get_rangevector (ob, other, &rv, flags);
2164 SPAGAIN;
2165 2141
2166 EXTEND (SP, 5); 2142 EXTEND (SP, 5);
2167 PUSHs (newSVuv (rv.distance)); 2143 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2168 PUSHs (newSViv (rv.distance_x)); 2144 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2169 PUSHs (newSViv (rv.distance_y)); 2145 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2170 PUSHs (newSViv (rv.direction)); 2146 PUSHs (sv_2mortal (newSViv (rv.direction)));
2171 PUSHs (to_sv (rv.part)); 2147 PUSHs (sv_2mortal (to_sv (rv.part)));
2172} 2148}
2173 2149
2174bool on_same_map_as (object *ob, object *other) 2150bool on_same_map_as (object *ob, object *other)
2175 CODE: 2151 CODE:
2176 RETVAL = on_same_map (ob, other); 2152 RETVAL = on_same_map (ob, other);
… …
2196 RETVAL = op->contr; 2172 RETVAL = op->contr;
2197 OUTPUT: RETVAL 2173 OUTPUT: RETVAL
2198 2174
2199bool move_player (object *op, int dir) 2175bool move_player (object *op, int dir)
2200 2176
2201void check_score (object *op)
2202
2203void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2177void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2204 CODE: 2178 CODE:
2205 new_draw_info (flags, 0, op, txt); 2179 new_draw_info (flags, 0, op, txt);
2206 2180
2207void kill_player (object *op) 2181void kill_player (object *op)
… …
2219int command_arrest (object *op, utf8_string params) 2193int command_arrest (object *op, utf8_string params)
2220 2194
2221 2195
2222MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2196MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2223 2197
2224INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2198INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2225 2199
2226int invoke (player *pl, int event, ...) 2200int invoke (player *pl, int event, ...)
2227 CODE: 2201 CODE:
2228 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2202 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2229 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2203 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2321 if (op->tag) 2295 if (op->tag)
2322 XPUSHs (sv_2mortal (to_sv (op))); 2296 XPUSHs (sv_2mortal (to_sv (op)));
2323 } 2297 }
2324} 2298}
2325 2299
2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2300INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2327 2301
2328void 2302void
2329adjust_daylight () 2303adjust_daylight ()
2330 CODE: 2304 CODE:
2331 maptile::adjust_daylight (); 2305 maptile::adjust_daylight ();
2306
2307int
2308outdoor_darkness (int darkness = 0)
2309 CODE:
2310 RETVAL = maptile::outdoor_darkness;
2311 if (items)
2312 maptile::outdoor_darkness = darkness;
2313 OUTPUT:
2314 RETVAL
2332 2315
2333void 2316void
2334maptile::instantiate () 2317maptile::instantiate ()
2335 2318
2336maptile *new () 2319maptile *new ()
… …
2368 for (int x = 0; x < THIS->width; ++x) 2351 for (int x = 0; x < THIS->width; ++x)
2369 for (int y = 0; y < THIS->height; ++y) 2352 for (int y = 0; y < THIS->height; ++y)
2370 { 2353 {
2371 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2354 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2372 if (op->flag [FLAG_IS_FLOOR]) 2355 if (op->flag [FLAG_IS_FLOOR])
2373 goto skip_space; 2356 goto skip;
2374 2357
2375 { 2358 {
2376 int offs = offset + y * stride + x; 2359 int offs = offset + y * stride + x;
2360
2377 if (IN_RANGE_EXC (offs, 0, idxlen)) 2361 if (IN_RANGE_EXC (offs, 0, idxlen))
2378 { 2362 {
2379 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2363 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2380 { 2364 {
2381 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2365 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2382 ob->flag [FLAG_NO_MAP_SAVE] = true; 2366 ob->flag [FLAG_NO_MAP_SAVE] = true;
2383 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2367 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2384 2368
2385 if (ob->randomitems) 2369 if (ob->randomitems && !ob->above)
2386 { 2370 {
2387 if (!ob->above)
2388 {
2389 ob->create_treasure (ob->randomitems); 2371 ob->create_treasure (ob->randomitems);
2390 2372
2391 for (object *op = ob->above; op; op = op->above) 2373 for (object *op = ob->above; op; op = op->above)
2392 op->flag [FLAG_NO_MAP_SAVE] = true; 2374 op->flag [FLAG_NO_MAP_SAVE] = true;
2393 } 2375 // TODO: if this is a pickable object, then the item
2394 2376 // will at a bit weird - saving inside the player
2395 ob->randomitems = 0; 2377 // will clear the flag, but when the player drops
2378 // it without logging out, it keeps the flag.
2379 // nobody ahs reported this, but this can be rather
2380 // annoying on persistent maps.
2396 } 2381 }
2397 } 2382 }
2398 } 2383 }
2399 } 2384 }
2400 2385
2401 skip_space: ; 2386 skip: ;
2402 } 2387 }
2403} 2388}
2404 2389
2405void 2390void
2406maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2391maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2416 2401
2417 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2402 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2418 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2403 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2419 2404
2420 for (int i = av_len ((AV *)palette) + 1; i--; ) 2405 for (int i = av_len ((AV *)palette) + 1; i--; )
2421 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2406 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2422 2407
2423 for (int y = 0; y < THIS->height; ++y) 2408 for (int y = 0; y < THIS->height; ++y)
2424 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2409 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2425 2410
2426 sfree (THIS->regions, THIS->size ()); 2411 sfree (THIS->regions, THIS->size ());
… …
2445 } 2430 }
2446 2431
2447int out_of_map (maptile *map, int x, int y) 2432int out_of_map (maptile *map, int x, int y)
2448 2433
2449void 2434void
2450trigger (maptile *map, long connection, bool state = true) 2435find_link (maptile *map, shstr_tmp connection)
2451 CODE:
2452 activate_connection (map, connection, state);
2453
2454void
2455get_connection (maptile *map, long connection)
2456 PPCODE: 2436 PPCODE:
2457 oblinkpt *obp = get_connection_links (map, connection); 2437 if (oblinkpt *obp = map->find_link (connection))
2458 if (obp)
2459 for (objectlink *ol = obp->link; ol; ol = ol->next) 2438 for (objectlink *ol = obp->link; ol; ol = ol->next)
2460 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2439 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2461 2440
2462void 2441void
2463get_map_flags (maptile *map, int x, int y) 2442get_map_flags (maptile *map, int x, int y)
… …
2553 case 7: RETVAL = newSVuv (ms.move_off ); break; 2532 case 7: RETVAL = newSVuv (ms.move_off ); break;
2554 } 2533 }
2555} 2534}
2556 OUTPUT: RETVAL 2535 OUTPUT: RETVAL
2557 2536
2558void fix_walls (maptile *map, int x, int y)
2559
2560void fix_walls_around (maptile *map, int x, int y)
2561
2562# worst xs function of my life 2537# worst xs function of my life
2563bool 2538bool
2564_create_random_map (\ 2539_create_random_map (\
2565 maptile *self,\ 2540 maptile *self,\
2566 utf8_string wallstyle,\ 2541 utf8_string wallstyle,\
… …
2569 utf8_string monsterstyle,\ 2544 utf8_string monsterstyle,\
2570 utf8_string treasurestyle,\ 2545 utf8_string treasurestyle,\
2571 utf8_string layoutstyle,\ 2546 utf8_string layoutstyle,\
2572 utf8_string doorstyle,\ 2547 utf8_string doorstyle,\
2573 utf8_string decorstyle,\ 2548 utf8_string decorstyle,\
2549 utf8_string miningstyle,\
2574 utf8_string origin_map,\ 2550 utf8_string origin_map,\
2575 utf8_string final_map,\ 2551 utf8_string final_map,\
2576 utf8_string exitstyle,\ 2552 utf8_string exitstyle,\
2577 utf8_string this_map,\ 2553 utf8_string this_map,\
2578 utf8_string exit_on_final_map,\ 2554 utf8_string exit_on_final_map,\
… …
2610 assign (rmp.monsterstyle , monsterstyle); 2586 assign (rmp.monsterstyle , monsterstyle);
2611 assign (rmp.treasurestyle , treasurestyle); 2587 assign (rmp.treasurestyle , treasurestyle);
2612 assign (rmp.layoutstyle , layoutstyle); 2588 assign (rmp.layoutstyle , layoutstyle);
2613 assign (rmp.doorstyle , doorstyle); 2589 assign (rmp.doorstyle , doorstyle);
2614 assign (rmp.decorstyle , decorstyle); 2590 assign (rmp.decorstyle , decorstyle);
2591 assign (rmp.miningstyle , miningstyle);
2615 assign (rmp.exitstyle , exitstyle); 2592 assign (rmp.exitstyle , exitstyle);
2616 assign (rmp.exit_on_final_map, exit_on_final_map); 2593 assign (rmp.exit_on_final_map, exit_on_final_map);
2617 2594
2618 rmp.origin_map = origin_map; 2595 rmp.origin_map = origin_map;
2619 rmp.final_map = final_map; 2596 rmp.final_map = final_map;
… …
2647 OUTPUT: 2624 OUTPUT:
2648 RETVAL 2625 RETVAL
2649 2626
2650MODULE = cf PACKAGE = cf::mapspace 2627MODULE = cf PACKAGE = cf::mapspace
2651 2628
2652INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2629INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2653 2630
2654MODULE = cf PACKAGE = cf::arch 2631MODULE = cf PACKAGE = cf::arch
2655 2632
2656int archetypes_size () 2633int archetypes_size ()
2657 CODE: 2634 CODE:
… …
2661archetype *archetypes (U32 index) 2638archetype *archetypes (U32 index)
2662 CODE: 2639 CODE:
2663 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2640 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2664 OUTPUT: RETVAL 2641 OUTPUT: RETVAL
2665 2642
2666object *instantiate (archetype *arch)
2667 CODE:
2668 RETVAL = arch_to_object (arch);
2669 OUTPUT:
2670 RETVAL
2671
2672INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2643INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2673 2644
2674MODULE = cf PACKAGE = cf::party 2645MODULE = cf PACKAGE = cf::party
2675 2646
2676partylist *first () 2647partylist *first ()
2677 PROTOTYPE: 2648 PROTOTYPE:
2678 CODE: 2649 CODE:
2679 RETVAL = get_firstparty (); 2650 RETVAL = get_firstparty ();
2680 OUTPUT: RETVAL 2651 OUTPUT: RETVAL
2681 2652
2682INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2653INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2683 2654
2684MODULE = cf PACKAGE = cf::region 2655MODULE = cf PACKAGE = cf::region
2685 2656
2686void 2657void
2687list () 2658list ()
… …
2693 PROTOTYPE: $ 2664 PROTOTYPE: $
2694 CODE: 2665 CODE:
2695 RETVAL = region::find (name); 2666 RETVAL = region::find (name);
2696 OUTPUT: RETVAL 2667 OUTPUT: RETVAL
2697 2668
2698region *find_fuzzy (utf8_string name)
2699 PROTOTYPE: $
2700 CODE:
2701 RETVAL = region::find_fuzzy (name);
2702 OUTPUT: RETVAL
2703
2704int specificity (region *rgn) 2669int specificity (region *rgn)
2705 CODE: 2670 CODE:
2706 RETVAL = 0; 2671 RETVAL = 0;
2707 while (rgn = rgn->parent) 2672 while (rgn = rgn->parent)
2708 RETVAL++; 2673 RETVAL++;
2709 OUTPUT: RETVAL 2674 OUTPUT: RETVAL
2710 2675
2711INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2676INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2712 2677
2713MODULE = cf PACKAGE = cf::living 2678MODULE = cf PACKAGE = cf::living
2714 2679
2715INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2680INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2716 2681
2717MODULE = cf PACKAGE = cf::settings 2682MODULE = cf PACKAGE = cf::settings
2718 2683
2719INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2684INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2720 2685
2721MODULE = cf PACKAGE = cf::client 2686MODULE = cf PACKAGE = cf::client
2722 2687
2723INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2688INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2724 2689
2725int invoke (client *ns, int event, ...) 2690int invoke (client *ns, int event, ...)
2726 CODE: 2691 CODE:
2727 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2692 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2728 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2693 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2794 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2759 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2795 old_sound_index [idx] = face; 2760 old_sound_index [idx] = face;
2796 2761
2797MODULE = cf PACKAGE = cf::face PREFIX = face_ 2762MODULE = cf PACKAGE = cf::face PREFIX = face_
2798 2763
2799#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2764#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2800 2765
2801faceidx face_find (utf8_string name, faceidx defidx = 0) 2766faceidx face_find (utf8_string name, faceidx defidx = 0)
2802 2767
2803faceidx alloc (utf8_string name) 2768faceidx alloc (utf8_string name)
2804 CODE: 2769 CODE:
… …
2811 while (!RETVAL); // crude way to leave index 0 2776 while (!RETVAL); // crude way to leave index 0
2812 2777
2813 faces [RETVAL].name = name; 2778 faces [RETVAL].name = name;
2814 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2779 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2815 2780
2816 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2781 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2817 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2782 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2783 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2818} 2784}
2819 OUTPUT: RETVAL 2785 OUTPUT: RETVAL
2820 2786
2821void set_type (faceidx idx, int value) 2787void set_type (faceidx idx, int value)
2822 ALIAS: 2788 ALIAS:
… …
2842 faceinfo *f = face_info (idx); assert (f); 2808 faceinfo *f = face_info (idx); assert (f);
2843 facedata *d = &(faceset ? f->data64 : f->data32); 2809 facedata *d = &(faceset ? f->data64 : f->data32);
2844 sv_to (data, d->data); 2810 sv_to (data, d->data);
2845 STRLEN clen; 2811 STRLEN clen;
2846 char *cdata = SvPVbyte (chksum, clen); 2812 char *cdata = SvPVbyte (chksum, clen);
2847 clen = min (CHKSUM_SIZE, clen); 2813 clen = min (CHKSUM_MAXLEN, clen);
2848 2814
2815 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2816
2849 if (memcmp (d->chksum, cdata, clen)) 2817 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2850 { 2818 {
2819 d->chksum_len = clen;
2851 memcpy (d->chksum, cdata, clen); 2820 memcpy (d->chksum, cdata, clen);
2852 2821
2853 // invalidate existing client face info 2822 // invalidate existing client face info
2854 for_all_clients (ns) 2823 for_all_clients (ns)
2855 if (ns->faceset == faceset) 2824 if (ns->faceset == faceset)
… …
2870 2839
2871SV *get_chksum (faceidx idx, int faceset = 0) 2840SV *get_chksum (faceidx idx, int faceset = 0)
2872 CODE: 2841 CODE:
2873 facedata *d = face_data (idx, faceset); 2842 facedata *d = face_data (idx, faceset);
2874 if (!d) XSRETURN_UNDEF; 2843 if (!d) XSRETURN_UNDEF;
2875 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2844 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2876 OUTPUT: 2845 OUTPUT:
2877 RETVAL 2846 RETVAL
2878 2847
2879SV *get_data (faceidx idx, int faceset = 0) 2848SV *get_data (faceidx idx, int faceset = 0)
2880 CODE: 2849 CODE:
… …
2900 ns->force_newmap = true; 2869 ns->force_newmap = true;
2901 } 2870 }
2902 2871
2903MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2872MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2904 2873
2905#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2874#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2906 2875
2907animidx anim_find (utf8_string name) 2876animidx anim_find (utf8_string name)
2908 CODE: 2877 CODE:
2909 RETVAL = animation::find (name).number; 2878 RETVAL = animation::find (name).number;
2910 OUTPUT: RETVAL 2879 OUTPUT: RETVAL
… …
2925 } 2894 }
2926 else 2895 else
2927 anim = &animation::create (name, av_len (av) + 1, facings); 2896 anim = &animation::create (name, av_len (av) + 1, facings);
2928 2897
2929 for (int i = 0; i < anim->num_animations; ++i) 2898 for (int i = 0; i < anim->num_animations; ++i)
2930 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2899 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2931} 2900}
2932 OUTPUT: RETVAL 2901 OUTPUT: RETVAL
2933 2902
2934void invalidate_all () 2903void invalidate_all ()
2935 CODE: 2904 CODE:
2936 for_all_clients (ns) 2905 for_all_clients (ns)
2937 ns->anims_sent.reset (); 2906 ns->anims_sent.reset ();
2938 2907
2939MODULE = cf PACKAGE = cf::object::freezer 2908MODULE = cf PACKAGE = cf::object::freezer
2940 2909
2941INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2910INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2942 2911
2943SV * 2912SV *
2944new (char *klass) 2913new (char *klass)
2945 CODE: 2914 CODE:
2946 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2915 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2953 sv_to (sv, self); 2922 sv_to (sv, self);
2954 delete self; 2923 delete self;
2955 2924
2956MODULE = cf PACKAGE = cf::object::thawer 2925MODULE = cf PACKAGE = cf::object::thawer
2957 2926
2958INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2927INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2959 2928
2960SV * 2929SV *
2961new_from_file (char *klass, octet_string path) 2930new_from_file (char *klass, octet_string path)
2962 CODE: 2931 CODE:
2963 object_thawer *f = new object_thawer (path); 2932 object_thawer *f = new object_thawer (path);

Diff Legend

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