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.303 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.360 by root, Mon Apr 5 20:33:13 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>
… …
71static int tick_pending; 69static int tick_pending;
72 70
73global gbl_ev; 71global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 72static 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; 73static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
74static AV *av_reflect;
76 75
77bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
79 78
80static HV 79static HV
… …
88 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
92 91
92static SV
93 *cv_cf_do_invoke,
94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg,
96 *cv_cf_tick,
97 *cv_cf_match_match;
98
99#ifndef newSVpv_utf8
93static inline SV * 100static SV *
94newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
95{ 102{
96 if (!s) 103 if (!s)
97 return newSV (0); 104 return newSV (0);
98 105
99 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 107 SvUTF8_on (sv);
101 return sv; 108 return sv;
102} 109}
110#endif
103 111
112#ifndef newSVpvn_utf8
104static inline SV * 113static SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 115{
107 if (!s) 116 if (!s)
108 return newSV (0); 117 return newSV (0);
109 118
110 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
111 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
112 return sv; 124 return sv;
125}
126#endif
127
128static noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
113} 142}
114 143
115// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
116template<class super> 145template<class super>
117static super * 146static super *
… …
151 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
152 hv_clear (self); 181 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
155 184
156 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 186 assert (!this->self);
158 } 187 }
159} 188}
160 189
161void 190void
… …
195attachable::destroy () 224attachable::destroy ()
196{ 225{
197 if (destroyed ()) 226 if (destroyed ())
198 return; 227 return;
199 228
200 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
201 do_destroy (); 230 do_destroy ();
202 sever_self (); 231 sever_self ();
203} 232}
204 233
205void 234void
… …
279 308
280 attach = src.attach; 309 attach = src.attach;
281 return *this; 310 return *this;
282} 311}
283 312
313#if 0
284template<typename T> 314template<typename T>
285static bool 315static bool
286find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
287{ 317{
288 char *s = (char *)obj; 318 char *s = (char *)obj;
… …
296 326
297 return false; 327 return false;
298} 328}
299 329
300// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
301void 331static void
302find_backref (void *ptr) 332find_backref (void *ptr)
303{ 333{
304 for_all_objects (op) 334 for_all_objects (op)
305 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
306 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 336 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
310 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
311 341
312 for_all_clients (ns) 342 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
315
316} 345}
346#endif
317 347
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 349
320static SV * 350static SV *
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
374 404
375 return sv; 405 return sv;
376 } 406 }
377} 407}
378 408
409#if 0 // unused
379static void 410static void
380clearSVptr (SV *sv) 411clearSVptr (SV *sv)
381{ 412{
382 if (SvROK (sv)) 413 if (SvROK (sv))
383 sv = SvRV (sv); 414 sv = SvRV (sv);
384 415
385 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
387} 418}
419#endif
420
421static long
422SvPTR_nc (SV *sv)
423{
424 sv = SvRV (sv);
425
426 // very important shortcut
427 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
428 return (long)SvMAGIC (sv)->mg_ptr;
429
430 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
431 return (long)mg->mg_ptr;
432
433 croak ("perl code used object, but C object is already destroyed, caught");
434}
388 435
389static long 436static long
390SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
391{ 438{
392 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
394 441
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
396
397 if (!mg)
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399
400 return (long)mg->mg_ptr;
401} 443}
402 444
403static long 445static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
405{ 447{
406 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
407 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
408 else
409 return 0;
410} 451}
411 452
453static long noinline
454SvPTR_ornull_client (SV *sv)
455{
456 if (expect_false (!SvOK (sv))) return 0;
457
458 if (!SvROK (sv)
459 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
460 && !sv_derived_from (sv, "cf::client")))
461 croak ("object of type cf::client expected");
462
463 return SvPTR_nc (sv);
464}
465
466static long noinline
467SvPTR_ornull_object (SV *sv)
468{
469 if (expect_false (!SvOK (sv))) return 0;
470
471 if (!SvROK (sv)
472 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
473 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
474 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
475 && !sv_derived_from (sv, "cf::object")))
476 croak ("object of type cf::object expected");
477
478 return SvPTR_nc (sv);
479}
480
481static long noinline
482SvPTR_ornull_player (SV *sv)
483{
484 if (expect_false (!SvOK (sv))) return 0;
485
486 if (!SvROK (sv)
487 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
488 && !sv_derived_from (sv, "cf::player")))
489 croak ("object of type cf::player expected");
490
491 return SvPTR_nc (sv);
492}
493
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 494static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 495static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 509static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
428inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 510static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
429inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 511static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 512static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
431inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 513static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
432inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 514static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 515static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
434inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 516static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
435inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 517static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 518
437inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
439 521
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 522static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 524
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 526
445inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
446{ 528{
447 SV *sv = newSV (0); 529 SV *sv = newSV (0);
448 530
449 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
… …
454 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
455 537
456 return sv; 538 return sv;
457} 539}
458 540
459inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
460{ 542{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 544 SvUTF8_on (sv);
463 return sv; 545 return sv;
464} 546}
465 547
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 548static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 549static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
477inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 559static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
478inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 560static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
481inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 563static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 564static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 565static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 566static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
485inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 567static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
486inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 568static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 569static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 570static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
489inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 571static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
490inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 572static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
491inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 573static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
492inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 574static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
493 575
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 576//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 577static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 578
497template<class T> 579template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 580static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 581
500template<int N> 582template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 583static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 584
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 585static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
504inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 586static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 589
508inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
509{ 591{
510 STRLEN len; 592 STRLEN len;
511 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 594 v.assign (data, len);
513} 595}
514 596
515inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
516{ 598{
517 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 601}
520 602
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 603static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 604
523static SV * 605static SV *
524newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
525{ 607{
526 SV *sv; 608 SV *sv;
… …
600 va_end (ap); 682 va_end (ap);
601 683
602 return sv; 684 return sv;
603} 685}
604 686
687// typemap support, mostly to avoid excessive inlining
688template<class type>
689static void noinline
690cf_obj_to (SV *arg, type &var)
691{
692 sv_to (arg, var);
693 if (!var)
694 croak ("must not pass invalid/null cf_obj here");
695}
696
697template<class object>
698static void noinline
699cf_obj_ornull_to (SV *arg, object *&var)
700{
701 if (SvOK (arg))
702 {
703 sv_to (arg, var);
704 if (!var)
705 croak ("unable to convert perl object to C++ object");
706 }
707 else
708 var = 0;
709}
710
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 712
607SV * 713static SV *
608registry (attachable *ext) 714registry (attachable *ext)
609{ 715{
610 if (!ext->cb) 716 if (!ext->cb)
611 ext->cb = newAV (); 717 ext->cb = newAV ();
612 718
… …
626 732
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 733 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 734
629 const char *argv[] = { 735 const char *argv[] = {
630 settings.argv [0], 736 settings.argv [0],
631 "-e" 737 "-e0"
632 "use EV ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 738 };
638 739
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 740 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 741 || perl_run (perl))
641 { 742 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 743 printf ("unable to initialize perl-interpreter, aborting.\n");
643 exit (EXIT_FAILURE); 744 exit (EXIT_FAILURE);
644 } 745 }
645}
646 746
747 eval_pv (
748 "#line 1 'cfperl init'\n"
749 "use EV ();\n"
750 "use Coro ();\n"
751 "cf->bootstrap;\n"
752 "unshift @INC, cf::datadir ();\n"
753 "require cf;\n",
754 0
755 );
756
757 if (SvTRUE (ERRSV))
758 {
759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
760 exit (EXIT_FAILURE);
761 }
762}
763
764void
647void cfperl_main () 765cfperl_main ()
648{ 766{
649 dSP; 767 dSP;
650 768
651 PUSHMARK (SP); 769 PUSHMARK (SP);
652 PUTBACK; 770 PUTBACK;
… …
677# undef def 795# undef def
678}; 796};
679 797
680#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 798#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
681 799
682static void 800static void noinline
683gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
684{ 802{
685 // event must be in array 803 // event must be in array
686 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
687 { 805 {
… …
773{ 891{
774 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
775 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
776} 894}
777 895
778void 896static void noinline
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{ 898{
781 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
782 { 900 {
783 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
… …
793 } 911 }
794 } 912 }
795} 913}
796 914
797// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
798void 916static void
799_recalc_want () 917_recalc_want ()
800{ 918{
801 ev_want_event.reset (); 919 ev_want_event.reset ();
802 920
803 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
… …
876 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
877 } 995 }
878 996
879 va_end (ap); 997 va_end (ap);
880 998
881 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
882 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
883 1001
884 CALL_END; 1002 CALL_END;
885 1003
886 return count; 1004 return count;
887} 1005}
888 1006
889SV * 1007static SV *
890cfperl_result (int idx) 1008cfperl_result (int idx)
891{ 1009{
892 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
893 if (!av) 1011 if (!av)
894 return &PL_sv_undef; 1012 return &PL_sv_undef;
… …
913} 1031}
914 1032
915///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions 1034// various c++ => perl glue functions
917 1035
1036void
918void cfperl_tick () 1037cfperl_tick ()
919{ 1038{
920 tick_pending = 1; 1039 tick_pending = 1;
921 1040
922 if (tick_inhibit) 1041 if (tick_inhibit)
923 return; 1042 return;
… …
926 1045
927 dSP; 1046 dSP;
928 1047
929 PUSHMARK (SP); 1048 PUSHMARK (SP);
930 PUTBACK; 1049 PUTBACK;
931 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
932 1051
933 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1052 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
934} 1053}
935 1054
936void 1055void
… …
959 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
960 CALL_END; 1079 CALL_END;
961} 1080}
962 1081
963void 1082void
964cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1083cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
965{ 1084{
966 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
967 CALL_ARG (ns); 1086 CALL_ARG (ns);
968 CALL_ARG (type); 1087 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color); 1089 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
972 CALL_END; 1091 CALL_END;
973} 1092}
974 1093
975int 1094int
976cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
… …
978 int can; 1097 int can;
979 1098
980 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
981 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
982 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
984 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
985 CALL_END; 1104 CALL_END;
986 1105
987 return can; 1106 return can;
988} 1107}
989 1108
1109void
1110cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1111{
1112 CALL_BEGIN (4);
1113 CALL_ARG (ob);
1114 CALL_ARG (state);
1115 CALL_ARG (activator);
1116 CALL_ARG (originator);
1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1118 CALL_END;
1119}
1120
990player * 1121player *
991player::find (const char *name) 1122player::find (const_utf8_string name)
992{ 1123{
993 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
994 CALL_ARG (name); 1125 CALL_ARG (name);
995 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
996 1127
… …
1001 1132
1002 return retval; 1133 return retval;
1003} 1134}
1004 1135
1005maptile * 1136maptile *
1006find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1007{ 1138{
1008 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1009 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1010 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1011 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
… …
1018 1149
1019 return retval; 1150 return retval;
1020} 1151}
1021 1152
1022maptile * 1153maptile *
1023maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1024{ 1155{
1025 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1026 CALL_ARG (path); 1157 CALL_ARG (path);
1027 CALL_ARG (origin); 1158 CALL_ARG (origin);
1028 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1034 1165
1035 return retval; 1166 return retval;
1036} 1167}
1037 1168
1038maptile * 1169maptile *
1039maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1040{ 1171{
1041 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1042 CALL_ARG (path); 1173 CALL_ARG (path);
1043 CALL_ARG (origin); 1174 CALL_ARG (origin);
1044 CALL_ARG (load); 1175 CALL_ARG (load);
… …
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1191 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1061 CALL_END; 1192 CALL_END;
1062} 1193}
1063 1194
1064void 1195void
1065maptile::change_all_map_light (int change)
1066{
1067 CALL_BEGIN (1);
1068 CALL_ARG (change);
1069 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1070 CALL_END;
1071}
1072
1073void
1074object::enter_exit (object *exit) 1196object::enter_exit (object *exit)
1075{ 1197{
1076 if (type != PLAYER) 1198 if (type != PLAYER)
1077 return; 1199 return;
1078 1200
… …
1082 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1083 CALL_END; 1205 CALL_END;
1084} 1206}
1085 1207
1086void 1208void
1087object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1088{ 1210{
1089 if (type != PLAYER) 1211 if (type != PLAYER)
1090 return; 1212 return;
1091 1213
1092 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
… …
1096 CALL_ARG (y); 1218 CALL_ARG (y);
1097 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1098 CALL_END; 1220 CALL_END;
1099} 1221}
1100 1222
1101const char * 1223const_utf8_string
1102object::ref () const 1224object::ref () const
1103{ 1225{
1104 if (type == PLAYER) 1226 if (type == PLAYER)
1105 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1227 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1106 else 1228 else
1107 return 0; 1229 return 0;
1108} 1230}
1109 1231
1110object * 1232object *
1111object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1112{ 1234{
1113 object *retval = 0; 1235 object *retval = 0;
1114 1236
1115 if (ref) 1237 if (ref)
1116 { 1238 {
… …
1126 1248
1127 return retval; 1249 return retval;
1128} 1250}
1129 1251
1130void 1252void
1131log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1132{ 1254{
1133#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1134 void *addr [20]; 1256 void *addr [20];
1135 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1136 1258
… …
1141 CALL_CALL ("cf::_log_backtrace", G_VOID); 1263 CALL_CALL ("cf::_log_backtrace", G_VOID);
1142 CALL_END; 1264 CALL_END;
1143#endif 1265#endif
1144} 1266}
1145 1267
1268bool
1269is_match_expr (const_utf8_string expr)
1270{
1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1272}
1273
1274bool
1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1276{
1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1278 expr += sizeof ("match ") - 1;
1279
1280 CALL_BEGIN (5);
1281 CALL_ARG (expr);
1282 CALL_ARG (ob);
1283 CALL_ARG (self);
1284 CALL_ARG (source);
1285 CALL_ARG (originator);
1286 CALL_CALL (cv_cf_match_match, G_SCALAR);
1287
1288 bool matched = count && SvTRUE (TOPs);
1289
1290 CALL_END;
1291
1292 return matched;
1293}
1294
1295object *
1296match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1297{
1298 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1299 expr += sizeof ("match ") - 1;
1300
1301 CALL_BEGIN (5);
1302 CALL_ARG (expr);
1303 CALL_ARG (ob);
1304 CALL_ARG (self);
1305 CALL_ARG (source);
1306 CALL_ARG (originator);
1307 CALL_CALL (cv_cf_match_match, G_ARRAY);
1308
1309 object *one = 0;
1310
1311 if (count)
1312 sv_to (TOPs, one);
1313
1314 CALL_END;
1315
1316 return one;
1317}
1318
1146///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1147 1320
1148struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1322struct CoroAPI *coroapi::GCoroAPI;
1150 1323
1324void
1151void coroapi::do_cede_to_tick () 1325coroapi::do_cede_to_tick ()
1152{ 1326{
1153 cede_pending = 0; 1327 cede_pending = 0;
1154 cede (); 1328 cede ();
1155} 1329}
1156 1330
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1354 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1355 if (active) start ();
1182 } 1356 }
1183} 1357}
1184 1358
1185void 1359static void
1186_connect_to_perl () 1360_connect_to_perl_1 ()
1187{ 1361{
1188 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1189 1363
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1365 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1210 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1211 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1212 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1213} 1387}
1214 1388
1389static void
1390_connect_to_perl_2 ()
1391{
1392 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1393 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1394 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1395 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1396 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1397}
1398
1215MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1216 1400
1217BOOT: 1401BOOT:
1218{ 1402{
1219 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1220 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1221 1405
1222 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1223 1407
1224 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1225 1409
1226 //{ 1410 //{
1227 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
… …
1235 static const struct { 1419 static const struct {
1236 const char *name; 1420 const char *name;
1237 IV iv; 1421 IV iv;
1238 } *civ, const_iv[] = { 1422 } *civ, const_iv[] = {
1239# define const_iv(name) { # name, (IV)name }, 1423# define const_iv(name) { # name, (IV)name },
1424# include "const_iv.h"
1425# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1426# include "attackinc.h"
1427# undef def
1428# define def(uc, flags) const_iv (SK_ ## uc)
1429# include "skillinc.h"
1430# undef def
1431
1240 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1432 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1241 const_iv (logBacktrace) 1433 const_iv (logBacktrace)
1242 1434
1243 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1435 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1244 1436
1245 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1437 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1246 1438
1247 const_iv (MAX_TIME) 1439 const_iv (MAX_TIME)
1248 const_iv (MAXSOCKBUF) 1440 const_iv (MAXSOCKBUF)
1249 1441
1250 const_iv (NUM_BODY_LOCATIONS)
1251 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1252 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1253 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1254 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1255 const_iv (body_wrist) const_iv (body_waist)
1256
1257 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1258 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1259 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1260 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1261 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1262 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1263 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1264 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1265 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1266 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1267 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1268 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1269 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1270 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1271 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1272 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1273 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1274 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1275 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1276 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1277 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1278 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1279 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1280 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1281 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1282 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1283 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1284 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1285
1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1287
1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1289 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1290
1291 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1292 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1293 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1294 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1295 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1296 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1297 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1298
1299 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1300 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1301 const_iv (WEAP_BLUD)
1302
1303 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1304 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1305 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1306 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1307 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1308 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1309 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1310 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1311 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1312 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1313 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1314 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1315 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1316 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1317 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1318 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1319 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1320 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1321 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1322 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1323 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1324 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1325 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1326 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1327 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1328 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1331 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1332 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1333 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1334 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1335 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1336
1337 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1442 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1338 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1443 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1339 1444
1340 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1445 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1341
1342 const_iv (SP_RAISE_DEAD)
1343 const_iv (SP_RUNE)
1344 const_iv (SP_MAKE_MARK)
1345 const_iv (SP_BOLT)
1346 const_iv (SP_BULLET)
1347 const_iv (SP_EXPLOSION)
1348 const_iv (SP_CONE)
1349 const_iv (SP_BOMB)
1350 const_iv (SP_WONDER)
1351 const_iv (SP_SMITE)
1352 const_iv (SP_MAGIC_MISSILE)
1353 const_iv (SP_SUMMON_GOLEM)
1354 const_iv (SP_DIMENSION_DOOR)
1355 const_iv (SP_MAGIC_MAPPING)
1356 const_iv (SP_MAGIC_WALL)
1357 const_iv (SP_DESTRUCTION)
1358 const_iv (SP_PERCEIVE_SELF)
1359 const_iv (SP_WORD_OF_RECALL)
1360 const_iv (SP_INVISIBLE)
1361 const_iv (SP_PROBE)
1362 const_iv (SP_HEALING)
1363 const_iv (SP_CREATE_FOOD)
1364 const_iv (SP_EARTH_TO_DUST)
1365 const_iv (SP_CHANGE_ABILITY)
1366 const_iv (SP_BLESS)
1367 const_iv (SP_CURSE)
1368 const_iv (SP_SUMMON_MONSTER)
1369 const_iv (SP_CHARGING)
1370 const_iv (SP_POLYMORPH)
1371 const_iv (SP_ALCHEMY)
1372 const_iv (SP_REMOVE_CURSE)
1373 const_iv (SP_IDENTIFY)
1374 const_iv (SP_DETECTION)
1375 const_iv (SP_MOOD_CHANGE)
1376 const_iv (SP_MOVING_BALL)
1377 const_iv (SP_SWARM)
1378 const_iv (SP_CHANGE_MANA)
1379 const_iv (SP_DISPEL_RUNE)
1380 const_iv (SP_CREATE_MISSILE)
1381 const_iv (SP_CONSECRATE)
1382 const_iv (SP_ANIMATE_WEAPON)
1383 const_iv (SP_LIGHT)
1384 const_iv (SP_CHANGE_MAP_LIGHT)
1385 const_iv (SP_FAERY_FIRE)
1386 const_iv (SP_CAUSE_DISEASE)
1387 const_iv (SP_AURA)
1388 const_iv (SP_TOWN_PORTAL)
1389 const_iv (SP_PARTY_SPELL)
1390 1446
1391 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1447 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1392 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1448 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1393 const_iv (F_LOCKED) 1449 const_iv (F_LOCKED)
1394 1450
1395 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1396
1397 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1451 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1398 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1452 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1399 1453
1400 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1401
1402 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1403 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1404
1405 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1406 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1407
1408 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1454 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1409
1410 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1411 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1412 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1413 const_iv (M_ICE) const_iv (M_SPECIAL)
1414 1455
1415 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1456 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1416 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1457 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1417 1458
1418 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1419 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1420 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1421 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1422 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1423 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1424 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1425 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1426 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1427 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1428 const_iv (SK_POISON_NAIL)
1429
1430 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1431 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1432 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1433 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1434 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1435 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1436
1437 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1438
1439 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1440 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1441 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1442 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1443 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1444 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1445 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1446
1447 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1459 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1448 const_iv (MAP_INACTIVE) 1460 const_iv (MAP_INACTIVE)
1449 1461
1450 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1462 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1451 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1463 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1452 1464
1453 const_iv (VERSION_CS) const_iv (VERSION_SC) 1465 const_iv (VERSION_CS) const_iv (VERSION_SC)
1454 1466
1455 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1467 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1456 1468
1457 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1458
1459 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1469 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1460
1461 // random map generator
1462 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1463 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1464
1465 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1466 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1467 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1468
1469 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1470 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1471
1472 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1473 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1474
1475 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1476 const_iv (FT_RSRC) const_iv (FT_NUM)
1477 }; 1470 };
1478 1471
1479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1472 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1473 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1481 1474
… …
1498 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1491 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1492 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1493 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1494 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502 } 1495 }
1496
1497 // used by autogenerated BOOT sections from genacc
1498 av_reflect = get_av ("cf::REFLECT", 1);
1503} 1499}
1504 1500
1505void _gv_clear (SV *gv) 1501void _gv_clear (SV *gv)
1506 CODE: 1502 CODE:
1507 assert (SvTYPE (gv) == SVt_PVGV); 1503 assert (SvTYPE (gv) == SVt_PVGV);
… …
1514 f (GvGP (gv)->gp_cv); 1510 f (GvGP (gv)->gp_cv);
1515 GvCVGEN (gv) = 0; 1511 GvCVGEN (gv) = 0;
1516 GvMULTI_off (gv); 1512 GvMULTI_off (gv);
1517# undef f 1513# undef f
1518 1514
1519void _connect_to_perl () 1515void _connect_to_perl_1 ()
1516
1517void _connect_to_perl_2 ()
1520 1518
1521void _recalc_want () 1519void _recalc_want ()
1522 1520
1521# not used by default anymore
1523void _global_reattach () 1522void _global_reattach ()
1524 CODE: 1523 CODE:
1525{ 1524{
1526 // reattach to all attachable objects in the game. 1525 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1526 for_all_clients (ns)
… …
1581 1580
1582void init_attackmess () 1581void init_attackmess ()
1583 1582
1584void init_dynamic () 1583void init_dynamic ()
1585 1584
1586void init_block ()
1587
1588void load_settings () 1585void load_settings ()
1589 1586
1590void load_materials () 1587void load_materials ()
1591 1588
1592void init_uuid () 1589void init_uuid ()
… …
1633 } 1630 }
1634 1631
1635void server_tick () 1632void server_tick ()
1636 CODE: 1633 CODE:
1637{ 1634{
1635 ev_now_update (EV_DEFAULT);
1638 NOW = ev_now (EV_DEFAULT); 1636 NOW = ev_now (EV_DEFAULT);
1639 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1637 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1640 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1638 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1641 runtime = SvNVX (sv_runtime); 1639 runtime = SvNVX (sv_runtime);
1642 1640
1643 server_tick (); 1641 server_tick ();
1644 1642
1645 NOW = ev_time (); 1643 ev_now_update (EV_DEFAULT);
1644 NOW = ev_now (EV_DEFAULT);
1646 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1645 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1647 runtime += TICK; 1646 runtime += TICK;
1648 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1647 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1649} 1648}
1650 1649
… …
1678NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1677NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1679 CODE: 1678 CODE:
1680 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1679 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1681 OUTPUT: 1680 OUTPUT:
1682 RETVAL 1681 RETVAL
1682
1683const char *ordinal (int i)
1683 1684
1684void weaken (...) 1685void weaken (...)
1685 PROTOTYPE: @ 1686 PROTOTYPE: @
1686 CODE: 1687 CODE:
1687 while (items > 0) 1688 while (items > 0)
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1777 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1777 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1778 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1778 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1779 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1779 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1780 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1781#endif
1781 EXTEND (SP, 2*2); 1782 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1783 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1783 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1784 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1784 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1785 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1786 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1787 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1788}
1786 1789
1787int find_animation (utf8_string text) 1790int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1791 PROTOTYPE: $
1789 1792
… …
1888 RETVAL 1891 RETVAL
1889 1892
1890void 1893void
1891debug_trace (attachable *obj, bool on = true) 1894debug_trace (attachable *obj, bool on = true)
1892 CODE: 1895 CODE:
1893 obj->flags &= ~attachable::F_DEBUG_TRACE; 1896 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1894 if (on) 1897 if (on)
1895 obj->flags |= attachable::F_DEBUG_TRACE; 1898 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1896 1899
1897int mortals_size () 1900int mortals_size ()
1898 CODE: 1901 CODE:
1899 RETVAL = attachable::mortals.size (); 1902 RETVAL = attachable::mortals.size ();
1900 OUTPUT: RETVAL 1903 OUTPUT: RETVAL
… …
1902#object *mortals (U32 index) 1905#object *mortals (U32 index)
1903# CODE: 1906# CODE:
1904# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1907# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1905# OUTPUT: RETVAL 1908# OUTPUT: RETVAL
1906 1909
1907INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1910INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1908 1911
1909MODULE = cf PACKAGE = cf::global 1912MODULE = cf PACKAGE = cf::global
1910 1913
1911int invoke (SV *klass, int event, ...) 1914int invoke (SV *klass, int event, ...)
1912 CODE: 1915 CODE:
… …
1916 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);
1917 OUTPUT: RETVAL 1920 OUTPUT: RETVAL
1918 1921
1919MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1922MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1920 1923
1921INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1924INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1922 1925
1923int invoke (object *op, int event, ...) 1926int invoke (object *op, int event, ...)
1924 CODE: 1927 CODE:
1925 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");
1926 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1929 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1953int mortals_size () 1956int mortals_size ()
1954 CODE: 1957 CODE:
1955 RETVAL = attachable::mortals.size (); 1958 RETVAL = attachable::mortals.size ();
1956 OUTPUT: RETVAL 1959 OUTPUT: RETVAL
1957 1960
1958const char *slot_use_name (U32 slot) 1961const_utf8_string slot_use_name (U32 slot)
1959 ALIAS: 1962 ALIAS:
1960 slot_nonuse_name = 1 1963 slot_nonuse_name = 1
1961 CODE: 1964 CODE:
1962{ 1965{
1963 if (slot >= NUM_BODY_LOCATIONS) 1966 if (slot >= NUM_BODY_LOCATIONS)
… …
2027 2030
2028int apply_shop_mat (object *shop_mat, object *op); 2031int apply_shop_mat (object *shop_mat, object *op);
2029 2032
2030int move (object *op, int dir, object *originator = op) 2033int move (object *op, int dir, object *originator = op)
2031 CODE: 2034 CODE:
2032 RETVAL = move_ob (op, dir, originator); 2035 RETVAL = op->move (dir, originator);
2033 OUTPUT: 2036 OUTPUT:
2034 RETVAL 2037 RETVAL
2035 2038
2036void apply (object *applier, object *applied, int flags = 0)
2037 CODE:
2038 manual_apply (applied, applier, flags);
2039
2040void apply_below (object *op) 2039void apply_below (object *op)
2041 CODE: 2040 CODE:
2042 player_apply_below (op); 2041 player_apply_below (op);
2043 2042
2044int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2043int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2044
2045int casting_level (object *caster, object *spell)
2045 2046
2046int pay_item (object *op, object *buyer) 2047int pay_item (object *op, object *buyer)
2047 CODE: 2048 CODE:
2048 RETVAL = pay_for_item (op, buyer); 2049 RETVAL = pay_for_item (op, buyer);
2049 OUTPUT: RETVAL 2050 OUTPUT: RETVAL
… …
2092 2093
2093void player_lvl_adj (object *who, object *skill = 0) 2094void player_lvl_adj (object *who, object *skill = 0)
2094 2095
2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2096int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2096 2097
2097int calc_skill_exp (object *who, object *op, object *skill); 2098int calc_skill_exp (object *who, object *op, object *skill)
2098 2099
2099void push_button (object *op); 2100void push_button (object *op, object *originator)
2100 2101
2101void use_trigger (object *op); 2102void use_trigger (object *op, object *originator)
2102 2103
2103void add_button_link (object *button, maptile *map, int connected);
2104
2105void remove_button_link (object *op);
2106
2107void handle_apply_yield (object *op); 2104void handle_apply_yield (object *op)
2108 2105
2106int convert_item (object *item, object *converter)
2107
2108void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2109 2109
2110MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2110MODULE = cf PACKAGE = cf::object PREFIX = cf_
2111 2111
2112# no clean way to get an object from an archetype - stupid idiotic 2112# no clean way to get an object from an archetype - stupid idiotic
2113# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2113# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2117 CODE: 2117 CODE:
2118 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2118 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2119 OUTPUT: 2119 OUTPUT:
2120 RETVAL 2120 RETVAL
2121 2121
2122object *generate (utf8_string arch, object *creator)
2123 CODE:
2124 object *obj = get_archetype (arch);
2125 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2126 RETVAL = obj;
2127 OUTPUT:
2128 RETVAL
2129
2122object *find_object (U32 tag) 2130object *find_object (U32 tag)
2131
2132object *find_object_uuid (UUID i)
2123 2133
2124# TODO: nuke 2134# TODO: nuke
2125object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2135object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2126 PROTOTYPE: $$$$$$ 2136 PROTOTYPE: $$$$$$
2127 CODE: 2137 CODE:
2128{ 2138{
2129 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2139 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2140
2141 if (RETVAL->destroyed ())
2142 RETVAL = 0;
2130} 2143}
2131 2144
2132shstr 2145shstr
2133object::kv_get (shstr key) 2146object::kv_get (shstr key)
2134 2147
… …
2186 RETVAL = op->contr; 2199 RETVAL = op->contr;
2187 OUTPUT: RETVAL 2200 OUTPUT: RETVAL
2188 2201
2189bool move_player (object *op, int dir) 2202bool move_player (object *op, int dir)
2190 2203
2191void check_score (object *op)
2192
2193void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2204void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2194 CODE: 2205 CODE:
2195 new_draw_info (flags, 0, op, txt); 2206 new_draw_info (flags, 0, op, txt);
2196 2207
2197void kill_player (object *op) 2208void kill_player (object *op)
… …
2209int command_arrest (object *op, utf8_string params) 2220int command_arrest (object *op, utf8_string params)
2210 2221
2211 2222
2212MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2223MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2213 2224
2214INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2225INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2215 2226
2216int invoke (player *pl, int event, ...) 2227int invoke (player *pl, int event, ...)
2217 CODE: 2228 CODE:
2218 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2229 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2219 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2230 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2229 pl->ob->stats.hp = pl->ob->stats.maxhp; 2240 pl->ob->stats.hp = pl->ob->stats.maxhp;
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2241 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2242 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2243 pl->orig_stats = pl->ob->stats;
2233 2244
2234void clear_los (player *pl) 2245# should only be temporary
2246void esrv_new_player (player *pl)
2235 2247
2248#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2249bool
2237cell_visible (player *pl, int dx, int dy) 2250cell_visible (player *pl, int dx, int dy)
2238 CODE: 2251 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2252 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2253 OUTPUT:
2242 RETVAL 2254 RETVAL
2243 2255
2244void 2256void
2245send (player *pl, SV *packet) 2257send (player *pl, SV *packet)
… …
2310 if (op->tag) 2322 if (op->tag)
2311 XPUSHs (sv_2mortal (to_sv (op))); 2323 XPUSHs (sv_2mortal (to_sv (op)));
2312 } 2324 }
2313} 2325}
2314 2326
2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2327INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2328
2329void
2330adjust_daylight ()
2331 CODE:
2332 maptile::adjust_daylight ();
2333
2334int
2335outdoor_darkness (int darkness = 0)
2336 CODE:
2337 RETVAL = maptile::outdoor_darkness;
2338 if (items)
2339 maptile::outdoor_darkness = darkness;
2340 OUTPUT:
2341 RETVAL
2316 2342
2317void 2343void
2318maptile::instantiate () 2344maptile::instantiate ()
2319 2345
2320maptile *new () 2346maptile *new ()
… …
2352 for (int x = 0; x < THIS->width; ++x) 2378 for (int x = 0; x < THIS->width; ++x)
2353 for (int y = 0; y < THIS->height; ++y) 2379 for (int y = 0; y < THIS->height; ++y)
2354 { 2380 {
2355 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2381 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2356 if (op->flag [FLAG_IS_FLOOR]) 2382 if (op->flag [FLAG_IS_FLOOR])
2357 goto skip_space; 2383 goto skip;
2358 2384
2359 { 2385 {
2360 int offs = offset + y * stride + x; 2386 int offs = offset + y * stride + x;
2387
2361 if (IN_RANGE_EXC (offs, 0, idxlen)) 2388 if (IN_RANGE_EXC (offs, 0, idxlen))
2362 { 2389 {
2363 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2390 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2364 { 2391 {
2365 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2392 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2366 ob->flag [FLAG_NO_MAP_SAVE] = true; 2393 ob->flag [FLAG_NO_MAP_SAVE] = true;
2367 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2394 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2368 2395
2369 if (ob->randomitems) 2396 if (ob->randomitems && !ob->above)
2370 { 2397 {
2371 if (!ob->above)
2372 {
2373 ob->create_treasure (ob->randomitems); 2398 ob->create_treasure (ob->randomitems);
2374 2399
2375 for (object *op = ob->above; op; op = op->above) 2400 for (object *op = ob->above; op; op = op->above)
2376 op->flag [FLAG_NO_MAP_SAVE] = true; 2401 op->flag [FLAG_NO_MAP_SAVE] = true;
2377 } 2402 // TODO: if this is a pickable object, then the item
2378 2403 // will at a bit weird - saving inside the player
2379 ob->randomitems = 0; 2404 // will clear the flag, but when the player drops
2405 // it without logging out, it keeps the flag.
2406 // nobody ahs reported this, but this can be rather
2407 // annoying on persistent maps.
2380 } 2408 }
2381 } 2409 }
2382 } 2410 }
2383 } 2411 }
2384 2412
2385 skip_space: ; 2413 skip: ;
2386 } 2414 }
2387} 2415}
2388 2416
2389void 2417void
2390maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2418maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2400 2428
2401 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2429 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2402 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2430 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2403 2431
2404 for (int i = av_len ((AV *)palette) + 1; i--; ) 2432 for (int i = av_len ((AV *)palette) + 1; i--; )
2405 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2433 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2406 2434
2407 for (int y = 0; y < THIS->height; ++y) 2435 for (int y = 0; y < THIS->height; ++y)
2408 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2436 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2409 2437
2410 sfree (THIS->regions, THIS->size ()); 2438 sfree (THIS->regions, THIS->size ());
… …
2429 } 2457 }
2430 2458
2431int out_of_map (maptile *map, int x, int y) 2459int out_of_map (maptile *map, int x, int y)
2432 2460
2433void 2461void
2434trigger (maptile *map, long connection, bool state = true) 2462find_link (maptile *map, shstr_tmp connection)
2435 CODE:
2436 activate_connection (map, connection, state);
2437
2438void
2439get_connection (maptile *map, long connection)
2440 PPCODE: 2463 PPCODE:
2441 oblinkpt *obp = get_connection_links (map, connection); 2464 if (oblinkpt *obp = map->find_link (connection))
2442 if (obp)
2443 for (objectlink *ol = obp->link; ol; ol = ol->next) 2465 for (objectlink *ol = obp->link; ol; ol = ol->next)
2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2466 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2445 2467
2446void 2468void
2447get_map_flags (maptile *map, int x, int y) 2469get_map_flags (maptile *map, int x, int y)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2523 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2524 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2525}
2504 2526
2505SV * 2527SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2528bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2529 PROTOTYPE: $$$
2508 ALIAS: 2530 ALIAS:
2509 top_at = 1 2531 top_at = 1
2510 flags_at = 2 2532 flags_at = 2
2511 light_at = 3 2533 light_at = 3
2512 move_block_at = 4 2534 move_block_at = 4
2513 move_slow_at = 5 2535 move_slow_at = 5
2514 move_on_at = 6 2536 move_on_at = 6
2515 move_off_at = 7 2537 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2538 CODE:
2539{
2540 sint16 nx = x;
2541 sint16 ny = y;
2542
2543 if (!xy_normalise (map, nx, ny))
2544 XSRETURN_UNDEF;
2545
2546 mapspace &ms = map->at (nx, ny);
2547
2548 ms.update ();
2549
2519 switch (ix) 2550 switch (ix)
2520 { 2551 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2552 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2553 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2554 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2555 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2556 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2557 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2558 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2559 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2560 }
2561}
2530 OUTPUT: RETVAL 2562 OUTPUT: RETVAL
2531
2532void fix_walls (maptile *map, int x, int y)
2533
2534void fix_walls_around (maptile *map, int x, int y)
2535 2563
2536# worst xs function of my life 2564# worst xs function of my life
2537bool 2565bool
2538_create_random_map (\ 2566_create_random_map (\
2539 maptile *self,\ 2567 maptile *self,\
… …
2543 utf8_string monsterstyle,\ 2571 utf8_string monsterstyle,\
2544 utf8_string treasurestyle,\ 2572 utf8_string treasurestyle,\
2545 utf8_string layoutstyle,\ 2573 utf8_string layoutstyle,\
2546 utf8_string doorstyle,\ 2574 utf8_string doorstyle,\
2547 utf8_string decorstyle,\ 2575 utf8_string decorstyle,\
2576 utf8_string miningstyle,\
2548 utf8_string origin_map,\ 2577 utf8_string origin_map,\
2549 utf8_string final_map,\ 2578 utf8_string final_map,\
2550 utf8_string exitstyle,\ 2579 utf8_string exitstyle,\
2551 utf8_string this_map,\ 2580 utf8_string this_map,\
2552 utf8_string exit_on_final_map,\ 2581 utf8_string exit_on_final_map,\
… …
2584 assign (rmp.monsterstyle , monsterstyle); 2613 assign (rmp.monsterstyle , monsterstyle);
2585 assign (rmp.treasurestyle , treasurestyle); 2614 assign (rmp.treasurestyle , treasurestyle);
2586 assign (rmp.layoutstyle , layoutstyle); 2615 assign (rmp.layoutstyle , layoutstyle);
2587 assign (rmp.doorstyle , doorstyle); 2616 assign (rmp.doorstyle , doorstyle);
2588 assign (rmp.decorstyle , decorstyle); 2617 assign (rmp.decorstyle , decorstyle);
2618 assign (rmp.miningstyle , miningstyle);
2589 assign (rmp.exitstyle , exitstyle); 2619 assign (rmp.exitstyle , exitstyle);
2590 assign (rmp.exit_on_final_map, exit_on_final_map); 2620 assign (rmp.exit_on_final_map, exit_on_final_map);
2591 2621
2592 rmp.origin_map = origin_map; 2622 rmp.origin_map = origin_map;
2593 rmp.final_map = final_map; 2623 rmp.final_map = final_map;
… …
2621 OUTPUT: 2651 OUTPUT:
2622 RETVAL 2652 RETVAL
2623 2653
2624MODULE = cf PACKAGE = cf::mapspace 2654MODULE = cf PACKAGE = cf::mapspace
2625 2655
2626INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2656INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2627 2657
2628MODULE = cf PACKAGE = cf::arch 2658MODULE = cf PACKAGE = cf::arch
2629 2659
2630int archetypes_size () 2660int archetypes_size ()
2631 CODE: 2661 CODE:
… …
2635archetype *archetypes (U32 index) 2665archetype *archetypes (U32 index)
2636 CODE: 2666 CODE:
2637 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2667 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2638 OUTPUT: RETVAL 2668 OUTPUT: RETVAL
2639 2669
2640object *instantiate (archetype *arch)
2641 CODE:
2642 RETVAL = arch_to_object (arch);
2643 OUTPUT:
2644 RETVAL
2645
2646INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2670INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2647 2671
2648MODULE = cf PACKAGE = cf::party 2672MODULE = cf PACKAGE = cf::party
2649 2673
2650partylist *first () 2674partylist *first ()
2651 PROTOTYPE: 2675 PROTOTYPE:
2652 CODE: 2676 CODE:
2653 RETVAL = get_firstparty (); 2677 RETVAL = get_firstparty ();
2654 OUTPUT: RETVAL 2678 OUTPUT: RETVAL
2655 2679
2656INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2680INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2657 2681
2658MODULE = cf PACKAGE = cf::region 2682MODULE = cf PACKAGE = cf::region
2659 2683
2660void 2684void
2661list () 2685list ()
… …
2667 PROTOTYPE: $ 2691 PROTOTYPE: $
2668 CODE: 2692 CODE:
2669 RETVAL = region::find (name); 2693 RETVAL = region::find (name);
2670 OUTPUT: RETVAL 2694 OUTPUT: RETVAL
2671 2695
2672region *find_fuzzy (utf8_string name)
2673 PROTOTYPE: $
2674 CODE:
2675 RETVAL = region::find_fuzzy (name);
2676 OUTPUT: RETVAL
2677
2678int specificity (region *rgn) 2696int specificity (region *rgn)
2679 CODE: 2697 CODE:
2680 RETVAL = 0; 2698 RETVAL = 0;
2681 while (rgn = rgn->parent) 2699 while (rgn = rgn->parent)
2682 RETVAL++; 2700 RETVAL++;
2683 OUTPUT: RETVAL 2701 OUTPUT: RETVAL
2684 2702
2685INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2703INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2686 2704
2687MODULE = cf PACKAGE = cf::living 2705MODULE = cf PACKAGE = cf::living
2688 2706
2689INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2707INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2690 2708
2691MODULE = cf PACKAGE = cf::settings 2709MODULE = cf PACKAGE = cf::settings
2692 2710
2693INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2711INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2694 2712
2695MODULE = cf PACKAGE = cf::client 2713MODULE = cf PACKAGE = cf::client
2696 2714
2697INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2715INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2698 2716
2699int invoke (client *ns, int event, ...) 2717int invoke (client *ns, int event, ...)
2700 CODE: 2718 CODE:
2701 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2719 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2702 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2720 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2768 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2786 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2769 old_sound_index [idx] = face; 2787 old_sound_index [idx] = face;
2770 2788
2771MODULE = cf PACKAGE = cf::face PREFIX = face_ 2789MODULE = cf PACKAGE = cf::face PREFIX = face_
2772 2790
2773#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2791#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2774 2792
2775faceidx face_find (utf8_string name, faceidx defidx = 0) 2793faceidx face_find (utf8_string name, faceidx defidx = 0)
2776 2794
2777faceidx alloc (utf8_string name) 2795faceidx alloc (utf8_string name)
2778 CODE: 2796 CODE:
… …
2816 faceinfo *f = face_info (idx); assert (f); 2834 faceinfo *f = face_info (idx); assert (f);
2817 facedata *d = &(faceset ? f->data64 : f->data32); 2835 facedata *d = &(faceset ? f->data64 : f->data32);
2818 sv_to (data, d->data); 2836 sv_to (data, d->data);
2819 STRLEN clen; 2837 STRLEN clen;
2820 char *cdata = SvPVbyte (chksum, clen); 2838 char *cdata = SvPVbyte (chksum, clen);
2821 clen = min (CHKSUM_SIZE, clen); 2839 clen = min (CHKSUM_MAXLEN, clen);
2822 2840
2841 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2842
2823 if (memcmp (d->chksum, cdata, clen)) 2843 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2824 { 2844 {
2845 d->chksum_len = clen;
2825 memcpy (d->chksum, cdata, clen); 2846 memcpy (d->chksum, cdata, clen);
2826 2847
2827 // invalidate existing client face info 2848 // invalidate existing client face info
2828 for_all_clients (ns) 2849 for_all_clients (ns)
2829 if (ns->faceset == faceset) 2850 if (ns->faceset == faceset)
… …
2844 2865
2845SV *get_chksum (faceidx idx, int faceset = 0) 2866SV *get_chksum (faceidx idx, int faceset = 0)
2846 CODE: 2867 CODE:
2847 facedata *d = face_data (idx, faceset); 2868 facedata *d = face_data (idx, faceset);
2848 if (!d) XSRETURN_UNDEF; 2869 if (!d) XSRETURN_UNDEF;
2849 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2870 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2850 OUTPUT: 2871 OUTPUT:
2851 RETVAL 2872 RETVAL
2852 2873
2853SV *get_data (faceidx idx, int faceset = 0) 2874SV *get_data (faceidx idx, int faceset = 0)
2854 CODE: 2875 CODE:
… …
2874 ns->force_newmap = true; 2895 ns->force_newmap = true;
2875 } 2896 }
2876 2897
2877MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2898MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2878 2899
2879#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2900#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2880 2901
2881animidx anim_find (utf8_string name) 2902animidx anim_find (utf8_string name)
2882 CODE: 2903 CODE:
2883 RETVAL = animation::find (name).number; 2904 RETVAL = animation::find (name).number;
2884 OUTPUT: RETVAL 2905 OUTPUT: RETVAL
… …
2899 } 2920 }
2900 else 2921 else
2901 anim = &animation::create (name, av_len (av) + 1, facings); 2922 anim = &animation::create (name, av_len (av) + 1, facings);
2902 2923
2903 for (int i = 0; i < anim->num_animations; ++i) 2924 for (int i = 0; i < anim->num_animations; ++i)
2904 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2925 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2905} 2926}
2906 OUTPUT: RETVAL 2927 OUTPUT: RETVAL
2907 2928
2908void invalidate_all () 2929void invalidate_all ()
2909 CODE: 2930 CODE:
2910 for_all_clients (ns) 2931 for_all_clients (ns)
2911 ns->anims_sent.reset (); 2932 ns->anims_sent.reset ();
2912 2933
2913MODULE = cf PACKAGE = cf::object::freezer 2934MODULE = cf PACKAGE = cf::object::freezer
2914 2935
2915INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2936INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2916 2937
2917SV * 2938SV *
2918new (char *klass) 2939new (char *klass)
2919 CODE: 2940 CODE:
2920 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2941 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2927 sv_to (sv, self); 2948 sv_to (sv, self);
2928 delete self; 2949 delete self;
2929 2950
2930MODULE = cf PACKAGE = cf::object::thawer 2951MODULE = cf PACKAGE = cf::object::thawer
2931 2952
2932INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2953INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
2933 2954
2934SV * 2955SV *
2935new_from_file (char *klass, octet_string path) 2956new_from_file (char *klass, octet_string path)
2936 CODE: 2957 CODE:
2937 object_thawer *f = new object_thawer (path); 2958 object_thawer *f = new object_thawer (path);

Diff Legend

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