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.323 by root, Sun Oct 11 23:51:41 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 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>
89 *stash_cf_arch_wrap, 87 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 88 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 89 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 90 *stash_cf_living_wrap;
93 91
92static SV
93 *cv_cf_do_invoke,
94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg,
96 *cv_cf_tick,
97 *cv_cf_match_match;
98
94#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
95static inline SV * 100static SV *
96newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
97{ 102{
98 if (!s) 103 if (!s)
99 return newSV (0); 104 return newSV (0);
100 105
103 return sv; 108 return sv;
104} 109}
105#endif 110#endif
106 111
107#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
108static inline SV * 113static SV *
109newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
110{ 115{
111 if (!s) 116 if (!s)
112 return newSV (0); 117 return newSV (0);
113 118
117 SvUTF8_on (sv); 122 SvUTF8_on (sv);
118 123
119 return sv; 124 return sv;
120} 125}
121#endif 126#endif
127
128static noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
122 143
123// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
124template<class super> 145template<class super>
125static super * 146static super *
126is_a (attachable *at) 147is_a (attachable *at)
203attachable::destroy () 224attachable::destroy ()
204{ 225{
205 if (destroyed ()) 226 if (destroyed ())
206 return; 227 return;
207 228
208 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
209 do_destroy (); 230 do_destroy ();
210 sever_self (); 231 sever_self ();
211} 232}
212 233
213void 234void
287 308
288 attach = src.attach; 309 attach = src.attach;
289 return *this; 310 return *this;
290} 311}
291 312
313#if 0
292template<typename T> 314template<typename T>
293static bool 315static bool
294find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
295{ 317{
296 char *s = (char *)obj; 318 char *s = (char *)obj;
304 326
305 return false; 327 return false;
306} 328}
307 329
308// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
309void 331static void
310find_backref (void *ptr) 332find_backref (void *ptr)
311{ 333{
312 for_all_objects (op) 334 for_all_objects (op)
313 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
314 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);
319 341
320 for_all_clients (ns) 342 for_all_clients (ns)
321 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
322 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
323} 345}
346#endif
324 347
325////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
326 349
327static SV * 350static SV *
328newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
381 404
382 return sv; 405 return sv;
383 } 406 }
384} 407}
385 408
409#if 0 // unused
386static void 410static void
387clearSVptr (SV *sv) 411clearSVptr (SV *sv)
388{ 412{
389 if (SvROK (sv)) 413 if (SvROK (sv))
390 sv = SvRV (sv); 414 sv = SvRV (sv);
391 415
392 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
393 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
394} 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}
395 435
396static long 436static long
397SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
398{ 438{
399 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
400 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
401 441
402 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 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} 443}
409 444
410static long noinline 445static long noinline
411SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
412{ 447{
413 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
414 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
415 else
416 return 0;
417} 451}
418 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
419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 494static 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); } 495static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
421inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
425inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
426inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
427inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
428inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
429inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
430inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
431inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
432inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
433inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
434inline 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); }
435inline 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); }
436inline 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); }
437inline 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); }
438inline 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); }
439inline 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); }
440inline 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); }
441inline 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); }
442inline 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); }
443 518
444inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
445inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
446 521
447inline 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 ()); }
448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
449 524
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451 526
452inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
453{ 528{
454 SV *sv = newSV (0); 529 SV *sv = newSV (0);
455 530
456 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
461 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
462 537
463 return sv; 538 return sv;
464} 539}
465 540
466inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
467{ 542{
468 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv); 544 SvUTF8_on (sv);
470 return sv; 545 return sv;
471} 546}
472 547
473inline 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; }
474inline 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; }
475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
477inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
478inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
479inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
480inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
481inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
482inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static 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); } 559static 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); } 560static 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); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
487inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static 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"); } 563static 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"); } 564static 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"); } 565static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
491inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 566static 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"); } 567static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 568static 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"); } 569static 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"); } 570static 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"); } 571static 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"); } 572static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 573static 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" ); } 574static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
500 575
501//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)]; }
502inline 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)); }
503 578
504template<class T> 579template<class T>
505inline 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; }
506 581
507template<int N> 582template<int N>
508inline 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)); }
509 584
510inline 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); }
511inline 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); }
512inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
513inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
514 589
515inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
516{ 591{
517 STRLEN len; 592 STRLEN len;
518 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
519 v.assign (data, len); 594 v.assign (data, len);
520} 595}
521 596
522inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
523{ 598{
524 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
525 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
526} 601}
527 602
528inline 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); }
529 604
530static SV * 605static SV *
531newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
532{ 607{
533 SV *sv; 608 SV *sv;
633 var = 0; 708 var = 0;
634} 709}
635 710
636////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
637 712
638SV * 713static SV *
639registry (attachable *ext) 714registry (attachable *ext)
640{ 715{
641 if (!ext->cb) 716 if (!ext->cb)
642 ext->cb = newAV (); 717 ext->cb = newAV ();
643 718
919 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 994 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
920 } 995 }
921 996
922 va_end (ap); 997 va_end (ap);
923 998
924 CALL_CALL ("cf::do_invoke", G_SCALAR); 999 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
925 count = count > 0 ? POPi : 0; 1000 count = count > 0 ? POPi : 0;
926 1001
927 CALL_END; 1002 CALL_END;
928 1003
929 return count; 1004 return count;
930} 1005}
931 1006
932SV * 1007static SV *
933cfperl_result (int idx) 1008cfperl_result (int idx)
934{ 1009{
935 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
936 if (!av) 1011 if (!av)
937 return &PL_sv_undef; 1012 return &PL_sv_undef;
970 1045
971 dSP; 1046 dSP;
972 1047
973 PUSHMARK (SP); 1048 PUSHMARK (SP);
974 PUTBACK; 1049 PUTBACK;
975 call_pv ("cf::tick", G_DISCARD | G_VOID); 1050 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
976 1051
977 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);
978} 1053}
979 1054
980void 1055void
1003 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
1004 CALL_END; 1079 CALL_END;
1005} 1080}
1006 1081
1007void 1082void
1008cfperl_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)
1009{ 1084{
1010 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
1011 CALL_ARG (ns); 1086 CALL_ARG (ns);
1012 CALL_ARG (type); 1087 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
1014 CALL_ARG (color); 1089 CALL_ARG (color);
1015 CALL_CALL ("cf::client::send_msg", G_VOID); 1090 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1016 CALL_END; 1091 CALL_END;
1017} 1092}
1018 1093
1019int 1094int
1020cfperl_can_merge (object *ob1, object *ob2) 1095cfperl_can_merge (object *ob1, object *ob2)
1022 int can; 1097 int can;
1023 1098
1024 CALL_BEGIN (2); 1099 CALL_BEGIN (2);
1025 CALL_ARG (ob1); 1100 CALL_ARG (ob1);
1026 CALL_ARG (ob2); 1101 CALL_ARG (ob2);
1027 CALL_CALL ("cf::_can_merge", G_SCALAR); 1102 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1028 can = count && SvTRUE (TOPs); 1103 can = count && SvTRUE (TOPs);
1029 CALL_END; 1104 CALL_END;
1030 1105
1031 return can; 1106 return can;
1032} 1107}
1042 CALL_CALL ("cf::mapscript::activate", G_VOID); 1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1043 CALL_END; 1118 CALL_END;
1044} 1119}
1045 1120
1046player * 1121player *
1047player::find (const char *name) 1122player::find (const_utf8_string name)
1048{ 1123{
1049 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1050 CALL_ARG (name); 1125 CALL_ARG (name);
1051 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1052 1127
1057 1132
1058 return retval; 1133 return retval;
1059} 1134}
1060 1135
1061maptile * 1136maptile *
1062find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1063{ 1138{
1064 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1065 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1066 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1067 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
1074 1149
1075 return retval; 1150 return retval;
1076} 1151}
1077 1152
1078maptile * 1153maptile *
1079maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1080{ 1155{
1081 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1082 CALL_ARG (path); 1157 CALL_ARG (path);
1083 CALL_ARG (origin); 1158 CALL_ARG (origin);
1084 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1090 1165
1091 return retval; 1166 return retval;
1092} 1167}
1093 1168
1094maptile * 1169maptile *
1095maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1096{ 1171{
1097 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1098 CALL_ARG (path); 1173 CALL_ARG (path);
1099 CALL_ARG (origin); 1174 CALL_ARG (origin);
1100 CALL_ARG (load); 1175 CALL_ARG (load);
1129 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1130 CALL_END; 1205 CALL_END;
1131} 1206}
1132 1207
1133void 1208void
1134object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1135{ 1210{
1136 if (type != PLAYER) 1211 if (type != PLAYER)
1137 return; 1212 return;
1138 1213
1139 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
1143 CALL_ARG (y); 1218 CALL_ARG (y);
1144 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1145 CALL_END; 1220 CALL_END;
1146} 1221}
1147 1222
1148const char * 1223const_utf8_string
1149object::ref () const 1224object::ref () const
1150{ 1225{
1151 if (type == PLAYER) 1226 if (type == PLAYER)
1152 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);
1153 else 1228 else
1154 return 0; 1229 return 0;
1155} 1230}
1156 1231
1157object * 1232object *
1158object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1159{ 1234{
1160 object *retval = 0; 1235 object *retval = 0;
1161 1236
1162 if (ref) 1237 if (ref)
1163 { 1238 {
1173 1248
1174 return retval; 1249 return retval;
1175} 1250}
1176 1251
1177void 1252void
1178log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1179{ 1254{
1180#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1181 void *addr [20]; 1256 void *addr [20];
1182 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1183 1258
1189 CALL_END; 1264 CALL_END;
1190#endif 1265#endif
1191} 1266}
1192 1267
1193bool 1268bool
1194is_match_expr (const char *expr) 1269is_match_expr (const_utf8_string expr)
1195{ 1270{
1196 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1197} 1272}
1198 1273
1199bool 1274bool
1200match (const char *expr, object *ob, object *self, object *source, object *originator) 1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1201{ 1276{
1202 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1203 expr += sizeof ("match ") - 1; 1278 expr += sizeof ("match ") - 1;
1204 1279
1205 CALL_BEGIN (5); 1280 CALL_BEGIN (5);
1206 CALL_ARG (expr); 1281 CALL_ARG (expr);
1207 CALL_ARG (ob); 1282 CALL_ARG (ob);
1208 CALL_ARG (self); 1283 CALL_ARG (self);
1209 CALL_ARG (source); 1284 CALL_ARG (source);
1210 CALL_ARG (originator); 1285 CALL_ARG (originator);
1211 CALL_CALL ("cf::match::match", G_SCALAR); 1286 CALL_CALL (cv_cf_match_match, G_SCALAR);
1212 1287
1213 bool matched = count && SvTRUE (POPs); 1288 bool matched = count && SvTRUE (TOPs);
1214 1289
1215 CALL_END; 1290 CALL_END;
1216 1291
1217 return matched; 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;
1218} 1317}
1219 1318
1220///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1221 1320
1222struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1256 if (active) start (); 1355 if (active) start ();
1257 } 1356 }
1258} 1357}
1259 1358
1260static void 1359static void
1261_connect_to_perl () 1360_connect_to_perl_1 ()
1262{ 1361{
1263 stash_cf = gv_stashpv ("cf", 1); 1362 stash_cf = gv_stashpv ("cf", 1);
1264 1363
1265 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1364 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1266 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);
1283 cb_object = get_av ("cf::CB_OBJECT", 1); 1382 cb_object = get_av ("cf::CB_OBJECT", 1);
1284 cb_player = get_av ("cf::CB_PLAYER", 1); 1383 cb_player = get_av ("cf::CB_PLAYER", 1);
1285 cb_client = get_av ("cf::CB_CLIENT", 1); 1384 cb_client = get_av ("cf::CB_CLIENT", 1);
1286 cb_type = get_av ("cf::CB_TYPE" , 1); 1385 cb_type = get_av ("cf::CB_TYPE" , 1);
1287 cb_map = get_av ("cf::CB_MAP" , 1); 1386 cb_map = get_av ("cf::CB_MAP" , 1);
1387}
1288 1388
1289 av_reflect = get_av ("cf::REFLECT" , 1); 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);
1290} 1397}
1291 1398
1292MODULE = cf PACKAGE = cf PREFIX = cf_ 1399MODULE = cf PACKAGE = cf PREFIX = cf_
1293 1400
1294BOOT: 1401BOOT:
1295{ 1402{
1296 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1403 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1297 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1404 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1298 1405
1299 _connect_to_perl (); 1406 _connect_to_perl_1 ();
1300 1407
1301 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1408 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1302 1409
1303 //{ 1410 //{
1304 // require_pv ("Time::HiRes"); 1411 // require_pv ("Time::HiRes");
1348 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)
1349 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)
1350 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)
1351 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)
1352 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)
1353 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)
1354 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)
1355 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)
1356 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)
1357 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)
1358 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)
1384 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)
1385 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)
1386 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)
1387 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)
1388 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)
1389 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)
1390 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)
1391 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)
1392 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)
1393 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)
1394 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)
1576 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1683 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1577 av_push (event, newSViv (eiv->klass)); 1684 av_push (event, newSViv (eiv->klass));
1578 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1685 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1579 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1686 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1580 } 1687 }
1688
1689 // used by autogenerated BOOT sections from genacc
1690 av_reflect = get_av ("cf::REFLECT", 1);
1581} 1691}
1582 1692
1583void _gv_clear (SV *gv) 1693void _gv_clear (SV *gv)
1584 CODE: 1694 CODE:
1585 assert (SvTYPE (gv) == SVt_PVGV); 1695 assert (SvTYPE (gv) == SVt_PVGV);
1592 f (GvGP (gv)->gp_cv); 1702 f (GvGP (gv)->gp_cv);
1593 GvCVGEN (gv) = 0; 1703 GvCVGEN (gv) = 0;
1594 GvMULTI_off (gv); 1704 GvMULTI_off (gv);
1595# undef f 1705# undef f
1596 1706
1597void _connect_to_perl () 1707void _connect_to_perl_1 ()
1708
1709void _connect_to_perl_2 ()
1598 1710
1599void _recalc_want () 1711void _recalc_want ()
1600 1712
1601# not used by default anymore 1713# not used by default anymore
1602void _global_reattach () 1714void _global_reattach ()
1967 RETVAL 2079 RETVAL
1968 2080
1969void 2081void
1970debug_trace (attachable *obj, bool on = true) 2082debug_trace (attachable *obj, bool on = true)
1971 CODE: 2083 CODE:
1972 obj->flags &= ~attachable::F_DEBUG_TRACE; 2084 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1973 if (on) 2085 if (on)
1974 obj->flags |= attachable::F_DEBUG_TRACE; 2086 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1975 2087
1976int mortals_size () 2088int mortals_size ()
1977 CODE: 2089 CODE:
1978 RETVAL = attachable::mortals.size (); 2090 RETVAL = attachable::mortals.size ();
1979 OUTPUT: RETVAL 2091 OUTPUT: RETVAL
2032int mortals_size () 2144int mortals_size ()
2033 CODE: 2145 CODE:
2034 RETVAL = attachable::mortals.size (); 2146 RETVAL = attachable::mortals.size ();
2035 OUTPUT: RETVAL 2147 OUTPUT: RETVAL
2036 2148
2037const char *slot_use_name (U32 slot) 2149const_utf8_string slot_use_name (U32 slot)
2038 ALIAS: 2150 ALIAS:
2039 slot_nonuse_name = 1 2151 slot_nonuse_name = 1
2040 CODE: 2152 CODE:
2041{ 2153{
2042 if (slot >= NUM_BODY_LOCATIONS) 2154 if (slot >= NUM_BODY_LOCATIONS)
2120 CODE: 2232 CODE:
2121 player_apply_below (op); 2233 player_apply_below (op);
2122 2234
2123int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2235int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2124 2236
2237int casting_level (object *caster, object *spell)
2238
2125int pay_item (object *op, object *buyer) 2239int pay_item (object *op, object *buyer)
2126 CODE: 2240 CODE:
2127 RETVAL = pay_for_item (op, buyer); 2241 RETVAL = pay_for_item (op, buyer);
2128 OUTPUT: RETVAL 2242 OUTPUT: RETVAL
2129 2243
2171 2285
2172void player_lvl_adj (object *who, object *skill = 0) 2286void player_lvl_adj (object *who, object *skill = 0)
2173 2287
2174int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2288int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2175 2289
2176int calc_skill_exp (object *who, object *op, object *skill); 2290int calc_skill_exp (object *who, object *op, object *skill)
2177 2291
2178void push_button (object *op, object *originator); 2292void push_button (object *op, object *originator)
2179 2293
2180void use_trigger (object *op, object *originator); 2294void use_trigger (object *op, object *originator)
2181 2295
2182void handle_apply_yield (object *op); 2296void handle_apply_yield (object *op)
2183 2297
2184int convert_item (object *item, object *converter); 2298int convert_item (object *item, object *converter)
2185 2299
2186 2300
2187MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2301MODULE = cf PACKAGE = cf::object PREFIX = cf_
2188 2302
2189# no clean way to get an object from an archetype - stupid idiotic 2303# no clean way to get an object from an archetype - stupid idiotic
2202object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2316object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2203 PROTOTYPE: $$$$$$ 2317 PROTOTYPE: $$$$$$
2204 CODE: 2318 CODE:
2205{ 2319{
2206 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2320 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2321
2322 if (RETVAL->destroyed ())
2323 RETVAL = 0;
2207} 2324}
2208 2325
2209shstr 2326shstr
2210object::kv_get (shstr key) 2327object::kv_get (shstr key)
2211 2328
2444 for (int x = 0; x < THIS->width; ++x) 2561 for (int x = 0; x < THIS->width; ++x)
2445 for (int y = 0; y < THIS->height; ++y) 2562 for (int y = 0; y < THIS->height; ++y)
2446 { 2563 {
2447 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2564 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2448 if (op->flag [FLAG_IS_FLOOR]) 2565 if (op->flag [FLAG_IS_FLOOR])
2449 goto skip_space; 2566 goto skip;
2450 2567
2451 { 2568 {
2452 int offs = offset + y * stride + x; 2569 int offs = offset + y * stride + x;
2570
2453 if (IN_RANGE_EXC (offs, 0, idxlen)) 2571 if (IN_RANGE_EXC (offs, 0, idxlen))
2454 { 2572 {
2455 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2573 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2456 { 2574 {
2457 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2575 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2458 ob->flag [FLAG_NO_MAP_SAVE] = true; 2576 ob->flag [FLAG_NO_MAP_SAVE] = true;
2459 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2577 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2460 2578
2461 if (ob->randomitems) 2579 if (ob->randomitems && !ob->above)
2462 { 2580 {
2463 if (!ob->above)
2464 {
2465 ob->create_treasure (ob->randomitems); 2581 ob->create_treasure (ob->randomitems);
2466 2582
2467 for (object *op = ob->above; op; op = op->above) 2583 for (object *op = ob->above; op; op = op->above)
2468 op->flag [FLAG_NO_MAP_SAVE] = true; 2584 op->flag [FLAG_NO_MAP_SAVE] = true;
2469 } 2585 // TODO: if this is a pickable object, then the item
2470 2586 // will at a bit weird - saving inside the player
2471 ob->randomitems = 0; 2587 // will clear the flag, but when the player drops
2588 // it without logging out, it keeps the flag.
2589 // nobody ahs reported this, but this can be rather
2590 // annoying on persistent maps.
2472 } 2591 }
2473 } 2592 }
2474 } 2593 }
2475 } 2594 }
2476 2595
2477 skip_space: ; 2596 skip: ;
2478 } 2597 }
2479} 2598}
2480 2599
2481void 2600void
2482maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2601maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2492 2611
2493 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2612 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2494 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2613 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2495 2614
2496 for (int i = av_len ((AV *)palette) + 1; i--; ) 2615 for (int i = av_len ((AV *)palette) + 1; i--; )
2497 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2616 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2498 2617
2499 for (int y = 0; y < THIS->height; ++y) 2618 for (int y = 0; y < THIS->height; ++y)
2500 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2619 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2501 2620
2502 sfree (THIS->regions, THIS->size ()); 2621 sfree (THIS->regions, THIS->size ());
2622 case 6: RETVAL = newSVuv (ms.move_on ); break; 2741 case 6: RETVAL = newSVuv (ms.move_on ); break;
2623 case 7: RETVAL = newSVuv (ms.move_off ); break; 2742 case 7: RETVAL = newSVuv (ms.move_off ); break;
2624 } 2743 }
2625} 2744}
2626 OUTPUT: RETVAL 2745 OUTPUT: RETVAL
2627
2628void fix_walls (maptile *map, int x, int y)
2629
2630void fix_walls_around (maptile *map, int x, int y)
2631 2746
2632# worst xs function of my life 2747# worst xs function of my life
2633bool 2748bool
2634_create_random_map (\ 2749_create_random_map (\
2635 maptile *self,\ 2750 maptile *self,\
2731archetype *archetypes (U32 index) 2846archetype *archetypes (U32 index)
2732 CODE: 2847 CODE:
2733 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2848 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2734 OUTPUT: RETVAL 2849 OUTPUT: RETVAL
2735 2850
2736object *instantiate (archetype *arch)
2737 CODE:
2738 RETVAL = arch_to_object (arch);
2739 OUTPUT:
2740 RETVAL
2741
2742INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2851INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2743 2852
2744MODULE = cf PACKAGE = cf::party 2853MODULE = cf PACKAGE = cf::party
2745 2854
2746partylist *first () 2855partylist *first ()
2906 faceinfo *f = face_info (idx); assert (f); 3015 faceinfo *f = face_info (idx); assert (f);
2907 facedata *d = &(faceset ? f->data64 : f->data32); 3016 facedata *d = &(faceset ? f->data64 : f->data32);
2908 sv_to (data, d->data); 3017 sv_to (data, d->data);
2909 STRLEN clen; 3018 STRLEN clen;
2910 char *cdata = SvPVbyte (chksum, clen); 3019 char *cdata = SvPVbyte (chksum, clen);
2911 clen = min (CHKSUM_SIZE, clen); 3020 clen = min (CHKSUM_MAXLEN, clen);
2912 3021
3022 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3023
2913 if (memcmp (d->chksum, cdata, clen)) 3024 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2914 { 3025 {
3026 d->chksum_len = clen;
2915 memcpy (d->chksum, cdata, clen); 3027 memcpy (d->chksum, cdata, clen);
2916 3028
2917 // invalidate existing client face info 3029 // invalidate existing client face info
2918 for_all_clients (ns) 3030 for_all_clients (ns)
2919 if (ns->faceset == faceset) 3031 if (ns->faceset == faceset)
2934 3046
2935SV *get_chksum (faceidx idx, int faceset = 0) 3047SV *get_chksum (faceidx idx, int faceset = 0)
2936 CODE: 3048 CODE:
2937 facedata *d = face_data (idx, faceset); 3049 facedata *d = face_data (idx, faceset);
2938 if (!d) XSRETURN_UNDEF; 3050 if (!d) XSRETURN_UNDEF;
2939 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3051 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2940 OUTPUT: 3052 OUTPUT:
2941 RETVAL 3053 RETVAL
2942 3054
2943SV *get_data (faceidx idx, int faceset = 0) 3055SV *get_data (faceidx idx, int faceset = 0)
2944 CODE: 3056 CODE:
2989 } 3101 }
2990 else 3102 else
2991 anim = &animation::create (name, av_len (av) + 1, facings); 3103 anim = &animation::create (name, av_len (av) + 1, facings);
2992 3104
2993 for (int i = 0; i < anim->num_animations; ++i) 3105 for (int i = 0; i < anim->num_animations; ++i)
2994 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3106 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
2995} 3107}
2996 OUTPUT: RETVAL 3108 OUTPUT: RETVAL
2997 3109
2998void invalidate_all () 3110void invalidate_all ()
2999 CODE: 3111 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines