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.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.350 by root, Mon Mar 22 00:56:57 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 5 *
8 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 9 * option) any later version.
12 * 10 *
13 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 14 * GNU General Public License for more details.
17 * 15 *
18 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 21 */
23 22
24#include "autoconf.h" 23#include "autoconf.h"
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h"
35#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
71static int tick_pending; 69static int tick_pending;
72 70
73global gbl_ev; 71global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 72static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 73static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
74static AV *av_reflect;
76 75
77bitset<NUM_EVENT_TYPES> ev_want_event; 76bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 77bitset<NUM_TYPES> ev_want_type;
79 78
80static HV 79static HV
88 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
92 91
92static SV
93 *cv_cf_do_invoke,
94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg,
96 *cv_cf_tick,
97 *cv_cf_match_match;
98
99#ifndef newSVpv_utf8
93static inline SV * 100static SV *
94newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
95{ 102{
96 if (!s) 103 if (!s)
97 return newSV (0); 104 return newSV (0);
98 105
99 SV *sv = newSVpv (s, 0); 106 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 107 SvUTF8_on (sv);
101 return sv; 108 return sv;
102} 109}
110#endif
103 111
112#ifndef newSVpvn_utf8
104static inline SV * 113static SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 115{
107 if (!s) 116 if (!s)
108 return newSV (0); 117 return newSV (0);
109 118
110 SV *sv = newSVpvn (s, l); 119 SV *sv = newSVpvn (s, l);
120
121 if (utf8)
111 SvUTF8_on (sv); 122 SvUTF8_on (sv);
123
112 return sv; 124 return sv;
125}
126#endif
127
128static noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
113} 142}
114 143
115// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
116template<class super> 145template<class super>
117static super * 146static super *
151 SvREFCNT_inc (self); 180 SvREFCNT_inc (self);
152 hv_clear (self); 181 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 182 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 183 SvREFCNT_dec (self);
155 184
156 // self *must* be null now because thats sv_unmagic's job. 185 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 186 assert (!this->self);
158 } 187 }
159} 188}
160 189
161void 190void
195attachable::destroy () 224attachable::destroy ()
196{ 225{
197 if (destroyed ()) 226 if (destroyed ())
198 return; 227 return;
199 228
200 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
201 do_destroy (); 230 do_destroy ();
202 sever_self (); 231 sever_self ();
203} 232}
204 233
205void 234void
279 308
280 attach = src.attach; 309 attach = src.attach;
281 return *this; 310 return *this;
282} 311}
283 312
313#if 0
284template<typename T> 314template<typename T>
285static bool 315static bool
286find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
287{ 317{
288 char *s = (char *)obj; 318 char *s = (char *)obj;
296 326
297 return false; 327 return false;
298} 328}
299 329
300// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
301void 331static void
302find_backref (void *ptr) 332find_backref (void *ptr)
303{ 333{
304 for_all_objects (op) 334 for_all_objects (op)
305 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
306 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 336 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
310 fprintf (stderr, "P %p\n", pl); 340 fprintf (stderr, "P %p\n", pl);
311 341
312 for_all_clients (ns) 342 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
315
316} 345}
346#endif
317 347
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 349
320static SV * 350static SV *
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
374 404
375 return sv; 405 return sv;
376 } 406 }
377} 407}
378 408
409#if 0 // unused
379static void 410static void
380clearSVptr (SV *sv) 411clearSVptr (SV *sv)
381{ 412{
382 if (SvROK (sv)) 413 if (SvROK (sv))
383 sv = SvRV (sv); 414 sv = SvRV (sv);
384 415
385 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
387} 418}
419#endif
420
421static long
422SvPTR_nc (SV *sv)
423{
424 sv = SvRV (sv);
425
426 // very important shortcut
427 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
428 return (long)SvMAGIC (sv)->mg_ptr;
429
430 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
431 return (long)mg->mg_ptr;
432
433 croak ("perl code used object, but C object is already destroyed, caught");
434}
388 435
389static long 436static long
390SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
391{ 438{
392 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
394 441
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
396
397 if (!mg)
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399
400 return (long)mg->mg_ptr;
401} 443}
402 444
403static long 445static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
405{ 447{
406 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
407 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
408 else
409 return 0;
410} 451}
411 452
453static long noinline
454SvPTR_ornull_client (SV *sv)
455{
456 if (expect_false (!SvOK (sv))) return 0;
457
458 if (!SvROK (sv)
459 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
460 && !sv_derived_from (sv, "cf::client")))
461 croak ("object of type cf::client expected");
462
463 return SvPTR_nc (sv);
464}
465
466static long noinline
467SvPTR_ornull_object (SV *sv)
468{
469 if (expect_false (!SvOK (sv))) return 0;
470
471 if (!SvROK (sv)
472 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
473 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
474 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
475 && !sv_derived_from (sv, "cf::object")))
476 croak ("object of type cf::object expected");
477
478 return SvPTR_nc (sv);
479}
480
481static long noinline
482SvPTR_ornull_player (SV *sv)
483{
484 if (expect_false (!SvOK (sv))) return 0;
485
486 if (!SvROK (sv)
487 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
488 && !sv_derived_from (sv, "cf::player")))
489 croak ("object of type cf::player expected");
490
491 return SvPTR_nc (sv);
492}
493
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 494static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 495static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 509static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
428inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 510static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
429inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 511static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 512static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
431inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 513static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
432inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 514static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 515static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
434inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 516static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
435inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 517static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 518
437inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
439 521
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 522static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 524
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 526
445inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
446{ 528{
447 SV *sv = newSV (0); 529 SV *sv = newSV (0);
448 530
449 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
454 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
455 537
456 return sv; 538 return sv;
457} 539}
458 540
459inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
460{ 542{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 544 SvUTF8_on (sv);
463 return sv; 545 return sv;
464} 546}
465 547
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 548static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 549static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
477inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 559static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
478inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 560static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
481inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 563static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 564static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 565static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 566static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
485inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 567static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
486inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 568static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 569static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 570static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
489inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 571static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
490inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 572static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
491inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 573static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
492inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 574static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
493 575
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 576//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 577static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 578
497template<class T> 579template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 580static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 581
500template<int N> 582template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 583static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 584
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 585static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
504inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 586static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 589
508inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
509{ 591{
510 STRLEN len; 592 STRLEN len;
511 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 594 v.assign (data, len);
513} 595}
514 596
515inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
516{ 598{
517 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 601}
520 602
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 603static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 604
523static SV * 605static SV *
524newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
525{ 607{
526 SV *sv; 608 SV *sv;
600 va_end (ap); 682 va_end (ap);
601 683
602 return sv; 684 return sv;
603} 685}
604 686
687// typemap support, mostly to avoid excessive inlining
688template<class type>
689static void noinline
690cf_obj_to (SV *arg, type &var)
691{
692 sv_to (arg, var);
693 if (!var)
694 croak ("must not pass invalid/null cf_obj here");
695}
696
697template<class object>
698static void noinline
699cf_obj_ornull_to (SV *arg, object *&var)
700{
701 if (SvOK (arg))
702 {
703 sv_to (arg, var);
704 if (!var)
705 croak ("unable to convert perl object to C++ object");
706 }
707 else
708 var = 0;
709}
710
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 712
607SV * 713static SV *
608registry (attachable *ext) 714registry (attachable *ext)
609{ 715{
610 if (!ext->cb) 716 if (!ext->cb)
611 ext->cb = newAV (); 717 ext->cb = newAV ();
612 718
626 732
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 733 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 734
629 const char *argv[] = { 735 const char *argv[] = {
630 settings.argv [0], 736 settings.argv [0],
631 "-e" 737 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 738 };
637 739
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 740 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 741 || perl_run (perl))
640 { 742 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 743 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 744 exit (EXIT_FAILURE);
643 } 745 }
644 746
747 eval_pv (
748 "#line 1 'cfperl init'\n"
749 "use EV ();\n"
750 "use Coro ();\n"
751 "cf->bootstrap;\n"
752 "unshift @INC, cf::datadir ();\n"
753 "require cf;\n",
754 0
755 );
756
757 if (SvTRUE (ERRSV))
645 { 758 {
646 dSP; 759 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 760 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 761 }
652} 762}
653 763
764void
654void cfperl_main () 765cfperl_main ()
655{ 766{
656 dSP; 767 dSP;
657 768
658 PUSHMARK (SP); 769 PUSHMARK (SP);
659 PUTBACK; 770 PUTBACK;
684# undef def 795# undef def
685}; 796};
686 797
687#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 798#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688 799
689static void 800static void noinline
690gather_callbacks (AV *&callbacks, AV *registry, event_type event) 801gather_callbacks (AV *&callbacks, AV *registry, event_type event)
691{ 802{
692 // event must be in array 803 // event must be in array
693 if (event >= 0 && event <= AvFILLp (registry)) 804 if (event >= 0 && event <= AvFILLp (registry))
694 { 805 {
780{ 891{
781 attachable::gather_callbacks (callbacks, event); 892 attachable::gather_callbacks (callbacks, event);
782 ::gather_callbacks (callbacks, cb_map, event); 893 ::gather_callbacks (callbacks, cb_map, event);
783} 894}
784 895
785void 896static void noinline
786_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 897_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787{ 898{
788 for (int event = 0; event <= AvFILLp (registry); ++event) 899 for (int event = 0; event <= AvFILLp (registry); ++event)
789 { 900 {
790 SV *cbs_ = AvARRAY (registry)[event]; 901 SV *cbs_ = AvARRAY (registry)[event];
800 } 911 }
801 } 912 }
802} 913}
803 914
804// very slow and inefficient way to recalculate the global want bitsets 915// very slow and inefficient way to recalculate the global want bitsets
805void 916static void
806_recalc_want () 917_recalc_want ()
807{ 918{
808 ev_want_event.reset (); 919 ev_want_event.reset ();
809 920
810 _recalc_want (ev_want_event, cb_global); 921 _recalc_want (ev_want_event, cb_global);
883 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
884 } 995 }
885 996
886 va_end (ap); 997 va_end (ap);
887 998
888 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
889 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
890 1001
891 CALL_END; 1002 CALL_END;
892 1003
893 return count; 1004 return count;
894} 1005}
895 1006
896SV * 1007static SV *
897cfperl_result (int idx) 1008cfperl_result (int idx)
898{ 1009{
899 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
900 if (!av) 1011 if (!av)
901 return &PL_sv_undef; 1012 return &PL_sv_undef;
920} 1031}
921 1032
922///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
923// various c++ => perl glue functions 1034// various c++ => perl glue functions
924 1035
1036void
925void cfperl_tick () 1037cfperl_tick ()
926{ 1038{
927 tick_pending = 1; 1039 tick_pending = 1;
928 1040
929 if (tick_inhibit) 1041 if (tick_inhibit)
930 return; 1042 return;
933 1045
934 dSP; 1046 dSP;
935 1047
936 PUSHMARK (SP); 1048 PUSHMARK (SP);
937 PUTBACK; 1049 PUTBACK;
938 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
939 1051
940 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1052 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
941} 1053}
942 1054
943void 1055void
966 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
967 CALL_END; 1079 CALL_END;
968} 1080}
969 1081
970void 1082void
971cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1083cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
972{ 1084{
973 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
974 CALL_ARG (ns); 1086 CALL_ARG (ns);
975 CALL_ARG (type); 1087 CALL_ARG (type);
976 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
977 CALL_ARG (color); 1089 CALL_ARG (color);
978 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
979 CALL_END; 1091 CALL_END;
980} 1092}
981 1093
982int 1094int
983cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
985 int can; 1097 int can;
986 1098
987 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
988 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
989 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
990 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
991 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
992 CALL_END; 1104 CALL_END;
993 1105
994 return can; 1106 return can;
995} 1107}
996 1108
1109void
1110cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1111{
1112 CALL_BEGIN (4);
1113 CALL_ARG (ob);
1114 CALL_ARG (state);
1115 CALL_ARG (activator);
1116 CALL_ARG (originator);
1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1118 CALL_END;
1119}
1120
997player * 1121player *
998player::find (const char *name) 1122player::find (const_utf8_string name)
999{ 1123{
1000 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1001 CALL_ARG (name); 1125 CALL_ARG (name);
1002 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1003 1127
1008 1132
1009 return retval; 1133 return retval;
1010} 1134}
1011 1135
1012maptile * 1136maptile *
1013find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1014{ 1138{
1015 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1016 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1017 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1018 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
1025 1149
1026 return retval; 1150 return retval;
1027} 1151}
1028 1152
1029maptile * 1153maptile *
1030maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1031{ 1155{
1032 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1033 CALL_ARG (path); 1157 CALL_ARG (path);
1034 CALL_ARG (origin); 1158 CALL_ARG (origin);
1035 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1041 1165
1042 return retval; 1166 return retval;
1043} 1167}
1044 1168
1045maptile * 1169maptile *
1046maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1047{ 1171{
1048 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1049 CALL_ARG (path); 1173 CALL_ARG (path);
1050 CALL_ARG (origin); 1174 CALL_ARG (origin);
1051 CALL_ARG (load); 1175 CALL_ARG (load);
1067 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1191 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068 CALL_END; 1192 CALL_END;
1069} 1193}
1070 1194
1071void 1195void
1072maptile::change_all_map_light (int change)
1073{
1074 CALL_BEGIN (1);
1075 CALL_ARG (change);
1076 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077 CALL_END;
1078}
1079
1080void
1081object::enter_exit (object *exit) 1196object::enter_exit (object *exit)
1082{ 1197{
1083 if (type != PLAYER) 1198 if (type != PLAYER)
1084 return; 1199 return;
1085 1200
1089 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1090 CALL_END; 1205 CALL_END;
1091} 1206}
1092 1207
1093void 1208void
1094object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1095{ 1210{
1096 if (type != PLAYER) 1211 if (type != PLAYER)
1097 return; 1212 return;
1098 1213
1099 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
1103 CALL_ARG (y); 1218 CALL_ARG (y);
1104 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1105 CALL_END; 1220 CALL_END;
1106} 1221}
1107 1222
1108const char * 1223const_utf8_string
1109object::ref () const 1224object::ref () const
1110{ 1225{
1111 if (type == PLAYER) 1226 if (type == PLAYER)
1112 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1227 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1113 else 1228 else
1114 return 0; 1229 return 0;
1115} 1230}
1116 1231
1117object * 1232object *
1118object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1119{ 1234{
1120 object *retval = 0; 1235 object *retval = 0;
1121 1236
1122 if (ref) 1237 if (ref)
1123 { 1238 {
1133 1248
1134 return retval; 1249 return retval;
1135} 1250}
1136 1251
1137void 1252void
1138log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1139{ 1254{
1140#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1141 void *addr [20]; 1256 void *addr [20];
1142 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1143 1258
1148 CALL_CALL ("cf::_log_backtrace", G_VOID); 1263 CALL_CALL ("cf::_log_backtrace", G_VOID);
1149 CALL_END; 1264 CALL_END;
1150#endif 1265#endif
1151} 1266}
1152 1267
1268bool
1269is_match_expr (const_utf8_string expr)
1270{
1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1272}
1273
1274bool
1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1276{
1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1278 expr += sizeof ("match ") - 1;
1279
1280 CALL_BEGIN (5);
1281 CALL_ARG (expr);
1282 CALL_ARG (ob);
1283 CALL_ARG (self);
1284 CALL_ARG (source);
1285 CALL_ARG (originator);
1286 CALL_CALL (cv_cf_match_match, G_SCALAR);
1287
1288 bool matched = count && SvTRUE (TOPs);
1289
1290 CALL_END;
1291
1292 return matched;
1293}
1294
1295object *
1296match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1297{
1298 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1299 expr += sizeof ("match ") - 1;
1300
1301 CALL_BEGIN (5);
1302 CALL_ARG (expr);
1303 CALL_ARG (ob);
1304 CALL_ARG (self);
1305 CALL_ARG (source);
1306 CALL_ARG (originator);
1307 CALL_CALL (cv_cf_match_match, G_ARRAY);
1308
1309 object *one = 0;
1310
1311 if (count)
1312 sv_to (TOPs, one);
1313
1314 CALL_END;
1315
1316 return one;
1317}
1318
1153///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1154 1320
1155struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1156struct CoroAPI *coroapi::GCoroAPI; 1322struct CoroAPI *coroapi::GCoroAPI;
1157 1323
1324void
1158void coroapi::do_cede_to_tick () 1325coroapi::do_cede_to_tick ()
1159{ 1326{
1160 cede_pending = 0; 1327 cede_pending = 0;
1161 cede (); 1328 cede ();
1162} 1329}
1163 1330
1187 ev_io_set ((ev_io *)this, fd, events); 1354 ev_io_set ((ev_io *)this, fd, events);
1188 if (active) start (); 1355 if (active) start ();
1189 } 1356 }
1190} 1357}
1191 1358
1192void 1359static void
1193_connect_to_perl () 1360_connect_to_perl_1 ()
1194{ 1361{
1195 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1196 1363
1197 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1198 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1365 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1217 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1218 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1219 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1220} 1387}
1221 1388
1389static void
1390_connect_to_perl_2 ()
1391{
1392 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1393 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1394 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1395 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1396 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1397}
1398
1222MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1223 1400
1224BOOT: 1401BOOT:
1225{ 1402{
1226 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1227 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1228 1405
1229 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1230 1407
1231 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1232 1409
1233 //{ 1410 //{
1234 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
1278 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1455 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1279 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1456 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1280 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1457 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1281 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1458 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1282 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1459 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1283 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1460 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1284 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1461 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1285 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1462 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1286 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1463 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1287 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1464 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1288 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1465 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1289 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1466 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1290 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1467 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1291 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1468 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1469 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1292 1470
1293 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1471 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1294 1472
1295 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1473 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1296 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1474 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1313 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1491 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1314 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE) 1492 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1315 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING) 1493 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1316 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW) 1494 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1317 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE) 1495 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1318 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE) 1496 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1319 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE) 1497 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1320 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL) 1498 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1321 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON) 1499 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1322 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS) 1500 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1323 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH) 1501 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1328 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1506 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1329 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1507 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1330 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1508 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1331 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1509 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1332 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1510 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1333 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1511 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1334 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1512 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1335 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1513 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336 1514
1337 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1515 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1338 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1516 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1342 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM) 1520 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1343 1521
1344 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1522 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1345 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1523 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1346 1524
1347 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1525 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1348 1526
1349 const_iv (SP_RAISE_DEAD) 1527 const_iv (SP_RAISE_DEAD)
1350 const_iv (SP_RUNE) 1528 const_iv (SP_RUNE)
1351 const_iv (SP_MAKE_MARK) 1529 const_iv (SP_MAKE_MARK)
1352 const_iv (SP_BOLT) 1530 const_iv (SP_BOLT)
1505 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1683 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1506 av_push (event, newSViv (eiv->klass)); 1684 av_push (event, newSViv (eiv->klass));
1507 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1685 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1508 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1686 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1509 } 1687 }
1688
1689 // used by autogenerated BOOT sections from genacc
1690 av_reflect = get_av ("cf::REFLECT", 1);
1510} 1691}
1511 1692
1512void _gv_clear (SV *gv) 1693void _gv_clear (SV *gv)
1513 CODE: 1694 CODE:
1514 assert (SvTYPE (gv) == SVt_PVGV); 1695 assert (SvTYPE (gv) == SVt_PVGV);
1521 f (GvGP (gv)->gp_cv); 1702 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1703 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1704 GvMULTI_off (gv);
1524# undef f 1705# undef f
1525 1706
1526
1527void _connect_to_perl () 1707void _connect_to_perl_1 ()
1708
1709void _connect_to_perl_2 ()
1528 1710
1529void _recalc_want () 1711void _recalc_want ()
1530 1712
1713# not used by default anymore
1531void _global_reattach () 1714void _global_reattach ()
1532 CODE: 1715 CODE:
1533{ 1716{
1534 // reattach to all attachable objects in the game. 1717 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1718 for_all_clients (ns)
1579 } 1762 }
1580 1763
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1764 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 1765}
1583 1766
1767void init_anim ()
1768
1769void init_globals ()
1770
1771void init_experience ()
1772
1773void init_attackmess ()
1774
1775void init_dynamic ()
1776
1777void load_settings ()
1778
1779void load_materials ()
1780
1781void init_uuid ()
1782 CODE:
1783 UUID::init ();
1784
1785void init_signals ()
1786
1787void init_commands ()
1788
1789void init_skills ()
1790
1791void init_beforeplay ()
1792
1584void evthread_start (int aiofd) 1793void evthread_start (int aiofd)
1585 1794
1586void cede_to_tick () 1795void cede_to_tick ()
1587 CODE: 1796 CODE:
1588 coroapi::cede_to_tick (); 1797 coroapi::cede_to_tick ();
1613 } 1822 }
1614 1823
1615void server_tick () 1824void server_tick ()
1616 CODE: 1825 CODE:
1617{ 1826{
1827 ev_now_update (EV_DEFAULT);
1618 NOW = ev_now (EV_DEFAULT); 1828 NOW = ev_now (EV_DEFAULT);
1619 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1829 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1620 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1830 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1621 runtime = SvNVX (sv_runtime); 1831 runtime = SvNVX (sv_runtime);
1622 1832
1623 server_tick (); 1833 server_tick ();
1624 1834
1625 NOW = ev_time (); 1835 ev_now_update (EV_DEFAULT);
1836 NOW = ev_now (EV_DEFAULT);
1626 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1837 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1627 runtime += TICK; 1838 runtime += TICK;
1628 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1839 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1629} 1840}
1630 1841
1756 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1967 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1757 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1968 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1758 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1969 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1759 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1970 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1760#endif 1971#endif
1761 EXTEND (SP, 2*2); 1972 EXTEND (SP, 5*2);
1762 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1973 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1763 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1974 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1764 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1975 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1976 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1977 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1765} 1978}
1766 1979
1767int find_animation (utf8_string text) 1980int find_animation (utf8_string text)
1768 PROTOTYPE: $ 1981 PROTOTYPE: $
1769 1982
1868 RETVAL 2081 RETVAL
1869 2082
1870void 2083void
1871debug_trace (attachable *obj, bool on = true) 2084debug_trace (attachable *obj, bool on = true)
1872 CODE: 2085 CODE:
1873 obj->flags &= ~attachable::F_DEBUG_TRACE; 2086 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1874 if (on) 2087 if (on)
1875 obj->flags |= attachable::F_DEBUG_TRACE; 2088 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1876 2089
1877int mortals_size () 2090int mortals_size ()
1878 CODE: 2091 CODE:
1879 RETVAL = attachable::mortals.size (); 2092 RETVAL = attachable::mortals.size ();
1880 OUTPUT: RETVAL 2093 OUTPUT: RETVAL
1933int mortals_size () 2146int mortals_size ()
1934 CODE: 2147 CODE:
1935 RETVAL = attachable::mortals.size (); 2148 RETVAL = attachable::mortals.size ();
1936 OUTPUT: RETVAL 2149 OUTPUT: RETVAL
1937 2150
1938const char *slot_use_name (U32 slot) 2151const_utf8_string slot_use_name (U32 slot)
1939 ALIAS: 2152 ALIAS:
1940 slot_nonuse_name = 1 2153 slot_nonuse_name = 1
1941 CODE: 2154 CODE:
1942{ 2155{
1943 if (slot >= NUM_BODY_LOCATIONS) 2156 if (slot >= NUM_BODY_LOCATIONS)
2021 CODE: 2234 CODE:
2022 player_apply_below (op); 2235 player_apply_below (op);
2023 2236
2024int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2237int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2025 2238
2239int casting_level (object *caster, object *spell)
2240
2026int pay_item (object *op, object *buyer) 2241int pay_item (object *op, object *buyer)
2027 CODE: 2242 CODE:
2028 RETVAL = pay_for_item (op, buyer); 2243 RETVAL = pay_for_item (op, buyer);
2029 OUTPUT: RETVAL 2244 OUTPUT: RETVAL
2030 2245
2072 2287
2073void player_lvl_adj (object *who, object *skill = 0) 2288void player_lvl_adj (object *who, object *skill = 0)
2074 2289
2075int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2290int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2076 2291
2077int calc_skill_exp (object *who, object *op, object *skill); 2292int calc_skill_exp (object *who, object *op, object *skill)
2078 2293
2079void push_button (object *op); 2294void push_button (object *op, object *originator)
2080 2295
2081void use_trigger (object *op); 2296void use_trigger (object *op, object *originator)
2082 2297
2083void add_button_link (object *button, maptile *map, int connected);
2084
2085void remove_button_link (object *op);
2086
2087void handle_apply_yield (object *op); 2298void handle_apply_yield (object *op)
2299
2300int convert_item (object *item, object *converter)
2088 2301
2089 2302
2090MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2303MODULE = cf PACKAGE = cf::object PREFIX = cf_
2091 2304
2092# no clean way to get an object from an archetype - stupid idiotic 2305# no clean way to get an object from an archetype - stupid idiotic
2099 OUTPUT: 2312 OUTPUT:
2100 RETVAL 2313 RETVAL
2101 2314
2102object *find_object (U32 tag) 2315object *find_object (U32 tag)
2103 2316
2317object *find_object_uuid (UUID i)
2318
2104# TODO: nuke 2319# TODO: nuke
2105object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2320object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2106 PROTOTYPE: $$$$$$ 2321 PROTOTYPE: $$$$$$
2107 CODE: 2322 CODE:
2108{ 2323{
2109 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2324 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2325
2326 if (RETVAL->destroyed ())
2327 RETVAL = 0;
2110} 2328}
2111 2329
2112shstr 2330shstr
2113object::kv_get (shstr key) 2331object::kv_get (shstr key)
2114 2332
2166 RETVAL = op->contr; 2384 RETVAL = op->contr;
2167 OUTPUT: RETVAL 2385 OUTPUT: RETVAL
2168 2386
2169bool move_player (object *op, int dir) 2387bool move_player (object *op, int dir)
2170 2388
2171void check_score (object *op)
2172
2173void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2389void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2174 CODE: 2390 CODE:
2175 new_draw_info (flags, 0, op, txt); 2391 new_draw_info (flags, 0, op, txt);
2176 2392
2177void kill_player (object *op) 2393void kill_player (object *op)
2209 pl->ob->stats.hp = pl->ob->stats.maxhp; 2425 pl->ob->stats.hp = pl->ob->stats.maxhp;
2210 pl->ob->stats.sp = pl->ob->stats.maxsp; 2426 pl->ob->stats.sp = pl->ob->stats.maxsp;
2211 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2427 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212 pl->orig_stats = pl->ob->stats; 2428 pl->orig_stats = pl->ob->stats;
2213 2429
2214void clear_los (player *pl) 2430# should only be temporary
2431void esrv_new_player (player *pl)
2215 2432
2433#d# TODO: replace by blocked_los accessor, fix code using this
2216bool 2434bool
2217cell_visible (player *pl, int dx, int dy) 2435cell_visible (player *pl, int dx, int dy)
2218 CODE: 2436 CODE:
2219 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2437 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221 OUTPUT: 2438 OUTPUT:
2222 RETVAL 2439 RETVAL
2223 2440
2224void 2441void
2225send (player *pl, SV *packet) 2442send (player *pl, SV *packet)
2293} 2510}
2294 2511
2295INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2512INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2296 2513
2297void 2514void
2515adjust_daylight ()
2516 CODE:
2517 maptile::adjust_daylight ();
2518
2519int
2520outdoor_darkness (int darkness = 0)
2521 CODE:
2522 RETVAL = maptile::outdoor_darkness;
2523 if (items)
2524 maptile::outdoor_darkness = darkness;
2525 OUTPUT:
2526 RETVAL
2527
2528void
2298maptile::instantiate () 2529maptile::instantiate ()
2299 2530
2300maptile *new () 2531maptile *new ()
2301 PROTOTYPE: 2532 PROTOTYPE:
2302 CODE: 2533 CODE:
2332 for (int x = 0; x < THIS->width; ++x) 2563 for (int x = 0; x < THIS->width; ++x)
2333 for (int y = 0; y < THIS->height; ++y) 2564 for (int y = 0; y < THIS->height; ++y)
2334 { 2565 {
2335 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2566 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2336 if (op->flag [FLAG_IS_FLOOR]) 2567 if (op->flag [FLAG_IS_FLOOR])
2337 goto skip_space; 2568 goto skip;
2338 2569
2339 { 2570 {
2340 int offs = offset + y * stride + x; 2571 int offs = offset + y * stride + x;
2572
2341 if (IN_RANGE_EXC (offs, 0, idxlen)) 2573 if (IN_RANGE_EXC (offs, 0, idxlen))
2342 { 2574 {
2343 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2575 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2344 { 2576 {
2345 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2577 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2346 ob->flag [FLAG_NO_MAP_SAVE] = true; 2578 ob->flag [FLAG_NO_MAP_SAVE] = true;
2347 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2579 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2348 2580
2349 if (ob->randomitems) 2581 if (ob->randomitems && !ob->above)
2350 { 2582 {
2351 if (!ob->above)
2352 {
2353 ob->create_treasure (ob->randomitems); 2583 ob->create_treasure (ob->randomitems);
2354 2584
2355 for (object *op = ob->above; op; op = op->above) 2585 for (object *op = ob->above; op; op = op->above)
2356 op->flag [FLAG_NO_MAP_SAVE] = true; 2586 op->flag [FLAG_NO_MAP_SAVE] = true;
2357 } 2587 // TODO: if this is a pickable object, then the item
2358 2588 // will at a bit weird - saving inside the player
2359 ob->randomitems = 0; 2589 // will clear the flag, but when the player drops
2590 // it without logging out, it keeps the flag.
2591 // nobody ahs reported this, but this can be rather
2592 // annoying on persistent maps.
2360 } 2593 }
2361 } 2594 }
2362 } 2595 }
2363 } 2596 }
2364 2597
2365 skip_space: ; 2598 skip: ;
2366 } 2599 }
2367} 2600}
2368 2601
2369void 2602void
2370maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2603maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2380 2613
2381 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2614 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2382 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2615 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2383 2616
2384 for (int i = av_len ((AV *)palette) + 1; i--; ) 2617 for (int i = av_len ((AV *)palette) + 1; i--; )
2385 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2618 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2386 2619
2387 for (int y = 0; y < THIS->height; ++y) 2620 for (int y = 0; y < THIS->height; ++y)
2388 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2621 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2389 2622
2390 sfree (THIS->regions, THIS->size ()); 2623 sfree (THIS->regions, THIS->size ());
2409 } 2642 }
2410 2643
2411int out_of_map (maptile *map, int x, int y) 2644int out_of_map (maptile *map, int x, int y)
2412 2645
2413void 2646void
2414trigger (maptile *map, long connection, bool state = true) 2647find_link (maptile *map, shstr_tmp connection)
2415 CODE:
2416 activate_connection (map, connection, state);
2417
2418void
2419get_connection (maptile *map, long connection)
2420 PPCODE: 2648 PPCODE:
2421 oblinkpt *obp = get_connection_links (map, connection); 2649 if (oblinkpt *obp = map->find_link (connection))
2422 if (obp)
2423 for (objectlink *ol = obp->link; ol; ol = ol->next) 2650 for (objectlink *ol = obp->link; ol; ol = ol->next)
2424 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2651 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2425 2652
2426void 2653void
2427get_map_flags (maptile *map, int x, int y) 2654get_map_flags (maptile *map, int x, int y)
2481 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2708 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2482 XPUSHs (sv_2mortal (to_sv (o))); 2709 XPUSHs (sv_2mortal (to_sv (o)));
2483} 2710}
2484 2711
2485SV * 2712SV *
2486bot_at (maptile *obj, unsigned int x, unsigned int y) 2713bot_at (maptile *map, unsigned int x, unsigned int y)
2487 PROTOTYPE: $$$ 2714 PROTOTYPE: $$$
2488 ALIAS: 2715 ALIAS:
2489 top_at = 1 2716 top_at = 1
2490 flags_at = 2 2717 flags_at = 2
2491 light_at = 3 2718 light_at = 3
2492 move_block_at = 4 2719 move_block_at = 4
2493 move_slow_at = 5 2720 move_slow_at = 5
2494 move_on_at = 6 2721 move_on_at = 6
2495 move_off_at = 7 2722 move_off_at = 7
2496 INIT:
2497 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2498 CODE: 2723 CODE:
2724{
2725 sint16 nx = x;
2726 sint16 ny = y;
2727
2728 if (!xy_normalise (map, nx, ny))
2729 XSRETURN_UNDEF;
2730
2731 mapspace &ms = map->at (nx, ny);
2732
2733 ms.update ();
2734
2499 switch (ix) 2735 switch (ix)
2500 { 2736 {
2501 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2737 case 0: RETVAL = to_sv (ms.bot ); break;
2502 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2738 case 1: RETVAL = to_sv (ms.top ); break;
2503 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2739 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2740 case 3: RETVAL = newSViv (ms.light ); break;
2505 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2741 case 4: RETVAL = newSVuv (ms.move_block); break;
2506 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2742 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2743 case 6: RETVAL = newSVuv (ms.move_on ); break;
2508 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2744 case 7: RETVAL = newSVuv (ms.move_off ); break;
2509 } 2745 }
2746}
2510 OUTPUT: RETVAL 2747 OUTPUT: RETVAL
2511
2512void fix_walls (maptile *map, int x, int y)
2513
2514void fix_walls_around (maptile *map, int x, int y)
2515 2748
2516# worst xs function of my life 2749# worst xs function of my life
2517bool 2750bool
2518_create_random_map (\ 2751_create_random_map (\
2519 maptile *self,\ 2752 maptile *self,\
2615archetype *archetypes (U32 index) 2848archetype *archetypes (U32 index)
2616 CODE: 2849 CODE:
2617 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2850 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2618 OUTPUT: RETVAL 2851 OUTPUT: RETVAL
2619 2852
2620object *instantiate (archetype *arch)
2621 CODE:
2622 RETVAL = arch_to_object (arch);
2623 OUTPUT:
2624 RETVAL
2625
2626INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2853INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2627 2854
2628MODULE = cf PACKAGE = cf::party 2855MODULE = cf PACKAGE = cf::party
2629 2856
2630partylist *first () 2857partylist *first ()
2645 2872
2646region *find (utf8_string name) 2873region *find (utf8_string name)
2647 PROTOTYPE: $ 2874 PROTOTYPE: $
2648 CODE: 2875 CODE:
2649 RETVAL = region::find (name); 2876 RETVAL = region::find (name);
2650 OUTPUT: RETVAL
2651
2652region *find_fuzzy (utf8_string name)
2653 PROTOTYPE: $
2654 CODE:
2655 RETVAL = region::find_fuzzy (name);
2656 OUTPUT: RETVAL 2877 OUTPUT: RETVAL
2657 2878
2658int specificity (region *rgn) 2879int specificity (region *rgn)
2659 CODE: 2880 CODE:
2660 RETVAL = 0; 2881 RETVAL = 0;
2796 faceinfo *f = face_info (idx); assert (f); 3017 faceinfo *f = face_info (idx); assert (f);
2797 facedata *d = &(faceset ? f->data64 : f->data32); 3018 facedata *d = &(faceset ? f->data64 : f->data32);
2798 sv_to (data, d->data); 3019 sv_to (data, d->data);
2799 STRLEN clen; 3020 STRLEN clen;
2800 char *cdata = SvPVbyte (chksum, clen); 3021 char *cdata = SvPVbyte (chksum, clen);
2801 clen = min (CHKSUM_SIZE, clen); 3022 clen = min (CHKSUM_MAXLEN, clen);
2802 3023
3024 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3025
2803 if (memcmp (d->chksum, cdata, clen)) 3026 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2804 { 3027 {
3028 d->chksum_len = clen;
2805 memcpy (d->chksum, cdata, clen); 3029 memcpy (d->chksum, cdata, clen);
2806 3030
2807 // invalidate existing client face info 3031 // invalidate existing client face info
2808 for_all_clients (ns) 3032 for_all_clients (ns)
2809 if (ns->faceset == faceset) 3033 if (ns->faceset == faceset)
2824 3048
2825SV *get_chksum (faceidx idx, int faceset = 0) 3049SV *get_chksum (faceidx idx, int faceset = 0)
2826 CODE: 3050 CODE:
2827 facedata *d = face_data (idx, faceset); 3051 facedata *d = face_data (idx, faceset);
2828 if (!d) XSRETURN_UNDEF; 3052 if (!d) XSRETURN_UNDEF;
2829 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3053 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2830 OUTPUT: 3054 OUTPUT:
2831 RETVAL 3055 RETVAL
2832 3056
2833SV *get_data (faceidx idx, int faceset = 0) 3057SV *get_data (faceidx idx, int faceset = 0)
2834 CODE: 3058 CODE:
2879 } 3103 }
2880 else 3104 else
2881 anim = &animation::create (name, av_len (av) + 1, facings); 3105 anim = &animation::create (name, av_len (av) + 1, facings);
2882 3106
2883 for (int i = 0; i < anim->num_animations; ++i) 3107 for (int i = 0; i < anim->num_animations; ++i)
2884 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3108 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2885} 3109}
2886 OUTPUT: RETVAL 3110 OUTPUT: RETVAL
2887 3111
2888void invalidate_all () 3112void invalidate_all ()
2889 CODE: 3113 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines