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.328 by root, Tue Nov 3 22:57:06 2009 UTC vs.
Revision 1.360 by root, Mon Apr 5 20:33:13 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 (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 9 * option) any later version.
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>
97 *cv_cf_client_send_msg, 95 *cv_cf_client_send_msg,
98 *cv_cf_tick, 96 *cv_cf_tick,
99 *cv_cf_match_match; 97 *cv_cf_match_match;
100 98
101#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
102static inline SV * 100static SV *
103newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
104{ 102{
105 if (!s) 103 if (!s)
106 return newSV (0); 104 return newSV (0);
107 105
110 return sv; 108 return sv;
111} 109}
112#endif 110#endif
113 111
114#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
115static inline SV * 113static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 115{
118 if (!s) 116 if (!s)
119 return newSV (0); 117 return newSV (0);
120 118
124 SvUTF8_on (sv); 122 SvUTF8_on (sv);
125 123
126 return sv; 124 return sv;
127} 125}
128#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}
129 143
130// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
131template<class super> 145template<class super>
132static super * 146static super *
133is_a (attachable *at) 147is_a (attachable *at)
210attachable::destroy () 224attachable::destroy ()
211{ 225{
212 if (destroyed ()) 226 if (destroyed ())
213 return; 227 return;
214 228
215 flags |= F_DESTROYED; 229 attachable_flags |= F_DESTROYED;
216 do_destroy (); 230 do_destroy ();
217 sever_self (); 231 sever_self ();
218} 232}
219 233
220void 234void
294 308
295 attach = src.attach; 309 attach = src.attach;
296 return *this; 310 return *this;
297} 311}
298 312
313#if 0
299template<typename T> 314template<typename T>
300static bool 315static bool
301find_backref (void *ptr, T *obj) 316find_backref (void *ptr, T *obj)
302{ 317{
303 char *s = (char *)obj; 318 char *s = (char *)obj;
311 326
312 return false; 327 return false;
313} 328}
314 329
315// for debugging, find "live" objects containing this ptr 330// for debugging, find "live" objects containing this ptr
316void 331static void
317find_backref (void *ptr) 332find_backref (void *ptr)
318{ 333{
319 for_all_objects (op) 334 for_all_objects (op)
320 if (find_backref (ptr, op)) 335 if (find_backref (ptr, op))
321 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);
326 341
327 for_all_clients (ns) 342 for_all_clients (ns)
328 if (find_backref (ptr, ns)) 343 if (find_backref (ptr, ns))
329 fprintf (stderr, "C %p\n", ns); 344 fprintf (stderr, "C %p\n", ns);
330} 345}
346#endif
331 347
332////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 348//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333 349
334static SV * 350static SV *
335newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 351newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
388 404
389 return sv; 405 return sv;
390 } 406 }
391} 407}
392 408
409#if 0 // unused
393static void 410static void
394clearSVptr (SV *sv) 411clearSVptr (SV *sv)
395{ 412{
396 if (SvROK (sv)) 413 if (SvROK (sv))
397 sv = SvRV (sv); 414 sv = SvRV (sv);
398 415
399 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
400 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
401} 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}
402 435
403static long 436static long
404SvPTR (SV *sv, const char *klass) 437SvPTR (SV *sv, const char *klass)
405{ 438{
406 if (!sv_derived_from (sv, klass)) 439 if (!sv_derived_from (sv, klass))
407 croak ("object of type %s expected", klass); 440 croak ("object of type %s expected", klass);
408 441
409 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 442 return SvPTR_nc (sv);
410
411 if (!mg)
412 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
413
414 return (long)mg->mg_ptr;
415} 443}
416 444
417static long noinline 445static long noinline
418SvPTR_ornull (SV *sv, const char *klass) 446SvPTR_ornull (SV *sv, const char *klass)
419{ 447{
420 if (SvOK (sv)) 448 if (expect_false (!SvOK (sv))) return 0;
449
421 return SvPTR (sv, klass); 450 return SvPTR (sv, klass);
422 else
423 return 0;
424} 451}
425 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
426inline 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); }
427inline 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); }
428inline SV *to_sv (bool v) { return newSViv (v); } 496static inline SV *to_sv (bool v) { return newSViv (v); }
429inline SV *to_sv ( signed char v) { return newSViv (v); } 497static inline SV *to_sv ( signed char v) { return newSViv (v); }
430inline SV *to_sv (unsigned char v) { return newSViv (v); } 498static inline SV *to_sv (unsigned char v) { return newSViv (v); }
431inline SV *to_sv ( signed short v) { return newSViv (v); } 499static inline SV *to_sv ( signed short v) { return newSViv (v); }
432inline SV *to_sv (unsigned short v) { return newSVuv (v); } 500static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
433inline SV *to_sv ( signed int v) { return newSViv (v); } 501static inline SV *to_sv ( signed int v) { return newSViv (v); }
434inline SV *to_sv (unsigned int v) { return newSVuv (v); } 502static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
435inline SV *to_sv ( signed long v) { return newSViv (v); } 503static inline SV *to_sv ( signed long v) { return newSViv (v); }
436inline SV *to_sv (unsigned long v) { return newSVuv (v); } 504static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
437inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 505static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
438inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 506static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
439inline SV *to_sv (float v) { return newSVnv (v); } 507static inline SV *to_sv (float v) { return newSVnv (v); }
440inline SV *to_sv (double v) { return newSVnv (v); } 508static inline SV *to_sv (double v) { return newSVnv (v); }
441inline 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); }
442inline 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); }
443inline 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); }
444inline 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); }
445inline 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); }
446inline 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); }
447inline 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); }
448inline 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); }
449inline 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); }
450 518
451inline SV *to_sv (object & v) { return to_sv (&v); } 519static inline SV *to_sv (object & v) { return to_sv (&v); }
452inline SV *to_sv (living & v) { return to_sv (&v); } 520static inline SV *to_sv (living & v) { return to_sv (&v); }
453 521
454inline 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 ()); }
455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 523static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
456 524
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 525static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458 526
459inline SV *to_sv (dynbuf * v) 527static inline SV *to_sv (dynbuf * v)
460{ 528{
461 SV *sv = newSV (0); 529 SV *sv = newSV (0);
462 530
463 sv_upgrade (sv, SVt_PV); 531 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1); 532 SvGROW (sv, v->size () + 1);
468 *SvEND (sv) = 0; 536 *SvEND (sv) = 0;
469 537
470 return sv; 538 return sv;
471} 539}
472 540
473inline SV *to_sv (dynbuf_text * v) 541static inline SV *to_sv (dynbuf_text * v)
474{ 542{
475 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv); 544 SvUTF8_on (sv);
477 return sv; 545 return sv;
478} 546}
479 547
480inline 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; }
481inline 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; }
482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 554static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 555static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 556static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 558static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
491inline 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); }
492inline 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); }
493inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 561static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 562static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
495inline 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); }
496inline 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); }
497inline 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); }
498inline 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"); }
499inline 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"); }
500inline 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"); }
501inline 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"); }
502inline 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"); }
503inline 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"); }
504inline 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"); }
505inline 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"); }
506inline 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" ); }
507 575
508//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)]; }
509inline 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)); }
510 578
511template<class T> 579template<class T>
512inline 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; }
513 581
514template<int N> 582template<int N>
515inline 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)); }
516 584
517inline 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); }
518inline 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); }
519inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 587static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 588static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
521 589
522inline void sv_to (SV *sv, std::string &v) 590static inline void sv_to (SV *sv, std::string &v)
523{ 591{
524 STRLEN len; 592 STRLEN len;
525 char *data = SvPVbyte (sv, len); 593 char *data = SvPVbyte (sv, len);
526 v.assign (data, len); 594 v.assign (data, len);
527} 595}
528 596
529inline void sv_to (SV *sv, UUID &v) 597static inline void sv_to (SV *sv, UUID &v)
530{ 598{
531 if (!v.parse (SvPV_nolen (sv))) 599 if (!v.parse (SvPV_nolen (sv)))
532 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 600 croak ("unparsable uuid: %s", SvPV_nolen (sv));
533} 601}
534 602
535inline 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); }
536 604
537static SV * 605static SV *
538newSVdt_va (va_list &ap, data_type type) 606newSVdt_va (va_list &ap, data_type type)
539{ 607{
540 SV *sv; 608 SV *sv;
640 var = 0; 708 var = 0;
641} 709}
642 710
643////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 711//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
644 712
645SV * 713static SV *
646registry (attachable *ext) 714registry (attachable *ext)
647{ 715{
648 if (!ext->cb) 716 if (!ext->cb)
649 ext->cb = newAV (); 717 ext->cb = newAV ();
650 718
934 CALL_END; 1002 CALL_END;
935 1003
936 return count; 1004 return count;
937} 1005}
938 1006
939SV * 1007static SV *
940cfperl_result (int idx) 1008cfperl_result (int idx)
941{ 1009{
942 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1010 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
943 if (!av) 1011 if (!av)
944 return &PL_sv_undef; 1012 return &PL_sv_undef;
1010 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
1011 CALL_END; 1079 CALL_END;
1012} 1080}
1013 1081
1014void 1082void
1015cfperl_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)
1016{ 1084{
1017 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
1018 CALL_ARG (ns); 1086 CALL_ARG (ns);
1019 CALL_ARG (type); 1087 CALL_ARG (type);
1020 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
1049 CALL_CALL ("cf::mapscript::activate", G_VOID); 1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1050 CALL_END; 1118 CALL_END;
1051} 1119}
1052 1120
1053player * 1121player *
1054player::find (const char *name) 1122player::find (const_utf8_string name)
1055{ 1123{
1056 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1057 CALL_ARG (name); 1125 CALL_ARG (name);
1058 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1059 1127
1064 1132
1065 return retval; 1133 return retval;
1066} 1134}
1067 1135
1068maptile * 1136maptile *
1069find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1070{ 1138{
1071 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1072 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1073 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1074 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
1081 1149
1082 return retval; 1150 return retval;
1083} 1151}
1084 1152
1085maptile * 1153maptile *
1086maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1087{ 1155{
1088 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1089 CALL_ARG (path); 1157 CALL_ARG (path);
1090 CALL_ARG (origin); 1158 CALL_ARG (origin);
1091 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1097 1165
1098 return retval; 1166 return retval;
1099} 1167}
1100 1168
1101maptile * 1169maptile *
1102maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1103{ 1171{
1104 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1105 CALL_ARG (path); 1173 CALL_ARG (path);
1106 CALL_ARG (origin); 1174 CALL_ARG (origin);
1107 CALL_ARG (load); 1175 CALL_ARG (load);
1136 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1137 CALL_END; 1205 CALL_END;
1138} 1206}
1139 1207
1140void 1208void
1141object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1142{ 1210{
1143 if (type != PLAYER) 1211 if (type != PLAYER)
1144 return; 1212 return;
1145 1213
1146 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
1150 CALL_ARG (y); 1218 CALL_ARG (y);
1151 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1152 CALL_END; 1220 CALL_END;
1153} 1221}
1154 1222
1155const char * 1223const_utf8_string
1156object::ref () const 1224object::ref () const
1157{ 1225{
1158 if (type == PLAYER) 1226 if (type == PLAYER)
1159 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);
1160 else 1228 else
1161 return 0; 1229 return 0;
1162} 1230}
1163 1231
1164object * 1232object *
1165object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1166{ 1234{
1167 object *retval = 0; 1235 object *retval = 0;
1168 1236
1169 if (ref) 1237 if (ref)
1170 { 1238 {
1180 1248
1181 return retval; 1249 return retval;
1182} 1250}
1183 1251
1184void 1252void
1185log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1186{ 1254{
1187#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1188 void *addr [20]; 1256 void *addr [20];
1189 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1190 1258
1196 CALL_END; 1264 CALL_END;
1197#endif 1265#endif
1198} 1266}
1199 1267
1200bool 1268bool
1201is_match_expr (const char *expr) 1269is_match_expr (const_utf8_string expr)
1202{ 1270{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204} 1272}
1205 1273
1206bool 1274bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator) 1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1208{ 1276{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1; 1278 expr += sizeof ("match ") - 1;
1211 1279
1212 CALL_BEGIN (5); 1280 CALL_BEGIN (5);
1220 bool matched = count && SvTRUE (TOPs); 1288 bool matched = count && SvTRUE (TOPs);
1221 1289
1222 CALL_END; 1290 CALL_END;
1223 1291
1224 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;
1225} 1317}
1226 1318
1227///////////////////////////////////////////////////////////////////////////// 1319/////////////////////////////////////////////////////////////////////////////
1228 1320
1229struct EVAPI *evapi::GEVAPI; 1321struct EVAPI *evapi::GEVAPI;
1327 static const struct { 1419 static const struct {
1328 const char *name; 1420 const char *name;
1329 IV iv; 1421 IV iv;
1330 } *civ, const_iv[] = { 1422 } *civ, const_iv[] = {
1331# define const_iv(name) { # name, (IV)name }, 1423# define const_iv(name) { # name, (IV)name },
1424# include "const_iv.h"
1425# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1426# include "attackinc.h"
1427# undef def
1428# define def(uc, flags) const_iv (SK_ ## uc)
1429# include "skillinc.h"
1430# undef def
1431
1332 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1432 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1333 const_iv (logBacktrace) 1433 const_iv (logBacktrace)
1334 1434
1335 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1435 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1336 1436
1337 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1437 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1338 1438
1339 const_iv (MAX_TIME) 1439 const_iv (MAX_TIME)
1340 const_iv (MAXSOCKBUF) 1440 const_iv (MAXSOCKBUF)
1341 1441
1342 const_iv (NUM_BODY_LOCATIONS)
1343 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1344 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1345 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1346 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1347 const_iv (body_wrist) const_iv (body_waist)
1348
1349 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1350 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1351 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1352 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1353 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1354 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1355 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1356 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1357 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1358 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1359 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1360 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1361 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1362 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1363 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1364 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1365 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1366 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1367 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1368 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1369 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1370 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1371 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1372 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1373 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1374 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1375 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1376 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1377 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1378
1379 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1380
1381 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1382 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1383
1384 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1385 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1386 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1387 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1388 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1389 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1390 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1391
1392 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1393 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1394 const_iv (WEAP_BLUD)
1395
1396 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1397 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1398 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1399 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1400 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1401 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1402 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1403 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1404 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1405 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1406 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1407 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1408 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1409 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1410 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1411 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1412 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1413 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1414 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1415 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1416 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1417 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1418 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1419 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1420 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1421 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1422
1423 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1424 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1425 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1426 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1427 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1428 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1429
1430 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1442 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1431 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1443 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1432 1444
1433 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1445 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1434
1435 const_iv (SP_RAISE_DEAD)
1436 const_iv (SP_RUNE)
1437 const_iv (SP_MAKE_MARK)
1438 const_iv (SP_BOLT)
1439 const_iv (SP_BULLET)
1440 const_iv (SP_EXPLOSION)
1441 const_iv (SP_CONE)
1442 const_iv (SP_BOMB)
1443 const_iv (SP_WONDER)
1444 const_iv (SP_SMITE)
1445 const_iv (SP_MAGIC_MISSILE)
1446 const_iv (SP_SUMMON_GOLEM)
1447 const_iv (SP_DIMENSION_DOOR)
1448 const_iv (SP_MAGIC_MAPPING)
1449 const_iv (SP_MAGIC_WALL)
1450 const_iv (SP_DESTRUCTION)
1451 const_iv (SP_PERCEIVE_SELF)
1452 const_iv (SP_WORD_OF_RECALL)
1453 const_iv (SP_INVISIBLE)
1454 const_iv (SP_PROBE)
1455 const_iv (SP_HEALING)
1456 const_iv (SP_CREATE_FOOD)
1457 const_iv (SP_EARTH_TO_DUST)
1458 const_iv (SP_CHANGE_ABILITY)
1459 const_iv (SP_BLESS)
1460 const_iv (SP_CURSE)
1461 const_iv (SP_SUMMON_MONSTER)
1462 const_iv (SP_CHARGING)
1463 const_iv (SP_POLYMORPH)
1464 const_iv (SP_ALCHEMY)
1465 const_iv (SP_REMOVE_CURSE)
1466 const_iv (SP_IDENTIFY)
1467 const_iv (SP_DETECTION)
1468 const_iv (SP_MOOD_CHANGE)
1469 const_iv (SP_MOVING_BALL)
1470 const_iv (SP_SWARM)
1471 const_iv (SP_CHANGE_MANA)
1472 const_iv (SP_DISPEL_RUNE)
1473 const_iv (SP_CREATE_MISSILE)
1474 const_iv (SP_CONSECRATE)
1475 const_iv (SP_ANIMATE_WEAPON)
1476 const_iv (SP_LIGHT)
1477 const_iv (SP_CHANGE_MAP_LIGHT)
1478 const_iv (SP_FAERY_FIRE)
1479 const_iv (SP_CAUSE_DISEASE)
1480 const_iv (SP_AURA)
1481 const_iv (SP_TOWN_PORTAL)
1482 const_iv (SP_PARTY_SPELL)
1483 1446
1484 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1447 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1485 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1448 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1486 const_iv (F_LOCKED) 1449 const_iv (F_LOCKED)
1487 1450
1488 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1489
1490 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1451 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1491 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1452 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1492 1453
1493 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1494
1495 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1496 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1497
1498 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1499 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1500
1501 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1454 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1502
1503 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1504 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1505 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1506 const_iv (M_ICE) const_iv (M_SPECIAL)
1507 1455
1508 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1456 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1509 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1457 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1510 1458
1511 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1512 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1513 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1514 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1515 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1516 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1517 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1518 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1519 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1520 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1521 const_iv (SK_POISON_NAIL)
1522
1523 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1524 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1525 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1526 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1527 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1528 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1529
1530 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1531
1532 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1533 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1534 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1535 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1536 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1537 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1538 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1539
1540 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1459 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1541 const_iv (MAP_INACTIVE) 1460 const_iv (MAP_INACTIVE)
1542 1461
1543 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1462 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1544 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1463 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1545 1464
1546 const_iv (VERSION_CS) const_iv (VERSION_SC) 1465 const_iv (VERSION_CS) const_iv (VERSION_SC)
1547 1466
1548 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1467 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1549 1468
1550 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1551
1552 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1469 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1553
1554 // random map generator
1555 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1556 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1557
1558 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1559 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1560 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1561
1562 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1563 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1564
1565 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1566 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1567
1568 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1569 const_iv (FT_RSRC) const_iv (FT_NUM)
1570 }; 1470 };
1571 1471
1572 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1472 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1573 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1473 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1574 1474
1730 } 1630 }
1731 1631
1732void server_tick () 1632void server_tick ()
1733 CODE: 1633 CODE:
1734{ 1634{
1635 ev_now_update (EV_DEFAULT);
1735 NOW = ev_now (EV_DEFAULT); 1636 NOW = ev_now (EV_DEFAULT);
1736 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1637 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1737 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1638 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1738 runtime = SvNVX (sv_runtime); 1639 runtime = SvNVX (sv_runtime);
1739 1640
1740 server_tick (); 1641 server_tick ();
1741 1642
1742 NOW = ev_time (); 1643 ev_now_update (EV_DEFAULT);
1644 NOW = ev_now (EV_DEFAULT);
1743 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1645 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1744 runtime += TICK; 1646 runtime += TICK;
1745 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1647 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1746} 1648}
1747 1649
1775NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out) 1677NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1776 CODE: 1678 CODE:
1777 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1679 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1778 OUTPUT: 1680 OUTPUT:
1779 RETVAL 1681 RETVAL
1682
1683const char *ordinal (int i)
1780 1684
1781void weaken (...) 1685void weaken (...)
1782 PROTOTYPE: @ 1686 PROTOTYPE: @
1783 CODE: 1687 CODE:
1784 while (items > 0) 1688 while (items > 0)
1987 RETVAL 1891 RETVAL
1988 1892
1989void 1893void
1990debug_trace (attachable *obj, bool on = true) 1894debug_trace (attachable *obj, bool on = true)
1991 CODE: 1895 CODE:
1992 obj->flags &= ~attachable::F_DEBUG_TRACE; 1896 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1993 if (on) 1897 if (on)
1994 obj->flags |= attachable::F_DEBUG_TRACE; 1898 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1995 1899
1996int mortals_size () 1900int mortals_size ()
1997 CODE: 1901 CODE:
1998 RETVAL = attachable::mortals.size (); 1902 RETVAL = attachable::mortals.size ();
1999 OUTPUT: RETVAL 1903 OUTPUT: RETVAL
2001#object *mortals (U32 index) 1905#object *mortals (U32 index)
2002# CODE: 1906# CODE:
2003# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1907# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2004# OUTPUT: RETVAL 1908# OUTPUT: RETVAL
2005 1909
2006INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1910INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2007 1911
2008MODULE = cf PACKAGE = cf::global 1912MODULE = cf PACKAGE = cf::global
2009 1913
2010int invoke (SV *klass, int event, ...) 1914int invoke (SV *klass, int event, ...)
2011 CODE: 1915 CODE:
2015 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1919 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2016 OUTPUT: RETVAL 1920 OUTPUT: RETVAL
2017 1921
2018MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1922MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2019 1923
2020INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1924INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2021 1925
2022int invoke (object *op, int event, ...) 1926int invoke (object *op, int event, ...)
2023 CODE: 1927 CODE:
2024 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1928 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2025 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1929 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2052int mortals_size () 1956int mortals_size ()
2053 CODE: 1957 CODE:
2054 RETVAL = attachable::mortals.size (); 1958 RETVAL = attachable::mortals.size ();
2055 OUTPUT: RETVAL 1959 OUTPUT: RETVAL
2056 1960
2057const char *slot_use_name (U32 slot) 1961const_utf8_string slot_use_name (U32 slot)
2058 ALIAS: 1962 ALIAS:
2059 slot_nonuse_name = 1 1963 slot_nonuse_name = 1
2060 CODE: 1964 CODE:
2061{ 1965{
2062 if (slot >= NUM_BODY_LOCATIONS) 1966 if (slot >= NUM_BODY_LOCATIONS)
2126 2030
2127int apply_shop_mat (object *shop_mat, object *op); 2031int apply_shop_mat (object *shop_mat, object *op);
2128 2032
2129int move (object *op, int dir, object *originator = op) 2033int move (object *op, int dir, object *originator = op)
2130 CODE: 2034 CODE:
2131 RETVAL = move_ob (op, dir, originator); 2035 RETVAL = op->move (dir, originator);
2132 OUTPUT: 2036 OUTPUT:
2133 RETVAL 2037 RETVAL
2134 2038
2135void apply (object *applier, object *applied, int flags = 0)
2136 CODE:
2137 manual_apply (applied, applier, flags);
2138
2139void apply_below (object *op) 2039void apply_below (object *op)
2140 CODE: 2040 CODE:
2141 player_apply_below (op); 2041 player_apply_below (op);
2142 2042
2143int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2043int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2044
2045int casting_level (object *caster, object *spell)
2144 2046
2145int pay_item (object *op, object *buyer) 2047int pay_item (object *op, object *buyer)
2146 CODE: 2048 CODE:
2147 RETVAL = pay_for_item (op, buyer); 2049 RETVAL = pay_for_item (op, buyer);
2148 OUTPUT: RETVAL 2050 OUTPUT: RETVAL
2191 2093
2192void player_lvl_adj (object *who, object *skill = 0) 2094void player_lvl_adj (object *who, object *skill = 0)
2193 2095
2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2096int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2195 2097
2196int calc_skill_exp (object *who, object *op, object *skill); 2098int calc_skill_exp (object *who, object *op, object *skill)
2197 2099
2198void push_button (object *op, object *originator); 2100void push_button (object *op, object *originator)
2199 2101
2200void use_trigger (object *op, object *originator); 2102void use_trigger (object *op, object *originator)
2201 2103
2202void handle_apply_yield (object *op); 2104void handle_apply_yield (object *op)
2203 2105
2204int convert_item (object *item, object *converter); 2106int convert_item (object *item, object *converter)
2205 2107
2108void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2206 2109
2207MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2110MODULE = cf PACKAGE = cf::object PREFIX = cf_
2208 2111
2209# no clean way to get an object from an archetype - stupid idiotic 2112# no clean way to get an object from an archetype - stupid idiotic
2210# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2113# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2214 CODE: 2117 CODE:
2215 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2118 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2216 OUTPUT: 2119 OUTPUT:
2217 RETVAL 2120 RETVAL
2218 2121
2122object *generate (utf8_string arch, object *creator)
2123 CODE:
2124 object *obj = get_archetype (arch);
2125 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2126 RETVAL = obj;
2127 OUTPUT:
2128 RETVAL
2129
2219object *find_object (U32 tag) 2130object *find_object (U32 tag)
2131
2132object *find_object_uuid (UUID i)
2220 2133
2221# TODO: nuke 2134# TODO: nuke
2222object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2135object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2223 PROTOTYPE: $$$$$$ 2136 PROTOTYPE: $$$$$$
2224 CODE: 2137 CODE:
2225{ 2138{
2226 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2139 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2140
2141 if (RETVAL->destroyed ())
2142 RETVAL = 0;
2227} 2143}
2228 2144
2229shstr 2145shstr
2230object::kv_get (shstr key) 2146object::kv_get (shstr key)
2231 2147
2283 RETVAL = op->contr; 2199 RETVAL = op->contr;
2284 OUTPUT: RETVAL 2200 OUTPUT: RETVAL
2285 2201
2286bool move_player (object *op, int dir) 2202bool move_player (object *op, int dir)
2287 2203
2288void check_score (object *op)
2289
2290void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2204void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2291 CODE: 2205 CODE:
2292 new_draw_info (flags, 0, op, txt); 2206 new_draw_info (flags, 0, op, txt);
2293 2207
2294void kill_player (object *op) 2208void kill_player (object *op)
2306int command_arrest (object *op, utf8_string params) 2220int command_arrest (object *op, utf8_string params)
2307 2221
2308 2222
2309MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2223MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2310 2224
2311INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2225INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2312 2226
2313int invoke (player *pl, int event, ...) 2227int invoke (player *pl, int event, ...)
2314 CODE: 2228 CODE:
2315 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2229 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2316 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2230 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2408 if (op->tag) 2322 if (op->tag)
2409 XPUSHs (sv_2mortal (to_sv (op))); 2323 XPUSHs (sv_2mortal (to_sv (op)));
2410 } 2324 }
2411} 2325}
2412 2326
2413INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2327INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2414 2328
2415void 2329void
2416adjust_daylight () 2330adjust_daylight ()
2417 CODE: 2331 CODE:
2418 maptile::adjust_daylight (); 2332 maptile::adjust_daylight ();
2464 for (int x = 0; x < THIS->width; ++x) 2378 for (int x = 0; x < THIS->width; ++x)
2465 for (int y = 0; y < THIS->height; ++y) 2379 for (int y = 0; y < THIS->height; ++y)
2466 { 2380 {
2467 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2381 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2468 if (op->flag [FLAG_IS_FLOOR]) 2382 if (op->flag [FLAG_IS_FLOOR])
2469 goto skip_space; 2383 goto skip;
2470 2384
2471 { 2385 {
2472 int offs = offset + y * stride + x; 2386 int offs = offset + y * stride + x;
2387
2473 if (IN_RANGE_EXC (offs, 0, idxlen)) 2388 if (IN_RANGE_EXC (offs, 0, idxlen))
2474 { 2389 {
2475 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2390 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2476 { 2391 {
2477 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2392 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2478 ob->flag [FLAG_NO_MAP_SAVE] = true; 2393 ob->flag [FLAG_NO_MAP_SAVE] = true;
2479 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2394 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2480 2395
2481 if (ob->randomitems) 2396 if (ob->randomitems && !ob->above)
2482 { 2397 {
2483 if (!ob->above)
2484 {
2485 ob->create_treasure (ob->randomitems); 2398 ob->create_treasure (ob->randomitems);
2486 2399
2487 for (object *op = ob->above; op; op = op->above) 2400 for (object *op = ob->above; op; op = op->above)
2488 op->flag [FLAG_NO_MAP_SAVE] = true; 2401 op->flag [FLAG_NO_MAP_SAVE] = true;
2489 } 2402 // TODO: if this is a pickable object, then the item
2490 2403 // will at a bit weird - saving inside the player
2491 ob->randomitems = 0; 2404 // will clear the flag, but when the player drops
2405 // it without logging out, it keeps the flag.
2406 // nobody ahs reported this, but this can be rather
2407 // annoying on persistent maps.
2492 } 2408 }
2493 } 2409 }
2494 } 2410 }
2495 } 2411 }
2496 2412
2497 skip_space: ; 2413 skip: ;
2498 } 2414 }
2499} 2415}
2500 2416
2501void 2417void
2502maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2418maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2512 2428
2513 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2429 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2514 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2430 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2515 2431
2516 for (int i = av_len ((AV *)palette) + 1; i--; ) 2432 for (int i = av_len ((AV *)palette) + 1; i--; )
2517 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2433 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2518 2434
2519 for (int y = 0; y < THIS->height; ++y) 2435 for (int y = 0; y < THIS->height; ++y)
2520 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2436 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2521 2437
2522 sfree (THIS->regions, THIS->size ()); 2438 sfree (THIS->regions, THIS->size ());
2655 utf8_string monsterstyle,\ 2571 utf8_string monsterstyle,\
2656 utf8_string treasurestyle,\ 2572 utf8_string treasurestyle,\
2657 utf8_string layoutstyle,\ 2573 utf8_string layoutstyle,\
2658 utf8_string doorstyle,\ 2574 utf8_string doorstyle,\
2659 utf8_string decorstyle,\ 2575 utf8_string decorstyle,\
2576 utf8_string miningstyle,\
2660 utf8_string origin_map,\ 2577 utf8_string origin_map,\
2661 utf8_string final_map,\ 2578 utf8_string final_map,\
2662 utf8_string exitstyle,\ 2579 utf8_string exitstyle,\
2663 utf8_string this_map,\ 2580 utf8_string this_map,\
2664 utf8_string exit_on_final_map,\ 2581 utf8_string exit_on_final_map,\
2696 assign (rmp.monsterstyle , monsterstyle); 2613 assign (rmp.monsterstyle , monsterstyle);
2697 assign (rmp.treasurestyle , treasurestyle); 2614 assign (rmp.treasurestyle , treasurestyle);
2698 assign (rmp.layoutstyle , layoutstyle); 2615 assign (rmp.layoutstyle , layoutstyle);
2699 assign (rmp.doorstyle , doorstyle); 2616 assign (rmp.doorstyle , doorstyle);
2700 assign (rmp.decorstyle , decorstyle); 2617 assign (rmp.decorstyle , decorstyle);
2618 assign (rmp.miningstyle , miningstyle);
2701 assign (rmp.exitstyle , exitstyle); 2619 assign (rmp.exitstyle , exitstyle);
2702 assign (rmp.exit_on_final_map, exit_on_final_map); 2620 assign (rmp.exit_on_final_map, exit_on_final_map);
2703 2621
2704 rmp.origin_map = origin_map; 2622 rmp.origin_map = origin_map;
2705 rmp.final_map = final_map; 2623 rmp.final_map = final_map;
2733 OUTPUT: 2651 OUTPUT:
2734 RETVAL 2652 RETVAL
2735 2653
2736MODULE = cf PACKAGE = cf::mapspace 2654MODULE = cf PACKAGE = cf::mapspace
2737 2655
2738INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2656INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2739 2657
2740MODULE = cf PACKAGE = cf::arch 2658MODULE = cf PACKAGE = cf::arch
2741 2659
2742int archetypes_size () 2660int archetypes_size ()
2743 CODE: 2661 CODE:
2747archetype *archetypes (U32 index) 2665archetype *archetypes (U32 index)
2748 CODE: 2666 CODE:
2749 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2667 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2750 OUTPUT: RETVAL 2668 OUTPUT: RETVAL
2751 2669
2752object *instantiate (archetype *arch)
2753 CODE:
2754 RETVAL = arch_to_object (arch);
2755 OUTPUT:
2756 RETVAL
2757
2758INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2670INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2759 2671
2760MODULE = cf PACKAGE = cf::party 2672MODULE = cf PACKAGE = cf::party
2761 2673
2762partylist *first () 2674partylist *first ()
2763 PROTOTYPE: 2675 PROTOTYPE:
2764 CODE: 2676 CODE:
2765 RETVAL = get_firstparty (); 2677 RETVAL = get_firstparty ();
2766 OUTPUT: RETVAL 2678 OUTPUT: RETVAL
2767 2679
2768INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2680INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2769 2681
2770MODULE = cf PACKAGE = cf::region 2682MODULE = cf PACKAGE = cf::region
2771 2683
2772void 2684void
2773list () 2685list ()
2786 RETVAL = 0; 2698 RETVAL = 0;
2787 while (rgn = rgn->parent) 2699 while (rgn = rgn->parent)
2788 RETVAL++; 2700 RETVAL++;
2789 OUTPUT: RETVAL 2701 OUTPUT: RETVAL
2790 2702
2791INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2703INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2792 2704
2793MODULE = cf PACKAGE = cf::living 2705MODULE = cf PACKAGE = cf::living
2794 2706
2795INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2707INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2796 2708
2797MODULE = cf PACKAGE = cf::settings 2709MODULE = cf PACKAGE = cf::settings
2798 2710
2799INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2711INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2800 2712
2801MODULE = cf PACKAGE = cf::client 2713MODULE = cf PACKAGE = cf::client
2802 2714
2803INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2715INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2804 2716
2805int invoke (client *ns, int event, ...) 2717int invoke (client *ns, int event, ...)
2806 CODE: 2718 CODE:
2807 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2719 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2808 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2720 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2874 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2786 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2875 old_sound_index [idx] = face; 2787 old_sound_index [idx] = face;
2876 2788
2877MODULE = cf PACKAGE = cf::face PREFIX = face_ 2789MODULE = cf PACKAGE = cf::face PREFIX = face_
2878 2790
2879#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2791#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2880 2792
2881faceidx face_find (utf8_string name, faceidx defidx = 0) 2793faceidx face_find (utf8_string name, faceidx defidx = 0)
2882 2794
2883faceidx alloc (utf8_string name) 2795faceidx alloc (utf8_string name)
2884 CODE: 2796 CODE:
2922 faceinfo *f = face_info (idx); assert (f); 2834 faceinfo *f = face_info (idx); assert (f);
2923 facedata *d = &(faceset ? f->data64 : f->data32); 2835 facedata *d = &(faceset ? f->data64 : f->data32);
2924 sv_to (data, d->data); 2836 sv_to (data, d->data);
2925 STRLEN clen; 2837 STRLEN clen;
2926 char *cdata = SvPVbyte (chksum, clen); 2838 char *cdata = SvPVbyte (chksum, clen);
2927 clen = min (CHKSUM_SIZE, clen); 2839 clen = min (CHKSUM_MAXLEN, clen);
2928 2840
2841 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2842
2929 if (memcmp (d->chksum, cdata, clen)) 2843 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2930 { 2844 {
2845 d->chksum_len = clen;
2931 memcpy (d->chksum, cdata, clen); 2846 memcpy (d->chksum, cdata, clen);
2932 2847
2933 // invalidate existing client face info 2848 // invalidate existing client face info
2934 for_all_clients (ns) 2849 for_all_clients (ns)
2935 if (ns->faceset == faceset) 2850 if (ns->faceset == faceset)
2950 2865
2951SV *get_chksum (faceidx idx, int faceset = 0) 2866SV *get_chksum (faceidx idx, int faceset = 0)
2952 CODE: 2867 CODE:
2953 facedata *d = face_data (idx, faceset); 2868 facedata *d = face_data (idx, faceset);
2954 if (!d) XSRETURN_UNDEF; 2869 if (!d) XSRETURN_UNDEF;
2955 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2870 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2956 OUTPUT: 2871 OUTPUT:
2957 RETVAL 2872 RETVAL
2958 2873
2959SV *get_data (faceidx idx, int faceset = 0) 2874SV *get_data (faceidx idx, int faceset = 0)
2960 CODE: 2875 CODE:
2980 ns->force_newmap = true; 2895 ns->force_newmap = true;
2981 } 2896 }
2982 2897
2983MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2898MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2984 2899
2985#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2900#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2986 2901
2987animidx anim_find (utf8_string name) 2902animidx anim_find (utf8_string name)
2988 CODE: 2903 CODE:
2989 RETVAL = animation::find (name).number; 2904 RETVAL = animation::find (name).number;
2990 OUTPUT: RETVAL 2905 OUTPUT: RETVAL
3005 } 2920 }
3006 else 2921 else
3007 anim = &animation::create (name, av_len (av) + 1, facings); 2922 anim = &animation::create (name, av_len (av) + 1, facings);
3008 2923
3009 for (int i = 0; i < anim->num_animations; ++i) 2924 for (int i = 0; i < anim->num_animations; ++i)
3010 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2925 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3011} 2926}
3012 OUTPUT: RETVAL 2927 OUTPUT: RETVAL
3013 2928
3014void invalidate_all () 2929void invalidate_all ()
3015 CODE: 2930 CODE:
3016 for_all_clients (ns) 2931 for_all_clients (ns)
3017 ns->anims_sent.reset (); 2932 ns->anims_sent.reset ();
3018 2933
3019MODULE = cf PACKAGE = cf::object::freezer 2934MODULE = cf PACKAGE = cf::object::freezer
3020 2935
3021INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2936INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3022 2937
3023SV * 2938SV *
3024new (char *klass) 2939new (char *klass)
3025 CODE: 2940 CODE:
3026 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2941 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
3033 sv_to (sv, self); 2948 sv_to (sv, self);
3034 delete self; 2949 delete self;
3035 2950
3036MODULE = cf PACKAGE = cf::object::thawer 2951MODULE = cf PACKAGE = cf::object::thawer
3037 2952
3038INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2953INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
3039 2954
3040SV * 2955SV *
3041new_from_file (char *klass, octet_string path) 2956new_from_file (char *klass, octet_string path)
3042 CODE: 2957 CODE:
3043 object_thawer *f = new object_thawer (path); 2958 object_thawer *f = new object_thawer (path);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines