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.288 by root, Tue May 6 18:47:32 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"
25 24
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#if HAVE_EXECINFO_H 25#if HAVE_EXECINFO_H
30# include <execinfo.h> 26# include <execinfo.h>
31#endif 27#endif
32 28
33#include <cstdarg> 29#include <cstdarg>
30#include <typeinfo>
34 31
35#include "global.h" 32#include "global.h"
36#include "loader.h"
37#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
38#include "evthread.h" 34#include "evthread.h"
39#include "sproto.h" 35#include "sproto.h"
40 36
41#include <unistd.h> 37#include <unistd.h>
… …
73static int tick_pending; 69static int tick_pending;
74 70
75global gbl_ev; 71global gbl_ev;
76static 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;
77static 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;
78 75
79bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
80bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
81 78
82static HV 79static HV
83 *stash_cf, 80 *stash_cf,
84 *stash_cf_object_wrap, 81 *stash_cf_object_wrap,
85 *stash_cf_object_player_wrap, 82 *stash_cf_object_player_wrap,
86 *stash_cf_player_wrap, 83 *stash_cf_player_wrap,
87 *stash_cf_map_wrap, 84 *stash_cf_map_wrap,
85 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 86 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
93 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
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
100 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
101 SvUTF8_on (sv); 107 SvUTF8_on (sv);
102 return sv; 108 return sv;
103} 109}
110#endif
104 111
112#ifndef newSVpvn_utf8
105static inline SV * 113static SV *
106newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
107{ 115{
108 if (!s) 116 if (!s)
109 return newSV (0); 117 return newSV (0);
110 118
111 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
112 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
113 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);
114} 142}
115 143
116// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
117template<class super> 145template<class super>
118static super * 146static super *
… …
152 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
153 hv_clear (self); 181 hv_clear (self);
154 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
155 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
156 184
157 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
158 assert (!this->self); 186 assert (!this->self);
159 } 187 }
160} 188}
161 189
162void 190void
… …
196attachable::destroy () 224attachable::destroy ()
197{ 225{
198 if (destroyed ()) 226 if (destroyed ())
199 return; 227 return;
200 228
201 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
202 do_destroy (); 230 do_destroy ();
203 sever_self (); 231 sever_self ();
232}
233
234void
235attachable::do_delete ()
236{
237 delete this;
204} 238}
205 239
206void 240void
207attachable::check_mortals () 241attachable::check_mortals ()
208{ 242{
… …
224 258
225 if (0) 259 if (0)
226 { 260 {
227 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
228 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
229 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
230 } 265 }
231 } 266 }
232 } 267 }
233 268
… …
253 } 288 }
254 else 289 else
255 { 290 {
256 mortals.erase (i); 291 mortals.erase (i);
257 obj->sever_self (); 292 obj->sever_self ();
258 delete obj; 293 obj->do_delete ();
259 } 294 }
260 } 295 }
261} 296}
262 297
263void 298void
… …
280 315
281 attach = src.attach; 316 attach = src.attach;
282 return *this; 317 return *this;
283} 318}
284 319
320#if 0
285template<typename T> 321template<typename T>
286static bool 322static bool
287find_backref (void *ptr, T *obj) 323find_backref (void *ptr, T *obj)
288{ 324{
289 char *s = (char *)obj; 325 char *s = (char *)obj;
… …
297 333
298 return false; 334 return false;
299} 335}
300 336
301// for debugging, find "live" objects containing this ptr 337// for debugging, find "live" objects containing this ptr
302void 338static void
303find_backref (void *ptr) 339find_backref (void *ptr)
304{ 340{
305 for_all_objects (op) 341 for_all_objects (op)
306 if (find_backref (ptr, op)) 342 if (find_backref (ptr, op))
307 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);
… …
311 fprintf (stderr, "P %p\n", pl); 347 fprintf (stderr, "P %p\n", pl);
312 348
313 for_all_clients (ns) 349 for_all_clients (ns)
314 if (find_backref (ptr, ns)) 350 if (find_backref (ptr, ns))
315 fprintf (stderr, "C %p\n", ns); 351 fprintf (stderr, "C %p\n", ns);
316
317} 352}
353#endif
318 354
319////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
320 356
321static SV * 357static SV *
322newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
375 411
376 return sv; 412 return sv;
377 } 413 }
378} 414}
379 415
416#if 0 // unused
380static void 417static void
381clearSVptr (SV *sv) 418clearSVptr (SV *sv)
382{ 419{
383 if (SvROK (sv)) 420 if (SvROK (sv))
384 sv = SvRV (sv); 421 sv = SvRV (sv);
385 422
386 hv_clear ((HV *)sv); 423 hv_clear ((HV *)sv);
387 sv_unmagic (sv, PERL_MAGIC_ext); 424 sv_unmagic (sv, PERL_MAGIC_ext);
388} 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}
389 442
390static long 443static long
391SvPTR (SV *sv, const char *klass) 444SvPTR (SV *sv, const char *klass)
392{ 445{
393 if (!sv_derived_from (sv, klass)) 446 if (!sv_derived_from (sv, klass))
394 croak ("object of type %s expected", klass); 447 croak ("object of type %s expected", klass);
395 448
396 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 449 return SvPTR_nc (sv);
397
398 if (!mg)
399 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
400
401 return (long)mg->mg_ptr;
402} 450}
403 451
404static long 452static long noinline
405SvPTR_ornull (SV *sv, const char *klass) 453SvPTR_ornull (SV *sv, const char *klass)
406{ 454{
407 if (SvOK (sv)) 455 if (expect_false (!SvOK (sv))) return 0;
456
408 return SvPTR (sv, klass); 457 return SvPTR (sv, klass);
409 else
410 return 0;
411} 458}
412 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
413inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 501static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
414inline 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); }
415inline SV *to_sv (bool v) { return newSViv (v); } 503static inline SV *to_sv (bool v) { return newSViv (v); }
416inline SV *to_sv ( signed char v) { return newSViv (v); } 504static inline SV *to_sv ( signed char v) { return newSViv (v); }
417inline SV *to_sv (unsigned char v) { return newSViv (v); } 505static inline SV *to_sv (unsigned char v) { return newSViv (v); }
418inline SV *to_sv ( signed short v) { return newSViv (v); } 506static inline SV *to_sv ( signed short v) { return newSViv (v); }
419inline SV *to_sv (unsigned short v) { return newSVuv (v); } 507static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
420inline SV *to_sv ( signed int v) { return newSViv (v); } 508static inline SV *to_sv ( signed int v) { return newSViv (v); }
421inline SV *to_sv (unsigned int v) { return newSVuv (v); } 509static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
422inline SV *to_sv ( signed long v) { return newSViv (v); } 510static inline SV *to_sv ( signed long v) { return newSViv (v); }
423inline SV *to_sv (unsigned long v) { return newSVuv (v); } 511static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
424inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 512static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
425inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 513static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
426inline SV *to_sv (float v) { return newSVnv (v); } 514static inline SV *to_sv (float v) { return newSVnv (v); }
427inline SV *to_sv (double v) { return newSVnv (v); } 515static inline SV *to_sv (double v) { return newSVnv (v); }
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432inline 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); }
433inline 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); }
434inline 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); }
435inline 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); }
524static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 525
437inline SV *to_sv (object & v) { return to_sv (&v); } 526static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 527static inline SV *to_sv (living & v) { return to_sv (&v); }
439 528
440inline 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 ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 530static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 531
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 532static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 533
534static inline SV *to_sv (dynbuf * v)
535{
536 SV *sv = newSV (0);
537
538 sv_upgrade (sv, SVt_PV);
539 SvGROW (sv, v->size () + 1);
540 SvPOK_only (sv);
541 v->linearise (SvPVX (sv));
542 SvCUR_set (sv, v->size ());
543 *SvEND (sv) = 0;
544
545 return sv;
546}
547
548static inline SV *to_sv (dynbuf_text * v)
549{
550 SV *sv = to_sv (static_cast<dynbuf *> (v));
551 SvUTF8_on (sv);
552 return sv;
553}
554
445inline 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; }
446inline 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; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 558static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
449inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 559static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
450inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 560static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
451inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 561static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
452inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 562static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
453inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 563static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
454inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 564static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
455inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 565static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
456inline 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); }
457inline 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); }
458inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 568static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
459inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 569static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
460inline 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); }
461inline 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); }
462inline 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); }
463inline 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"); }
464inline 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"); }
465inline 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"); }
466inline 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"); }
467inline 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"); }
468inline 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"); }
579static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
469inline 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"); }
470inline 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" ); }
471 582
472//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)]; }
473inline 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)); }
474 585
475template<class T> 586template<class T>
476inline 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; }
477 588
478template<int N> 589template<int N>
479inline 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)); }
480 591
481inline 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); }
482inline 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); }
483inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 594static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
484inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 595static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
485 596
486inline void sv_to (SV *sv, std::string &v) 597static inline void sv_to (SV *sv, std::string &v)
487{ 598{
488 STRLEN len; 599 STRLEN len;
489 char *data = SvPVbyte (sv, len); 600 char *data = SvPVbyte (sv, len);
490 v.assign (data, len); 601 v.assign (data, len);
491} 602}
492 603
493inline void sv_to (SV *sv, UUID &v) 604static inline void sv_to (SV *sv, UUID &v)
494{ 605{
495 if (!v.parse (SvPV_nolen (sv))) 606 if (!v.parse (SvPV_nolen (sv)))
496 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 607 croak ("unparsable uuid: %s", SvPV_nolen (sv));
497} 608}
498 609
499inline 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); }
500 611
501static SV * 612static SV *
502newSVdt_va (va_list &ap, data_type type) 613newSVdt_va (va_list &ap, data_type type)
503{ 614{
504 SV *sv; 615 SV *sv;
… …
578 va_end (ap); 689 va_end (ap);
579 690
580 return sv; 691 return sv;
581} 692}
582 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
583////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 718//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
584 719
585SV * 720static SV *
586registry (attachable *ext) 721registry (attachable *ext)
587{ 722{
588 if (!ext->cb) 723 if (!ext->cb)
589 ext->cb = newAV (); 724 ext->cb = newAV ();
590 725
… …
604 739
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 740 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 741
607 const char *argv[] = { 742 const char *argv[] = {
608 settings.argv [0], 743 settings.argv [0],
609 "-e" 744 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 745 };
615 746
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 747 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 748 || perl_run (perl))
618 { 749 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 750 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 751 exit (EXIT_FAILURE);
621 } 752 }
622 753
754 eval_pv (
755 "#line 1 'cfperl init'\n"
756 "use EV ();\n"
757 "use Coro ();\n"
758 "cf->bootstrap;\n"
759 "unshift @INC, cf::datadir ();\n"
760 "require cf;\n",
761 0
762 );
763
764 if (SvTRUE (ERRSV))
623 { 765 {
624 dSP; 766 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 767 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 768 }
630} 769}
631 770
771void
632void cfperl_main () 772cfperl_main ()
633{ 773{
634 dSP; 774 dSP;
635 775
636 PUSHMARK (SP); 776 PUSHMARK (SP);
637 PUTBACK; 777 PUTBACK;
… …
662# undef def 802# undef def
663}; 803};
664 804
665#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)
666 806
667static void 807static void noinline
668gather_callbacks (AV *&callbacks, AV *registry, event_type event) 808gather_callbacks (AV *&callbacks, AV *registry, event_type event)
669{ 809{
670 // event must be in array 810 // event must be in array
671 if (event >= 0 && event <= AvFILLp (registry)) 811 if (event >= 0 && event <= AvFILLp (registry))
672 { 812 {
… …
758{ 898{
759 attachable::gather_callbacks (callbacks, event); 899 attachable::gather_callbacks (callbacks, event);
760 ::gather_callbacks (callbacks, cb_map, event); 900 ::gather_callbacks (callbacks, cb_map, event);
761} 901}
762 902
763void 903static void noinline
764_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 904_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
765{ 905{
766 for (int event = 0; event <= AvFILLp (registry); ++event) 906 for (int event = 0; event <= AvFILLp (registry); ++event)
767 { 907 {
768 SV *cbs_ = AvARRAY (registry)[event]; 908 SV *cbs_ = AvARRAY (registry)[event];
… …
778 } 918 }
779 } 919 }
780} 920}
781 921
782// very slow and inefficient way to recalculate the global want bitsets 922// very slow and inefficient way to recalculate the global want bitsets
783void 923static void
784_recalc_want () 924_recalc_want ()
785{ 925{
786 ev_want_event.reset (); 926 ev_want_event.reset ();
787 927
788 _recalc_want (ev_want_event, cb_global); 928 _recalc_want (ev_want_event, cb_global);
… …
861 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 1001 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
862 } 1002 }
863 1003
864 va_end (ap); 1004 va_end (ap);
865 1005
866 CALL_CALL ("cf::do_invoke", G_SCALAR); 1006 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
867 count = count > 0 ? POPi : 0; 1007 count = count > 0 ? POPi : 0;
868 1008
869 CALL_END; 1009 CALL_END;
870 1010
871 return count; 1011 return count;
872} 1012}
873 1013
874SV * 1014static SV *
875cfperl_result (int idx) 1015cfperl_result (int idx)
876{ 1016{
877 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1017 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
878 if (!av) 1018 if (!av)
879 return &PL_sv_undef; 1019 return &PL_sv_undef;
… …
898} 1038}
899 1039
900///////////////////////////////////////////////////////////////////////////// 1040/////////////////////////////////////////////////////////////////////////////
901// various c++ => perl glue functions 1041// various c++ => perl glue functions
902 1042
1043void
903void cfperl_tick () 1044cfperl_tick ()
904{ 1045{
905 tick_pending = 1; 1046 tick_pending = 1;
906 1047
907 if (tick_inhibit) 1048 if (tick_inhibit)
908 return; 1049 return;
… …
911 1052
912 dSP; 1053 dSP;
913 1054
914 PUSHMARK (SP); 1055 PUSHMARK (SP);
915 PUTBACK; 1056 PUTBACK;
916 call_pv ("cf::tick", G_DISCARD | G_VOID); 1057 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
917 1058
918 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);
919} 1060}
920 1061
921void 1062void
… …
944 CALL_CALL ("ext::books::make_book", G_VOID); 1085 CALL_CALL ("ext::books::make_book", G_VOID);
945 CALL_END; 1086 CALL_END;
946} 1087}
947 1088
948void 1089void
949cfperl_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)
950{ 1091{
951 CALL_BEGIN (4); 1092 CALL_BEGIN (4);
952 CALL_ARG (ns); 1093 CALL_ARG (ns);
953 CALL_ARG (type); 1094 CALL_ARG (type);
954 CALL_ARG_SV (newSVpv_utf8 (msg)); 1095 CALL_ARG_SV (newSVpv_utf8 (msg));
955 CALL_ARG (color); 1096 CALL_ARG (color);
956 CALL_CALL ("cf::client::send_msg", G_VOID); 1097 CALL_CALL (cv_cf_client_send_msg, G_VOID);
957 CALL_END; 1098 CALL_END;
958} 1099}
959 1100
960int 1101int
961cfperl_can_merge (object *ob1, object *ob2) 1102cfperl_can_merge (object *ob1, object *ob2)
… …
963 int can; 1104 int can;
964 1105
965 CALL_BEGIN (2); 1106 CALL_BEGIN (2);
966 CALL_ARG (ob1); 1107 CALL_ARG (ob1);
967 CALL_ARG (ob2); 1108 CALL_ARG (ob2);
968 CALL_CALL ("cf::_can_merge", G_SCALAR); 1109 CALL_CALL (cv_cf__can_merge, G_SCALAR);
969 can = count && SvTRUE (TOPs); 1110 can = count && SvTRUE (TOPs);
970 CALL_END; 1111 CALL_END;
971 1112
972 return can; 1113 return can;
973} 1114}
974 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
975player * 1128player *
976player::find (const char *name) 1129player::find (const_utf8_string name)
977{ 1130{
978 CALL_BEGIN (1); 1131 CALL_BEGIN (1);
979 CALL_ARG (name); 1132 CALL_ARG (name);
980 CALL_CALL ("cf::player::find", G_SCALAR); 1133 CALL_CALL ("cf::player::find", G_SCALAR);
981 1134
… …
986 1139
987 return retval; 1140 return retval;
988} 1141}
989 1142
990maptile * 1143maptile *
991find_style (const char *dirname, const char *stylename, int difficulty) 1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
992{ 1145{
993 CALL_BEGIN (3); 1146 CALL_BEGIN (3);
994 CALL_ARG (dirname); 1147 CALL_ARG (dirname);
995 CALL_ARG (stylename); 1148 CALL_ARG (stylename);
996 CALL_ARG (difficulty); 1149 CALL_ARG (difficulty);
… …
1003 1156
1004 return retval; 1157 return retval;
1005} 1158}
1006 1159
1007maptile * 1160maptile *
1008maptile::find_sync (const char *path, maptile *origin) 1161maptile::find_sync (const_utf8_string path, maptile *origin)
1009{ 1162{
1010 CALL_BEGIN (2); 1163 CALL_BEGIN (2);
1011 CALL_ARG (path); 1164 CALL_ARG (path);
1012 CALL_ARG (origin); 1165 CALL_ARG (origin);
1013 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1166 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1019 1172
1020 return retval; 1173 return retval;
1021} 1174}
1022 1175
1023maptile * 1176maptile *
1024maptile::find_async (const char *path, maptile *origin, bool load) 1177maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1025{ 1178{
1026 CALL_BEGIN (3); 1179 CALL_BEGIN (3);
1027 CALL_ARG (path); 1180 CALL_ARG (path);
1028 CALL_ARG (origin); 1181 CALL_ARG (origin);
1029 CALL_ARG (load); 1182 CALL_ARG (load);
… …
1045 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1198 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1046 CALL_END; 1199 CALL_END;
1047} 1200}
1048 1201
1049void 1202void
1050maptile::change_all_map_light (int change)
1051{
1052 CALL_BEGIN (1);
1053 CALL_ARG (change);
1054 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1055 CALL_END;
1056}
1057
1058void
1059object::enter_exit (object *exit) 1203object::enter_exit (object *exit)
1060{ 1204{
1061 if (type != PLAYER) 1205 if (type != PLAYER)
1062 return; 1206 return;
1063 1207
… …
1067 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1211 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1068 CALL_END; 1212 CALL_END;
1069} 1213}
1070 1214
1071void 1215void
1072object::player_goto (const char *path, int x, int y) 1216object::player_goto (const_utf8_string path, int x, int y)
1073{ 1217{
1074 if (type != PLAYER) 1218 if (type != PLAYER)
1075 return; 1219 return;
1076 1220
1077 CALL_BEGIN (4); 1221 CALL_BEGIN (4);
… …
1081 CALL_ARG (y); 1225 CALL_ARG (y);
1082 CALL_CALL ("cf::object::player::goto", G_VOID); 1226 CALL_CALL ("cf::object::player::goto", G_VOID);
1083 CALL_END; 1227 CALL_END;
1084} 1228}
1085 1229
1086const char * 1230const_utf8_string
1087object::ref () const 1231object::ref () const
1088{ 1232{
1089 if (type == PLAYER) 1233 if (type == PLAYER)
1090 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);
1091 else 1235 else
1236 // TODO: should be able to save references within the same map, at least
1092 return 0; 1237 return 0;
1093} 1238}
1094 1239
1095object * 1240object *
1096object::deref (const char *ref) 1241object::deref (const_utf8_string ref)
1097{ 1242{
1098 object *retval = 0; 1243 object *retval = 0;
1099 1244
1100 if (ref) 1245 if (ref)
1101 { 1246 {
… …
1111 1256
1112 return retval; 1257 return retval;
1113} 1258}
1114 1259
1115void 1260void
1116log_backtrace (const char *msg) 1261log_backtrace (const_utf8_string msg)
1117{ 1262{
1118#if HAVE_BACKTRACE 1263#if HAVE_BACKTRACE
1119 void *addr [20]; 1264 void *addr [20];
1120 int size = backtrace (addr, 20); 1265 int size = backtrace (addr, 20);
1121 1266
… …
1126 CALL_CALL ("cf::_log_backtrace", G_VOID); 1271 CALL_CALL ("cf::_log_backtrace", G_VOID);
1127 CALL_END; 1272 CALL_END;
1128#endif 1273#endif
1129} 1274}
1130 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
1131///////////////////////////////////////////////////////////////////////////// 1327/////////////////////////////////////////////////////////////////////////////
1132 1328
1133struct EVAPI *evapi::GEVAPI; 1329struct EVAPI *evapi::GEVAPI;
1134struct CoroAPI *coroapi::GCoroAPI; 1330struct CoroAPI *coroapi::GCoroAPI;
1135 1331
1332void
1136void coroapi::do_cede_to_tick () 1333coroapi::do_cede_to_tick ()
1137{ 1334{
1138 cede_pending = 0; 1335 cede_pending = 0;
1139 cede (); 1336 cede ();
1140} 1337}
1141 1338
… …
1165 ev_io_set ((ev_io *)this, fd, events); 1362 ev_io_set ((ev_io *)this, fd, events);
1166 if (active) start (); 1363 if (active) start ();
1167 } 1364 }
1168} 1365}
1169 1366
1170void 1367static void
1171_connect_to_perl () 1368_connect_to_perl_1 ()
1172{ 1369{
1173 stash_cf = gv_stashpv ("cf", 1); 1370 stash_cf = gv_stashpv ("cf", 1);
1174 1371
1175 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1372 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1176 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);
1177 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1374 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1178 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1375 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1376 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1179 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1377 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1180 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1378 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1181 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1379 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1182 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1380 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1183 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1381 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1194 cb_client = get_av ("cf::CB_CLIENT", 1); 1392 cb_client = get_av ("cf::CB_CLIENT", 1);
1195 cb_type = get_av ("cf::CB_TYPE" , 1); 1393 cb_type = get_av ("cf::CB_TYPE" , 1);
1196 cb_map = get_av ("cf::CB_MAP" , 1); 1394 cb_map = get_av ("cf::CB_MAP" , 1);
1197} 1395}
1198 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
1199MODULE = cf PACKAGE = cf PREFIX = cf_ 1407MODULE = cf PACKAGE = cf PREFIX = cf_
1200 1408
1201BOOT: 1409BOOT:
1202{ 1410{
1203 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1411 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1204 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1412 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1205 1413
1206 _connect_to_perl (); 1414 _connect_to_perl_1 ();
1207 1415
1208 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1416 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1209 1417
1210 //{ 1418 //{
1211 // require_pv ("Time::HiRes"); 1419 // require_pv ("Time::HiRes");
… …
1219 static const struct { 1427 static const struct {
1220 const char *name; 1428 const char *name;
1221 IV iv; 1429 IV iv;
1222 } *civ, const_iv[] = { 1430 } *civ, const_iv[] = {
1223# 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
1224 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)
1225 const_iv (logBacktrace) 1441 const_iv (logBacktrace)
1226 1442
1227 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1443 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1228 1444
1229 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1445 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1230 1446
1231 const_iv (MAX_TIME) 1447 const_iv (MAX_TIME)
1232 const_iv (MAXSOCKBUF) 1448 const_iv (MAXSOCKBUF)
1233 1449
1234 const_iv (NUM_BODY_LOCATIONS)
1235 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1236 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1237 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1238 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1239 const_iv (body_wrist) const_iv (body_waist)
1240
1241 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1242 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1243 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1244 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1245 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1246 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1247 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1248 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1249 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1250 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1251 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1252 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1253 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1254 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1255 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1256 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1257 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1258 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1259 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1260 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1261 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1262 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1263 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1264 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1265 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1266 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1267 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1268 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1269
1270 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1271
1272 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1273 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1274
1275 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1276 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1277 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1278 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1279 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1280 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1281 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1282
1283 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1284 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1285 const_iv (WEAP_BLUD)
1286
1287 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1288 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1289 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1290 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1291 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1292 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1293 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1294 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1295 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1296 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1297 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1298 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1299 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1300 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1301 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1302 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1303 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1304 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1305 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1306 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1307 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1308 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK)
1309 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1310 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1311 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1312 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1313
1314 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1315 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1316 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1317 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1318 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1319 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR)
1320
1321 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)
1322 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)
1323 1452
1324 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)
1325
1326 const_iv (SP_RAISE_DEAD)
1327 const_iv (SP_RUNE)
1328 const_iv (SP_MAKE_MARK)
1329 const_iv (SP_BOLT)
1330 const_iv (SP_BULLET)
1331 const_iv (SP_EXPLOSION)
1332 const_iv (SP_CONE)
1333 const_iv (SP_BOMB)
1334 const_iv (SP_WONDER)
1335 const_iv (SP_SMITE)
1336 const_iv (SP_MAGIC_MISSILE)
1337 const_iv (SP_SUMMON_GOLEM)
1338 const_iv (SP_DIMENSION_DOOR)
1339 const_iv (SP_MAGIC_MAPPING)
1340 const_iv (SP_MAGIC_WALL)
1341 const_iv (SP_DESTRUCTION)
1342 const_iv (SP_PERCEIVE_SELF)
1343 const_iv (SP_WORD_OF_RECALL)
1344 const_iv (SP_INVISIBLE)
1345 const_iv (SP_PROBE)
1346 const_iv (SP_HEALING)
1347 const_iv (SP_CREATE_FOOD)
1348 const_iv (SP_EARTH_TO_DUST)
1349 const_iv (SP_CHANGE_ABILITY)
1350 const_iv (SP_BLESS)
1351 const_iv (SP_CURSE)
1352 const_iv (SP_SUMMON_MONSTER)
1353 const_iv (SP_CHARGING)
1354 const_iv (SP_POLYMORPH)
1355 const_iv (SP_ALCHEMY)
1356 const_iv (SP_REMOVE_CURSE)
1357 const_iv (SP_IDENTIFY)
1358 const_iv (SP_DETECTION)
1359 const_iv (SP_MOOD_CHANGE)
1360 const_iv (SP_MOVING_BALL)
1361 const_iv (SP_SWARM)
1362 const_iv (SP_CHANGE_MANA)
1363 const_iv (SP_DISPEL_RUNE)
1364 const_iv (SP_CREATE_MISSILE)
1365 const_iv (SP_CONSECRATE)
1366 const_iv (SP_ANIMATE_WEAPON)
1367 const_iv (SP_LIGHT)
1368 const_iv (SP_CHANGE_MAP_LIGHT)
1369 const_iv (SP_FAERY_FIRE)
1370 const_iv (SP_CAUSE_DISEASE)
1371 const_iv (SP_AURA)
1372 const_iv (SP_TOWN_PORTAL)
1373 const_iv (SP_PARTY_SPELL)
1374 1454
1375 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)
1376 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)
1377 const_iv (F_LOCKED) 1457 const_iv (F_LOCKED)
1378 1458
1379 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1380
1381 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) 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)
1382 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)
1383 1461
1384 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1385
1386 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1387 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1388
1389 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1390 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1391
1392 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1462 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1393
1394 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1395 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1396 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1397 const_iv (M_ICE) const_iv (M_SPECIAL)
1398 1463
1399 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)
1400 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)
1401 1466
1402 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1403 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1404 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1405 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1406 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1407 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1408 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1409 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1410 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1411 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1412 const_iv (SK_POISON_NAIL)
1413
1414 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1415 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1416 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1417 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1418 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1419 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1420
1421 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1422
1423 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1424 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1425 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1426 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1427 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1428 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1429 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1430
1431 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)
1432 const_iv (MAP_INACTIVE) 1468 const_iv (MAP_INACTIVE)
1433 1469
1434 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)
1435 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)
1436 1472
1437 const_iv (VERSION_CS) const_iv (VERSION_SC)
1438
1439 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)
1440 1474
1441 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1442
1443 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)
1444
1445 // random map generator
1446 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1447 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1448
1449 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1450 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1451 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1452
1453 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1454 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1455
1456 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1457 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1458
1459 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1460 const_iv (FT_RSRC) const_iv (FT_NUM)
1461 }; 1476 };
1462 1477
1463 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; )
1464 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1479 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1465 1480
… …
1482 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1497 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1483 av_push (event, newSViv (eiv->klass)); 1498 av_push (event, newSViv (eiv->klass));
1484 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1499 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1485 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1500 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1486 } 1501 }
1487}
1488 1502
1503 // used by autogenerated BOOT sections from genacc
1504 av_reflect = get_av ("cf::REFLECT", 1);
1505}
1506
1507void _gv_clear (SV *gv)
1508 CODE:
1509 assert (SvTYPE (gv) == SVt_PVGV);
1510# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1511 f (GvGP (gv)->gp_form);
1512 f (GvGP (gv)->gp_io);
1513 f (GvGP (gv)->gp_sv);
1514 f (GvGP (gv)->gp_av);
1515 f (GvGP (gv)->gp_hv);
1516 f (GvGP (gv)->gp_cv);
1517 GvCVGEN (gv) = 0;
1518 GvMULTI_off (gv);
1519# undef f
1520
1489void _connect_to_perl () 1521void _connect_to_perl_1 ()
1522
1523void _connect_to_perl_2 ()
1490 1524
1491void _recalc_want () 1525void _recalc_want ()
1492 1526
1527# not used by default anymore
1493void _global_reattach () 1528void _global_reattach ()
1494 CODE: 1529 CODE:
1495{ 1530{
1496 // reattach to all attachable objects in the game. 1531 // reattach to all attachable objects in the game.
1497 for_all_clients (ns) 1532 for_all_clients (ns)
… …
1541 } 1576 }
1542 1577
1543 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1578 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1544} 1579}
1545 1580
1581void init_anim ()
1582
1583void init_globals ()
1584
1585void init_experience ()
1586
1587void init_attackmess ()
1588
1589void init_dynamic ()
1590
1591void load_settings ()
1592
1593void load_materials ()
1594
1595void init_uuid ()
1596 CODE:
1597 UUID::init ();
1598
1599void init_signals ()
1600
1601void init_skills ()
1602
1603void init_beforeplay ()
1604
1546void evthread_start (int aiofd) 1605void evthread_start (int aiofd)
1547 1606
1548void cede_to_tick () 1607void cede_to_tick ()
1549 CODE: 1608 CODE:
1550 coroapi::cede_to_tick (); 1609 coroapi::cede_to_tick ();
… …
1575 } 1634 }
1576 1635
1577void server_tick () 1636void server_tick ()
1578 CODE: 1637 CODE:
1579{ 1638{
1639 ev_now_update (EV_DEFAULT);
1580 NOW = ev_now (EV_DEFAULT); 1640 NOW = ev_now (EV_DEFAULT);
1581 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1641 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1582 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1642 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1583 runtime = SvNVX (sv_runtime); 1643 runtime = SvNVX (sv_runtime);
1584 1644
1585 server_tick (); 1645 server_tick ();
1586 1646
1587 NOW = ev_time (); 1647 ev_now_update (EV_DEFAULT);
1648 NOW = ev_now (EV_DEFAULT);
1588 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1649 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1589 runtime += TICK; 1650 runtime += TICK;
1590 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1651 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1591} 1652}
1592 1653
… …
1621 CODE: 1682 CODE:
1622 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1683 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1623 OUTPUT: 1684 OUTPUT:
1624 RETVAL 1685 RETVAL
1625 1686
1687const char *ordinal (int i)
1688
1626void weaken (...) 1689void weaken (...)
1627 PROTOTYPE: @ 1690 PROTOTYPE: @
1628 CODE: 1691 CODE:
1629 while (items > 0) 1692 while (items > 0)
1630 sv_rvweaken (ST (--items)); 1693 sv_rvweaken (ST (--items));
1631 1694
1632void 1695void log_suspend ()
1696
1697void log_resume ()
1698
1633log_backtrace (utf8_string msg) 1699void log_backtrace (utf8_string msg)
1634 1700
1635void
1636LOG (int flags, utf8_string msg) 1701void LOG (int flags, utf8_string msg)
1637 PROTOTYPE: $$ 1702 PROTOTYPE: $$
1638 C_ARGS: flags, "%s", msg 1703 C_ARGS: flags, "%s", msg
1639 1704
1640octet_string path_combine (octet_string base, octet_string path) 1705octet_string path_combine (octet_string base, octet_string path)
1641 PROTOTYPE: $$ 1706 PROTOTYPE: $$
… …
1687#if _POSIX_MEMLOCK 1752#if _POSIX_MEMLOCK
1688 1753
1689int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1754int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1690 INIT: 1755 INIT:
1691#if __GLIBC__ 1756#if __GLIBC__
1757 mallopt (M_TOP_PAD, 1024 * 1024);
1758 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1759 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1692 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1760 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1693#endif 1761#endif
1694 1762
1695int munlockall () 1763int munlockall ()
1696 1764
… …
1715 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1783 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1716 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1784 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1717 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1785 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1718 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1786 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1719#endif 1787#endif
1720 EXTEND (SP, 2*2); 1788 EXTEND (SP, 5*2);
1721 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1789 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1722 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1790 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1723 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1791 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1792 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1793 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1724} 1794}
1725 1795
1726int find_animation (utf8_string text) 1796int find_animation (utf8_string text)
1727 PROTOTYPE: $ 1797 PROTOTYPE: $
1728 1798
… …
1827 RETVAL 1897 RETVAL
1828 1898
1829void 1899void
1830debug_trace (attachable *obj, bool on = true) 1900debug_trace (attachable *obj, bool on = true)
1831 CODE: 1901 CODE:
1832 obj->flags &= ~attachable::F_DEBUG_TRACE; 1902 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1833 if (on) 1903 if (on)
1834 obj->flags |= attachable::F_DEBUG_TRACE; 1904 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1835 1905
1836int mortals_size () 1906int mortals_size ()
1837 CODE: 1907 CODE:
1838 RETVAL = attachable::mortals.size (); 1908 RETVAL = attachable::mortals.size ();
1839 OUTPUT: RETVAL 1909 OUTPUT: RETVAL
… …
1841#object *mortals (U32 index) 1911#object *mortals (U32 index)
1842# CODE: 1912# CODE:
1843# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1913# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1844# OUTPUT: RETVAL 1914# OUTPUT: RETVAL
1845 1915
1846INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1916INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1847 1917
1848MODULE = cf PACKAGE = cf::global 1918MODULE = cf PACKAGE = cf::global
1849 1919
1850int invoke (SV *klass, int event, ...) 1920int invoke (SV *klass, int event, ...)
1851 CODE: 1921 CODE:
… …
1855 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);
1856 OUTPUT: RETVAL 1926 OUTPUT: RETVAL
1857 1927
1858MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1928MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1859 1929
1860INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1930INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1861 1931
1862int invoke (object *op, int event, ...) 1932int invoke (object *op, int event, ...)
1863 CODE: 1933 CODE:
1864 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");
1865 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1935 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1892int mortals_size () 1962int mortals_size ()
1893 CODE: 1963 CODE:
1894 RETVAL = attachable::mortals.size (); 1964 RETVAL = attachable::mortals.size ();
1895 OUTPUT: RETVAL 1965 OUTPUT: RETVAL
1896 1966
1897const char *slot_use_name (U32 slot) 1967const_utf8_string slot_use_name (U32 slot)
1898 ALIAS: 1968 ALIAS:
1899 slot_nonuse_name = 1 1969 slot_nonuse_name = 1
1900 CODE: 1970 CODE:
1901{ 1971{
1902 if (slot >= NUM_BODY_LOCATIONS) 1972 if (slot >= NUM_BODY_LOCATIONS)
… …
1966 2036
1967int apply_shop_mat (object *shop_mat, object *op); 2037int apply_shop_mat (object *shop_mat, object *op);
1968 2038
1969int move (object *op, int dir, object *originator = op) 2039int move (object *op, int dir, object *originator = op)
1970 CODE: 2040 CODE:
1971 RETVAL = move_ob (op, dir, originator); 2041 RETVAL = op->move (dir, originator);
1972 OUTPUT: 2042 OUTPUT:
1973 RETVAL 2043 RETVAL
1974 2044
1975void apply (object *applier, object *applied, int flags = 0)
1976 CODE:
1977 manual_apply (applied, applier, flags);
1978
1979void apply_below (object *op) 2045void apply_below (object *op)
1980 CODE: 2046 CODE:
1981 player_apply_below (op); 2047 player_apply_below (op);
1982 2048
1983int 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)
1984 2052
1985int pay_item (object *op, object *buyer) 2053int pay_item (object *op, object *buyer)
1986 CODE: 2054 CODE:
1987 RETVAL = pay_for_item (op, buyer); 2055 RETVAL = pay_for_item (op, buyer);
1988 OUTPUT: RETVAL 2056 OUTPUT: RETVAL
… …
2031 2099
2032void player_lvl_adj (object *who, object *skill = 0) 2100void player_lvl_adj (object *who, object *skill = 0)
2033 2101
2034int 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)
2035 2103
2036int calc_skill_exp (object *who, object *op, object *skill); 2104int calc_skill_exp (object *who, object *op, object *skill)
2037 2105
2038void push_button (object *op); 2106void push_button (object *op, object *originator)
2039 2107
2040void use_trigger (object *op); 2108void use_trigger (object *op, object *originator)
2041 2109
2042void add_button_link (object *button, maptile *map, int connected);
2043
2044void remove_button_link (object *op);
2045
2046void handle_apply_yield (object *op); 2110void handle_apply_yield (object *op)
2047 2111
2112int convert_item (object *item, object *converter)
2113
2114void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2048 2115
2049MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2116MODULE = cf PACKAGE = cf::object PREFIX = cf_
2050 2117
2051# 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
2052# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2119# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2056 CODE: 2123 CODE:
2057 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2124 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2058 OUTPUT: 2125 OUTPUT:
2059 RETVAL 2126 RETVAL
2060 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
2061object *find_object (U32 tag) 2136object *find_object (U32 tag)
2137
2138object *find_object_uuid (UUID i)
2062 2139
2063# TODO: nuke 2140# TODO: nuke
2064object *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)
2065 PROTOTYPE: $$$$$$ 2142 PROTOTYPE: $$$$$$
2066 CODE: 2143 CODE:
2067{ 2144{
2068 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;
2069} 2149}
2070 2150
2071shstr 2151shstr
2072object::kv_get (shstr key) 2152object::kv_get (shstr key)
2073 2153
… …
2085void rangevector (object *ob, object *other, int flags = 0) 2165void rangevector (object *ob, object *other, int flags = 0)
2086 PROTOTYPE: $$;$ 2166 PROTOTYPE: $$;$
2087 PPCODE: 2167 PPCODE:
2088{ 2168{
2089 rv_vector rv; 2169 rv_vector rv;
2170
2090 get_rangevector (ob, other, &rv, flags); 2171 get_rangevector (ob, other, &rv, flags);
2172
2091 EXTEND (SP, 5); 2173 EXTEND (SP, 5);
2092 PUSHs (newSVuv (rv.distance)); 2174 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2093 PUSHs (newSViv (rv.distance_x)); 2175 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2094 PUSHs (newSViv (rv.distance_y)); 2176 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2095 PUSHs (newSViv (rv.direction)); 2177 PUSHs (sv_2mortal (newSViv (rv.direction)));
2096 PUSHs (to_sv (rv.part)); 2178 PUSHs (sv_2mortal (to_sv (rv.part)));
2097} 2179}
2098 2180
2099bool on_same_map_as (object *ob, object *other) 2181bool on_same_map_as (object *ob, object *other)
2100 CODE: 2182 CODE:
2101 RETVAL = on_same_map (ob, other); 2183 RETVAL = on_same_map (ob, other);
… …
2121 RETVAL = op->contr; 2203 RETVAL = op->contr;
2122 OUTPUT: RETVAL 2204 OUTPUT: RETVAL
2123 2205
2124bool move_player (object *op, int dir) 2206bool move_player (object *op, int dir)
2125 2207
2126void check_score (object *op)
2127
2128void 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)
2129 CODE: 2209 CODE:
2130 new_draw_info (flags, 0, op, txt); 2210 new_draw_info (flags, 0, op, txt);
2131 2211
2132void kill_player (object *op) 2212void kill_player (object *op)
… …
2144int command_arrest (object *op, utf8_string params) 2224int command_arrest (object *op, utf8_string params)
2145 2225
2146 2226
2147MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2227MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2148 2228
2149INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2229INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2150 2230
2151int invoke (player *pl, int event, ...) 2231int invoke (player *pl, int event, ...)
2152 CODE: 2232 CODE:
2153 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");
2154 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2234 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2164 pl->ob->stats.hp = pl->ob->stats.maxhp; 2244 pl->ob->stats.hp = pl->ob->stats.maxhp;
2165 pl->ob->stats.sp = pl->ob->stats.maxsp; 2245 pl->ob->stats.sp = pl->ob->stats.maxsp;
2166 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2246 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2167 pl->orig_stats = pl->ob->stats; 2247 pl->orig_stats = pl->ob->stats;
2168 2248
2169void clear_los (player *pl) 2249# should only be temporary
2250void esrv_new_player (player *pl)
2170 2251
2252#d# TODO: replace by blocked_los accessor, fix code using this
2171bool 2253bool
2172cell_visible (player *pl, int dx, int dy) 2254cell_visible (player *pl, int dx, int dy)
2173 CODE: 2255 CODE:
2174 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2256 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2175 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2176 OUTPUT: 2257 OUTPUT:
2177 RETVAL 2258 RETVAL
2178 2259
2179void 2260void
2180send (player *pl, SV *packet) 2261send (player *pl, SV *packet)
… …
2186 if (len > MAXSOCKBUF) 2267 if (len > MAXSOCKBUF)
2187 pl->failmsg ("[packet too long for client]"); 2268 pl->failmsg ("[packet too long for client]");
2188 else if (pl->ns) 2269 else if (pl->ns)
2189 pl->ns->send_packet (buf, len); 2270 pl->ns->send_packet (buf, len);
2190} 2271}
2191
2192int
2193listening (player *pl, int new_value = -1)
2194 CODE:
2195 RETVAL = pl->listening;
2196 if (new_value >= 0)
2197 pl->listening = new_value;
2198 OUTPUT:
2199 RETVAL
2200 2272
2201void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2273void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2202 PROTOTYPE: $;$$$ 2274 PROTOTYPE: $;$$$
2203 PPCODE: 2275 PPCODE:
2204 if (GIMME_V != G_VOID) 2276 if (GIMME_V != G_VOID)
… …
2254 if (op->tag) 2326 if (op->tag)
2255 XPUSHs (sv_2mortal (to_sv (op))); 2327 XPUSHs (sv_2mortal (to_sv (op)));
2256 } 2328 }
2257} 2329}
2258 2330
2259INCLUDE: $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
2260 2346
2261void 2347void
2262maptile::instantiate () 2348maptile::instantiate ()
2263 2349
2264maptile *new () 2350maptile *new ()
… …
2296 for (int x = 0; x < THIS->width; ++x) 2382 for (int x = 0; x < THIS->width; ++x)
2297 for (int y = 0; y < THIS->height; ++y) 2383 for (int y = 0; y < THIS->height; ++y)
2298 { 2384 {
2299 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)
2300 if (op->flag [FLAG_IS_FLOOR]) 2386 if (op->flag [FLAG_IS_FLOOR])
2301 goto skip_space; 2387 goto skip;
2302 2388
2303 { 2389 {
2304 int offs = offset + y * stride + x; 2390 int offs = offset + y * stride + x;
2391
2305 if (IN_RANGE_EXC (offs, 0, idxlen)) 2392 if (IN_RANGE_EXC (offs, 0, idxlen))
2306 { 2393 {
2307 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2394 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2308 { 2395 {
2309 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2396 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2310 ob->flag [FLAG_NO_MAP_SAVE] = true; 2397 ob->flag [FLAG_NO_MAP_SAVE] = true;
2311 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2398 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2312 2399
2313 if (ob->randomitems) 2400 if (ob->randomitems && !ob->above)
2314 { 2401 {
2315 if (!ob->above)
2316 {
2317 ob->create_treasure (ob->randomitems); 2402 ob->create_treasure (ob->randomitems);
2318 2403
2319 for (object *op = ob->above; op; op = op->above) 2404 for (object *op = ob->above; op; op = op->above)
2320 op->flag [FLAG_NO_MAP_SAVE] = true; 2405 op->flag [FLAG_NO_MAP_SAVE] = true;
2321 } 2406 // TODO: if this is a pickable object, then the item
2322 2407 // will at a bit weird - saving inside the player
2323 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.
2324 } 2412 }
2325 } 2413 }
2326 } 2414 }
2327 } 2415 }
2328 2416
2329 skip_space: ; 2417 skip: ;
2330 } 2418 }
2331} 2419}
2332 2420
2333void 2421void
2334maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2422maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2344 2432
2345 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2433 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2346 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2434 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2347 2435
2348 for (int i = av_len ((AV *)palette) + 1; i--; ) 2436 for (int i = av_len ((AV *)palette) + 1; i--; )
2349 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)));
2350 2438
2351 for (int y = 0; y < THIS->height; ++y) 2439 for (int y = 0; y < THIS->height; ++y)
2352 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2440 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2353 2441
2354 sfree (THIS->regions, THIS->size ()); 2442 sfree (THIS->regions, THIS->size ());
… …
2359} 2447}
2360 2448
2361void 2449void
2362maptile::create_region_treasure () 2450maptile::create_region_treasure ()
2363 CODE: 2451 CODE:
2364{
2365 object *op = object::create ();
2366 op->type = FLOOR;
2367 op->map = THIS;
2368
2369 for (int x = 0; x < THIS->width; ++x) 2452 for (int x = 0; x < THIS->width; ++x)
2370 for (int y = 0; y < THIS->height; ++y) 2453 for (int y = 0; y < THIS->height; ++y)
2371 { 2454 {
2372 region *rgn = THIS->region (x, y); 2455 region *rgn = THIS->region (x, y);
2373 2456
2374 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2457 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2458 if (object *op = THIS->at (x, y).top)
2375 if (rgn->treasure && rndm () < rgn->treasure_density) 2459 if (rgn->treasure && rndm () < rgn->treasure_density)
2376 {
2377 op->x = x;
2378 op->y = y;
2379 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2460 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2380 }
2381 } 2461 }
2382 2462
2383 op->destroy ();
2384}
2385
2386int out_of_map (maptile *map, int x, int y) 2463int out_of_map (maptile *map, int x, int y)
2387 2464
2388void 2465void
2389trigger (maptile *map, long connection, bool state = true) 2466find_link (maptile *map, shstr_tmp connection)
2390 CODE:
2391 activate_connection (map, connection, state);
2392
2393void
2394get_connection (maptile *map, long connection)
2395 PPCODE: 2467 PPCODE:
2396 oblinkpt *obp = get_connection_links (map, connection); 2468 if (oblinkpt *obp = map->find_link (connection))
2397 if (obp)
2398 for (objectlink *ol = obp->link; ol; ol = ol->next) 2469 for (objectlink *ol = obp->link; ol; ol = ol->next)
2399 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2470 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2400 2471
2401void 2472void
2402get_map_flags (maptile *map, int x, int y) 2473get_map_flags (maptile *map, int x, int y)
2403 PPCODE: 2474 PPCODE:
2404{ 2475{
2405 maptile *nmap = 0; 2476 maptile *nmap = 0;
2406 I16 nx = 0, ny = 0; 2477 I16 nx = 0, ny = 0;
2478
2479 PUTBACK;
2407 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2480 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2481 SPAGAIN;
2408 2482
2409 EXTEND (SP, 4); 2483 EXTEND (SP, 4);
2410 PUSHs (sv_2mortal (newSViv (flags))); 2484 PUSHs (sv_2mortal (newSViv (flags)));
2411 2485
2412 if (GIMME_V == G_ARRAY) 2486 if (GIMME_V == G_ARRAY)
… …
2415 PUSHs (sv_2mortal (newSViv (nx))); 2489 PUSHs (sv_2mortal (newSViv (nx)));
2416 PUSHs (sv_2mortal (newSViv (ny))); 2490 PUSHs (sv_2mortal (newSViv (ny)));
2417 } 2491 }
2418} 2492}
2419 2493
2494mapspace *
2495ms (maptile *map, unsigned int x, unsigned int y)
2496 PROTOTYPE: $$$
2497 CODE:
2498{
2499 maptile *nmap = 0;
2500 I16 nx, ny;
2501
2502 PUTBACK;
2503 get_map_flags (map, &nmap, x, y, &nx, &ny);
2504 SPAGAIN;
2505
2506 if (!nmap)
2507 XSRETURN_UNDEF;
2508
2509 RETVAL = &nmap->at (nx, ny);
2510}
2511 OUTPUT:
2512 RETVAL
2513
2420void 2514void
2421at (maptile *map, unsigned int x, unsigned int y) 2515at (maptile *map, unsigned int x, unsigned int y)
2422 PROTOTYPE: $$$ 2516 PROTOTYPE: $$$
2423 PPCODE: 2517 PPCODE:
2424{ 2518{
2425 object *o;
2426 maptile *nmap = 0; 2519 maptile *nmap = 0;
2427 I16 nx, ny; 2520 I16 nx, ny;
2428 2521
2522 PUTBACK;
2429 get_map_flags (map, &nmap, x, y, &nx, &ny); 2523 get_map_flags (map, &nmap, x, y, &nx, &ny);
2524 SPAGAIN;
2430 2525
2431 if (nmap) 2526 if (nmap)
2432 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2527 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2433 XPUSHs (sv_2mortal (to_sv (o))); 2528 XPUSHs (sv_2mortal (to_sv (o)));
2434} 2529}
2435 2530
2436SV * 2531SV *
2437bot_at (maptile *obj, unsigned int x, unsigned int y) 2532bot_at (maptile *map, unsigned int x, unsigned int y)
2438 PROTOTYPE: $$$ 2533 PROTOTYPE: $$$
2439 ALIAS: 2534 ALIAS:
2440 top_at = 1 2535 top_at = 1
2441 flags_at = 2 2536 flags_at = 2
2442 light_at = 3 2537 light_at = 3
2443 move_block_at = 4 2538 move_block_at = 4
2444 move_slow_at = 5 2539 move_slow_at = 5
2445 move_on_at = 6 2540 move_on_at = 6
2446 move_off_at = 7 2541 move_off_at = 7
2447 INIT:
2448 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2449 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
2450 switch (ix) 2554 switch (ix)
2451 { 2555 {
2452 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2556 case 0: RETVAL = to_sv (ms.bot ); break;
2453 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2557 case 1: RETVAL = to_sv (ms.top ); break;
2454 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2558 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2455 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2559 case 3: RETVAL = newSViv (ms.light ); break;
2456 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2560 case 4: RETVAL = newSVuv (ms.move_block); break;
2457 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2561 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2458 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2562 case 6: RETVAL = newSVuv (ms.move_on ); break;
2459 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2563 case 7: RETVAL = newSVuv (ms.move_off ); break;
2460 } 2564 }
2565}
2461 OUTPUT: RETVAL 2566 OUTPUT: RETVAL
2462
2463void fix_walls (maptile *map, int x, int y)
2464
2465void fix_walls_around (maptile *map, int x, int y)
2466 2567
2467# worst xs function of my life 2568# worst xs function of my life
2468bool 2569bool
2469_create_random_map (\ 2570_create_random_map (\
2470 maptile *self,\ 2571 maptile *self,\
… …
2474 utf8_string monsterstyle,\ 2575 utf8_string monsterstyle,\
2475 utf8_string treasurestyle,\ 2576 utf8_string treasurestyle,\
2476 utf8_string layoutstyle,\ 2577 utf8_string layoutstyle,\
2477 utf8_string doorstyle,\ 2578 utf8_string doorstyle,\
2478 utf8_string decorstyle,\ 2579 utf8_string decorstyle,\
2580 utf8_string miningstyle,\
2479 utf8_string origin_map,\ 2581 utf8_string origin_map,\
2480 utf8_string final_map,\ 2582 utf8_string final_map,\
2481 utf8_string exitstyle,\ 2583 utf8_string exitstyle,\
2482 utf8_string this_map,\ 2584 utf8_string this_map,\
2483 utf8_string exit_on_final_map,\ 2585 utf8_string exit_on_final_map,\
… …
2515 assign (rmp.monsterstyle , monsterstyle); 2617 assign (rmp.monsterstyle , monsterstyle);
2516 assign (rmp.treasurestyle , treasurestyle); 2618 assign (rmp.treasurestyle , treasurestyle);
2517 assign (rmp.layoutstyle , layoutstyle); 2619 assign (rmp.layoutstyle , layoutstyle);
2518 assign (rmp.doorstyle , doorstyle); 2620 assign (rmp.doorstyle , doorstyle);
2519 assign (rmp.decorstyle , decorstyle); 2621 assign (rmp.decorstyle , decorstyle);
2622 assign (rmp.miningstyle , miningstyle);
2520 assign (rmp.exitstyle , exitstyle); 2623 assign (rmp.exitstyle , exitstyle);
2521 assign (rmp.exit_on_final_map, exit_on_final_map); 2624 assign (rmp.exit_on_final_map, exit_on_final_map);
2522 2625
2523 rmp.origin_map = origin_map; 2626 rmp.origin_map = origin_map;
2524 rmp.final_map = final_map; 2627 rmp.final_map = final_map;
… …
2550 RETVAL = self->generate_random_map (&rmp); 2653 RETVAL = self->generate_random_map (&rmp);
2551} 2654}
2552 OUTPUT: 2655 OUTPUT:
2553 RETVAL 2656 RETVAL
2554 2657
2658MODULE = cf PACKAGE = cf::mapspace
2659
2660INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2661
2555MODULE = cf PACKAGE = cf::arch 2662MODULE = cf PACKAGE = cf::arch
2556 2663
2557int archetypes_size () 2664int archetypes_size ()
2558 CODE: 2665 CODE:
2559 RETVAL = archetypes.size (); 2666 RETVAL = archetypes.size ();
… …
2562archetype *archetypes (U32 index) 2669archetype *archetypes (U32 index)
2563 CODE: 2670 CODE:
2564 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2671 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2565 OUTPUT: RETVAL 2672 OUTPUT: RETVAL
2566 2673
2567object *instantiate (archetype *arch)
2568 CODE:
2569 RETVAL = arch_to_object (arch);
2570 OUTPUT:
2571 RETVAL
2572
2573INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2674INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2574 2675
2575MODULE = cf PACKAGE = cf::party 2676MODULE = cf PACKAGE = cf::party
2576 2677
2577partylist *first () 2678partylist *first ()
2578 PROTOTYPE: 2679 PROTOTYPE:
2579 CODE: 2680 CODE:
2580 RETVAL = get_firstparty (); 2681 RETVAL = get_firstparty ();
2581 OUTPUT: RETVAL 2682 OUTPUT: RETVAL
2582 2683
2583INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2684INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2584 2685
2585MODULE = cf PACKAGE = cf::region 2686MODULE = cf PACKAGE = cf::region
2586 2687
2587void 2688void
2588list () 2689list ()
… …
2594 PROTOTYPE: $ 2695 PROTOTYPE: $
2595 CODE: 2696 CODE:
2596 RETVAL = region::find (name); 2697 RETVAL = region::find (name);
2597 OUTPUT: RETVAL 2698 OUTPUT: RETVAL
2598 2699
2599region *find_fuzzy (utf8_string name)
2600 PROTOTYPE: $
2601 CODE:
2602 RETVAL = region::find_fuzzy (name);
2603 OUTPUT: RETVAL
2604
2605int specificity (region *rgn) 2700int specificity (region *rgn)
2606 CODE: 2701 CODE:
2607 RETVAL = 0; 2702 RETVAL = 0;
2608 while (rgn = rgn->parent) 2703 while (rgn = rgn->parent)
2609 RETVAL++; 2704 RETVAL++;
2610 OUTPUT: RETVAL 2705 OUTPUT: RETVAL
2611 2706
2612INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2707INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2613 2708
2614MODULE = cf PACKAGE = cf::living 2709MODULE = cf PACKAGE = cf::living
2615 2710
2616INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2711INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2617 2712
2618MODULE = cf PACKAGE = cf::settings 2713MODULE = cf PACKAGE = cf::settings
2619 2714
2620INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2715INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2621 2716
2622MODULE = cf PACKAGE = cf::client 2717MODULE = cf PACKAGE = cf::client
2623 2718
2624INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2719INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2625 2720
2626int invoke (client *ns, int event, ...) 2721int invoke (client *ns, int event, ...)
2627 CODE: 2722 CODE:
2628 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");
2629 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2724 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2695 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2790 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2696 old_sound_index [idx] = face; 2791 old_sound_index [idx] = face;
2697 2792
2698MODULE = cf PACKAGE = cf::face PREFIX = face_ 2793MODULE = cf PACKAGE = cf::face PREFIX = face_
2699 2794
2700#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2795#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2701 2796
2702faceidx face_find (utf8_string name, faceidx defidx = 0) 2797faceidx face_find (utf8_string name, faceidx defidx = 0)
2703 2798
2704faceidx alloc (utf8_string name) 2799faceidx alloc (utf8_string name)
2705 CODE: 2800 CODE:
… …
2743 faceinfo *f = face_info (idx); assert (f); 2838 faceinfo *f = face_info (idx); assert (f);
2744 facedata *d = &(faceset ? f->data64 : f->data32); 2839 facedata *d = &(faceset ? f->data64 : f->data32);
2745 sv_to (data, d->data); 2840 sv_to (data, d->data);
2746 STRLEN clen; 2841 STRLEN clen;
2747 char *cdata = SvPVbyte (chksum, clen); 2842 char *cdata = SvPVbyte (chksum, clen);
2748 clen = min (CHKSUM_SIZE, clen); 2843 clen = min (CHKSUM_MAXLEN, clen);
2749 2844
2845 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2846
2750 if (memcmp (d->chksum, cdata, clen)) 2847 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2751 { 2848 {
2849 d->chksum_len = clen;
2752 memcpy (d->chksum, cdata, clen); 2850 memcpy (d->chksum, cdata, clen);
2753 2851
2754 // invalidate existing client face info 2852 // invalidate existing client face info
2755 for_all_clients (ns) 2853 for_all_clients (ns)
2756 if (ns->faceset == faceset) 2854 if (ns->faceset == faceset)
… …
2771 2869
2772SV *get_chksum (faceidx idx, int faceset = 0) 2870SV *get_chksum (faceidx idx, int faceset = 0)
2773 CODE: 2871 CODE:
2774 facedata *d = face_data (idx, faceset); 2872 facedata *d = face_data (idx, faceset);
2775 if (!d) XSRETURN_UNDEF; 2873 if (!d) XSRETURN_UNDEF;
2776 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2874 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2777 OUTPUT: 2875 OUTPUT:
2778 RETVAL 2876 RETVAL
2779 2877
2780SV *get_data (faceidx idx, int faceset = 0) 2878SV *get_data (faceidx idx, int faceset = 0)
2781 CODE: 2879 CODE:
… …
2801 ns->force_newmap = true; 2899 ns->force_newmap = true;
2802 } 2900 }
2803 2901
2804MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2902MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2805 2903
2806#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2904#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2807 2905
2808animidx anim_find (utf8_string name) 2906animidx anim_find (utf8_string name)
2809 CODE: 2907 CODE:
2810 RETVAL = animation::find (name).number; 2908 RETVAL = animation::find (name).number;
2811 OUTPUT: RETVAL 2909 OUTPUT: RETVAL
… …
2826 } 2924 }
2827 else 2925 else
2828 anim = &animation::create (name, av_len (av) + 1, facings); 2926 anim = &animation::create (name, av_len (av) + 1, facings);
2829 2927
2830 for (int i = 0; i < anim->num_animations; ++i) 2928 for (int i = 0; i < anim->num_animations; ++i)
2831 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)));
2832} 2930}
2833 OUTPUT: RETVAL 2931 OUTPUT: RETVAL
2834 2932
2835void invalidate_all () 2933void invalidate_all ()
2836 CODE: 2934 CODE:
2837 for_all_clients (ns) 2935 for_all_clients (ns)
2838 ns->anims_sent.reset (); 2936 ns->anims_sent.reset ();
2839 2937
2840MODULE = cf PACKAGE = cf::object::freezer 2938MODULE = cf PACKAGE = cf::object::freezer
2841 2939
2842INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2940INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2843 2941
2844SV * 2942SV *
2845new (char *klass) 2943new (char *klass)
2846 CODE: 2944 CODE:
2847 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2945 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2854 sv_to (sv, self); 2952 sv_to (sv, self);
2855 delete self; 2953 delete self;
2856 2954
2857MODULE = cf PACKAGE = cf::object::thawer 2955MODULE = cf PACKAGE = cf::object::thawer
2858 2956
2859INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2957INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
2860 2958
2861SV * 2959SV *
2862new_from_file (char *klass, octet_string path) 2960new_from_file (char *klass, octet_string path)
2863 CODE: 2961 CODE:
2864 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