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.332 by root, Fri Nov 6 13:21:20 2009 UTC vs.
Revision 1.367 by root, Mon Apr 12 05:22:38 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 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 ();
232}
233
234void
235attachable::do_delete ()
236{
237 delete this;
218} 238}
219 239
220void 240void
221attachable::check_mortals () 241attachable::check_mortals ()
222{ 242{
238 258
239 if (0) 259 if (0)
240 { 260 {
241 for (int j = 0; j < mortals.size (); ++j)//D 261 for (int j = 0; j < mortals.size (); ++j)//D
242 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
263
243 fprintf (stderr, "\n");//D 264 fprintf (stderr, "\n");//D
244 } 265 }
245 } 266 }
246 } 267 }
247 268
267 } 288 }
268 else 289 else
269 { 290 {
270 mortals.erase (i); 291 mortals.erase (i);
271 obj->sever_self (); 292 obj->sever_self ();
272 delete obj; 293 obj->do_delete ();
273 } 294 }
274 } 295 }
275} 296}
276 297
277void 298void
294 315
295 attach = src.attach; 316 attach = src.attach;
296 return *this; 317 return *this;
297} 318}
298 319
320#if 0
299template<typename T> 321template<typename T>
300static bool 322static bool
301find_backref (void *ptr, T *obj) 323find_backref (void *ptr, T *obj)
302{ 324{
303 char *s = (char *)obj; 325 char *s = (char *)obj;
311 333
312 return false; 334 return false;
313} 335}
314 336
315// for debugging, find "live" objects containing this ptr 337// for debugging, find "live" objects containing this ptr
316void 338static void
317find_backref (void *ptr) 339find_backref (void *ptr)
318{ 340{
319 for_all_objects (op) 341 for_all_objects (op)
320 if (find_backref (ptr, op)) 342 if (find_backref (ptr, op))
321 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 343 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
326 348
327 for_all_clients (ns) 349 for_all_clients (ns)
328 if (find_backref (ptr, ns)) 350 if (find_backref (ptr, ns))
329 fprintf (stderr, "C %p\n", ns); 351 fprintf (stderr, "C %p\n", ns);
330} 352}
353#endif
331 354
332////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
333 356
334static SV * 357static SV *
335newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
401 sv_unmagic (sv, PERL_MAGIC_ext); 424 sv_unmagic (sv, PERL_MAGIC_ext);
402} 425}
403#endif 426#endif
404 427
405static long 428static long
429SvPTR_nc (SV *sv)
430{
431 sv = SvRV (sv);
432
433 // very important shortcut
434 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
435 return (long)SvMAGIC (sv)->mg_ptr;
436
437 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
438 return (long)mg->mg_ptr;
439
440 croak ("perl code used object, but C object is already destroyed, caught");
441}
442
443static long
406SvPTR (SV *sv, const char *klass) 444SvPTR (SV *sv, const char *klass)
407{ 445{
408 if (!sv_derived_from (sv, klass)) 446 if (!sv_derived_from (sv, klass))
409 croak ("object of type %s expected", klass); 447 croak ("object of type %s expected", klass);
410 448
411 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 449 return SvPTR_nc (sv);
412
413 if (!mg)
414 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
415
416 return (long)mg->mg_ptr;
417} 450}
418 451
419static long noinline 452static long noinline
420SvPTR_ornull (SV *sv, const char *klass) 453SvPTR_ornull (SV *sv, const char *klass)
421{ 454{
422 if (SvOK (sv)) 455 if (expect_false (!SvOK (sv))) return 0;
456
423 return SvPTR (sv, klass); 457 return SvPTR (sv, klass);
424 else
425 return 0;
426} 458}
427 459
460static long noinline
461SvPTR_ornull_client (SV *sv)
462{
463 if (expect_false (!SvOK (sv))) return 0;
464
465 if (!SvROK (sv)
466 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
467 && !sv_derived_from (sv, "cf::client")))
468 croak ("object of type cf::client expected");
469
470 return SvPTR_nc (sv);
471}
472
473static long noinline
474SvPTR_ornull_object (SV *sv)
475{
476 if (expect_false (!SvOK (sv))) return 0;
477
478 if (!SvROK (sv)
479 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
480 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
481 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
482 && !sv_derived_from (sv, "cf::object")))
483 croak ("object of type cf::object expected");
484
485 return SvPTR_nc (sv);
486}
487
488static long noinline
489SvPTR_ornull_player (SV *sv)
490{
491 if (expect_false (!SvOK (sv))) return 0;
492
493 if (!SvROK (sv)
494 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
495 && !sv_derived_from (sv, "cf::player")))
496 croak ("object of type cf::player expected");
497
498 return SvPTR_nc (sv);
499}
500
428inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); } 501static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
429inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 502static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
430inline SV *to_sv (bool v) { return newSViv (v); } 503static inline SV *to_sv (bool v) { return newSViv (v); }
431inline SV *to_sv ( signed char v) { return newSViv (v); } 504static inline SV *to_sv ( signed char v) { return newSViv (v); }
432inline SV *to_sv (unsigned char v) { return newSViv (v); } 505static inline SV *to_sv (unsigned char v) { return newSViv (v); }
433inline SV *to_sv ( signed short v) { return newSViv (v); } 506static inline SV *to_sv ( signed short v) { return newSViv (v); }
434inline SV *to_sv (unsigned short v) { return newSVuv (v); } 507static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
435inline SV *to_sv ( signed int v) { return newSViv (v); } 508static inline SV *to_sv ( signed int v) { return newSViv (v); }
436inline SV *to_sv (unsigned int v) { return newSVuv (v); } 509static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
437inline SV *to_sv ( signed long v) { return newSViv (v); } 510static inline SV *to_sv ( signed long v) { return newSViv (v); }
438inline SV *to_sv (unsigned long v) { return newSVuv (v); } 511static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
439inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 512static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
440inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 513static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
441inline SV *to_sv (float v) { return newSVnv (v); } 514static inline SV *to_sv (float v) { return newSVnv (v); }
442inline SV *to_sv (double v) { return newSVnv (v); } 515static inline SV *to_sv (double v) { return newSVnv (v); }
443inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 516static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
444inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 517static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
445inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 518static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
446inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 519static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
447inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 520static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
448inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 521static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
449inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 522static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
450inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 523static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
451inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 524static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
452 525
453inline SV *to_sv (object & v) { return to_sv (&v); } 526static inline SV *to_sv (object & v) { return to_sv (&v); }
454inline SV *to_sv (living & v) { return to_sv (&v); } 527static inline SV *to_sv (living & v) { return to_sv (&v); }
455 528
456inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 529static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
457inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 530static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
458 531
459inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 532static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
460 533
461inline SV *to_sv (dynbuf * v) 534static inline SV *to_sv (dynbuf * v)
462{ 535{
463 SV *sv = newSV (0); 536 SV *sv = newSV (0);
464 537
465 sv_upgrade (sv, SVt_PV); 538 sv_upgrade (sv, SVt_PV);
466 SvGROW (sv, v->size () + 1); 539 SvGROW (sv, v->size () + 1);
470 *SvEND (sv) = 0; 543 *SvEND (sv) = 0;
471 544
472 return sv; 545 return sv;
473} 546}
474 547
475inline SV *to_sv (dynbuf_text * v) 548static inline SV *to_sv (dynbuf_text * v)
476{ 549{
477 SV *sv = to_sv (static_cast<dynbuf *> (v)); 550 SV *sv = to_sv (static_cast<dynbuf *> (v));
478 SvUTF8_on (sv); 551 SvUTF8_on (sv);
479 return sv; 552 return sv;
480} 553}
481 554
482inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 555static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
483inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 556static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
484inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 557static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
485inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 558static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
486inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 559static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
487inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 560static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
488inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 561static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
489inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 562static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
490inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 563static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
491inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 564static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
492inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 565static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
493inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 566static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
494inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 567static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
495inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 568static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
496inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 569static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
497inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 570static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
498inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 571static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
499inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 572static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
500inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 573static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
501inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 574static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
502inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 575static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
503inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 576static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
504inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 577static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
505inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 578static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
506inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 579static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
507inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 580static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
508inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 581static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
509 582
510//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 583//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
511inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 584static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
512 585
513template<class T> 586template<class T>
514inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 587static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
515 588
516template<int N> 589template<int N>
517inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 590static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
518 591
519inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 592static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
520inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 593static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
521inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 594static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
522inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 595static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
523 596
524inline void sv_to (SV *sv, std::string &v) 597static inline void sv_to (SV *sv, std::string &v)
525{ 598{
526 STRLEN len; 599 STRLEN len;
527 char *data = SvPVbyte (sv, len); 600 char *data = SvPVbyte (sv, len);
528 v.assign (data, len); 601 v.assign (data, len);
529} 602}
530 603
531inline void sv_to (SV *sv, UUID &v) 604static inline void sv_to (SV *sv, UUID &v)
532{ 605{
533 if (!v.parse (SvPV_nolen (sv))) 606 if (!v.parse (SvPV_nolen (sv)))
534 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 607 croak ("unparsable uuid: %s", SvPV_nolen (sv));
535} 608}
536 609
537inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 610static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
538 611
539static SV * 612static SV *
540newSVdt_va (va_list &ap, data_type type) 613newSVdt_va (va_list &ap, data_type type)
541{ 614{
542 SV *sv; 615 SV *sv;
642 var = 0; 715 var = 0;
643} 716}
644 717
645////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 718//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
646 719
647SV * 720static SV *
648registry (attachable *ext) 721registry (attachable *ext)
649{ 722{
650 if (!ext->cb) 723 if (!ext->cb)
651 ext->cb = newAV (); 724 ext->cb = newAV ();
652 725
936 CALL_END; 1009 CALL_END;
937 1010
938 return count; 1011 return count;
939} 1012}
940 1013
941SV * 1014static SV *
942cfperl_result (int idx) 1015cfperl_result (int idx)
943{ 1016{
944 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 1017 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
945 if (!av) 1018 if (!av)
946 return &PL_sv_undef; 1019 return &PL_sv_undef;
1012 CALL_CALL ("ext::books::make_book", G_VOID); 1085 CALL_CALL ("ext::books::make_book", G_VOID);
1013 CALL_END; 1086 CALL_END;
1014} 1087}
1015 1088
1016void 1089void
1017cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1090cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1018{ 1091{
1019 CALL_BEGIN (4); 1092 CALL_BEGIN (4);
1020 CALL_ARG (ns); 1093 CALL_ARG (ns);
1021 CALL_ARG (type); 1094 CALL_ARG (type);
1022 CALL_ARG_SV (newSVpv_utf8 (msg)); 1095 CALL_ARG_SV (newSVpv_utf8 (msg));
1051 CALL_CALL ("cf::mapscript::activate", G_VOID); 1124 CALL_CALL ("cf::mapscript::activate", G_VOID);
1052 CALL_END; 1125 CALL_END;
1053} 1126}
1054 1127
1055player * 1128player *
1056player::find (const char *name) 1129player::find (const_utf8_string name)
1057{ 1130{
1058 CALL_BEGIN (1); 1131 CALL_BEGIN (1);
1059 CALL_ARG (name); 1132 CALL_ARG (name);
1060 CALL_CALL ("cf::player::find", G_SCALAR); 1133 CALL_CALL ("cf::player::find", G_SCALAR);
1061 1134
1066 1139
1067 return retval; 1140 return retval;
1068} 1141}
1069 1142
1070maptile * 1143maptile *
1071find_style (const char *dirname, const char *stylename, int difficulty) 1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1072{ 1145{
1073 CALL_BEGIN (3); 1146 CALL_BEGIN (3);
1074 CALL_ARG (dirname); 1147 CALL_ARG (dirname);
1075 CALL_ARG (stylename); 1148 CALL_ARG (stylename);
1076 CALL_ARG (difficulty); 1149 CALL_ARG (difficulty);
1083 1156
1084 return retval; 1157 return retval;
1085} 1158}
1086 1159
1087maptile * 1160maptile *
1088maptile::find_sync (const char *path, maptile *origin) 1161maptile::find_sync (const_utf8_string path, maptile *origin)
1089{ 1162{
1090 CALL_BEGIN (2); 1163 CALL_BEGIN (2);
1091 CALL_ARG (path); 1164 CALL_ARG (path);
1092 CALL_ARG (origin); 1165 CALL_ARG (origin);
1093 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1166 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1099 1172
1100 return retval; 1173 return retval;
1101} 1174}
1102 1175
1103maptile * 1176maptile *
1104maptile::find_async (const char *path, maptile *origin, bool load) 1177maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1105{ 1178{
1106 CALL_BEGIN (3); 1179 CALL_BEGIN (3);
1107 CALL_ARG (path); 1180 CALL_ARG (path);
1108 CALL_ARG (origin); 1181 CALL_ARG (origin);
1109 CALL_ARG (load); 1182 CALL_ARG (load);
1138 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1211 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1139 CALL_END; 1212 CALL_END;
1140} 1213}
1141 1214
1142void 1215void
1143object::player_goto (const char *path, int x, int y) 1216object::player_goto (const_utf8_string path, int x, int y)
1144{ 1217{
1145 if (type != PLAYER) 1218 if (type != PLAYER)
1146 return; 1219 return;
1147 1220
1148 CALL_BEGIN (4); 1221 CALL_BEGIN (4);
1152 CALL_ARG (y); 1225 CALL_ARG (y);
1153 CALL_CALL ("cf::object::player::goto", G_VOID); 1226 CALL_CALL ("cf::object::player::goto", G_VOID);
1154 CALL_END; 1227 CALL_END;
1155} 1228}
1156 1229
1157const char * 1230const_utf8_string
1158object::ref () const 1231object::ref () const
1159{ 1232{
1160 if (type == PLAYER) 1233 if (type == PLAYER)
1161 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1234 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1162 else 1235 else
1236 // TODO: should be able to save references within the same map, at least
1163 return 0; 1237 return 0;
1164} 1238}
1165 1239
1166object * 1240object *
1167object::deref (const char *ref) 1241object::deref (const_utf8_string ref)
1168{ 1242{
1169 object *retval = 0; 1243 object *retval = 0;
1170 1244
1171 if (ref) 1245 if (ref)
1172 { 1246 {
1182 1256
1183 return retval; 1257 return retval;
1184} 1258}
1185 1259
1186void 1260void
1187log_backtrace (const char *msg) 1261log_backtrace (const_utf8_string msg)
1188{ 1262{
1189#if HAVE_BACKTRACE 1263#if HAVE_BACKTRACE
1190 void *addr [20]; 1264 void *addr [20];
1191 int size = backtrace (addr, 20); 1265 int size = backtrace (addr, 20);
1192 1266
1198 CALL_END; 1272 CALL_END;
1199#endif 1273#endif
1200} 1274}
1201 1275
1202bool 1276bool
1203is_match_expr (const char *expr) 1277is_match_expr (const_utf8_string expr)
1204{ 1278{
1205 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1279 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1206} 1280}
1207 1281
1208bool 1282bool
1209match (const char *expr, object *ob, object *self, object *source, object *originator) 1283match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1210{ 1284{
1211 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1285 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1212 expr += sizeof ("match ") - 1; 1286 expr += sizeof ("match ") - 1;
1213 1287
1214 CALL_BEGIN (5); 1288 CALL_BEGIN (5);
1225 1299
1226 return matched; 1300 return matched;
1227} 1301}
1228 1302
1229object * 1303object *
1230match_one (const char *expr, object *ob, object *self, object *source, object *originator) 1304match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1231{ 1305{
1232 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1306 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1233 expr += sizeof ("match ") - 1; 1307 expr += sizeof ("match ") - 1;
1234 1308
1235 CALL_BEGIN (5); 1309 CALL_BEGIN (5);
1353 static const struct { 1427 static const struct {
1354 const char *name; 1428 const char *name;
1355 IV iv; 1429 IV iv;
1356 } *civ, const_iv[] = { 1430 } *civ, const_iv[] = {
1357# define const_iv(name) { # name, (IV)name }, 1431# define const_iv(name) { # name, (IV)name },
1432# include "const_iv.h"
1433# define def(uc, lc, name, plus, change) const_iv (AT_ ## uc) const_iv (ATNR_ ## uc)
1434# include "attackinc.h"
1435# undef def
1436# define def(uc, flags) const_iv (SK_ ## uc)
1437# include "skillinc.h"
1438# undef def
1439
1358 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1440 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1359 const_iv (logBacktrace) 1441 const_iv (logBacktrace)
1360 1442
1361 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1443 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1362 1444
1363 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1445 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1364 1446
1365 const_iv (MAX_TIME) 1447 const_iv (MAX_TIME)
1366 const_iv (MAXSOCKBUF) 1448 const_iv (MAXSOCKBUF)
1367 1449
1368 const_iv (NUM_BODY_LOCATIONS)
1369 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1370 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1371 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1372 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1373 const_iv (body_wrist) const_iv (body_waist)
1374
1375 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1376 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1377 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1378 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1379 const_iv (SPECIAL_KEY) const_iv (MAP) const_iv (DOOR) const_iv (KEY)
1380 const_iv (TIMED_GATE) const_iv (TRIGGER) const_iv (GRIMREAPER) const_iv (MAGIC_EAR)
1381 const_iv (TRIGGER_BUTTON) const_iv (TRIGGER_ALTAR) const_iv (TRIGGER_PEDESTAL) const_iv (SHIELD)
1382 const_iv (HELMET) const_iv (HORN) const_iv (MONEY) const_iv (CLASS)
1383 const_iv (GRAVESTONE) const_iv (AMULET) const_iv (PLAYERMOVER) const_iv (TELEPORTER)
1384 const_iv (CREATOR) const_iv (SKILL) const_iv (EARTHWALL) const_iv (GOLEM)
1385 const_iv (THROWN_OBJ) const_iv (BLINDNESS) const_iv (GOD) const_iv (DETECTOR)
1386 const_iv (TRIGGER_MARKER) const_iv (DEAD_OBJECT) const_iv (DRINK) const_iv (MARKER)
1387 const_iv (HOLY_ALTAR) const_iv (PLAYER_CHANGER) const_iv (BATTLEGROUND) const_iv (PEACEMAKER)
1388 const_iv (GEM) const_iv (FIREWALL) const_iv (ANVIL) const_iv (CHECK_INV)
1389 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1390 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1391 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1392 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1393 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1394 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1395 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1396 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1397 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1398 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1399 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1400 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1401 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1402 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1403 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1404
1405 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1406
1407 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1408 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1409
1410 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1411 const_iv (AT_COLD) const_iv (AT_CONFUSION) const_iv (AT_ACID) const_iv (AT_DRAIN)
1412 const_iv (AT_WEAPONMAGIC) const_iv (AT_GHOSTHIT) const_iv (AT_POISON) const_iv (AT_SLOW)
1413 const_iv (AT_PARALYZE) const_iv (AT_TURN_UNDEAD) const_iv (AT_FEAR) const_iv (AT_CANCELLATION)
1414 const_iv (AT_DEPLETE) const_iv (AT_DEATH) const_iv (AT_CHAOS) const_iv (AT_COUNTERSPELL)
1415 const_iv (AT_GODPOWER) const_iv (AT_HOLYWORD) const_iv (AT_BLIND) const_iv (AT_INTERNAL)
1416 const_iv (AT_LIFE_STEALING) const_iv (AT_DISEASE)
1417
1418 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1419 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1420 const_iv (WEAP_BLUD)
1421
1422 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1423 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1424 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1425 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1426 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1427 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1428 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1429 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1430 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE)
1431 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1432 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1433 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1434 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1435 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1436 const_iv (FLAG_SLEEP) const_iv (FLAG_STAND_STILL) const_iv (FLAG_RANDOM_MOVE) const_iv (FLAG_ONLY_ATTACK)
1437 const_iv (FLAG_CONFUSED) const_iv (FLAG_STEALTH) const_iv (FLAG_WIZPASS) const_iv (FLAG_IS_LINKED)
1438 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1439 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1440 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1441 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1442 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1443 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1444 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1445 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1446 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1447 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1448
1449 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1450 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1451 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1452 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1453 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1454 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1455
1456 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1450 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1457 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1451 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1458 1452
1459 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1453 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_LEVEL)
1460
1461 const_iv (SP_RAISE_DEAD)
1462 const_iv (SP_RUNE)
1463 const_iv (SP_MAKE_MARK)
1464 const_iv (SP_BOLT)
1465 const_iv (SP_BULLET)
1466 const_iv (SP_EXPLOSION)
1467 const_iv (SP_CONE)
1468 const_iv (SP_BOMB)
1469 const_iv (SP_WONDER)
1470 const_iv (SP_SMITE)
1471 const_iv (SP_MAGIC_MISSILE)
1472 const_iv (SP_SUMMON_GOLEM)
1473 const_iv (SP_DIMENSION_DOOR)
1474 const_iv (SP_MAGIC_MAPPING)
1475 const_iv (SP_MAGIC_WALL)
1476 const_iv (SP_DESTRUCTION)
1477 const_iv (SP_PERCEIVE_SELF)
1478 const_iv (SP_WORD_OF_RECALL)
1479 const_iv (SP_INVISIBLE)
1480 const_iv (SP_PROBE)
1481 const_iv (SP_HEALING)
1482 const_iv (SP_CREATE_FOOD)
1483 const_iv (SP_EARTH_TO_DUST)
1484 const_iv (SP_CHANGE_ABILITY)
1485 const_iv (SP_BLESS)
1486 const_iv (SP_CURSE)
1487 const_iv (SP_SUMMON_MONSTER)
1488 const_iv (SP_CHARGING)
1489 const_iv (SP_POLYMORPH)
1490 const_iv (SP_ALCHEMY)
1491 const_iv (SP_REMOVE_CURSE)
1492 const_iv (SP_IDENTIFY)
1493 const_iv (SP_DETECTION)
1494 const_iv (SP_MOOD_CHANGE)
1495 const_iv (SP_MOVING_BALL)
1496 const_iv (SP_SWARM)
1497 const_iv (SP_CHANGE_MANA)
1498 const_iv (SP_DISPEL_RUNE)
1499 const_iv (SP_CREATE_MISSILE)
1500 const_iv (SP_CONSECRATE)
1501 const_iv (SP_ANIMATE_WEAPON)
1502 const_iv (SP_LIGHT)
1503 const_iv (SP_CHANGE_MAP_LIGHT)
1504 const_iv (SP_FAERY_FIRE)
1505 const_iv (SP_CAUSE_DISEASE)
1506 const_iv (SP_AURA)
1507 const_iv (SP_TOWN_PORTAL)
1508 const_iv (SP_PARTY_SPELL)
1509 1454
1510 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1455 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1511 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1456 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1512 const_iv (F_LOCKED) 1457 const_iv (F_LOCKED)
1513 1458
1514 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1515
1516 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1459 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1517 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1460 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1518 1461
1519 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1520
1521 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1522 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1523
1524 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1525 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1526
1527 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1462 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1528
1529 const_iv (M_PAPER) const_iv (M_IRON) const_iv (M_GLASS) const_iv (M_LEATHER)
1530 const_iv (M_WOOD) const_iv (M_ORGANIC) const_iv (M_STONE) const_iv (M_CLOTH)
1531 const_iv (M_ADAMANT) const_iv (M_LIQUID) const_iv (M_SOFT_METAL) const_iv (M_BONE)
1532 const_iv (M_ICE) const_iv (M_SPECIAL)
1533 1463
1534 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1464 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1535 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1465 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1536 1466
1537 const_iv (SK_LOCKPICKING) const_iv (SK_HIDING) const_iv (SK_SMITHERY) const_iv (SK_BOWYER)
1538 const_iv (SK_JEWELER) const_iv (SK_ALCHEMY) const_iv (SK_STEALING) const_iv (SK_LITERACY)
1539 const_iv (SK_BARGAINING) const_iv (SK_JUMPING) const_iv (SK_DET_MAGIC) const_iv (SK_ORATORY)
1540 const_iv (SK_SINGING) const_iv (SK_DET_CURSE) const_iv (SK_FIND_TRAPS) const_iv (SK_MEDITATION)
1541 const_iv (SK_PUNCHING) const_iv (SK_FLAME_TOUCH) const_iv (SK_KARATE) const_iv (SK_CLIMBING)
1542 const_iv (SK_WOODSMAN) const_iv (SK_INSCRIPTION) const_iv (SK_ONE_HANDED_WEAPON) const_iv (SK_MISSILE_WEAPON)
1543 const_iv (SK_THROWING) const_iv (SK_USE_MAGIC_ITEM) const_iv (SK_DISARM_TRAPS) const_iv (SK_SET_TRAP)
1544 const_iv (SK_THAUMATURGY) const_iv (SK_PRAYING) const_iv (SK_CLAWING) const_iv (SK_LEVITATION)
1545 const_iv (SK_SUMMONING) const_iv (SK_PYROMANCY) const_iv (SK_EVOCATION) const_iv (SK_SORCERY)
1546 const_iv (SK_TWO_HANDED_WEAPON) const_iv (SK_SPARK_TOUCH) const_iv (SK_SHIVER) const_iv (SK_ACID_SPLASH)
1547 const_iv (SK_POISON_NAIL)
1548
1549 const_iv (SOUND_NEW_PLAYER) const_iv (SOUND_FIRE_ARROW) const_iv (SOUND_LEARN_SPELL) const_iv (SOUND_FUMBLE_SPELL)
1550 const_iv (SOUND_WAND_POOF) const_iv (SOUND_OPEN_DOOR) const_iv (SOUND_PUSH_PLAYER) const_iv (SOUND_PLAYER_HITS1)
1551 const_iv (SOUND_PLAYER_HITS2) const_iv (SOUND_PLAYER_HITS3) const_iv (SOUND_PLAYER_HITS4) const_iv (SOUND_PLAYER_IS_HIT1)
1552 const_iv (SOUND_PLAYER_IS_HIT2) const_iv (SOUND_PLAYER_IS_HIT3) const_iv (SOUND_PLAYER_KILLS) const_iv (SOUND_PET_IS_KILLED)
1553 const_iv (SOUND_PLAYER_DIES) const_iv (SOUND_OB_EVAPORATE) const_iv (SOUND_OB_EXPLODE) const_iv (SOUND_CLOCK)
1554 const_iv (SOUND_TURN_HANDLE) const_iv (SOUND_FALL_HOLE) const_iv (SOUND_DRINK_POISON) const_iv (SOUND_CAST_SPELL_0)
1555
1556 const_iv (PREFER_LOW) const_iv (PREFER_HIGH)
1557
1558 const_iv (ATNR_PHYSICAL) const_iv (ATNR_MAGIC) const_iv (ATNR_FIRE) const_iv (ATNR_ELECTRICITY)
1559 const_iv (ATNR_COLD) const_iv (ATNR_CONFUSION) const_iv (ATNR_ACID) const_iv (ATNR_DRAIN)
1560 const_iv (ATNR_WEAPONMAGIC) const_iv (ATNR_GHOSTHIT) const_iv (ATNR_POISON) const_iv (ATNR_SLOW)
1561 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1562 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1563 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1564 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1565
1566 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1467 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1567 const_iv (MAP_INACTIVE) 1468 const_iv (MAP_INACTIVE)
1568 1469
1569 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1470 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1570 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1471 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1571 1472
1572 const_iv (VERSION_CS) const_iv (VERSION_SC)
1573
1574 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1473 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1575 1474
1576 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1577
1578 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1475 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1579
1580 // random map generator
1581 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1582 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1583
1584 const_iv (RMOPT_RANDOM) const_iv (RMOPT_CENTERED) const_iv (RMOPT_LINEAR)
1585 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1586 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1587
1588 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1589 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1590
1591 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1592 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1593
1594 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1595 const_iv (FT_RSRC) const_iv (FT_NUM)
1596 }; 1476 };
1597 1477
1598 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1478 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1599 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1479 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1600 1480
1716 CODE: 1596 CODE:
1717 UUID::init (); 1597 UUID::init ();
1718 1598
1719void init_signals () 1599void init_signals ()
1720 1600
1721void init_commands ()
1722
1723void init_skills () 1601void init_skills ()
1724 1602
1725void init_beforeplay () 1603void init_beforeplay ()
1726 1604
1727void evthread_start (int aiofd) 1605void evthread_start (int aiofd)
1756 } 1634 }
1757 1635
1758void server_tick () 1636void server_tick ()
1759 CODE: 1637 CODE:
1760{ 1638{
1639 ev_now_update (EV_DEFAULT);
1761 NOW = ev_now (EV_DEFAULT); 1640 NOW = ev_now (EV_DEFAULT);
1762 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1641 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1763 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1642 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1764 runtime = SvNVX (sv_runtime); 1643 runtime = SvNVX (sv_runtime);
1765 1644
1766 server_tick (); 1645 server_tick ();
1767 1646
1768 NOW = ev_time (); 1647 ev_now_update (EV_DEFAULT);
1648 NOW = ev_now (EV_DEFAULT);
1769 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1649 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1770 runtime += TICK; 1650 runtime += TICK;
1771 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1651 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1772} 1652}
1773 1653
1802 CODE: 1682 CODE:
1803 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1683 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1804 OUTPUT: 1684 OUTPUT:
1805 RETVAL 1685 RETVAL
1806 1686
1687const char *ordinal (int i)
1688
1807void weaken (...) 1689void weaken (...)
1808 PROTOTYPE: @ 1690 PROTOTYPE: @
1809 CODE: 1691 CODE:
1810 while (items > 0) 1692 while (items > 0)
1811 sv_rvweaken (ST (--items)); 1693 sv_rvweaken (ST (--items));
1812 1694
1813void 1695void log_suspend ()
1696
1697void log_resume ()
1698
1814log_backtrace (utf8_string msg) 1699void log_backtrace (utf8_string msg)
1815 1700
1816void
1817LOG (int flags, utf8_string msg) 1701void LOG (int flags, utf8_string msg)
1818 PROTOTYPE: $$ 1702 PROTOTYPE: $$
1819 C_ARGS: flags, "%s", msg 1703 C_ARGS: flags, "%s", msg
1820 1704
1821octet_string path_combine (octet_string base, octet_string path) 1705octet_string path_combine (octet_string base, octet_string path)
1822 PROTOTYPE: $$ 1706 PROTOTYPE: $$
2013 RETVAL 1897 RETVAL
2014 1898
2015void 1899void
2016debug_trace (attachable *obj, bool on = true) 1900debug_trace (attachable *obj, bool on = true)
2017 CODE: 1901 CODE:
2018 obj->flags &= ~attachable::F_DEBUG_TRACE; 1902 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
2019 if (on) 1903 if (on)
2020 obj->flags |= attachable::F_DEBUG_TRACE; 1904 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
2021 1905
2022int mortals_size () 1906int mortals_size ()
2023 CODE: 1907 CODE:
2024 RETVAL = attachable::mortals.size (); 1908 RETVAL = attachable::mortals.size ();
2025 OUTPUT: RETVAL 1909 OUTPUT: RETVAL
2027#object *mortals (U32 index) 1911#object *mortals (U32 index)
2028# CODE: 1912# CODE:
2029# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1913# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
2030# OUTPUT: RETVAL 1914# OUTPUT: RETVAL
2031 1915
2032INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h | 1916INCLUDE: $PERL $srcdir/genacc attachable $srcdir/../include/util.h $srcdir/../include/cfperl.h |
2033 1917
2034MODULE = cf PACKAGE = cf::global 1918MODULE = cf PACKAGE = cf::global
2035 1919
2036int invoke (SV *klass, int event, ...) 1920int invoke (SV *klass, int event, ...)
2037 CODE: 1921 CODE:
2041 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END); 1925 RETVAL = gbl_ev.invoke ((event_type)event, ARG_AV (av), DT_END);
2042 OUTPUT: RETVAL 1926 OUTPUT: RETVAL
2043 1927
2044MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1928MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
2045 1929
2046INCLUDE: $PERL $srcdir/genacc object ../include/object.h | 1930INCLUDE: $PERL $srcdir/genacc object $srcdir/../include/object.h |
2047 1931
2048int invoke (object *op, int event, ...) 1932int invoke (object *op, int event, ...)
2049 CODE: 1933 CODE:
2050 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT"); 1934 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
2051 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 1935 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2078int mortals_size () 1962int mortals_size ()
2079 CODE: 1963 CODE:
2080 RETVAL = attachable::mortals.size (); 1964 RETVAL = attachable::mortals.size ();
2081 OUTPUT: RETVAL 1965 OUTPUT: RETVAL
2082 1966
2083const char *slot_use_name (U32 slot) 1967const_utf8_string slot_use_name (U32 slot)
2084 ALIAS: 1968 ALIAS:
2085 slot_nonuse_name = 1 1969 slot_nonuse_name = 1
2086 CODE: 1970 CODE:
2087{ 1971{
2088 if (slot >= NUM_BODY_LOCATIONS) 1972 if (slot >= NUM_BODY_LOCATIONS)
2152 2036
2153int apply_shop_mat (object *shop_mat, object *op); 2037int apply_shop_mat (object *shop_mat, object *op);
2154 2038
2155int move (object *op, int dir, object *originator = op) 2039int move (object *op, int dir, object *originator = op)
2156 CODE: 2040 CODE:
2157 RETVAL = move_ob (op, dir, originator); 2041 RETVAL = op->move (dir, originator);
2158 OUTPUT: 2042 OUTPUT:
2159 RETVAL 2043 RETVAL
2160 2044
2161void apply (object *applier, object *applied, int flags = 0)
2162 CODE:
2163 manual_apply (applied, applier, flags);
2164
2165void apply_below (object *op) 2045void apply_below (object *op)
2166 CODE: 2046 CODE:
2167 player_apply_below (op); 2047 player_apply_below (op);
2168 2048
2169int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2049int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2219 2099
2220void player_lvl_adj (object *who, object *skill = 0) 2100void player_lvl_adj (object *who, object *skill = 0)
2221 2101
2222int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2102int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2223 2103
2224int calc_skill_exp (object *who, object *op, object *skill); 2104int calc_skill_exp (object *who, object *op, object *skill)
2225 2105
2226void push_button (object *op, object *originator); 2106void push_button (object *op, object *originator)
2227 2107
2228void use_trigger (object *op, object *originator); 2108void use_trigger (object *op, object *originator)
2229 2109
2230void handle_apply_yield (object *op); 2110void handle_apply_yield (object *op)
2231 2111
2232int convert_item (object *item, object *converter); 2112int convert_item (object *item, object *converter)
2233 2113
2114void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2234 2115
2235MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2116MODULE = cf PACKAGE = cf::object PREFIX = cf_
2236 2117
2237# no clean way to get an object from an archetype - stupid idiotic 2118# no clean way to get an object from an archetype - stupid idiotic
2238# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2119# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2242 CODE: 2123 CODE:
2243 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2124 RETVAL = archetype ? get_archetype (archetype) : object::create ();
2244 OUTPUT: 2125 OUTPUT:
2245 RETVAL 2126 RETVAL
2246 2127
2128object *generate (utf8_string arch, object *creator)
2129 CODE:
2130 object *obj = get_archetype (arch);
2131 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2132 RETVAL = obj;
2133 OUTPUT:
2134 RETVAL
2135
2247object *find_object (U32 tag) 2136object *find_object (U32 tag)
2137
2138object *find_object_uuid (UUID i)
2248 2139
2249# TODO: nuke 2140# TODO: nuke
2250object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2141object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2251 PROTOTYPE: $$$$$$ 2142 PROTOTYPE: $$$$$$
2252 CODE: 2143 CODE:
2275 PROTOTYPE: $$;$ 2166 PROTOTYPE: $$;$
2276 PPCODE: 2167 PPCODE:
2277{ 2168{
2278 rv_vector rv; 2169 rv_vector rv;
2279 2170
2280 PUTBACK;
2281 get_rangevector (ob, other, &rv, flags); 2171 get_rangevector (ob, other, &rv, flags);
2282 SPAGAIN;
2283 2172
2284 EXTEND (SP, 5); 2173 EXTEND (SP, 5);
2285 PUSHs (newSVuv (rv.distance)); 2174 PUSHs (sv_2mortal (newSVuv (rv.distance)));
2286 PUSHs (newSViv (rv.distance_x)); 2175 PUSHs (sv_2mortal (newSViv (rv.distance_x)));
2287 PUSHs (newSViv (rv.distance_y)); 2176 PUSHs (sv_2mortal (newSViv (rv.distance_y)));
2288 PUSHs (newSViv (rv.direction)); 2177 PUSHs (sv_2mortal (newSViv (rv.direction)));
2289 PUSHs (to_sv (rv.part)); 2178 PUSHs (sv_2mortal (to_sv (rv.part)));
2290} 2179}
2291 2180
2292bool on_same_map_as (object *ob, object *other) 2181bool on_same_map_as (object *ob, object *other)
2293 CODE: 2182 CODE:
2294 RETVAL = on_same_map (ob, other); 2183 RETVAL = on_same_map (ob, other);
2314 RETVAL = op->contr; 2203 RETVAL = op->contr;
2315 OUTPUT: RETVAL 2204 OUTPUT: RETVAL
2316 2205
2317bool move_player (object *op, int dir) 2206bool move_player (object *op, int dir)
2318 2207
2319void check_score (object *op)
2320
2321void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2208void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2322 CODE: 2209 CODE:
2323 new_draw_info (flags, 0, op, txt); 2210 new_draw_info (flags, 0, op, txt);
2324 2211
2325void kill_player (object *op) 2212void kill_player (object *op)
2337int command_arrest (object *op, utf8_string params) 2224int command_arrest (object *op, utf8_string params)
2338 2225
2339 2226
2340MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 2227MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
2341 2228
2342INCLUDE: $PERL $srcdir/genacc player ../include/player.h | 2229INCLUDE: $PERL $srcdir/genacc player $srcdir/../include/player.h |
2343 2230
2344int invoke (player *pl, int event, ...) 2231int invoke (player *pl, int event, ...)
2345 CODE: 2232 CODE:
2346 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER"); 2233 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
2347 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2234 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2439 if (op->tag) 2326 if (op->tag)
2440 XPUSHs (sv_2mortal (to_sv (op))); 2327 XPUSHs (sv_2mortal (to_sv (op)));
2441 } 2328 }
2442} 2329}
2443 2330
2444INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2331INCLUDE: $PERL $srcdir/genacc maptile $srcdir/../include/map.h |
2445 2332
2446void 2333void
2447adjust_daylight () 2334adjust_daylight ()
2448 CODE: 2335 CODE:
2449 maptile::adjust_daylight (); 2336 maptile::adjust_daylight ();
2495 for (int x = 0; x < THIS->width; ++x) 2382 for (int x = 0; x < THIS->width; ++x)
2496 for (int y = 0; y < THIS->height; ++y) 2383 for (int y = 0; y < THIS->height; ++y)
2497 { 2384 {
2498 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2385 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2499 if (op->flag [FLAG_IS_FLOOR]) 2386 if (op->flag [FLAG_IS_FLOOR])
2500 goto skip_space; 2387 goto skip;
2501 2388
2502 { 2389 {
2503 int offs = offset + y * stride + x; 2390 int offs = offset + y * stride + x;
2391
2504 if (IN_RANGE_EXC (offs, 0, idxlen)) 2392 if (IN_RANGE_EXC (offs, 0, idxlen))
2505 { 2393 {
2506 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2394 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2507 { 2395 {
2508 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2396 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2509 ob->flag [FLAG_NO_MAP_SAVE] = true; 2397 ob->flag [FLAG_NO_MAP_SAVE] = true;
2510 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2398 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2511 2399
2512 if (ob->randomitems) 2400 if (ob->randomitems && !ob->above)
2513 { 2401 {
2514 if (!ob->above)
2515 {
2516 ob->create_treasure (ob->randomitems); 2402 ob->create_treasure (ob->randomitems);
2517 2403
2518 for (object *op = ob->above; op; op = op->above) 2404 for (object *op = ob->above; op; op = op->above)
2519 op->flag [FLAG_NO_MAP_SAVE] = true; 2405 op->flag [FLAG_NO_MAP_SAVE] = true;
2520 } 2406 // TODO: if this is a pickable object, then the item
2521 2407 // will at a bit weird - saving inside the player
2522 ob->randomitems = 0; 2408 // will clear the flag, but when the player drops
2409 // it without logging out, it keeps the flag.
2410 // nobody ahs reported this, but this can be rather
2411 // annoying on persistent maps.
2523 } 2412 }
2524 } 2413 }
2525 } 2414 }
2526 } 2415 }
2527 2416
2528 skip_space: ; 2417 skip: ;
2529 } 2418 }
2530} 2419}
2531 2420
2532void 2421void
2533maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2422maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2543 2432
2544 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2433 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2545 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2434 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2546 2435
2547 for (int i = av_len ((AV *)palette) + 1; i--; ) 2436 for (int i = av_len ((AV *)palette) + 1; i--; )
2548 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2437 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2549 2438
2550 for (int y = 0; y < THIS->height; ++y) 2439 for (int y = 0; y < THIS->height; ++y)
2551 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2440 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2552 2441
2553 sfree (THIS->regions, THIS->size ()); 2442 sfree (THIS->regions, THIS->size ());
2686 utf8_string monsterstyle,\ 2575 utf8_string monsterstyle,\
2687 utf8_string treasurestyle,\ 2576 utf8_string treasurestyle,\
2688 utf8_string layoutstyle,\ 2577 utf8_string layoutstyle,\
2689 utf8_string doorstyle,\ 2578 utf8_string doorstyle,\
2690 utf8_string decorstyle,\ 2579 utf8_string decorstyle,\
2580 utf8_string miningstyle,\
2691 utf8_string origin_map,\ 2581 utf8_string origin_map,\
2692 utf8_string final_map,\ 2582 utf8_string final_map,\
2693 utf8_string exitstyle,\ 2583 utf8_string exitstyle,\
2694 utf8_string this_map,\ 2584 utf8_string this_map,\
2695 utf8_string exit_on_final_map,\ 2585 utf8_string exit_on_final_map,\
2727 assign (rmp.monsterstyle , monsterstyle); 2617 assign (rmp.monsterstyle , monsterstyle);
2728 assign (rmp.treasurestyle , treasurestyle); 2618 assign (rmp.treasurestyle , treasurestyle);
2729 assign (rmp.layoutstyle , layoutstyle); 2619 assign (rmp.layoutstyle , layoutstyle);
2730 assign (rmp.doorstyle , doorstyle); 2620 assign (rmp.doorstyle , doorstyle);
2731 assign (rmp.decorstyle , decorstyle); 2621 assign (rmp.decorstyle , decorstyle);
2622 assign (rmp.miningstyle , miningstyle);
2732 assign (rmp.exitstyle , exitstyle); 2623 assign (rmp.exitstyle , exitstyle);
2733 assign (rmp.exit_on_final_map, exit_on_final_map); 2624 assign (rmp.exit_on_final_map, exit_on_final_map);
2734 2625
2735 rmp.origin_map = origin_map; 2626 rmp.origin_map = origin_map;
2736 rmp.final_map = final_map; 2627 rmp.final_map = final_map;
2764 OUTPUT: 2655 OUTPUT:
2765 RETVAL 2656 RETVAL
2766 2657
2767MODULE = cf PACKAGE = cf::mapspace 2658MODULE = cf PACKAGE = cf::mapspace
2768 2659
2769INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h | 2660INCLUDE: $PERL $srcdir/genacc mapspace $srcdir/../include/map.h |
2770 2661
2771MODULE = cf PACKAGE = cf::arch 2662MODULE = cf PACKAGE = cf::arch
2772 2663
2773int archetypes_size () 2664int archetypes_size ()
2774 CODE: 2665 CODE:
2778archetype *archetypes (U32 index) 2669archetype *archetypes (U32 index)
2779 CODE: 2670 CODE:
2780 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2671 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2781 OUTPUT: RETVAL 2672 OUTPUT: RETVAL
2782 2673
2783object *instantiate (archetype *arch)
2784 CODE:
2785 RETVAL = arch_to_object (arch);
2786 OUTPUT:
2787 RETVAL
2788
2789INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2674INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2790 2675
2791MODULE = cf PACKAGE = cf::party 2676MODULE = cf PACKAGE = cf::party
2792 2677
2793partylist *first () 2678partylist *first ()
2794 PROTOTYPE: 2679 PROTOTYPE:
2795 CODE: 2680 CODE:
2796 RETVAL = get_firstparty (); 2681 RETVAL = get_firstparty ();
2797 OUTPUT: RETVAL 2682 OUTPUT: RETVAL
2798 2683
2799INCLUDE: $PERL $srcdir/genacc partylist ../include/player.h | 2684INCLUDE: $PERL $srcdir/genacc partylist $srcdir/../include/player.h |
2800 2685
2801MODULE = cf PACKAGE = cf::region 2686MODULE = cf PACKAGE = cf::region
2802 2687
2803void 2688void
2804list () 2689list ()
2817 RETVAL = 0; 2702 RETVAL = 0;
2818 while (rgn = rgn->parent) 2703 while (rgn = rgn->parent)
2819 RETVAL++; 2704 RETVAL++;
2820 OUTPUT: RETVAL 2705 OUTPUT: RETVAL
2821 2706
2822INCLUDE: $PERL $srcdir/genacc region ../include/region.h | 2707INCLUDE: $PERL $srcdir/genacc region $srcdir/../include/region.h |
2823 2708
2824MODULE = cf PACKAGE = cf::living 2709MODULE = cf PACKAGE = cf::living
2825 2710
2826INCLUDE: $PERL $srcdir/genacc living ../include/living.h | 2711INCLUDE: $PERL $srcdir/genacc living $srcdir/../include/living.h |
2827 2712
2828MODULE = cf PACKAGE = cf::settings 2713MODULE = cf PACKAGE = cf::settings
2829 2714
2830INCLUDE: $PERL $srcdir/genacc Settings ../include/global.h | 2715INCLUDE: $PERL $srcdir/genacc Settings $srcdir/../include/global.h |
2831 2716
2832MODULE = cf PACKAGE = cf::client 2717MODULE = cf PACKAGE = cf::client
2833 2718
2834INCLUDE: $PERL $srcdir/genacc client ../include/client.h | 2719INCLUDE: $PERL $srcdir/genacc client $srcdir/../include/client.h |
2835 2720
2836int invoke (client *ns, int event, ...) 2721int invoke (client *ns, int event, ...)
2837 CODE: 2722 CODE:
2838 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT"); 2723 if (KLASS_OF (event) != KLASS_CLIENT) croak ("event class must be CLIENT");
2839 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 2724 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
2905 extern faceidx old_sound_index [SOUND_CAST_SPELL_0]; 2790 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2906 old_sound_index [idx] = face; 2791 old_sound_index [idx] = face;
2907 2792
2908MODULE = cf PACKAGE = cf::face PREFIX = face_ 2793MODULE = cf PACKAGE = cf::face PREFIX = face_
2909 2794
2910#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2795#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/face.h |
2911 2796
2912faceidx face_find (utf8_string name, faceidx defidx = 0) 2797faceidx face_find (utf8_string name, faceidx defidx = 0)
2913 2798
2914faceidx alloc (utf8_string name) 2799faceidx alloc (utf8_string name)
2915 CODE: 2800 CODE:
2953 faceinfo *f = face_info (idx); assert (f); 2838 faceinfo *f = face_info (idx); assert (f);
2954 facedata *d = &(faceset ? f->data64 : f->data32); 2839 facedata *d = &(faceset ? f->data64 : f->data32);
2955 sv_to (data, d->data); 2840 sv_to (data, d->data);
2956 STRLEN clen; 2841 STRLEN clen;
2957 char *cdata = SvPVbyte (chksum, clen); 2842 char *cdata = SvPVbyte (chksum, clen);
2958 clen = min (CHKSUM_SIZE, clen); 2843 clen = min (CHKSUM_MAXLEN, clen);
2959 2844
2845 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2846
2960 if (memcmp (d->chksum, cdata, clen)) 2847 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2961 { 2848 {
2849 d->chksum_len = clen;
2962 memcpy (d->chksum, cdata, clen); 2850 memcpy (d->chksum, cdata, clen);
2963 2851
2964 // invalidate existing client face info 2852 // invalidate existing client face info
2965 for_all_clients (ns) 2853 for_all_clients (ns)
2966 if (ns->faceset == faceset) 2854 if (ns->faceset == faceset)
2981 2869
2982SV *get_chksum (faceidx idx, int faceset = 0) 2870SV *get_chksum (faceidx idx, int faceset = 0)
2983 CODE: 2871 CODE:
2984 facedata *d = face_data (idx, faceset); 2872 facedata *d = face_data (idx, faceset);
2985 if (!d) XSRETURN_UNDEF; 2873 if (!d) XSRETURN_UNDEF;
2986 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2874 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2987 OUTPUT: 2875 OUTPUT:
2988 RETVAL 2876 RETVAL
2989 2877
2990SV *get_data (faceidx idx, int faceset = 0) 2878SV *get_data (faceidx idx, int faceset = 0)
2991 CODE: 2879 CODE:
3011 ns->force_newmap = true; 2899 ns->force_newmap = true;
3012 } 2900 }
3013 2901
3014MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2902MODULE = cf PACKAGE = cf::anim PREFIX = anim_
3015 2903
3016#INCLUDE: $PERL $srcdir/genacc faceset ../include/anim.h | 2904#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
3017 2905
3018animidx anim_find (utf8_string name) 2906animidx anim_find (utf8_string name)
3019 CODE: 2907 CODE:
3020 RETVAL = animation::find (name).number; 2908 RETVAL = animation::find (name).number;
3021 OUTPUT: RETVAL 2909 OUTPUT: RETVAL
3036 } 2924 }
3037 else 2925 else
3038 anim = &animation::create (name, av_len (av) + 1, facings); 2926 anim = &animation::create (name, av_len (av) + 1, facings);
3039 2927
3040 for (int i = 0; i < anim->num_animations; ++i) 2928 for (int i = 0; i < anim->num_animations; ++i)
3041 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 2929 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3042} 2930}
3043 OUTPUT: RETVAL 2931 OUTPUT: RETVAL
3044 2932
3045void invalidate_all () 2933void invalidate_all ()
3046 CODE: 2934 CODE:
3047 for_all_clients (ns) 2935 for_all_clients (ns)
3048 ns->anims_sent.reset (); 2936 ns->anims_sent.reset ();
3049 2937
3050MODULE = cf PACKAGE = cf::object::freezer 2938MODULE = cf PACKAGE = cf::object::freezer
3051 2939
3052INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h | 2940INCLUDE: $PERL $srcdir/genacc object_freezer $srcdir/../include/cfperl.h |
3053 2941
3054SV * 2942SV *
3055new (char *klass) 2943new (char *klass)
3056 CODE: 2944 CODE:
3057 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1)); 2945 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
3064 sv_to (sv, self); 2952 sv_to (sv, self);
3065 delete self; 2953 delete self;
3066 2954
3067MODULE = cf PACKAGE = cf::object::thawer 2955MODULE = cf PACKAGE = cf::object::thawer
3068 2956
3069INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h | 2957INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h |
3070 2958
3071SV * 2959SV *
3072new_from_file (char *klass, octet_string path) 2960new_from_file (char *klass, octet_string path)
3073 CODE: 2961 CODE:
3074 object_thawer *f = new object_thawer (path); 2962 object_thawer *f = new object_thawer (path);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines