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.308 by root, Mon Nov 24 05:19:59 2008 UTC vs.
Revision 1.367 by root, Mon Apr 12 05:22:38 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
93#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
94static inline SV * 100static SV *
95newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
96{ 102{
97 if (!s) 103 if (!s)
98 return newSV (0); 104 return newSV (0);
99 105
… …
102 return sv; 108 return sv;
103} 109}
104#endif 110#endif
105 111
106#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
107static inline SV * 113static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 115{
110 if (!s) 116 if (!s)
111 return newSV (0); 117 return newSV (0);
112 118
… …
116 SvUTF8_on (sv); 122 SvUTF8_on (sv);
117 123
118 return sv; 124 return sv;
119} 125}
120#endif 126#endif
127
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);
142}
121 143
122// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
123template<class super> 145template<class super>
124static super * 146static super *
125is_a (attachable *at) 147is_a (attachable *at)
… …
158 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
159 hv_clear (self); 181 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
162 184
163 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 186 assert (!this->self);
165 } 187 }
166} 188}
167 189
168void 190void
… …
202attachable::destroy () 224attachable::destroy ()
203{ 225{
204 if (destroyed ()) 226 if (destroyed ())
205 return; 227 return;
206 228
207 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
208 do_destroy (); 230 do_destroy ();
209 sever_self (); 231 sever_self ();
232}
233
234void
235attachable::do_delete ()
236{
237 delete this;
210} 238}
211 239
212void 240void
213attachable::check_mortals () 241attachable::check_mortals ()
214{ 242{
… …
230 258
231 if (0) 259 if (0)
232 { 260 {
233 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
234 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
235 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
236 } 265 }
237 } 266 }
238 } 267 }
239 268
… …
259 } 288 }
260 else 289 else
261 { 290 {
262 mortals.erase (i); 291 mortals.erase (i);
263 obj->sever_self (); 292 obj->sever_self ();
264 delete obj; 293 obj->do_delete ();
265 } 294 }
266 } 295 }
267} 296}
268 297
269void 298void
… …
286 315
287 attach = src.attach; 316 attach = src.attach;
288 return *this; 317 return *this;
289} 318}
290 319
320#if 0
291template<typename T> 321template<typename T>
292static bool 322static bool
293find_backref (void *ptr, T *obj) 323find_backref (void *ptr, T *obj)
294{ 324{
295 char *s = (char *)obj; 325 char *s = (char *)obj;
… …
303 333
304 return false; 334 return false;
305} 335}
306 336
307// for debugging, find "live" objects containing this ptr 337// for debugging, find "live" objects containing this ptr
308void 338static void
309find_backref (void *ptr) 339find_backref (void *ptr)
310{ 340{
311 for_all_objects (op) 341 for_all_objects (op)
312 if (find_backref (ptr, op)) 342 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 343 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
317 fprintf (stderr, "P %p\n", pl); 347 fprintf (stderr, "P %p\n", pl);
318 348
319 for_all_clients (ns) 349 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 350 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 351 fprintf (stderr, "C %p\n", ns);
322
323} 352}
353#endif
324 354
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 356
327static SV * 357static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
381 411
382 return sv; 412 return sv;
383 } 413 }
384} 414}
385 415
416#if 0 // unused
386static void 417static void
387clearSVptr (SV *sv) 418clearSVptr (SV *sv)
388{ 419{
389 if (SvROK (sv)) 420 if (SvROK (sv))
390 sv = SvRV (sv); 421 sv = SvRV (sv);
391 422
392 hv_clear ((HV *)sv); 423 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 424 sv_unmagic (sv, PERL_MAGIC_ext);
394} 425}
426#endif
427
428static long
429SvPTR_nc (SV *sv)
430{
431 sv = SvRV (sv);
432
433 // very important shortcut
434 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
435 return (long)SvMAGIC (sv)->mg_ptr;
436
437 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
438 return (long)mg->mg_ptr;
439
440 croak ("perl code used object, but C object is already destroyed, caught");
441}
395 442
396static long 443static long
397SvPTR (SV *sv, const char *klass) 444SvPTR (SV *sv, const char *klass)
398{ 445{
399 if (!sv_derived_from (sv, klass)) 446 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 447 croak ("object of type %s expected", klass);
401 448
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 449 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} 450}
409 451
410static long 452static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 453SvPTR_ornull (SV *sv, const char *klass)
412{ 454{
413 if (SvOK (sv)) 455 if (expect_false (!SvOK (sv))) return 0;
456
414 return SvPTR (sv, klass); 457 return SvPTR (sv, klass);
415 else
416 return 0;
417} 458}
418 459
460static long noinline
461SvPTR_ornull_client (SV *sv)
462{
463 if (expect_false (!SvOK (sv))) return 0;
464
465 if (!SvROK (sv)
466 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
467 && !sv_derived_from (sv, "cf::client")))
468 croak ("object of type cf::client expected");
469
470 return SvPTR_nc (sv);
471}
472
473static long noinline
474SvPTR_ornull_object (SV *sv)
475{
476 if (expect_false (!SvOK (sv))) return 0;
477
478 if (!SvROK (sv)
479 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
480 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
481 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
482 && !sv_derived_from (sv, "cf::object")))
483 croak ("object of type cf::object expected");
484
485 return SvPTR_nc (sv);
486}
487
488static long noinline
489SvPTR_ornull_player (SV *sv)
490{
491 if (expect_false (!SvOK (sv))) return 0;
492
493 if (!SvROK (sv)
494 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
495 && !sv_derived_from (sv, "cf::player")))
496 croak ("object of type cf::player expected");
497
498 return SvPTR_nc (sv);
499}
500
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 501static 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); } 502static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 503static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 504static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 505static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 506static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 507static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 508static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 509static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 510static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 511static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 512static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 513static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 514static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 515static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 516static 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); } 517static 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); } 518static 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); } 519static 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); } 520static 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); } 521static 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); } 522static 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); } 523static 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); } 524static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
443 525
444inline SV *to_sv (object & v) { return to_sv (&v); } 526static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 527static inline SV *to_sv (living & v) { return to_sv (&v); }
446 528
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 529static 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); } 530static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 531
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 532static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 533
452inline SV *to_sv (dynbuf * v) 534static inline SV *to_sv (dynbuf * v)
453{ 535{
454 SV *sv = newSV (0); 536 SV *sv = newSV (0);
455 537
456 sv_upgrade (sv, SVt_PV); 538 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 539 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 543 *SvEND (sv) = 0;
462 544
463 return sv; 545 return sv;
464} 546}
465 547
466inline SV *to_sv (dynbuf_text * v) 548static inline SV *to_sv (dynbuf_text * v)
467{ 549{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 550 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 551 SvUTF8_on (sv);
470 return sv; 552 return sv;
471} 553}
472 554
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 555static 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; } 556static 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); } 557static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 558static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 559static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 560static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 561static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 562static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 563static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 564static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 565static 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); } 566static 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); } 567static 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); } 568static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 569static 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"); } 570static 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"); } 571static 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"); } 572static 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"); } 573static 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"); } 574static 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"); } 575static 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"); } 576static 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"); } 577static 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"); } 578static 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"); } 579static 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"); } 580static 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" ); } 581static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 582
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 583//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)); } 584static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 585
504template<class T> 586template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 587static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 588
507template<int N> 589template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 590static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 591
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 592static 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); } 593static 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); } 594static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 595static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 596
515inline void sv_to (SV *sv, std::string &v) 597static inline void sv_to (SV *sv, std::string &v)
516{ 598{
517 STRLEN len; 599 STRLEN len;
518 char *data = SvPVbyte (sv, len); 600 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 601 v.assign (data, len);
520} 602}
521 603
522inline void sv_to (SV *sv, UUID &v) 604static inline void sv_to (SV *sv, UUID &v)
523{ 605{
524 if (!v.parse (SvPV_nolen (sv))) 606 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 607 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 608}
527 609
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 610static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 611
530static SV * 612static SV *
531newSVdt_va (va_list &ap, data_type type) 613newSVdt_va (va_list &ap, data_type type)
532{ 614{
533 SV *sv; 615 SV *sv;
… …
607 va_end (ap); 689 va_end (ap);
608 690
609 return sv; 691 return sv;
610} 692}
611 693
694// typemap support, mostly to avoid excessive inlining
695template<class type>
696static void noinline
697cf_obj_to (SV *arg, type &var)
698{
699 sv_to (arg, var);
700 if (!var)
701 croak ("must not pass invalid/null cf_obj here");
702}
703
704template<class object>
705static void noinline
706cf_obj_ornull_to (SV *arg, object *&var)
707{
708 if (SvOK (arg))
709 {
710 sv_to (arg, var);
711 if (!var)
712 croak ("unable to convert perl object to C++ object");
713 }
714 else
715 var = 0;
716}
717
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 718//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 719
614SV * 720static SV *
615registry (attachable *ext) 721registry (attachable *ext)
616{ 722{
617 if (!ext->cb) 723 if (!ext->cb)
618 ext->cb = newAV (); 724 ext->cb = newAV ();
619 725
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 766 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 767 exit (EXIT_FAILURE);
662 } 768 }
663} 769}
664 770
771void
665void cfperl_main () 772cfperl_main ()
666{ 773{
667 dSP; 774 dSP;
668 775
669 PUSHMARK (SP); 776 PUSHMARK (SP);
670 PUTBACK; 777 PUTBACK;
… …
695# undef def 802# undef def
696}; 803};
697 804
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 805#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 806
700static void 807static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 808gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 809{
703 // event must be in array 810 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 811 if (event >= 0 && event <= AvFILLp (registry))
705 { 812 {
… …
791{ 898{
792 attachable::gather_callbacks (callbacks, event); 899 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 900 ::gather_callbacks (callbacks, cb_map, event);
794} 901}
795 902
796void 903static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 904_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 905{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 906 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 907 {
801 SV *cbs_ = AvARRAY (registry)[event]; 908 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 918 }
812 } 919 }
813} 920}
814 921
815// very slow and inefficient way to recalculate the global want bitsets 922// very slow and inefficient way to recalculate the global want bitsets
816void 923static void
817_recalc_want () 924_recalc_want ()
818{ 925{
819 ev_want_event.reset (); 926 ev_want_event.reset ();
820 927
821 _recalc_want (ev_want_event, cb_global); 928 _recalc_want (ev_want_event, cb_global);
… …
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 1001 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 1002 }
896 1003
897 va_end (ap); 1004 va_end (ap);
898 1005
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 1006 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 1007 count = count > 0 ? POPi : 0;
901 1008
902 CALL_END; 1009 CALL_END;
903 1010
904 return count; 1011 return count;
905} 1012}
906 1013
907SV * 1014static SV *
908cfperl_result (int idx) 1015cfperl_result (int idx)
909{ 1016{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1017 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 1018 if (!av)
912 return &PL_sv_undef; 1019 return &PL_sv_undef;
… …
931} 1038}
932 1039
933///////////////////////////////////////////////////////////////////////////// 1040/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 1041// various c++ => perl glue functions
935 1042
1043void
936void cfperl_tick () 1044cfperl_tick ()
937{ 1045{
938 tick_pending = 1; 1046 tick_pending = 1;
939 1047
940 if (tick_inhibit) 1048 if (tick_inhibit)
941 return; 1049 return;
… …
944 1052
945 dSP; 1053 dSP;
946 1054
947 PUSHMARK (SP); 1055 PUSHMARK (SP);
948 PUTBACK; 1056 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 1057 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 1058
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1059 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 1060}
953 1061
954void 1062void
… …
977 CALL_CALL ("ext::books::make_book", G_VOID); 1085 CALL_CALL ("ext::books::make_book", G_VOID);
978 CALL_END; 1086 CALL_END;
979} 1087}
980 1088
981void 1089void
982cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1090cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
983{ 1091{
984 CALL_BEGIN (4); 1092 CALL_BEGIN (4);
985 CALL_ARG (ns); 1093 CALL_ARG (ns);
986 CALL_ARG (type); 1094 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1095 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1096 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1097 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1098 CALL_END;
991} 1099}
992 1100
993int 1101int
994cfperl_can_merge (object *ob1, object *ob2) 1102cfperl_can_merge (object *ob1, object *ob2)
… …
996 int can; 1104 int can;
997 1105
998 CALL_BEGIN (2); 1106 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1107 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1108 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1109 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1110 can = count && SvTRUE (TOPs);
1003 CALL_END; 1111 CALL_END;
1004 1112
1005 return can; 1113 return can;
1006} 1114}
1007 1115
1116void
1117cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1118{
1119 CALL_BEGIN (4);
1120 CALL_ARG (ob);
1121 CALL_ARG (state);
1122 CALL_ARG (activator);
1123 CALL_ARG (originator);
1124 CALL_CALL ("cf::mapscript::activate", G_VOID);
1125 CALL_END;
1126}
1127
1008player * 1128player *
1009player::find (const char *name) 1129player::find (const_utf8_string name)
1010{ 1130{
1011 CALL_BEGIN (1); 1131 CALL_BEGIN (1);
1012 CALL_ARG (name); 1132 CALL_ARG (name);
1013 CALL_CALL ("cf::player::find", G_SCALAR); 1133 CALL_CALL ("cf::player::find", G_SCALAR);
1014 1134
… …
1019 1139
1020 return retval; 1140 return retval;
1021} 1141}
1022 1142
1023maptile * 1143maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty) 1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1025{ 1145{
1026 CALL_BEGIN (3); 1146 CALL_BEGIN (3);
1027 CALL_ARG (dirname); 1147 CALL_ARG (dirname);
1028 CALL_ARG (stylename); 1148 CALL_ARG (stylename);
1029 CALL_ARG (difficulty); 1149 CALL_ARG (difficulty);
… …
1036 1156
1037 return retval; 1157 return retval;
1038} 1158}
1039 1159
1040maptile * 1160maptile *
1041maptile::find_sync (const char *path, maptile *origin) 1161maptile::find_sync (const_utf8_string path, maptile *origin)
1042{ 1162{
1043 CALL_BEGIN (2); 1163 CALL_BEGIN (2);
1044 CALL_ARG (path); 1164 CALL_ARG (path);
1045 CALL_ARG (origin); 1165 CALL_ARG (origin);
1046 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1166 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1052 1172
1053 return retval; 1173 return retval;
1054} 1174}
1055 1175
1056maptile * 1176maptile *
1057maptile::find_async (const char *path, maptile *origin, bool load) 1177maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1058{ 1178{
1059 CALL_BEGIN (3); 1179 CALL_BEGIN (3);
1060 CALL_ARG (path); 1180 CALL_ARG (path);
1061 CALL_ARG (origin); 1181 CALL_ARG (origin);
1062 CALL_ARG (load); 1182 CALL_ARG (load);
… …
1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1198 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1079 CALL_END; 1199 CALL_END;
1080} 1200}
1081 1201
1082void 1202void
1083maptile::change_all_map_light (int change)
1084{
1085 CALL_BEGIN (1);
1086 CALL_ARG (change);
1087 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1088 CALL_END;
1089}
1090
1091void
1092object::enter_exit (object *exit) 1203object::enter_exit (object *exit)
1093{ 1204{
1094 if (type != PLAYER) 1205 if (type != PLAYER)
1095 return; 1206 return;
1096 1207
… …
1100 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1211 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1101 CALL_END; 1212 CALL_END;
1102} 1213}
1103 1214
1104void 1215void
1105object::player_goto (const char *path, int x, int y) 1216object::player_goto (const_utf8_string path, int x, int y)
1106{ 1217{
1107 if (type != PLAYER) 1218 if (type != PLAYER)
1108 return; 1219 return;
1109 1220
1110 CALL_BEGIN (4); 1221 CALL_BEGIN (4);
… …
1114 CALL_ARG (y); 1225 CALL_ARG (y);
1115 CALL_CALL ("cf::object::player::goto", G_VOID); 1226 CALL_CALL ("cf::object::player::goto", G_VOID);
1116 CALL_END; 1227 CALL_END;
1117} 1228}
1118 1229
1119const char * 1230const_utf8_string
1120object::ref () const 1231object::ref () const
1121{ 1232{
1122 if (type == PLAYER) 1233 if (type == PLAYER)
1123 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1234 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1124 else 1235 else
1236 // TODO: should be able to save references within the same map, at least
1125 return 0; 1237 return 0;
1126} 1238}
1127 1239
1128object * 1240object *
1129object::deref (const char *ref) 1241object::deref (const_utf8_string ref)
1130{ 1242{
1131 object *retval = 0; 1243 object *retval = 0;
1132 1244
1133 if (ref) 1245 if (ref)
1134 { 1246 {
… …
1144 1256
1145 return retval; 1257 return retval;
1146} 1258}
1147 1259
1148void 1260void
1149log_backtrace (const char *msg) 1261log_backtrace (const_utf8_string msg)
1150{ 1262{
1151#if HAVE_BACKTRACE 1263#if HAVE_BACKTRACE
1152 void *addr [20]; 1264 void *addr [20];
1153 int size = backtrace (addr, 20); 1265 int size = backtrace (addr, 20);
1154 1266
… …
1159 CALL_CALL ("cf::_log_backtrace", G_VOID); 1271 CALL_CALL ("cf::_log_backtrace", G_VOID);
1160 CALL_END; 1272 CALL_END;
1161#endif 1273#endif
1162} 1274}
1163 1275
1276bool
1277is_match_expr (const_utf8_string expr)
1278{
1279 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1280}
1281
1282bool
1283match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1284{
1285 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1286 expr += sizeof ("match ") - 1;
1287
1288 CALL_BEGIN (5);
1289 CALL_ARG (expr);
1290 CALL_ARG (ob);
1291 CALL_ARG (self);
1292 CALL_ARG (source);
1293 CALL_ARG (originator);
1294 CALL_CALL (cv_cf_match_match, G_SCALAR);
1295
1296 bool matched = count && SvTRUE (TOPs);
1297
1298 CALL_END;
1299
1300 return matched;
1301}
1302
1303object *
1304match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1305{
1306 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1307 expr += sizeof ("match ") - 1;
1308
1309 CALL_BEGIN (5);
1310 CALL_ARG (expr);
1311 CALL_ARG (ob);
1312 CALL_ARG (self);
1313 CALL_ARG (source);
1314 CALL_ARG (originator);
1315 CALL_CALL (cv_cf_match_match, G_ARRAY);
1316
1317 object *one = 0;
1318
1319 if (count)
1320 sv_to (TOPs, one);
1321
1322 CALL_END;
1323
1324 return one;
1325}
1326
1164///////////////////////////////////////////////////////////////////////////// 1327/////////////////////////////////////////////////////////////////////////////
1165 1328
1166struct EVAPI *evapi::GEVAPI; 1329struct EVAPI *evapi::GEVAPI;
1167struct CoroAPI *coroapi::GCoroAPI; 1330struct CoroAPI *coroapi::GCoroAPI;
1168 1331
1332void
1169void coroapi::do_cede_to_tick () 1333coroapi::do_cede_to_tick ()
1170{ 1334{
1171 cede_pending = 0; 1335 cede_pending = 0;
1172 cede (); 1336 cede ();
1173} 1337}
1174 1338
… …
1198 ev_io_set ((ev_io *)this, fd, events); 1362 ev_io_set ((ev_io *)this, fd, events);
1199 if (active) start (); 1363 if (active) start ();
1200 } 1364 }
1201} 1365}
1202 1366
1203void 1367static void
1204_connect_to_perl () 1368_connect_to_perl_1 ()
1205{ 1369{
1206 stash_cf = gv_stashpv ("cf", 1); 1370 stash_cf = gv_stashpv ("cf", 1);
1207 1371
1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1372 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1373 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1228 cb_client = get_av ("cf::CB_CLIENT", 1); 1392 cb_client = get_av ("cf::CB_CLIENT", 1);
1229 cb_type = get_av ("cf::CB_TYPE" , 1); 1393 cb_type = get_av ("cf::CB_TYPE" , 1);
1230 cb_map = get_av ("cf::CB_MAP" , 1); 1394 cb_map = get_av ("cf::CB_MAP" , 1);
1231} 1395}
1232 1396
1397static void
1398_connect_to_perl_2 ()
1399{
1400 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1401 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1402 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1403 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1404 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1405}
1406
1233MODULE = cf PACKAGE = cf PREFIX = cf_ 1407MODULE = cf PACKAGE = cf PREFIX = cf_
1234 1408
1235BOOT: 1409BOOT:
1236{ 1410{
1237 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1411 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1238 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1412 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1239 1413
1240 _connect_to_perl (); 1414 _connect_to_perl_1 ();
1241 1415
1242 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1416 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1243 1417
1244 //{ 1418 //{
1245 // require_pv ("Time::HiRes"); 1419 // require_pv ("Time::HiRes");
… …
1253 static const struct { 1427 static const struct {
1254 const char *name; 1428 const char *name;
1255 IV iv; 1429 IV iv;
1256 } *civ, const_iv[] = { 1430 } *civ, const_iv[] = {
1257# define const_iv(name) { # name, (IV)name }, 1431# define const_iv(name) { # name, (IV)name },
1432# include "const_iv.h"
1433# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1434# include "attackinc.h"
1435# undef def
1436# define def(uc, flags) const_iv (SK_ ## uc)
1437# include "skillinc.h"
1438# undef def
1439
1258 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1440 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1259 const_iv (logBacktrace) 1441 const_iv (logBacktrace)
1260 1442
1261 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1443 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1262 1444
1263 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1445 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1264 1446
1265 const_iv (MAX_TIME) 1447 const_iv (MAX_TIME)
1266 const_iv (MAXSOCKBUF) 1448 const_iv (MAXSOCKBUF)
1267 1449
1268 const_iv (NUM_BODY_LOCATIONS)
1269 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1270 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1271 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1272 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1273 const_iv (body_wrist) const_iv (body_waist)
1274
1275 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1276 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1277 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1278 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1279 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1280 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1281 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1282 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1283 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1284 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1285 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1286 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1287 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1288 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1289 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1290 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1291 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1292 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1293 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1294 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1295 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1296 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1297 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1298 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1299 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1300 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1301 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1302 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1303
1304 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1305
1306 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1307 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1308
1309 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1310 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1311 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1312 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1313 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1314 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1315 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1316
1317 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1318 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1319 const_iv (WEAP_BLUD)
1320
1321 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1322 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1323 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1324 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1325 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1326 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1327 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1328 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1329 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1330 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1331 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1332 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1333 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1334 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1335 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1336 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1337 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1338 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1347
1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1350 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1351 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1352 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1353 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1354
1355 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1450 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1356 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1451 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1357 1452
1358 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1453 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1359
1360 const_iv (SP_RAISE_DEAD)
1361 const_iv (SP_RUNE)
1362 const_iv (SP_MAKE_MARK)
1363 const_iv (SP_BOLT)
1364 const_iv (SP_BULLET)
1365 const_iv (SP_EXPLOSION)
1366 const_iv (SP_CONE)
1367 const_iv (SP_BOMB)
1368 const_iv (SP_WONDER)
1369 const_iv (SP_SMITE)
1370 const_iv (SP_MAGIC_MISSILE)
1371 const_iv (SP_SUMMON_GOLEM)
1372 const_iv (SP_DIMENSION_DOOR)
1373 const_iv (SP_MAGIC_MAPPING)
1374 const_iv (SP_MAGIC_WALL)
1375 const_iv (SP_DESTRUCTION)
1376 const_iv (SP_PERCEIVE_SELF)
1377 const_iv (SP_WORD_OF_RECALL)
1378 const_iv (SP_INVISIBLE)
1379 const_iv (SP_PROBE)
1380 const_iv (SP_HEALING)
1381 const_iv (SP_CREATE_FOOD)
1382 const_iv (SP_EARTH_TO_DUST)
1383 const_iv (SP_CHANGE_ABILITY)
1384 const_iv (SP_BLESS)
1385 const_iv (SP_CURSE)
1386 const_iv (SP_SUMMON_MONSTER)
1387 const_iv (SP_CHARGING)
1388 const_iv (SP_POLYMORPH)
1389 const_iv (SP_ALCHEMY)
1390 const_iv (SP_REMOVE_CURSE)
1391 const_iv (SP_IDENTIFY)
1392 const_iv (SP_DETECTION)
1393 const_iv (SP_MOOD_CHANGE)
1394 const_iv (SP_MOVING_BALL)
1395 const_iv (SP_SWARM)
1396 const_iv (SP_CHANGE_MANA)
1397 const_iv (SP_DISPEL_RUNE)
1398 const_iv (SP_CREATE_MISSILE)
1399 const_iv (SP_CONSECRATE)
1400 const_iv (SP_ANIMATE_WEAPON)
1401 const_iv (SP_LIGHT)
1402 const_iv (SP_CHANGE_MAP_LIGHT)
1403 const_iv (SP_FAERY_FIRE)
1404 const_iv (SP_CAUSE_DISEASE)
1405 const_iv (SP_AURA)
1406 const_iv (SP_TOWN_PORTAL)
1407 const_iv (SP_PARTY_SPELL)
1408 1454
1409 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1455 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1410 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1456 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1411 const_iv (F_LOCKED) 1457 const_iv (F_LOCKED)
1412 1458
1413 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1414
1415 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1459 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1416 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1460 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1417 1461
1418 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1419
1420 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1421 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1422
1423 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1424 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1425
1426 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1462 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1427
1428 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1429 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1430 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1431 const_iv (M_ICE) const_iv (M_SPECIAL)
1432 1463
1433 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1464 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1434 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1465 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1435 1466
1436 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1437 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1438 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1439 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1440 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1441 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1442 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1443 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1444 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1445 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1446 const_iv (SK_POISON_NAIL)
1447
1448 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1449 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1450 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1451 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1452 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1453 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1454
1455 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1456
1457 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1458 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1459 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1460 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1461 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1462 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1463 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1464
1465 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1467 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1466 const_iv (MAP_INACTIVE) 1468 const_iv (MAP_INACTIVE)
1467 1469
1468 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1470 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1469 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1471 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1470 1472
1471 const_iv (VERSION_CS) const_iv (VERSION_SC)
1472
1473 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1473 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1474 1474
1475 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1476
1477 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1475 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1478
1479 // random map generator
1480 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1481 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1482
1483 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1484 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1485 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1486
1487 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1488 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1489
1490 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1491 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1492
1493 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1494 const_iv (FT_RSRC) const_iv (FT_NUM)
1495 }; 1476 };
1496 1477
1497 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1478 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1498 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1479 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1499 1480
… …
1516 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1497 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1517 av_push (event, newSViv (eiv->klass)); 1498 av_push (event, newSViv (eiv->klass));
1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1499 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1500 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1520 } 1501 }
1502
1503 // used by autogenerated BOOT sections from genacc
1504 av_reflect = get_av ("cf::REFLECT", 1);
1521} 1505}
1522 1506
1523void _gv_clear (SV *gv) 1507void _gv_clear (SV *gv)
1524 CODE: 1508 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV); 1509 assert (SvTYPE (gv) == SVt_PVGV);
… …
1532 f (GvGP (gv)->gp_cv); 1516 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0; 1517 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv); 1518 GvMULTI_off (gv);
1535# undef f 1519# undef f
1536 1520
1537void _connect_to_perl () 1521void _connect_to_perl_1 ()
1522
1523void _connect_to_perl_2 ()
1538 1524
1539void _recalc_want () 1525void _recalc_want ()
1540 1526
1541# not used by default anymore 1527# not used by default anymore
1542void _global_reattach () 1528void _global_reattach ()
… …
1600 1586
1601void init_attackmess () 1587void init_attackmess ()
1602 1588
1603void init_dynamic () 1589void init_dynamic ()
1604 1590
1605void init_block ()
1606
1607void load_settings () 1591void load_settings ()
1608 1592
1609void load_materials () 1593void load_materials ()
1610 1594
1611void init_uuid () 1595void init_uuid ()
1612 CODE: 1596 CODE:
1613 UUID::init (); 1597 UUID::init ();
1614 1598
1615void init_signals () 1599void init_signals ()
1616
1617void init_commands ()
1618 1600
1619void init_skills () 1601void init_skills ()
1620 1602
1621void init_beforeplay () 1603void init_beforeplay ()
1622 1604
… …
1652 } 1634 }
1653 1635
1654void server_tick () 1636void server_tick ()
1655 CODE: 1637 CODE:
1656{ 1638{
1639 ev_now_update (EV_DEFAULT);
1657 NOW = ev_now (EV_DEFAULT); 1640 NOW = ev_now (EV_DEFAULT);
1658 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1641 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1659 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1642 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1660 runtime = SvNVX (sv_runtime); 1643 runtime = SvNVX (sv_runtime);
1661 1644
1662 server_tick (); 1645 server_tick ();
1663 1646
1664 NOW = ev_time (); 1647 ev_now_update (EV_DEFAULT);
1648 NOW = ev_now (EV_DEFAULT);
1665 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1649 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1666 runtime += TICK; 1650 runtime += TICK;
1667 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1651 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1668} 1652}
1669 1653
… …
1698 CODE: 1682 CODE:
1699 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1683 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1700 OUTPUT: 1684 OUTPUT:
1701 RETVAL 1685 RETVAL
1702 1686
1687const char *ordinal (int i)
1688
1703void weaken (...) 1689void weaken (...)
1704 PROTOTYPE: @ 1690 PROTOTYPE: @
1705 CODE: 1691 CODE:
1706 while (items > 0) 1692 while (items > 0)
1707 sv_rvweaken (ST (--items)); 1693 sv_rvweaken (ST (--items));
1708 1694
1709void 1695void log_suspend ()
1696
1697void log_resume ()
1698
1710log_backtrace (utf8_string msg) 1699void log_backtrace (utf8_string msg)
1711 1700
1712void
1713LOG (int flags, utf8_string msg) 1701void LOG (int flags, utf8_string msg)
1714 PROTOTYPE: $$ 1702 PROTOTYPE: $$
1715 C_ARGS: flags, "%s", msg 1703 C_ARGS: flags, "%s", msg
1716 1704
1717octet_string path_combine (octet_string base, octet_string path) 1705octet_string path_combine (octet_string base, octet_string path)
1718 PROTOTYPE: $$ 1706 PROTOTYPE: $$
… …
1909 RETVAL 1897 RETVAL
1910 1898
1911void 1899void
1912debug_trace (attachable *obj, bool on = true) 1900debug_trace (attachable *obj, bool on = true)
1913 CODE: 1901 CODE:
1914 obj->flags &= ~attachable::F_DEBUG_TRACE; 1902 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1915 if (on) 1903 if (on)
1916 obj->flags |= attachable::F_DEBUG_TRACE; 1904 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1917 1905
1918int mortals_size () 1906int mortals_size ()
1919 CODE: 1907 CODE:
1920 RETVAL = attachable::mortals.size (); 1908 RETVAL = attachable::mortals.size ();
1921 OUTPUT: RETVAL 1909 OUTPUT: RETVAL
… …
1923#object *mortals (U32 index) 1911#object *mortals (U32 index)
1924# CODE: 1912# CODE:
1925# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1913# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1926# OUTPUT: RETVAL 1914# OUTPUT: RETVAL
1927 1915
1928INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1916INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1929 1917
1930MODULE = cf PACKAGE = cf::global 1918MODULE = cf PACKAGE = cf::global
1931 1919
1932int invoke (SV *klass, int event, ...) 1920int invoke (SV *klass, int event, ...)
1933 CODE: 1921 CODE:
… …
1937 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1925 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1938 OUTPUT: RETVAL 1926 OUTPUT: RETVAL
1939 1927
1940MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1928MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1941 1929
1942INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1930INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1943 1931
1944int invoke (object *op, int event, ...) 1932int invoke (object *op, int event, ...)
1945 CODE: 1933 CODE:
1946 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1934 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1947 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1935 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1974int mortals_size () 1962int mortals_size ()
1975 CODE: 1963 CODE:
1976 RETVAL = attachable::mortals.size (); 1964 RETVAL = attachable::mortals.size ();
1977 OUTPUT: RETVAL 1965 OUTPUT: RETVAL
1978 1966
1979const char *slot_use_name (U32 slot) 1967const_utf8_string slot_use_name (U32 slot)
1980 ALIAS: 1968 ALIAS:
1981 slot_nonuse_name = 1 1969 slot_nonuse_name = 1
1982 CODE: 1970 CODE:
1983{ 1971{
1984 if (slot >= NUM_BODY_LOCATIONS) 1972 if (slot >= NUM_BODY_LOCATIONS)
… …
2048 2036
2049int apply_shop_mat (object *shop_mat, object *op); 2037int apply_shop_mat (object *shop_mat, object *op);
2050 2038
2051int move (object *op, int dir, object *originator = op) 2039int move (object *op, int dir, object *originator = op)
2052 CODE: 2040 CODE:
2053 RETVAL = move_ob (op, dir, originator); 2041 RETVAL = op->move (dir, originator);
2054 OUTPUT: 2042 OUTPUT:
2055 RETVAL 2043 RETVAL
2056 2044
2057void apply (object *applier, object *applied, int flags = 0)
2058 CODE:
2059 manual_apply (applied, applier, flags);
2060
2061void apply_below (object *op) 2045void apply_below (object *op)
2062 CODE: 2046 CODE:
2063 player_apply_below (op); 2047 player_apply_below (op);
2064 2048
2065int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2049int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2050
2051int casting_level (object *caster, object *spell)
2066 2052
2067int pay_item (object *op, object *buyer) 2053int pay_item (object *op, object *buyer)
2068 CODE: 2054 CODE:
2069 RETVAL = pay_for_item (op, buyer); 2055 RETVAL = pay_for_item (op, buyer);
2070 OUTPUT: RETVAL 2056 OUTPUT: RETVAL
… …
2113 2099
2114void player_lvl_adj (object *who, object *skill = 0) 2100void player_lvl_adj (object *who, object *skill = 0)
2115 2101
2116int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2102int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2117 2103
2118int calc_skill_exp (object *who, object *op, object *skill); 2104int calc_skill_exp (object *who, object *op, object *skill)
2119 2105
2120void push_button (object *op); 2106void push_button (object *op, object *originator)
2121 2107
2122void use_trigger (object *op); 2108void use_trigger (object *op, object *originator)
2123 2109
2124void add_button_link (object *button, maptile *map, int connected);
2125
2126void remove_button_link (object *op);
2127
2128void handle_apply_yield (object *op); 2110void handle_apply_yield (object *op)
2129 2111
2112int convert_item (object *item, object *converter)
2113
2114void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2130 2115
2131MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2116MODULE = cf PACKAGE = cf::object PREFIX = cf_
2132 2117
2133# no clean way to get an object from an archetype - stupid idiotic 2118# no clean way to get an object from an archetype - stupid idiotic
2134# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2119# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2138 CODE: 2123 CODE:
2139 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2124 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2140 OUTPUT: 2125 OUTPUT:
2141 RETVAL 2126 RETVAL
2142 2127
2128object *generate (utf8_string arch, object *creator)
2129 CODE:
2130 object *obj = get_archetype (arch);
2131 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2132 RETVAL = obj;
2133 OUTPUT:
2134 RETVAL
2135
2143object *find_object (U32 tag) 2136object *find_object (U32 tag)
2137
2138object *find_object_uuid (UUID i)
2144 2139
2145# TODO: nuke 2140# TODO: nuke
2146object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2141object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2147 PROTOTYPE: $$$$$$ 2142 PROTOTYPE: $$$$$$
2148 CODE: 2143 CODE:
2149{ 2144{
2150 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2145 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2146
2147 if (RETVAL->destroyed ())
2148 RETVAL = 0;
2151} 2149}
2152 2150
2153shstr 2151shstr
2154object::kv_get (shstr key) 2152object::kv_get (shstr key)
2155 2153
… …
2168 PROTOTYPE: $$;$ 2166 PROTOTYPE: $$;$
2169 PPCODE: 2167 PPCODE:
2170{ 2168{
2171 rv_vector rv; 2169 rv_vector rv;
2172 2170
2173 PUTBACK;
2174 get_rangevector (ob, other, &rv, flags); 2171 get_rangevector (ob, other, &rv, flags);
2175 SPAGAIN;
2176 2172
2177 EXTEND (SP, 5); 2173 EXTEND (SP, 5);
2178 PUSHs (newSVuv (rv.distance)); 2174 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2179 PUSHs (newSViv (rv.distance_x)); 2175 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2180 PUSHs (newSViv (rv.distance_y)); 2176 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2181 PUSHs (newSViv (rv.direction)); 2177 PUSHs (sv_2mortal (newSViv (rv.direction)));
2182 PUSHs (to_sv (rv.part)); 2178 PUSHs (sv_2mortal (to_sv (rv.part)));
2183} 2179}
2184 2180
2185bool on_same_map_as (object *ob, object *other) 2181bool on_same_map_as (object *ob, object *other)
2186 CODE: 2182 CODE:
2187 RETVAL = on_same_map (ob, other); 2183 RETVAL = on_same_map (ob, other);
… …
2207 RETVAL = op->contr; 2203 RETVAL = op->contr;
2208 OUTPUT: RETVAL 2204 OUTPUT: RETVAL
2209 2205
2210bool move_player (object *op, int dir) 2206bool move_player (object *op, int dir)
2211 2207
2212void check_score (object *op)
2213
2214void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2208void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2215 CODE: 2209 CODE:
2216 new_draw_info (flags, 0, op, txt); 2210 new_draw_info (flags, 0, op, txt);
2217 2211
2218void kill_player (object *op) 2212void kill_player (object *op)
… …
2230int command_arrest (object *op, utf8_string params) 2224int command_arrest (object *op, utf8_string params)
2231 2225
2232 2226
2233MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2227MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2234 2228
2235INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2229INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2236 2230
2237int invoke (player *pl, int event, ...) 2231int invoke (player *pl, int event, ...)
2238 CODE: 2232 CODE:
2239 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2233 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2240 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2234 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2250 pl->ob->stats.hp = pl->ob->stats.maxhp; 2244 pl->ob->stats.hp = pl->ob->stats.maxhp;
2251 pl->ob->stats.sp = pl->ob->stats.maxsp; 2245 pl->ob->stats.sp = pl->ob->stats.maxsp;
2252 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2246 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2253 pl->orig_stats = pl->ob->stats; 2247 pl->orig_stats = pl->ob->stats;
2254 2248
2255void clear_los (player *pl)
2256
2257# should only be temporary 2249# should only be temporary
2258void esrv_new_player (player *pl) 2250void esrv_new_player (player *pl)
2259 2251
2252#d# TODO: replace by blocked_los accessor, fix code using this
2260bool 2253bool
2261cell_visible (player *pl, int dx, int dy) 2254cell_visible (player *pl, int dx, int dy)
2262 CODE: 2255 CODE:
2263 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2256 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2264 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2265 OUTPUT: 2257 OUTPUT:
2266 RETVAL 2258 RETVAL
2267 2259
2268void 2260void
2269send (player *pl, SV *packet) 2261send (player *pl, SV *packet)
… …
2334 if (op->tag) 2326 if (op->tag)
2335 XPUSHs (sv_2mortal (to_sv (op))); 2327 XPUSHs (sv_2mortal (to_sv (op)));
2336 } 2328 }
2337} 2329}
2338 2330
2339INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2331INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2332
2333void
2334adjust_daylight ()
2335 CODE:
2336 maptile::adjust_daylight ();
2337
2338int
2339outdoor_darkness (int darkness = 0)
2340 CODE:
2341 RETVAL = maptile::outdoor_darkness;
2342 if (items)
2343 maptile::outdoor_darkness = darkness;
2344 OUTPUT:
2345 RETVAL
2340 2346
2341void 2347void
2342maptile::instantiate () 2348maptile::instantiate ()
2343 2349
2344maptile *new () 2350maptile *new ()
… …
2376 for (int x = 0; x < THIS->width; ++x) 2382 for (int x = 0; x < THIS->width; ++x)
2377 for (int y = 0; y < THIS->height; ++y) 2383 for (int y = 0; y < THIS->height; ++y)
2378 { 2384 {
2379 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2385 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2380 if (op->flag [FLAG_IS_FLOOR]) 2386 if (op->flag [FLAG_IS_FLOOR])
2381 goto skip_space; 2387 goto skip;
2382 2388
2383 { 2389 {
2384 int offs = offset + y * stride + x; 2390 int offs = offset + y * stride + x;
2391
2385 if (IN_RANGE_EXC (offs, 0, idxlen)) 2392 if (IN_RANGE_EXC (offs, 0, idxlen))
2386 { 2393 {
2387 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2394 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2388 { 2395 {
2389 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2396 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2390 ob->flag [FLAG_NO_MAP_SAVE] = true; 2397 ob->flag [FLAG_NO_MAP_SAVE] = true;
2391 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2398 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2392 2399
2393 if (ob->randomitems) 2400 if (ob->randomitems && !ob->above)
2394 { 2401 {
2395 if (!ob->above)
2396 {
2397 ob->create_treasure (ob->randomitems); 2402 ob->create_treasure (ob->randomitems);
2398 2403
2399 for (object *op = ob->above; op; op = op->above) 2404 for (object *op = ob->above; op; op = op->above)
2400 op->flag [FLAG_NO_MAP_SAVE] = true; 2405 op->flag [FLAG_NO_MAP_SAVE] = true;
2401 } 2406 // TODO: if this is a pickable object, then the item
2402 2407 // will at a bit weird - saving inside the player
2403 ob->randomitems = 0; 2408 // will clear the flag, but when the player drops
2409 // it without logging out, it keeps the flag.
2410 // nobody ahs reported this, but this can be rather
2411 // annoying on persistent maps.
2404 } 2412 }
2405 } 2413 }
2406 } 2414 }
2407 } 2415 }
2408 2416
2409 skip_space: ; 2417 skip: ;
2410 } 2418 }
2411} 2419}
2412 2420
2413void 2421void
2414maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2422maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2424 2432
2425 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2433 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2426 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2434 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2427 2435
2428 for (int i = av_len ((AV *)palette) + 1; i--; ) 2436 for (int i = av_len ((AV *)palette) + 1; i--; )
2429 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2437 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2430 2438
2431 for (int y = 0; y < THIS->height; ++y) 2439 for (int y = 0; y < THIS->height; ++y)
2432 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2440 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2433 2441
2434 sfree (THIS->regions, THIS->size ()); 2442 sfree (THIS->regions, THIS->size ());
… …
2453 } 2461 }
2454 2462
2455int out_of_map (maptile *map, int x, int y) 2463int out_of_map (maptile *map, int x, int y)
2456 2464
2457void 2465void
2458trigger (maptile *map, long connection, bool state = true) 2466find_link (maptile *map, shstr_tmp connection)
2459 CODE:
2460 activate_connection (map, connection, state);
2461
2462void
2463get_connection (maptile *map, long connection)
2464 PPCODE: 2467 PPCODE:
2465 oblinkpt *obp = get_connection_links (map, connection); 2468 if (oblinkpt *obp = map->find_link (connection))
2466 if (obp)
2467 for (objectlink *ol = obp->link; ol; ol = ol->next) 2469 for (objectlink *ol = obp->link; ol; ol = ol->next)
2468 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2470 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2469 2471
2470void 2472void
2471get_map_flags (maptile *map, int x, int y) 2473get_map_flags (maptile *map, int x, int y)
… …
2525 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2527 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2526 XPUSHs (sv_2mortal (to_sv (o))); 2528 XPUSHs (sv_2mortal (to_sv (o)));
2527} 2529}
2528 2530
2529SV * 2531SV *
2530bot_at (maptile *obj, unsigned int x, unsigned int y) 2532bot_at (maptile *map, unsigned int x, unsigned int y)
2531 PROTOTYPE: $$$ 2533 PROTOTYPE: $$$
2532 ALIAS: 2534 ALIAS:
2533 top_at = 1 2535 top_at = 1
2534 flags_at = 2 2536 flags_at = 2
2535 light_at = 3 2537 light_at = 3
2536 move_block_at = 4 2538 move_block_at = 4
2537 move_slow_at = 5 2539 move_slow_at = 5
2538 move_on_at = 6 2540 move_on_at = 6
2539 move_off_at = 7 2541 move_off_at = 7
2540 INIT:
2541 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2542 CODE: 2542 CODE:
2543{
2544 sint16 nx = x;
2545 sint16 ny = y;
2546
2547 if (!xy_normalise (map, nx, ny))
2548 XSRETURN_UNDEF;
2549
2550 mapspace &ms = map->at (nx, ny);
2551
2552 ms.update ();
2553
2543 switch (ix) 2554 switch (ix)
2544 { 2555 {
2545 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2556 case 0: RETVAL = to_sv (ms.bot ); break;
2546 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2557 case 1: RETVAL = to_sv (ms.top ); break;
2547 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2558 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2548 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2559 case 3: RETVAL = newSViv (ms.light ); break;
2549 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2560 case 4: RETVAL = newSVuv (ms.move_block); break;
2550 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2561 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2551 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2562 case 6: RETVAL = newSVuv (ms.move_on ); break;
2552 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2563 case 7: RETVAL = newSVuv (ms.move_off ); break;
2553 } 2564 }
2565}
2554 OUTPUT: RETVAL 2566 OUTPUT: RETVAL
2555
2556void fix_walls (maptile *map, int x, int y)
2557
2558void fix_walls_around (maptile *map, int x, int y)
2559 2567
2560# worst xs function of my life 2568# worst xs function of my life
2561bool 2569bool
2562_create_random_map (\ 2570_create_random_map (\
2563 maptile *self,\ 2571 maptile *self,\
… …
2567 utf8_string monsterstyle,\ 2575 utf8_string monsterstyle,\
2568 utf8_string treasurestyle,\ 2576 utf8_string treasurestyle,\
2569 utf8_string layoutstyle,\ 2577 utf8_string layoutstyle,\
2570 utf8_string doorstyle,\ 2578 utf8_string doorstyle,\
2571 utf8_string decorstyle,\ 2579 utf8_string decorstyle,\
2580 utf8_string miningstyle,\
2572 utf8_string origin_map,\ 2581 utf8_string origin_map,\
2573 utf8_string final_map,\ 2582 utf8_string final_map,\
2574 utf8_string exitstyle,\ 2583 utf8_string exitstyle,\
2575 utf8_string this_map,\ 2584 utf8_string this_map,\
2576 utf8_string exit_on_final_map,\ 2585 utf8_string exit_on_final_map,\
… …
2608 assign (rmp.monsterstyle , monsterstyle); 2617 assign (rmp.monsterstyle , monsterstyle);
2609 assign (rmp.treasurestyle , treasurestyle); 2618 assign (rmp.treasurestyle , treasurestyle);
2610 assign (rmp.layoutstyle , layoutstyle); 2619 assign (rmp.layoutstyle , layoutstyle);
2611 assign (rmp.doorstyle , doorstyle); 2620 assign (rmp.doorstyle , doorstyle);
2612 assign (rmp.decorstyle , decorstyle); 2621 assign (rmp.decorstyle , decorstyle);
2622 assign (rmp.miningstyle , miningstyle);
2613 assign (rmp.exitstyle , exitstyle); 2623 assign (rmp.exitstyle , exitstyle);
2614 assign (rmp.exit_on_final_map, exit_on_final_map); 2624 assign (rmp.exit_on_final_map, exit_on_final_map);
2615 2625
2616 rmp.origin_map = origin_map; 2626 rmp.origin_map = origin_map;
2617 rmp.final_map = final_map; 2627 rmp.final_map = final_map;
… …
2645 OUTPUT: 2655 OUTPUT:
2646 RETVAL 2656 RETVAL
2647 2657
2648MODULE = cf PACKAGE = cf::mapspace 2658MODULE = cf PACKAGE = cf::mapspace
2649 2659
2650INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2660INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2651 2661
2652MODULE = cf PACKAGE = cf::arch 2662MODULE = cf PACKAGE = cf::arch
2653 2663
2654int archetypes_size () 2664int archetypes_size ()
2655 CODE: 2665 CODE:
… …
2659archetype *archetypes (U32 index) 2669archetype *archetypes (U32 index)
2660 CODE: 2670 CODE:
2661 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2671 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2662 OUTPUT: RETVAL 2672 OUTPUT: RETVAL
2663 2673
2664object *instantiate (archetype *arch)
2665 CODE:
2666 RETVAL = arch_to_object (arch);
2667 OUTPUT:
2668 RETVAL
2669
2670INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2674INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2671 2675
2672MODULE = cf PACKAGE = cf::party 2676MODULE = cf PACKAGE = cf::party
2673 2677
2674partylist *first () 2678partylist *first ()
2675 PROTOTYPE: 2679 PROTOTYPE:
2676 CODE: 2680 CODE:
2677 RETVAL = get_firstparty (); 2681 RETVAL = get_firstparty ();
2678 OUTPUT: RETVAL 2682 OUTPUT: RETVAL
2679 2683
2680INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2684INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2681 2685
2682MODULE = cf PACKAGE = cf::region 2686MODULE = cf PACKAGE = cf::region
2683 2687
2684void 2688void
2685list () 2689list ()
… …
2691 PROTOTYPE: $ 2695 PROTOTYPE: $
2692 CODE: 2696 CODE:
2693 RETVAL = region::find (name); 2697 RETVAL = region::find (name);
2694 OUTPUT: RETVAL 2698 OUTPUT: RETVAL
2695 2699
2696region *find_fuzzy (utf8_string name)
2697 PROTOTYPE: $
2698 CODE:
2699 RETVAL = region::find_fuzzy (name);
2700 OUTPUT: RETVAL
2701
2702int specificity (region *rgn) 2700int specificity (region *rgn)
2703 CODE: 2701 CODE:
2704 RETVAL = 0; 2702 RETVAL = 0;
2705 while (rgn = rgn->parent) 2703 while (rgn = rgn->parent)
2706 RETVAL++; 2704 RETVAL++;
2707 OUTPUT: RETVAL 2705 OUTPUT: RETVAL
2708 2706
2709INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2707INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2710 2708
2711MODULE = cf PACKAGE = cf::living 2709MODULE = cf PACKAGE = cf::living
2712 2710
2713INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2711INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2714 2712
2715MODULE = cf PACKAGE = cf::settings 2713MODULE = cf PACKAGE = cf::settings
2716 2714
2717INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2715INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2718 2716
2719MODULE = cf PACKAGE = cf::client 2717MODULE = cf PACKAGE = cf::client
2720 2718
2721INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2719INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2722 2720
2723int invoke (client *ns, int event, ...) 2721int invoke (client *ns, int event, ...)
2724 CODE: 2722 CODE:
2725 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2723 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2726 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2724 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2792 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2790 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2793 old_sound_index [idx] = face; 2791 old_sound_index [idx] = face;
2794 2792
2795MODULE = cf PACKAGE = cf::face PREFIX = face_ 2793MODULE = cf PACKAGE = cf::face PREFIX = face_
2796 2794
2797#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2795#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2798 2796
2799faceidx face_find (utf8_string name, faceidx defidx = 0) 2797faceidx face_find (utf8_string name, faceidx defidx = 0)
2800 2798
2801faceidx alloc (utf8_string name) 2799faceidx alloc (utf8_string name)
2802 CODE: 2800 CODE:
… …
2840 faceinfo *f = face_info (idx); assert (f); 2838 faceinfo *f = face_info (idx); assert (f);
2841 facedata *d = &(faceset ? f->data64 : f->data32); 2839 facedata *d = &(faceset ? f->data64 : f->data32);
2842 sv_to (data, d->data); 2840 sv_to (data, d->data);
2843 STRLEN clen; 2841 STRLEN clen;
2844 char *cdata = SvPVbyte (chksum, clen); 2842 char *cdata = SvPVbyte (chksum, clen);
2845 clen = min (CHKSUM_SIZE, clen); 2843 clen = min (CHKSUM_MAXLEN, clen);
2846 2844
2845 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2846
2847 if (memcmp (d->chksum, cdata, clen)) 2847 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2848 { 2848 {
2849 d->chksum_len = clen;
2849 memcpy (d->chksum, cdata, clen); 2850 memcpy (d->chksum, cdata, clen);
2850 2851
2851 // invalidate existing client face info 2852 // invalidate existing client face info
2852 for_all_clients (ns) 2853 for_all_clients (ns)
2853 if (ns->faceset == faceset) 2854 if (ns->faceset == faceset)
… …
2868 2869
2869SV *get_chksum (faceidx idx, int faceset = 0) 2870SV *get_chksum (faceidx idx, int faceset = 0)
2870 CODE: 2871 CODE:
2871 facedata *d = face_data (idx, faceset); 2872 facedata *d = face_data (idx, faceset);
2872 if (!d) XSRETURN_UNDEF; 2873 if (!d) XSRETURN_UNDEF;
2873 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2874 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2874 OUTPUT: 2875 OUTPUT:
2875 RETVAL 2876 RETVAL
2876 2877
2877SV *get_data (faceidx idx, int faceset = 0) 2878SV *get_data (faceidx idx, int faceset = 0)
2878 CODE: 2879 CODE:
… …
2898 ns->force_newmap = true; 2899 ns->force_newmap = true;
2899 } 2900 }
2900 2901
2901MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2902MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2902 2903
2903#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2904#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2904 2905
2905animidx anim_find (utf8_string name) 2906animidx anim_find (utf8_string name)
2906 CODE: 2907 CODE:
2907 RETVAL = animation::find (name).number; 2908 RETVAL = animation::find (name).number;
2908 OUTPUT: RETVAL 2909 OUTPUT: RETVAL
… …
2923 } 2924 }
2924 else 2925 else
2925 anim = &animation::create (name, av_len (av) + 1, facings); 2926 anim = &animation::create (name, av_len (av) + 1, facings);
2926 2927
2927 for (int i = 0; i < anim->num_animations; ++i) 2928 for (int i = 0; i < anim->num_animations; ++i)
2928 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2929 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2929} 2930}
2930 OUTPUT: RETVAL 2931 OUTPUT: RETVAL
2931 2932
2932void invalidate_all () 2933void invalidate_all ()
2933 CODE: 2934 CODE:
2934 for_all_clients (ns) 2935 for_all_clients (ns)
2935 ns->anims_sent.reset (); 2936 ns->anims_sent.reset ();
2936 2937
2937MODULE = cf PACKAGE = cf::object::freezer 2938MODULE = cf PACKAGE = cf::object::freezer
2938 2939
2939INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2940INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2940 2941
2941SV * 2942SV *
2942new (char *klass) 2943new (char *klass)
2943 CODE: 2944 CODE:
2944 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2945 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2951 sv_to (sv, self); 2952 sv_to (sv, self);
2952 delete self; 2953 delete self;
2953 2954
2954MODULE = cf PACKAGE = cf::object::thawer 2955MODULE = cf PACKAGE = cf::object::thawer
2955 2956
2956INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2957INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
2957 2958
2958SV * 2959SV *
2959new_from_file (char *klass, octet_string path) 2960new_from_file (char *klass, octet_string path)
2960 CODE: 2961 CODE:
2961 object_thawer *f = new object_thawer (path); 2962 object_thawer *f = new object_thawer (path);

Diff Legend

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