ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.308 by root, Mon Nov 24 05:19:59 2008 UTC vs.
Revision 1.391 by root, Sat Jul 3 01:49:18 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include "autoconf.h" 23#include "autoconf.h"
… …
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h"
35#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
… …
54#include <XSUB.h> 52#include <XSUB.h>
55 53
56#include "CoroAPI.h" 54#include "CoroAPI.h"
57#include "perlxsi.c" 55#include "perlxsi.c"
58 56
59extern sint64 *levels; // the experience table
60
61typedef object_thawer &object_thawer_ref; 57typedef object_thawer &object_thawer_ref;
62typedef object_freezer &object_freezer_ref; 58typedef object_freezer &object_freezer_ref;
63 59
64typedef std::string std__string; 60typedef std::string std__string;
65 61
… …
71static int tick_pending; 67static int tick_pending;
72 68
73global gbl_ev; 69global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 70static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 71static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
72static AV *av_reflect;
76 73
77bitset<NUM_EVENT_TYPES> ev_want_event; 74bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 75bitset<NUM_TYPES> ev_want_type;
79 76
80static HV 77static HV
… …
86 *stash_cf_mapspace_wrap, 83 *stash_cf_mapspace_wrap,
87 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
88 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 88 *stash_cf_living_wrap,
89 *stash_cf_layout_wrap,
90 *stash_ext_map_world;
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;
92 98
93#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
94static inline SV * 100static SV *
95newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
96{ 102{
97 if (!s) 103 if (!s)
98 return newSV (0); 104 return newSV (0);
99 105
… …
102 return sv; 108 return sv;
103} 109}
104#endif 110#endif
105 111
106#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
107static inline SV * 113static SV *
108newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
109{ 115{
110 if (!s) 116 if (!s)
111 return newSV (0); 117 return newSV (0);
112 118
… …
116 SvUTF8_on (sv); 122 SvUTF8_on (sv);
117 123
118 return sv; 124 return sv;
119} 125}
120#endif 126#endif
127
128noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
121 143
122// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
123template<class super> 145template<class super>
124static super * 146static super *
125is_a (attachable *at) 147is_a (attachable *at)
… …
158 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
159 hv_clear (self); 181 hv_clear (self);
160 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
161 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
162 184
163 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
164 assert (!this->self); 186 assert (!this->self);
165 } 187 }
166} 188}
167 189
168void 190void
… …
202attachable::destroy () 224attachable::destroy ()
203{ 225{
204 if (destroyed ()) 226 if (destroyed ())
205 return; 227 return;
206 228
207 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
208 do_destroy (); 230 do_destroy ();
209 sever_self (); 231 sever_self ();
232}
233
234void
235attachable::do_delete ()
236{
237 delete this;
210} 238}
211 239
212void 240void
213attachable::check_mortals () 241attachable::check_mortals ()
214{ 242{
… …
230 258
231 if (0) 259 if (0)
232 { 260 {
233 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
234 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
235 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
236 } 265 }
237 } 266 }
238 } 267 }
239 268
… …
259 } 288 }
260 else 289 else
261 { 290 {
262 mortals.erase (i); 291 mortals.erase (i);
263 obj->sever_self (); 292 obj->sever_self ();
264 delete obj; 293 obj->do_delete ();
265 } 294 }
266 } 295 }
267} 296}
268 297
269void 298void
… …
286 315
287 attach = src.attach; 316 attach = src.attach;
288 return *this; 317 return *this;
289} 318}
290 319
320#if 0
291template<typename T> 321template<typename T>
292static bool 322static bool
293find_backref (void *ptr, T *obj) 323find_backref (void *ptr, T *obj)
294{ 324{
295 char *s = (char *)obj; 325 char *s = (char *)obj;
… …
303 333
304 return false; 334 return false;
305} 335}
306 336
307// for debugging, find "live" objects containing this ptr 337// for debugging, find "live" objects containing this ptr
308void 338static void
309find_backref (void *ptr) 339find_backref (void *ptr)
310{ 340{
311 for_all_objects (op) 341 for_all_objects (op)
312 if (find_backref (ptr, op)) 342 if (find_backref (ptr, op))
313 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 343 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
317 fprintf (stderr, "P %p\n", pl); 347 fprintf (stderr, "P %p\n", pl);
318 348
319 for_all_clients (ns) 349 for_all_clients (ns)
320 if (find_backref (ptr, ns)) 350 if (find_backref (ptr, ns))
321 fprintf (stderr, "C %p\n", ns); 351 fprintf (stderr, "C %p\n", ns);
322
323} 352}
353#endif
324 354
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 356
327static SV * 357static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv)
329{ 359{
330 SV *sv;
331
332 if (!ptr) 360 if (!ptr)
333 return newSV (0); 361 return newSV (0);
334 362
335 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 363 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
336 return sv_bless (newRV_noinc ((SV *)hv), stash); 364 return sv_bless (newRV_noinc ((SV *)hv), stash);
365}
366
367static SV * noinline
368newSVptr (void *ptr, HV *stash)
369{
370 return newSVptr (ptr, stash, newHV ());
337} 371}
338 372
339static int 373static int
340attachable_free (pTHX_ SV *sv, MAGIC *mg) 374attachable_free (pTHX_ SV *sv, MAGIC *mg)
341{ 375{
… …
353 return 0; 387 return 0;
354} 388}
355 389
356MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 390MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
357 391
358static SV * 392static SV * noinline
359newSVattachable (attachable *obj, HV *stash) 393newSVattachable (attachable *obj, HV *stash)
360{ 394{
361 if (!obj) 395 if (!obj)
362 return newSV (0); 396 return newSV (0);
363 397
… …
381 415
382 return sv; 416 return sv;
383 } 417 }
384} 418}
385 419
420#if 0 // unused
386static void 421static void
387clearSVptr (SV *sv) 422clearSVptr (SV *sv)
388{ 423{
389 if (SvROK (sv)) 424 if (SvROK (sv))
390 sv = SvRV (sv); 425 sv = SvRV (sv);
391 426
392 hv_clear ((HV *)sv); 427 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 428 sv_unmagic (sv, PERL_MAGIC_ext);
394} 429}
430#endif
431
432static long
433SvPTR_nc (SV *sv)
434{
435 sv = SvRV (sv);
436
437 // very important shortcut
438 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
439 return (long)SvMAGIC (sv)->mg_ptr;
440
441 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
442 return (long)mg->mg_ptr;
443
444 croak ("perl code used object, but C object is already destroyed, caught");
445}
395 446
396static long 447static long
397SvPTR (SV *sv, const char *klass) 448SvPTR (SV *sv, const char *klass)
398{ 449{
399 if (!sv_derived_from (sv, klass)) 450 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 451 croak ("object of type %s expected", klass);
401 452
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 453 return SvPTR_nc (sv);
403
404 if (!mg)
405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
406
407 return (long)mg->mg_ptr;
408} 454}
409 455
410static long 456static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 457SvPTR_ornull (SV *sv, const char *klass)
412{ 458{
413 if (SvOK (sv)) 459 if (expect_false (!SvOK (sv))) return 0;
460
414 return SvPTR (sv, klass); 461 return SvPTR (sv, klass);
415 else
416 return 0;
417} 462}
418 463
464static long noinline
465SvPTR_ornull_client (SV *sv)
466{
467 if (expect_false (!SvOK (sv))) return 0;
468
469 if (!SvROK (sv)
470 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
471 && !sv_derived_from (sv, "cf::client")))
472 croak ("object of type cf::client expected");
473
474 return SvPTR_nc (sv);
475}
476
477static long noinline
478SvPTR_ornull_object (SV *sv)
479{
480 if (expect_false (!SvOK (sv))) return 0;
481
482 if (!SvROK (sv)
483 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
484 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
485 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
486 && !sv_derived_from (sv, "cf::object")))
487 croak ("object of type cf::object expected");
488
489 return SvPTR_nc (sv);
490}
491
492static long noinline
493SvPTR_ornull_maptile (SV *sv)
494{
495 if (expect_false (!SvOK (sv))) return 0;
496
497 if (!SvROK (sv)
498 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
499 && SvSTASH (SvRV (sv)) != stash_ext_map_world
500 && !sv_derived_from (sv, "cf::map")))
501 croak ("object of type cf::map expected");
502
503 return SvPTR_nc (sv);
504}
505
506static long noinline
507SvPTR_ornull_player (SV *sv)
508{
509 if (expect_false (!SvOK (sv))) return 0;
510
511 if (!SvROK (sv)
512 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
513 && !sv_derived_from (sv, "cf::player")))
514 croak ("object of type cf::player expected");
515
516 return SvPTR_nc (sv);
517}
518
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 519static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
420inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 520static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 521static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 522static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 523static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 524static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 525static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 526static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 527static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 528static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 529static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 530static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 531static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 532static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 533static inline SV *to_sv (double v) { return newSVnv (v); }
434inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 534static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
435inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 535static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
536// gcc dislikes noilnine on to_sv
436inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 537static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
538static inline SV *to_sv (object * v) { return to_sv_ni (v); }
437inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 539static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
438inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 540static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
439inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 541static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
440inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 542static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
441inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 543static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
442inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 544static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
545static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
443 546
444inline SV *to_sv (object & v) { return to_sv (&v); } 547static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 548static inline SV *to_sv (living & v) { return to_sv (&v); }
446 549
447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 550static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 551static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 552
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 553static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 554
452inline SV *to_sv (dynbuf * v) 555static inline SV *to_sv (dynbuf * v)
453{ 556{
454 SV *sv = newSV (0); 557 SV *sv = newSV (0);
455 558
456 sv_upgrade (sv, SVt_PV); 559 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 560 SvGROW (sv, v->size () + 1);
… …
461 *SvEND (sv) = 0; 564 *SvEND (sv) = 0;
462 565
463 return sv; 566 return sv;
464} 567}
465 568
466inline SV *to_sv (dynbuf_text * v) 569static inline SV *to_sv (dynbuf_text * v)
467{ 570{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 571 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 572 SvUTF8_on (sv);
470 return sv; 573 return sv;
471} 574}
472 575
473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 576static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 577static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 578static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 579static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 580static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 581static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 582static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 583static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 584static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 585static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 586static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
484inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 587static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
485inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 588static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
486inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 589static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 590static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
488inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 591static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
489inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 592static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
490inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 593static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
594static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
491inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 595static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
492inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 596static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
494inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 597static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
495inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 598static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
496inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 599static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
497inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 600static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
601static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 602static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
499inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 603static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 604
501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 605//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
502inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 606static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
503 607
504template<class T> 608template<class T>
505inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 609static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
506 610
507template<int N> 611template<int N>
508inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 612static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
509 613
510inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 614static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
511inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 615static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
512inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 616static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 617static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 618
515inline void sv_to (SV *sv, std::string &v) 619static inline void sv_to (SV *sv, std::string &v)
516{ 620{
517 STRLEN len; 621 STRLEN len;
518 char *data = SvPVbyte (sv, len); 622 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 623 v.assign (data, len);
520} 624}
521 625
522inline void sv_to (SV *sv, UUID &v) 626static inline void sv_to (SV *sv, UUID &v)
523{ 627{
524 if (!v.parse (SvPV_nolen (sv))) 628 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 629 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 630}
527 631
528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 632static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
529 633
530static SV * 634static SV *
531newSVdt_va (va_list &ap, data_type type) 635newSVdt_va (va_list &ap, data_type type)
532{ 636{
533 SV *sv; 637 SV *sv;
… …
607 va_end (ap); 711 va_end (ap);
608 712
609 return sv; 713 return sv;
610} 714}
611 715
716// typemap support, mostly to avoid excessive inlining
717template<class type>
718static void noinline
719cf_obj_to (SV *arg, type &var)
720{
721 sv_to (arg, var);
722 if (expect_false (!var))
723 croak ("must not pass invalid/null cf_obj here");
724}
725
726template<class object>
727static void noinline
728cf_obj_ornull_to (SV *arg, object *&var)
729{
730 if (SvOK (arg))
731 {
732 sv_to (arg, var);
733 if (expect_false (!var))
734 croak ("unable to convert perl object to C++ object");
735 }
736 else
737 var = 0;
738}
739
612////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 740//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
613 741
614SV * 742static SV *
615registry (attachable *ext) 743registry (attachable *ext)
616{ 744{
617 if (!ext->cb) 745 if (!ext->cb)
618 ext->cb = newAV (); 746 ext->cb = newAV ();
619 747
… …
645 exit (EXIT_FAILURE); 773 exit (EXIT_FAILURE);
646 } 774 }
647 775
648 eval_pv ( 776 eval_pv (
649 "#line 1 'cfperl init'\n" 777 "#line 1 'cfperl init'\n"
650 "use EV ();\n" 778 "use EV ();\n" // required by bootstrap
651 "use Coro ();\n" 779 "use Coro ();\n" // required by bootstrap
652 "cf->bootstrap;\n" 780 "cf->bootstrap;\n" // required for cf::datadir
653 "unshift @INC, cf::datadir ();\n" 781 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
654 "require cf;\n", 782 "require cf;\n",
655 0 783 0
656 ); 784 );
657 785
658 if (SvTRUE (ERRSV)) 786 if (SvTRUE (ERRSV))
… …
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 788 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
661 exit (EXIT_FAILURE); 789 exit (EXIT_FAILURE);
662 } 790 }
663} 791}
664 792
793void
665void cfperl_main () 794cfperl_main ()
666{ 795{
667 dSP; 796 dSP;
668 797
669 PUSHMARK (SP); 798 PUSHMARK (SP);
670 PUTBACK; 799 PUTBACK;
… …
695# undef def 824# undef def
696}; 825};
697 826
698#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 827#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
699 828
700static void 829static void noinline
701gather_callbacks (AV *&callbacks, AV *registry, event_type event) 830gather_callbacks (AV *&callbacks, AV *registry, event_type event)
702{ 831{
703 // event must be in array 832 // event must be in array
704 if (event >= 0 && event <= AvFILLp (registry)) 833 if (event >= 0 && event <= AvFILLp (registry))
705 { 834 {
… …
791{ 920{
792 attachable::gather_callbacks (callbacks, event); 921 attachable::gather_callbacks (callbacks, event);
793 ::gather_callbacks (callbacks, cb_map, event); 922 ::gather_callbacks (callbacks, cb_map, event);
794} 923}
795 924
796void 925static void noinline
797_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 926_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
798{ 927{
799 for (int event = 0; event <= AvFILLp (registry); ++event) 928 for (int event = 0; event <= AvFILLp (registry); ++event)
800 { 929 {
801 SV *cbs_ = AvARRAY (registry)[event]; 930 SV *cbs_ = AvARRAY (registry)[event];
… …
811 } 940 }
812 } 941 }
813} 942}
814 943
815// very slow and inefficient way to recalculate the global want bitsets 944// very slow and inefficient way to recalculate the global want bitsets
816void 945static void
817_recalc_want () 946_recalc_want ()
818{ 947{
819 ev_want_event.reset (); 948 ev_want_event.reset ();
820 949
821 _recalc_want (ev_want_event, cb_global); 950 _recalc_want (ev_want_event, cb_global);
… …
894 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 1023 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
895 } 1024 }
896 1025
897 va_end (ap); 1026 va_end (ap);
898 1027
899 CALL_CALL ("cf::do_invoke", G_SCALAR); 1028 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
900 count = count > 0 ? POPi : 0; 1029 count = count > 0 ? POPi : 0;
901 1030
902 CALL_END; 1031 CALL_END;
903 1032
904 return count; 1033 return count;
905} 1034}
906 1035
907SV * 1036static SV *
908cfperl_result (int idx) 1037cfperl_result (int idx)
909{ 1038{
910 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1039 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
911 if (!av) 1040 if (!av)
912 return &PL_sv_undef; 1041 return &PL_sv_undef;
… …
931} 1060}
932 1061
933///////////////////////////////////////////////////////////////////////////// 1062/////////////////////////////////////////////////////////////////////////////
934// various c++ => perl glue functions 1063// various c++ => perl glue functions
935 1064
1065void
936void cfperl_tick () 1066cfperl_tick ()
937{ 1067{
938 tick_pending = 1; 1068 tick_pending = 1;
939 1069
940 if (tick_inhibit) 1070 if (tick_inhibit)
941 return; 1071 return;
… …
944 1074
945 dSP; 1075 dSP;
946 1076
947 PUSHMARK (SP); 1077 PUSHMARK (SP);
948 PUTBACK; 1078 PUTBACK;
949 call_pv ("cf::tick", G_DISCARD | G_VOID); 1079 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
950 1080
951 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1081 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
952} 1082}
953 1083
954void 1084void
… …
977 CALL_CALL ("ext::books::make_book", G_VOID); 1107 CALL_CALL ("ext::books::make_book", G_VOID);
978 CALL_END; 1108 CALL_END;
979} 1109}
980 1110
981void 1111void
982cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1112cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
983{ 1113{
984 CALL_BEGIN (4); 1114 CALL_BEGIN (4);
985 CALL_ARG (ns); 1115 CALL_ARG (ns);
986 CALL_ARG (type); 1116 CALL_ARG (type);
987 CALL_ARG_SV (newSVpv_utf8 (msg)); 1117 CALL_ARG_SV (newSVpv_utf8 (msg));
988 CALL_ARG (color); 1118 CALL_ARG (color);
989 CALL_CALL ("cf::client::send_msg", G_VOID); 1119 CALL_CALL (cv_cf_client_send_msg, G_VOID);
990 CALL_END; 1120 CALL_END;
991} 1121}
992 1122
993int 1123int
994cfperl_can_merge (object *ob1, object *ob2) 1124cfperl_can_merge (object *ob1, object *ob2)
… …
996 int can; 1126 int can;
997 1127
998 CALL_BEGIN (2); 1128 CALL_BEGIN (2);
999 CALL_ARG (ob1); 1129 CALL_ARG (ob1);
1000 CALL_ARG (ob2); 1130 CALL_ARG (ob2);
1001 CALL_CALL ("cf::_can_merge", G_SCALAR); 1131 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1002 can = count && SvTRUE (TOPs); 1132 can = count && SvTRUE (TOPs);
1003 CALL_END; 1133 CALL_END;
1004 1134
1005 return can; 1135 return can;
1006} 1136}
1007 1137
1138void
1139cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1140{
1141 CALL_BEGIN (4);
1142 CALL_ARG (ob);
1143 CALL_ARG (state);
1144 CALL_ARG (activator);
1145 CALL_ARG (originator);
1146 CALL_CALL ("cf::mapscript::activate", G_VOID);
1147 CALL_END;
1148}
1149
1008player * 1150player *
1009player::find (const char *name) 1151player::find (const_utf8_string name)
1010{ 1152{
1011 CALL_BEGIN (1); 1153 CALL_BEGIN (1);
1012 CALL_ARG (name); 1154 CALL_ARG (name);
1013 CALL_CALL ("cf::player::find", G_SCALAR); 1155 CALL_CALL ("cf::player::find", G_SCALAR);
1014 1156
… …
1019 1161
1020 return retval; 1162 return retval;
1021} 1163}
1022 1164
1023maptile * 1165maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty) 1166find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1025{ 1167{
1026 CALL_BEGIN (3); 1168 CALL_BEGIN (4);
1027 CALL_ARG (dirname); 1169 CALL_ARG (dirname);
1028 CALL_ARG (stylename); 1170 CALL_ARG (stylename);
1029 CALL_ARG (difficulty); 1171 CALL_ARG (difficulty);
1172 CALL_ARG (recurse);
1030 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1173 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1031 1174
1032 maptile *retval = 0; 1175 maptile *retval = 0;
1033 if (count) sv_to (POPs, retval); 1176 if (count) sv_to (POPs, retval);
1034 1177
… …
1036 1179
1037 return retval; 1180 return retval;
1038} 1181}
1039 1182
1040maptile * 1183maptile *
1041maptile::find_sync (const char *path, maptile *origin) 1184maptile::find_sync (const_utf8_string path, maptile *origin)
1042{ 1185{
1043 CALL_BEGIN (2); 1186 CALL_BEGIN (2);
1044 CALL_ARG (path); 1187 CALL_ARG (path);
1045 CALL_ARG (origin); 1188 CALL_ARG (origin);
1046 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1189 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1052 1195
1053 return retval; 1196 return retval;
1054} 1197}
1055 1198
1056maptile * 1199maptile *
1057maptile::find_async (const char *path, maptile *origin, bool load) 1200maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1058{ 1201{
1059 CALL_BEGIN (3); 1202 CALL_BEGIN (3);
1060 CALL_ARG (path); 1203 CALL_ARG (path);
1061 CALL_ARG (origin); 1204 CALL_ARG (origin);
1062 CALL_ARG (load); 1205 CALL_ARG (load);
… …
1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1221 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1079 CALL_END; 1222 CALL_END;
1080} 1223}
1081 1224
1082void 1225void
1083maptile::change_all_map_light (int change)
1084{
1085 CALL_BEGIN (1);
1086 CALL_ARG (change);
1087 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1088 CALL_END;
1089}
1090
1091void
1092object::enter_exit (object *exit) 1226object::enter_exit (object *exit)
1093{ 1227{
1094 if (type != PLAYER) 1228 if (type != PLAYER)
1095 return; 1229 return;
1096 1230
… …
1100 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1234 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1101 CALL_END; 1235 CALL_END;
1102} 1236}
1103 1237
1104void 1238void
1105object::player_goto (const char *path, int x, int y) 1239object::player_goto (const_utf8_string path, int x, int y)
1106{ 1240{
1107 if (type != PLAYER) 1241 if (type != PLAYER)
1108 return; 1242 return;
1109 1243
1110 CALL_BEGIN (4); 1244 CALL_BEGIN (4);
… …
1114 CALL_ARG (y); 1248 CALL_ARG (y);
1115 CALL_CALL ("cf::object::player::goto", G_VOID); 1249 CALL_CALL ("cf::object::player::goto", G_VOID);
1116 CALL_END; 1250 CALL_END;
1117} 1251}
1118 1252
1119const char * 1253const_utf8_string
1120object::ref () const 1254object::ref () const
1121{ 1255{
1122 if (type == PLAYER) 1256 if (type == PLAYER)
1123 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1257 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1124 else 1258 else
1259 // TODO: should be able to save references within the same map, at least
1125 return 0; 1260 return 0;
1126} 1261}
1127 1262
1128object * 1263object *
1129object::deref (const char *ref) 1264object::deref (const_utf8_string ref)
1130{ 1265{
1131 object *retval = 0; 1266 object *retval = 0;
1132 1267
1133 if (ref) 1268 if (ref)
1134 { 1269 {
… …
1144 1279
1145 return retval; 1280 return retval;
1146} 1281}
1147 1282
1148void 1283void
1149log_backtrace (const char *msg) 1284log_backtrace (const_utf8_string msg)
1150{ 1285{
1151#if HAVE_BACKTRACE 1286#if HAVE_BACKTRACE
1152 void *addr [20]; 1287 void *addr [20];
1153 int size = backtrace (addr, 20); 1288 int size = backtrace (addr, 20);
1154 1289
… …
1159 CALL_CALL ("cf::_log_backtrace", G_VOID); 1294 CALL_CALL ("cf::_log_backtrace", G_VOID);
1160 CALL_END; 1295 CALL_END;
1161#endif 1296#endif
1162} 1297}
1163 1298
1299bool
1300is_match_expr (const_utf8_string expr)
1301{
1302 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1303}
1304
1305bool
1306match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1307{
1308 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1309 expr += sizeof ("match ") - 1;
1310
1311 CALL_BEGIN (5);
1312 CALL_ARG (expr);
1313 CALL_ARG (ob);
1314 CALL_ARG (self);
1315 CALL_ARG (source);
1316 CALL_ARG (originator);
1317 CALL_CALL (cv_cf_match_match, G_SCALAR);
1318
1319 bool matched = count && SvTRUE (TOPs);
1320
1321 CALL_END;
1322
1323 return matched;
1324}
1325
1326object *
1327match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1328{
1329 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1330 expr += sizeof ("match ") - 1;
1331
1332 CALL_BEGIN (5);
1333 CALL_ARG (expr);
1334 CALL_ARG (ob);
1335 CALL_ARG (self);
1336 CALL_ARG (source);
1337 CALL_ARG (originator);
1338 CALL_CALL (cv_cf_match_match, G_ARRAY);
1339
1340 object *one = 0;
1341
1342 if (count)
1343 sv_to (TOPs, one);
1344
1345 CALL_END;
1346
1347 return one;
1348}
1349
1164///////////////////////////////////////////////////////////////////////////// 1350/////////////////////////////////////////////////////////////////////////////
1165 1351
1166struct EVAPI *evapi::GEVAPI; 1352struct EVAPI *evapi::GEVAPI;
1167struct CoroAPI *coroapi::GCoroAPI; 1353struct CoroAPI *coroapi::GCoroAPI;
1168 1354
1355void
1169void coroapi::do_cede_to_tick () 1356coroapi::do_cede_to_tick ()
1170{ 1357{
1171 cede_pending = 0; 1358 cede_pending = 0;
1172 cede (); 1359 cede ();
1173} 1360}
1174 1361
… …
1198 ev_io_set ((ev_io *)this, fd, events); 1385 ev_io_set ((ev_io *)this, fd, events);
1199 if (active) start (); 1386 if (active) start ();
1200 } 1387 }
1201} 1388}
1202 1389
1203void 1390static void
1204_connect_to_perl () 1391_connect_to_perl_1 ()
1205{ 1392{
1206 stash_cf = gv_stashpv ("cf", 1); 1393 stash_cf = gv_stashpv ("cf", 1);
1207 1394
1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1395 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1396 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1213 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1400 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1214 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1401 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1215 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1402 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1216 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1217 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1404 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1405 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1406 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1218 1407
1219 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1408 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1220 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1409 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1221 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1410 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1222 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1411 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1228 cb_client = get_av ("cf::CB_CLIENT", 1); 1417 cb_client = get_av ("cf::CB_CLIENT", 1);
1229 cb_type = get_av ("cf::CB_TYPE" , 1); 1418 cb_type = get_av ("cf::CB_TYPE" , 1);
1230 cb_map = get_av ("cf::CB_MAP" , 1); 1419 cb_map = get_av ("cf::CB_MAP" , 1);
1231} 1420}
1232 1421
1422static void
1423_connect_to_perl_2 ()
1424{
1425 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1426 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1427 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1428 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1429 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1430}
1431
1233MODULE = cf PACKAGE = cf PREFIX = cf_ 1432MODULE = cf PACKAGE = cf PREFIX = cf_
1234 1433
1235BOOT: 1434BOOT:
1236{ 1435{
1237 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1436 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1238 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1437 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1239 1438
1240 _connect_to_perl (); 1439 _connect_to_perl_1 ();
1241 1440
1242 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1441 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1243 1442
1244 //{ 1443 //{
1245 // require_pv ("Time::HiRes"); 1444 // require_pv ("Time::HiRes");
… …
1253 static const struct { 1452 static const struct {
1254 const char *name; 1453 const char *name;
1255 IV iv; 1454 IV iv;
1256 } *civ, const_iv[] = { 1455 } *civ, const_iv[] = {
1257# define const_iv(name) { # name, (IV)name }, 1456# define const_iv(name) { # name, (IV)name },
1258 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1457# include "const_iv.h"
1259 const_iv (logBacktrace) 1458# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1459# include "attackinc.h"
1460# undef def
1461# define def(uc, flags) const_iv (SK_ ## uc)
1462# include "skillinc.h"
1463# undef def
1260 1464
1261 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1465 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1262 1466
1263 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1467 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1264 1468
1265 const_iv (MAX_TIME) 1469 const_iv (MAX_TIME)
1266 const_iv (MAXSOCKBUF) 1470 const_iv (MAXSOCKBUF)
1267 1471
1268 const_iv (NUM_BODY_LOCATIONS)
1269 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1270 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1271 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1272 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1273 const_iv (body_wrist) const_iv (body_waist)
1274
1275 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1276 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1277 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1278 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1279 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1280 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1281 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1282 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1283 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1284 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1285 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1286 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1287 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1288 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1289 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1290 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1291 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1292 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1293 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1294 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1295 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1296 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1297 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1298 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1299 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1300 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1301 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1302 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1303
1304 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1305
1306 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1307 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1308
1309 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1310 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1311 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1312 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1313 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1314 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1315 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1316
1317 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1318 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1319 const_iv (WEAP_BLUD)
1320
1321 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1322 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1323 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1324 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1325 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1326 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1327 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1328 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1329 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1330 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1331 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1332 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1333 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1334 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1335 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1336 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1337 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1338 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1347
1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1350 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1351 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1352 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1353 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1354
1355 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1472 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1356 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1473 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1357 1474
1358 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1475 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1359
1360 const_iv (SP_RAISE_DEAD)
1361 const_iv (SP_RUNE)
1362 const_iv (SP_MAKE_MARK)
1363 const_iv (SP_BOLT)
1364 const_iv (SP_BULLET)
1365 const_iv (SP_EXPLOSION)
1366 const_iv (SP_CONE)
1367 const_iv (SP_BOMB)
1368 const_iv (SP_WONDER)
1369 const_iv (SP_SMITE)
1370 const_iv (SP_MAGIC_MISSILE)
1371 const_iv (SP_SUMMON_GOLEM)
1372 const_iv (SP_DIMENSION_DOOR)
1373 const_iv (SP_MAGIC_MAPPING)
1374 const_iv (SP_MAGIC_WALL)
1375 const_iv (SP_DESTRUCTION)
1376 const_iv (SP_PERCEIVE_SELF)
1377 const_iv (SP_WORD_OF_RECALL)
1378 const_iv (SP_INVISIBLE)
1379 const_iv (SP_PROBE)
1380 const_iv (SP_HEALING)
1381 const_iv (SP_CREATE_FOOD)
1382 const_iv (SP_EARTH_TO_DUST)
1383 const_iv (SP_CHANGE_ABILITY)
1384 const_iv (SP_BLESS)
1385 const_iv (SP_CURSE)
1386 const_iv (SP_SUMMON_MONSTER)
1387 const_iv (SP_CHARGING)
1388 const_iv (SP_POLYMORPH)
1389 const_iv (SP_ALCHEMY)
1390 const_iv (SP_REMOVE_CURSE)
1391 const_iv (SP_IDENTIFY)
1392 const_iv (SP_DETECTION)
1393 const_iv (SP_MOOD_CHANGE)
1394 const_iv (SP_MOVING_BALL)
1395 const_iv (SP_SWARM)
1396 const_iv (SP_CHANGE_MANA)
1397 const_iv (SP_DISPEL_RUNE)
1398 const_iv (SP_CREATE_MISSILE)
1399 const_iv (SP_CONSECRATE)
1400 const_iv (SP_ANIMATE_WEAPON)
1401 const_iv (SP_LIGHT)
1402 const_iv (SP_CHANGE_MAP_LIGHT)
1403 const_iv (SP_FAERY_FIRE)
1404 const_iv (SP_CAUSE_DISEASE)
1405 const_iv (SP_AURA)
1406 const_iv (SP_TOWN_PORTAL)
1407 const_iv (SP_PARTY_SPELL)
1408 1476
1409 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1477 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1410 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1478 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1411 const_iv (F_LOCKED) 1479 const_iv (F_LOCKED)
1412 1480
1413 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1414
1415 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1481 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1416 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1482 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1417 1483
1418 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1419
1420 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1421 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1422
1423 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1424 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1425
1426 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1484 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1427
1428 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1429 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1430 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1431 const_iv (M_ICE) const_iv (M_SPECIAL)
1432 1485
1433 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1486 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1434 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1487 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1435 1488
1436 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1437 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1438 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1439 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1440 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1441 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1442 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1443 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1444 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1445 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1446 const_iv (SK_POISON_NAIL)
1447
1448 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1449 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1450 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1451 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1452 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1453 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1454
1455 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1456
1457 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1458 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1459 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1460 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1461 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1462 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1463 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1464
1465 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1489 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1466 const_iv (MAP_INACTIVE) 1490 const_iv (MAP_INACTIVE)
1467 1491
1468 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1492 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1469 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1493 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1470 1494
1471 const_iv (VERSION_CS) const_iv (VERSION_SC)
1472
1473 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1495 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1474 1496
1475 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1476
1477 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1497 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1478
1479 // random map generator
1480 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1481 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1482
1483 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1484 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1485 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1486
1487 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1488 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1489
1490 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1491 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1492
1493 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1494 const_iv (FT_RSRC) const_iv (FT_NUM)
1495 }; 1498 };
1496 1499
1497 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1500 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1498 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1501 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1499 1502
1500 static const struct { 1503 static const struct {
1501 const char *name; 1504 const char *name;
1502 int skip; 1505 int skip;
… …
1508# undef def 1511# undef def
1509 }; 1512 };
1510 1513
1511 AV *av = get_av ("cf::EVENT", 1); 1514 AV *av = get_av ("cf::EVENT", 1);
1512 1515
1513 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1516 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1514 { 1517 {
1515 AV *event = newAV (); 1518 AV *event = newAV ();
1516 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1519 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1517 av_push (event, newSViv (eiv->klass)); 1520 av_push (event, newSViv (eiv->klass));
1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1521 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1522 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1520 } 1523 }
1524
1525 // used by autogenerated BOOT sections from genacc
1526 av_reflect = get_av ("cf::REFLECT", 1);
1521} 1527}
1522 1528
1523void _gv_clear (SV *gv) 1529void _gv_clear (SV *gv)
1524 CODE: 1530 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV); 1531 assert (SvTYPE (gv) == SVt_PVGV);
… …
1532 f (GvGP (gv)->gp_cv); 1538 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0; 1539 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv); 1540 GvMULTI_off (gv);
1535# undef f 1541# undef f
1536 1542
1537void _connect_to_perl () 1543void _connect_to_perl_1 ()
1544
1545void _connect_to_perl_2 ()
1538 1546
1539void _recalc_want () 1547void _recalc_want ()
1540 1548
1541# not used by default anymore 1549# not used by default anymore
1542void _global_reattach () 1550void _global_reattach ()
… …
1594 1602
1595void init_anim () 1603void init_anim ()
1596 1604
1597void init_globals () 1605void init_globals ()
1598 1606
1599void init_experience ()
1600
1601void init_attackmess () 1607void init_attackmess ()
1602 1608
1603void init_dynamic () 1609void init_dynamic ()
1604 1610
1605void init_block ()
1606
1607void load_settings () 1611void load_settings ()
1608 1612
1613void reload_exp_table ()
1614
1609void load_materials () 1615void reload_materials ()
1610 1616
1611void init_uuid () 1617void init_uuid ()
1612 CODE: 1618 CODE:
1613 UUID::init (); 1619 UUID::init ();
1614 1620
1615void init_signals () 1621void init_signals ()
1616
1617void init_commands ()
1618 1622
1619void init_skills () 1623void init_skills ()
1620 1624
1621void init_beforeplay () 1625void init_beforeplay ()
1622 1626
… …
1652 } 1656 }
1653 1657
1654void server_tick () 1658void server_tick ()
1655 CODE: 1659 CODE:
1656{ 1660{
1661 ev_now_update (EV_DEFAULT);
1657 NOW = ev_now (EV_DEFAULT); 1662 NOW = ev_now (EV_DEFAULT);
1658 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1663 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1659 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1664 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1660 runtime = SvNVX (sv_runtime); 1665 runtime = SvNVX (sv_runtime);
1661 1666
1662 server_tick (); 1667 server_tick ();
1663 1668
1664 NOW = ev_time (); 1669 ev_now_update (EV_DEFAULT);
1670 NOW = ev_now (EV_DEFAULT);
1665 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1671 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1666 runtime += TICK; 1672 runtime += TICK;
1667 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1673 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1668} 1674}
1669 1675
… …
1680 switch (items) 1686 switch (items)
1681 { 1687 {
1682 case 0: RETVAL = gen (); break; 1688 case 0: RETVAL = gen (); break;
1683 case 1: RETVAL = gen (SvUV (ST (0))); break; 1689 case 1: RETVAL = gen (SvUV (ST (0))); break;
1684 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1690 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1685 default: croak ("cf::rndm requires none, one or two parameters."); break; 1691 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1686 } 1692 }
1687} 1693}
1688 OUTPUT: 1694 OUTPUT:
1689 RETVAL 1695 RETVAL
1690 1696
… …
1697NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1703NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1698 CODE: 1704 CODE:
1699 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1705 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1700 OUTPUT: 1706 OUTPUT:
1701 RETVAL 1707 RETVAL
1708
1709const char *ordinal (int i)
1702 1710
1703void weaken (...) 1711void weaken (...)
1704 PROTOTYPE: @ 1712 PROTOTYPE: @
1705 CODE: 1713 CODE:
1706 while (items > 0) 1714 while (items > 0)
1707 sv_rvweaken (ST (--items)); 1715 sv_rvweaken (ST (--items));
1708 1716
1709void 1717void log_suspend ()
1718
1719void log_resume ()
1720
1710log_backtrace (utf8_string msg) 1721void log_backtrace (utf8_string msg)
1711 1722
1712void
1713LOG (int flags, utf8_string msg) 1723void LOG (int flags, utf8_string msg)
1714 PROTOTYPE: $$ 1724 PROTOTYPE: $$
1715 C_ARGS: flags, "%s", msg 1725 C_ARGS: flags, "%s", msg
1716 1726
1717octet_string path_combine (octet_string base, octet_string path) 1727octet_string path_combine (octet_string base, octet_string path)
1718 PROTOTYPE: $$ 1728 PROTOTYPE: $$
… …
1810 1820
1811int random_roll (int min, int max, object *op, int goodbad); 1821int random_roll (int min, int max, object *op, int goodbad);
1812 1822
1813const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1823const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1814 1824
1815int
1816exp_to_level (val64 exp) 1825int exp_to_level (val64 exp)
1817 CODE:
1818{
1819 int i = 0;
1820 1826
1821 RETVAL = settings.max_level;
1822
1823 for (i = 1; i <= settings.max_level; i++)
1824 {
1825 if (levels[i] > exp)
1826 {
1827 RETVAL = i - 1;
1828 break;
1829 }
1830 }
1831}
1832 OUTPUT: RETVAL
1833
1834val64
1835level_to_min_exp (int level) 1827val64 level_to_min_exp (int level)
1836 CODE:
1837 if (level > settings.max_level)
1838 RETVAL = levels[settings.max_level];
1839 else if (level < 1)
1840 RETVAL = 0;
1841 else
1842 RETVAL = levels[level];
1843 OUTPUT: RETVAL
1844 1828
1845SV * 1829SV *
1846resistance_to_string (int atnr) 1830resistance_to_string (int atnr)
1847 CODE: 1831 CODE:
1848 if (atnr >= 0 && atnr < NROFATTACKS) 1832 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1906 CODE: 1890 CODE:
1907 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1891 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1908 OUTPUT: 1892 OUTPUT:
1909 RETVAL 1893 RETVAL
1910 1894
1895bool should_invoke (attachable *obj, int event)
1896 CODE:
1897 RETVAL = obj->should_invoke ((event_type)event);
1898 OUTPUT: RETVAL
1899
1911void 1900void
1912debug_trace (attachable *obj, bool on = true) 1901debug_trace (attachable *obj, bool on = true)
1913 CODE: 1902 CODE:
1914 obj->flags &= ~attachable::F_DEBUG_TRACE; 1903 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1915 if (on) 1904 if (on)
1916 obj->flags |= attachable::F_DEBUG_TRACE; 1905 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1917 1906
1918int mortals_size () 1907int mortals_size ()
1919 CODE: 1908 CODE:
1920 RETVAL = attachable::mortals.size (); 1909 RETVAL = attachable::mortals.size ();
1921 OUTPUT: RETVAL 1910 OUTPUT: RETVAL
… …
1923#object *mortals (U32 index) 1912#object *mortals (U32 index)
1924# CODE: 1913# CODE:
1925# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1914# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1926# OUTPUT: RETVAL 1915# OUTPUT: RETVAL
1927 1916
1928INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1917INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
1929 1918
1930MODULE = cf PACKAGE = cf::global 1919MODULE = cf PACKAGE = cf::global
1931 1920
1932int invoke (SV *klass, int event, ...) 1921int invoke (SV *klass, int event, ...)
1933 CODE: 1922 CODE:
… …
1937 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1926 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
1938 OUTPUT: RETVAL 1927 OUTPUT: RETVAL
1939 1928
1940MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1929MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1941 1930
1942INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1931INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
1943 1932
1944int invoke (object *op, int event, ...) 1933int invoke (object *op, int event, ...)
1945 CODE: 1934 CODE:
1946 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1935 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1947 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1936 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
1974int mortals_size () 1963int mortals_size ()
1975 CODE: 1964 CODE:
1976 RETVAL = attachable::mortals.size (); 1965 RETVAL = attachable::mortals.size ();
1977 OUTPUT: RETVAL 1966 OUTPUT: RETVAL
1978 1967
1979const char *slot_use_name (U32 slot) 1968const_utf8_string slot_use_name (U32 slot)
1980 ALIAS: 1969 ALIAS:
1981 slot_nonuse_name = 1 1970 slot_nonuse_name = 1
1982 CODE: 1971 CODE:
1983{ 1972{
1984 if (slot >= NUM_BODY_LOCATIONS) 1973 if (slot >= NUM_BODY_LOCATIONS)
… …
2040 OUTPUT: 2029 OUTPUT:
2041 RETVAL 2030 RETVAL
2042 2031
2043object *find_best_object_match (object *op, utf8_string match) 2032object *find_best_object_match (object *op, utf8_string match)
2044 2033
2045object *find_marked_object (object *op)
2046
2047int need_identify (object *obj);
2048
2049int apply_shop_mat (object *shop_mat, object *op); 2034int apply_shop_mat (object *shop_mat, object *op);
2050 2035
2051int move (object *op, int dir, object *originator = op) 2036int move (object *op, int dir, object *originator = op)
2052 CODE: 2037 CODE:
2053 RETVAL = move_ob (op, dir, originator); 2038 RETVAL = op->move (dir, originator);
2054 OUTPUT: 2039 OUTPUT:
2055 RETVAL 2040 RETVAL
2056 2041
2057void apply (object *applier, object *applied, int flags = 0)
2058 CODE:
2059 manual_apply (applied, applier, flags);
2060
2061void apply_below (object *op) 2042void apply_below (object *op)
2062 CODE: 2043 CODE:
2063 player_apply_below (op); 2044 player_apply_below (op);
2064 2045
2065int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2046int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2047
2048int casting_level (object *caster, object *spell)
2066 2049
2067int pay_item (object *op, object *buyer) 2050int pay_item (object *op, object *buyer)
2068 CODE: 2051 CODE:
2069 RETVAL = pay_for_item (op, buyer); 2052 RETVAL = pay_for_item (op, buyer);
2070 OUTPUT: RETVAL 2053 OUTPUT: RETVAL
… …
2107 2090
2108void pick_up (object *who, object *op) 2091void pick_up (object *who, object *op)
2109 2092
2110void update_object (object *op, int action) 2093void update_object (object *op, int action)
2111 2094
2112void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2095void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2113 2096
2114void player_lvl_adj (object *who, object *skill = 0) 2097void player_lvl_adj (object *who, object *skill = 0)
2115 2098
2116int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2099int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2117 2100
2118int calc_skill_exp (object *who, object *op, object *skill); 2101int calc_skill_exp (object *who, object *op, object *skill)
2119 2102
2120void push_button (object *op); 2103void push_button (object *op, object *originator)
2121 2104
2122void use_trigger (object *op); 2105void use_trigger (object *op, object *originator)
2123 2106
2124void add_button_link (object *button, maptile *map, int connected);
2125
2126void remove_button_link (object *op);
2127
2128void handle_apply_yield (object *op); 2107void handle_apply_yield (object *op)
2129 2108
2109int convert_item (object *item, object *converter)
2110
2111void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2130 2112
2131MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2113MODULE = cf PACKAGE = cf::object PREFIX = cf_
2132 2114
2133# no clean way to get an object from an archetype - stupid idiotic 2115# no clean way to get an object from an archetype - stupid idiotic
2134# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2116# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
… …
2138 CODE: 2120 CODE:
2139 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2121 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2140 OUTPUT: 2122 OUTPUT:
2141 RETVAL 2123 RETVAL
2142 2124
2125object *generate (utf8_string arch, object *creator)
2126 CODE:
2127 object *obj = get_archetype (arch);
2128 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2129 RETVAL = obj;
2130 OUTPUT:
2131 RETVAL
2132
2143object *find_object (U32 tag) 2133object *find_object (U32 tag)
2134
2135object *find_object_uuid (UUID i)
2144 2136
2145# TODO: nuke 2137# TODO: nuke
2146object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2138object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2147 PROTOTYPE: $$$$$$ 2139 PROTOTYPE: $$$$$$
2148 CODE: 2140 CODE:
2149{ 2141{
2150 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2142 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2143
2144 if (RETVAL->destroyed ())
2145 RETVAL = 0;
2151} 2146}
2152 2147
2153shstr 2148shstr
2154object::kv_get (shstr key) 2149object::kv_get (shstr key)
2155 2150
… …
2168 PROTOTYPE: $$;$ 2163 PROTOTYPE: $$;$
2169 PPCODE: 2164 PPCODE:
2170{ 2165{
2171 rv_vector rv; 2166 rv_vector rv;
2172 2167
2173 PUTBACK;
2174 get_rangevector (ob, other, &rv, flags); 2168 get_rangevector (ob, other, &rv, flags);
2175 SPAGAIN;
2176 2169
2177 EXTEND (SP, 5); 2170 EXTEND (SP, 5);
2178 PUSHs (newSVuv (rv.distance)); 2171 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2179 PUSHs (newSViv (rv.distance_x)); 2172 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2180 PUSHs (newSViv (rv.distance_y)); 2173 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2181 PUSHs (newSViv (rv.direction)); 2174 PUSHs (sv_2mortal (newSViv (rv.direction)));
2182 PUSHs (to_sv (rv.part)); 2175 PUSHs (sv_2mortal (to_sv (rv.part)));
2183} 2176}
2184 2177
2185bool on_same_map_as (object *ob, object *other) 2178bool on_same_map_as (object *ob, object *other)
2186 CODE: 2179 CODE:
2187 RETVAL = on_same_map (ob, other); 2180 RETVAL = on_same_map (ob, other);
… …
2207 RETVAL = op->contr; 2200 RETVAL = op->contr;
2208 OUTPUT: RETVAL 2201 OUTPUT: RETVAL
2209 2202
2210bool move_player (object *op, int dir) 2203bool move_player (object *op, int dir)
2211 2204
2212void check_score (object *op)
2213
2214void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2205void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2215 CODE: 2206 CODE:
2216 new_draw_info (flags, 0, op, txt); 2207 new_draw_info (flags, 0, op, txt);
2217 2208
2218void kill_player (object *op) 2209void kill_player (object *op)
… …
2230int command_arrest (object *op, utf8_string params) 2221int command_arrest (object *op, utf8_string params)
2231 2222
2232 2223
2233MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2224MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2234 2225
2235INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2226INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2236 2227
2237int invoke (player *pl, int event, ...) 2228int invoke (player *pl, int event, ...)
2238 CODE: 2229 CODE:
2239 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2230 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2240 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2231 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2250 pl->ob->stats.hp = pl->ob->stats.maxhp; 2241 pl->ob->stats.hp = pl->ob->stats.maxhp;
2251 pl->ob->stats.sp = pl->ob->stats.maxsp; 2242 pl->ob->stats.sp = pl->ob->stats.maxsp;
2252 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2243 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2253 pl->orig_stats = pl->ob->stats; 2244 pl->orig_stats = pl->ob->stats;
2254 2245
2255void clear_los (player *pl)
2256
2257# should only be temporary 2246# should only be temporary
2258void esrv_new_player (player *pl) 2247void esrv_new_player (player *pl)
2259 2248
2249#d# TODO: replace by blocked_los accessor, fix code using this
2260bool 2250bool
2261cell_visible (player *pl, int dx, int dy) 2251cell_visible (player *pl, int dx, int dy)
2262 CODE: 2252 CODE:
2263 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2253 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2264 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2265 OUTPUT: 2254 OUTPUT:
2266 RETVAL 2255 RETVAL
2267 2256
2268void 2257void
2269send (player *pl, SV *packet) 2258send (player *pl, SV *packet)
… …
2334 if (op->tag) 2323 if (op->tag)
2335 XPUSHs (sv_2mortal (to_sv (op))); 2324 XPUSHs (sv_2mortal (to_sv (op)));
2336 } 2325 }
2337} 2326}
2338 2327
2339INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2328INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2329
2330void
2331adjust_daylight ()
2332 CODE:
2333 maptile::adjust_daylight ();
2334
2335int
2336outdoor_darkness (int darkness = 0)
2337 CODE:
2338 RETVAL = maptile::outdoor_darkness;
2339 if (items)
2340 maptile::outdoor_darkness = darkness;
2341 OUTPUT:
2342 RETVAL
2340 2343
2341void 2344void
2342maptile::instantiate () 2345maptile::instantiate ()
2343 2346
2344maptile *new () 2347maptile *new ()
… …
2376 for (int x = 0; x < THIS->width; ++x) 2379 for (int x = 0; x < THIS->width; ++x)
2377 for (int y = 0; y < THIS->height; ++y) 2380 for (int y = 0; y < THIS->height; ++y)
2378 { 2381 {
2379 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2382 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2380 if (op->flag [FLAG_IS_FLOOR]) 2383 if (op->flag [FLAG_IS_FLOOR])
2381 goto skip_space; 2384 goto skip;
2382 2385
2383 { 2386 {
2384 int offs = offset + y * stride + x; 2387 int offs = offset + y * stride + x;
2388
2385 if (IN_RANGE_EXC (offs, 0, idxlen)) 2389 if (IN_RANGE_EXC (offs, 0, idxlen))
2386 { 2390 {
2387 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2391 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2388 { 2392 {
2389 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2393 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2390 ob->flag [FLAG_NO_MAP_SAVE] = true; 2394 ob->flag [FLAG_NO_MAP_SAVE] = true;
2391 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2395 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2392 2396
2393 if (ob->randomitems) 2397 if (ob->randomitems && !ob->above)
2394 { 2398 {
2395 if (!ob->above)
2396 {
2397 ob->create_treasure (ob->randomitems); 2399 ob->create_treasure (ob->randomitems);
2398 2400
2399 for (object *op = ob->above; op; op = op->above) 2401 for (object *op = ob->above; op; op = op->above)
2400 op->flag [FLAG_NO_MAP_SAVE] = true; 2402 op->flag [FLAG_NO_MAP_SAVE] = true;
2401 } 2403 // TODO: if this is a pickable object, then the item
2402 2404 // will at a bit weird - saving inside the player
2403 ob->randomitems = 0; 2405 // will clear the flag, but when the player drops
2406 // it without logging out, it keeps the flag.
2407 // nobody ahs reported this, but this can be rather
2408 // annoying on persistent maps.
2404 } 2409 }
2405 } 2410 }
2406 } 2411 }
2407 } 2412 }
2408 2413
2409 skip_space: ; 2414 skip: ;
2410 } 2415 }
2411} 2416}
2412 2417
2413void 2418void
2414maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2419maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2424 2429
2425 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2430 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2426 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2431 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2427 2432
2428 for (int i = av_len ((AV *)palette) + 1; i--; ) 2433 for (int i = av_len ((AV *)palette) + 1; i--; )
2429 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2434 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2430 2435
2431 for (int y = 0; y < THIS->height; ++y) 2436 for (int y = 0; y < THIS->height; ++y)
2432 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2437 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2433 2438
2434 sfree (THIS->regions, THIS->size ()); 2439 sfree (THIS->regions, THIS->size ());
… …
2453 } 2458 }
2454 2459
2455int out_of_map (maptile *map, int x, int y) 2460int out_of_map (maptile *map, int x, int y)
2456 2461
2457void 2462void
2458trigger (maptile *map, long connection, bool state = true) 2463find_link (maptile *map, shstr_tmp connection)
2459 CODE:
2460 activate_connection (map, connection, state);
2461
2462void
2463get_connection (maptile *map, long connection)
2464 PPCODE: 2464 PPCODE:
2465 oblinkpt *obp = get_connection_links (map, connection); 2465 if (oblinkpt *obp = map->find_link (connection))
2466 if (obp)
2467 for (objectlink *ol = obp->link; ol; ol = ol->next) 2466 for (objectlink *ol = obp->link; ol; ol = ol->next)
2468 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2467 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2469 2468
2470void 2469void
2471get_map_flags (maptile *map, int x, int y) 2470xy_normalise (maptile *map, int x, int y, int dir = 0)
2472 PPCODE: 2471 PPCODE:
2473{ 2472{
2474 maptile *nmap = 0; 2473 mapxy pos (map, x, y);
2475 I16 nx = 0, ny = 0; 2474 if (!pos.move (dir).normalise ())
2475 XSRETURN_EMPTY;
2476 2476
2477 PUTBACK;
2478 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2479 SPAGAIN;
2480
2481 EXTEND (SP, 4); 2477 EXTEND (SP, 3);
2482 PUSHs (sv_2mortal (newSViv (flags)));
2483
2484 if (GIMME_V == G_ARRAY)
2485 {
2486 PUSHs (sv_2mortal (to_sv (nmap))); 2478 PUSHs (sv_2mortal (to_sv (pos.m)));
2487 PUSHs (sv_2mortal (newSViv (nx))); 2479 PUSHs (sv_2mortal (to_sv (pos.x)));
2488 PUSHs (sv_2mortal (newSViv (ny))); 2480 PUSHs (sv_2mortal (to_sv (pos.y)));
2489 }
2490} 2481}
2491 2482
2492mapspace * 2483mapspace *
2493ms (maptile *map, unsigned int x, unsigned int y) 2484ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2494 PROTOTYPE: $$$ 2485 PROTOTYPE: $$$;$
2495 CODE: 2486 CODE:
2496{ 2487{
2497 maptile *nmap = 0; 2488 mapxy pos (map, x, y);
2498 I16 nx, ny; 2489 if (!pos.move (dir).normalise ())
2499
2500 PUTBACK;
2501 get_map_flags (map, &nmap, x, y, &nx, &ny);
2502 SPAGAIN;
2503
2504 if (!nmap)
2505 XSRETURN_UNDEF; 2490 XSRETURN_UNDEF;
2506 2491
2507 RETVAL = &nmap->at (nx, ny); 2492 RETVAL = &*pos;
2508} 2493}
2509 OUTPUT: 2494 OUTPUT:
2510 RETVAL 2495 RETVAL
2511 2496
2512void 2497void
2513at (maptile *map, unsigned int x, unsigned int y) 2498at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2514 PROTOTYPE: $$$ 2499 PROTOTYPE: $$$;$
2515 PPCODE: 2500 PPCODE:
2516{ 2501 mapxy pos (map, x, y);
2517 maptile *nmap = 0; 2502 if (pos.move (dir).normalise ())
2518 I16 nx, ny;
2519
2520 PUTBACK;
2521 get_map_flags (map, &nmap, x, y, &nx, &ny);
2522 SPAGAIN;
2523
2524 if (nmap)
2525 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2503 for (object *o = pos->bot; o; o = o->above)
2526 XPUSHs (sv_2mortal (to_sv (o))); 2504 XPUSHs (sv_2mortal (to_sv (o)));
2527}
2528 2505
2529SV * 2506SV *
2530bot_at (maptile *obj, unsigned int x, unsigned int y) 2507bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2531 PROTOTYPE: $$$ 2508 PROTOTYPE: $$$;$
2532 ALIAS: 2509 ALIAS:
2533 top_at = 1 2510 top_at = 1
2534 flags_at = 2 2511 flags_at = 2
2535 light_at = 3 2512 light_at = 3
2536 move_block_at = 4 2513 move_block_at = 4
2537 move_slow_at = 5 2514 move_slow_at = 5
2538 move_on_at = 6 2515 move_on_at = 6
2539 move_off_at = 7 2516 move_off_at = 7
2540 INIT:
2541 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2542 CODE: 2517 CODE:
2518{
2519 mapxy pos (map, x, y);
2520 if (!pos.move (dir).normalise ())
2521 XSRETURN_UNDEF;
2522
2523 mapspace &ms = *pos;
2524
2525 ms.update ();
2526
2543 switch (ix) 2527 switch (ix)
2544 { 2528 {
2545 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2529 case 0: RETVAL = to_sv (ms.bot ); break;
2546 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2530 case 1: RETVAL = to_sv (ms.top ); break;
2547 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2531 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2548 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2532 case 3: RETVAL = newSViv (ms.light ); break;
2549 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2533 case 4: RETVAL = newSVuv (ms.move_block); break;
2550 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2534 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2551 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2535 case 6: RETVAL = newSVuv (ms.move_on ); break;
2552 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2536 case 7: RETVAL = newSVuv (ms.move_off ); break;
2553 } 2537 }
2538}
2554 OUTPUT: RETVAL 2539 OUTPUT: RETVAL
2555
2556void fix_walls (maptile *map, int x, int y)
2557
2558void fix_walls_around (maptile *map, int x, int y)
2559 2540
2560# worst xs function of my life 2541# worst xs function of my life
2561bool 2542bool
2562_create_random_map (\ 2543_create_random_map (maptile *self, SV *options)
2563 maptile *self,\
2564 utf8_string wallstyle,\
2565 utf8_string wall_name,\
2566 utf8_string floorstyle,\
2567 utf8_string monsterstyle,\
2568 utf8_string treasurestyle,\
2569 utf8_string layoutstyle,\
2570 utf8_string doorstyle,\
2571 utf8_string decorstyle,\
2572 utf8_string origin_map,\
2573 utf8_string final_map,\
2574 utf8_string exitstyle,\
2575 utf8_string this_map,\
2576 utf8_string exit_on_final_map,\
2577 int xsize,\
2578 int ysize,\
2579 int expand2x,\
2580 int layoutoptions1,\
2581 int layoutoptions2,\
2582 int layoutoptions3,\
2583 int symmetry,\
2584 int difficulty,\
2585 int difficulty_given,\
2586 float difficulty_increase,\
2587 int dungeon_level,\
2588 int dungeon_depth,\
2589 int decoroptions,\
2590 int orientation,\
2591 int origin_y,\
2592 int origin_x,\
2593 U32 random_seed,\
2594 val64 total_map_hp,\
2595 int map_layout_style,\
2596 int treasureoptions,\
2597 int symmetry_used,\
2598 region *region,\
2599 utf8_string custom\
2600)
2601 CODE: 2544 CODE:
2602{ 2545{
2603 random_map_params rmp; 2546 random_map_params rmp ((HV *)SvRV (options));
2604
2605 assign (rmp.wallstyle , wallstyle);
2606 assign (rmp.wall_name , wall_name);
2607 assign (rmp.floorstyle , floorstyle);
2608 assign (rmp.monsterstyle , monsterstyle);
2609 assign (rmp.treasurestyle , treasurestyle);
2610 assign (rmp.layoutstyle , layoutstyle);
2611 assign (rmp.doorstyle , doorstyle);
2612 assign (rmp.decorstyle , decorstyle);
2613 assign (rmp.exitstyle , exitstyle);
2614 assign (rmp.exit_on_final_map, exit_on_final_map);
2615
2616 rmp.origin_map = origin_map;
2617 rmp.final_map = final_map;
2618 rmp.this_map = this_map;
2619 rmp.xsize = xsize;
2620 rmp.ysize = ysize;
2621 rmp.expand2x = expand2x;
2622 rmp.layoutoptions1 = layoutoptions1;
2623 rmp.layoutoptions2 = layoutoptions2;
2624 rmp.layoutoptions3 = layoutoptions3;
2625 rmp.symmetry = symmetry;
2626 rmp.difficulty = difficulty;
2627 rmp.difficulty_given = difficulty_given;
2628 rmp.difficulty_increase = difficulty_increase;
2629 rmp.dungeon_level = dungeon_level;
2630 rmp.dungeon_depth = dungeon_depth;
2631 rmp.decoroptions = decoroptions;
2632 rmp.orientation = orientation;
2633 rmp.origin_y = origin_y;
2634 rmp.origin_x = origin_x;
2635 rmp.random_seed = random_seed;
2636 rmp.total_map_hp = (uint64_t) total_map_hp;
2637 rmp.map_layout_style = map_layout_style;
2638 rmp.treasureoptions = treasureoptions;
2639 rmp.symmetry_used = symmetry_used;
2640 rmp.region = region;
2641 rmp.custom = custom;
2642
2643 RETVAL = self->generate_random_map (&rmp); 2547 RETVAL = self->generate_random_map (&rmp);
2644} 2548}
2645 OUTPUT: 2549 OUTPUT:
2646 RETVAL 2550 RETVAL
2647 2551
2648MODULE = cf PACKAGE = cf::mapspace 2552MODULE = cf PACKAGE = cf::mapspace
2649 2553
2650INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2554INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2651 2555
2652MODULE = cf PACKAGE = cf::arch 2556MODULE = cf PACKAGE = cf::arch
2653 2557
2654int archetypes_size () 2558int archetypes_size ()
2655 CODE: 2559 CODE:
… …
2659archetype *archetypes (U32 index) 2563archetype *archetypes (U32 index)
2660 CODE: 2564 CODE:
2661 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2565 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2662 OUTPUT: RETVAL 2566 OUTPUT: RETVAL
2663 2567
2664object *instantiate (archetype *arch)
2665 CODE:
2666 RETVAL = arch_to_object (arch);
2667 OUTPUT:
2668 RETVAL
2669
2670INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2568INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2671 2569
2672MODULE = cf PACKAGE = cf::party 2570MODULE = cf PACKAGE = cf::party
2673 2571
2674partylist *first () 2572partylist *first ()
2675 PROTOTYPE: 2573 PROTOTYPE:
2676 CODE: 2574 CODE:
2677 RETVAL = get_firstparty (); 2575 RETVAL = get_firstparty ();
2678 OUTPUT: RETVAL 2576 OUTPUT: RETVAL
2679 2577
2680INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2578INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2681 2579
2682MODULE = cf PACKAGE = cf::region 2580MODULE = cf PACKAGE = cf::region
2683 2581
2684void 2582void
2685list () 2583list ()
2686 PPCODE: 2584 PPCODE:
2687 for_all_regions (rgn) 2585 for_all_regions (rgn)
2688 XPUSHs (sv_2mortal (to_sv (rgn))); 2586 XPUSHs (sv_2mortal (to_sv (rgn)));
2689 2587
2690region *find (utf8_string name)
2691 PROTOTYPE: $
2692 CODE:
2693 RETVAL = region::find (name);
2694 OUTPUT: RETVAL
2695
2696region *find_fuzzy (utf8_string name)
2697 PROTOTYPE: $
2698 CODE:
2699 RETVAL = region::find_fuzzy (name);
2700 OUTPUT: RETVAL
2701
2702int specificity (region *rgn) 2588int specificity (region *rgn)
2703 CODE: 2589 CODE:
2704 RETVAL = 0; 2590 RETVAL = 0;
2705 while (rgn = rgn->parent) 2591 while (rgn = rgn->parent)
2706 RETVAL++; 2592 RETVAL++;
2707 OUTPUT: RETVAL 2593 OUTPUT: RETVAL
2708 2594
2709INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2595INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2710 2596
2711MODULE = cf PACKAGE = cf::living 2597MODULE = cf PACKAGE = cf::living
2712 2598
2713INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2599INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2714 2600
2715MODULE = cf PACKAGE = cf::settings 2601MODULE = cf PACKAGE = cf::settings
2716 2602
2717INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2603INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2718 2604
2719MODULE = cf PACKAGE = cf::client 2605MODULE = cf PACKAGE = cf::client
2720 2606
2721INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2607INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2722 2608
2723int invoke (client *ns, int event, ...) 2609int invoke (client *ns, int event, ...)
2724 CODE: 2610 CODE:
2725 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2611 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2726 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2612 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
… …
2792 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2678 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2793 old_sound_index [idx] = face; 2679 old_sound_index [idx] = face;
2794 2680
2795MODULE = cf PACKAGE = cf::face PREFIX = face_ 2681MODULE = cf PACKAGE = cf::face PREFIX = face_
2796 2682
2797#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2683#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2798 2684
2799faceidx face_find (utf8_string name, faceidx defidx = 0) 2685faceidx face_find (utf8_string name, faceidx defidx = 0)
2800 2686
2801faceidx alloc (utf8_string name) 2687faceidx alloc (utf8_string name)
2802 CODE: 2688 CODE:
… …
2809 while (!RETVAL); // crude way to leave index 0 2695 while (!RETVAL); // crude way to leave index 0
2810 2696
2811 faces [RETVAL].name = name; 2697 faces [RETVAL].name = name;
2812 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2698 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2813 2699
2814 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2700 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2815 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2701 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2702 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2816} 2703}
2817 OUTPUT: RETVAL 2704 OUTPUT: RETVAL
2818 2705
2819void set_type (faceidx idx, int value) 2706void set_type (faceidx idx, int value)
2820 ALIAS: 2707 ALIAS:
… …
2840 faceinfo *f = face_info (idx); assert (f); 2727 faceinfo *f = face_info (idx); assert (f);
2841 facedata *d = &(faceset ? f->data64 : f->data32); 2728 facedata *d = &(faceset ? f->data64 : f->data32);
2842 sv_to (data, d->data); 2729 sv_to (data, d->data);
2843 STRLEN clen; 2730 STRLEN clen;
2844 char *cdata = SvPVbyte (chksum, clen); 2731 char *cdata = SvPVbyte (chksum, clen);
2845 clen = min (CHKSUM_SIZE, clen); 2732 clen = min (CHKSUM_MAXLEN, clen);
2846 2733
2734 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2735
2847 if (memcmp (d->chksum, cdata, clen)) 2736 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2848 { 2737 {
2738 d->chksum_len = clen;
2849 memcpy (d->chksum, cdata, clen); 2739 memcpy (d->chksum, cdata, clen);
2850 2740
2851 // invalidate existing client face info 2741 // invalidate existing client face info
2852 for_all_clients (ns) 2742 for_all_clients (ns)
2853 if (ns->faceset == faceset) 2743 if (ns->faceset == faceset)
… …
2868 2758
2869SV *get_chksum (faceidx idx, int faceset = 0) 2759SV *get_chksum (faceidx idx, int faceset = 0)
2870 CODE: 2760 CODE:
2871 facedata *d = face_data (idx, faceset); 2761 facedata *d = face_data (idx, faceset);
2872 if (!d) XSRETURN_UNDEF; 2762 if (!d) XSRETURN_UNDEF;
2873 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2763 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2874 OUTPUT: 2764 OUTPUT:
2875 RETVAL 2765 RETVAL
2876 2766
2877SV *get_data (faceidx idx, int faceset = 0) 2767SV *get_data (faceidx idx, int faceset = 0)
2878 CODE: 2768 CODE:
… …
2898 ns->force_newmap = true; 2788 ns->force_newmap = true;
2899 } 2789 }
2900 2790
2901MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2791MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2902 2792
2903#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2793#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2904 2794
2905animidx anim_find (utf8_string name) 2795animidx anim_find (utf8_string name)
2906 CODE: 2796 CODE:
2907 RETVAL = animation::find (name).number; 2797 RETVAL = animation::find (name).number;
2908 OUTPUT: RETVAL 2798 OUTPUT: RETVAL
… …
2923 } 2813 }
2924 else 2814 else
2925 anim = &animation::create (name, av_len (av) + 1, facings); 2815 anim = &animation::create (name, av_len (av) + 1, facings);
2926 2816
2927 for (int i = 0; i < anim->num_animations; ++i) 2817 for (int i = 0; i < anim->num_animations; ++i)
2928 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2818 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2929} 2819}
2930 OUTPUT: RETVAL 2820 OUTPUT: RETVAL
2931 2821
2932void invalidate_all () 2822void invalidate_all ()
2933 CODE: 2823 CODE:
2934 for_all_clients (ns) 2824 for_all_clients (ns)
2935 ns->anims_sent.reset (); 2825 ns->anims_sent.reset ();
2936 2826
2937MODULE = cf PACKAGE = cf::object::freezer 2827MODULE = cf PACKAGE = cf::object::freezer
2938 2828
2939INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2829INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
2940 2830
2941SV * 2831SV *
2942new (char *klass) 2832new (char *klass)
2943 CODE: 2833 CODE:
2944 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2834 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
… …
2951 sv_to (sv, self); 2841 sv_to (sv, self);
2952 delete self; 2842 delete self;
2953 2843
2954MODULE = cf PACKAGE = cf::object::thawer 2844MODULE = cf PACKAGE = cf::object::thawer
2955 2845
2956INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2846INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2847
2848bool
2849errors_are_fatal (bool fatal)
2850 CODE:
2851 RETVAL = object_thawer::errors_are_fatal;
2852 object_thawer::errors_are_fatal = fatal;
2853 OUTPUT:
2854 RETVAL
2957 2855
2958SV * 2856SV *
2959new_from_file (char *klass, octet_string path) 2857new_from_file (char *klass, octet_string path)
2960 CODE: 2858 CODE:
2961 object_thawer *f = new object_thawer (path); 2859 object_thawer *f = new object_thawer (path);
… …
2987 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2885 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2988 2886
2989 self->skip (); 2887 self->skip ();
2990 } 2888 }
2991 2889
2890MODULE = cf PACKAGE = cf::layout
2891
2892INCLUDE: $PERL $srcdir/genacc layout $srcdir/../random_maps/random_map.h |
2893

Diff Legend

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