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.304 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.334 by root, Sat Nov 7 21:09:58 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 6 *
8 * Deliantra is free software: you can redistribute it and/or modify 7 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 10 * option) any later version.
12 * 11 *
13 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 15 * GNU General Public License for more details.
17 * 16 *
18 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
… …
71static int tick_pending; 71static int tick_pending;
72 72
73global gbl_ev; 73global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
76 77
77bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
79 80
80static HV 81static HV
… …
88 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
92 93
94static SV
95 *cv_cf_do_invoke,
96 *cv_cf__can_merge,
97 *cv_cf_client_send_msg,
98 *cv_cf_tick,
99 *cv_cf_match_match;
100
101#ifndef newSVpv_utf8
93static inline SV * 102static inline SV *
94newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
95{ 104{
96 if (!s) 105 if (!s)
97 return newSV (0); 106 return newSV (0);
98 107
99 SV *sv = newSVpv (s, 0); 108 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 109 SvUTF8_on (sv);
101 return sv; 110 return sv;
102} 111}
112#endif
103 113
114#ifndef newSVpvn_utf8
104static inline SV * 115static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 116newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 117{
107 if (!s) 118 if (!s)
108 return newSV (0); 119 return newSV (0);
109 120
110 SV *sv = newSVpvn (s, l); 121 SV *sv = newSVpvn (s, l);
122
123 if (utf8)
111 SvUTF8_on (sv); 124 SvUTF8_on (sv);
125
112 return sv; 126 return sv;
113} 127}
128#endif
114 129
115// helper cast function, returns super class * or 0 130// helper cast function, returns super class * or 0
116template<class super> 131template<class super>
117static super * 132static super *
118is_a (attachable *at) 133is_a (attachable *at)
… …
151 SvREFCNT_inc (self); 166 SvREFCNT_inc (self);
152 hv_clear (self); 167 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 168 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 169 SvREFCNT_dec (self);
155 170
156 // self *must* be null now because thats sv_unmagic's job. 171 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 172 assert (!this->self);
158 } 173 }
159} 174}
160 175
161void 176void
… …
279 294
280 attach = src.attach; 295 attach = src.attach;
281 return *this; 296 return *this;
282} 297}
283 298
299#if 0
284template<typename T> 300template<typename T>
285static bool 301static bool
286find_backref (void *ptr, T *obj) 302find_backref (void *ptr, T *obj)
287{ 303{
288 char *s = (char *)obj; 304 char *s = (char *)obj;
… …
296 312
297 return false; 313 return false;
298} 314}
299 315
300// for debugging, find "live" objects containing this ptr 316// for debugging, find "live" objects containing this ptr
301void 317static void
302find_backref (void *ptr) 318find_backref (void *ptr)
303{ 319{
304 for_all_objects (op) 320 for_all_objects (op)
305 if (find_backref (ptr, op)) 321 if (find_backref (ptr, op))
306 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name); 322 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
… …
310 fprintf (stderr, "P %p\n", pl); 326 fprintf (stderr, "P %p\n", pl);
311 327
312 for_all_clients (ns) 328 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 329 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 330 fprintf (stderr, "C %p\n", ns);
315
316} 331}
332#endif
317 333
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 334//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 335
320static SV * 336static SV *
321newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 337newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
… …
374 390
375 return sv; 391 return sv;
376 } 392 }
377} 393}
378 394
395#if 0 // unused
379static void 396static void
380clearSVptr (SV *sv) 397clearSVptr (SV *sv)
381{ 398{
382 if (SvROK (sv)) 399 if (SvROK (sv))
383 sv = SvRV (sv); 400 sv = SvRV (sv);
384 401
385 hv_clear ((HV *)sv); 402 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 403 sv_unmagic (sv, PERL_MAGIC_ext);
387} 404}
405#endif
388 406
389static long 407static long
390SvPTR (SV *sv, const char *klass) 408SvPTR (SV *sv, const char *klass)
391{ 409{
392 if (!sv_derived_from (sv, klass)) 410 if (!sv_derived_from (sv, klass))
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 416 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 417
400 return (long)mg->mg_ptr; 418 return (long)mg->mg_ptr;
401} 419}
402 420
403static long 421static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 422SvPTR_ornull (SV *sv, const char *klass)
405{ 423{
406 if (SvOK (sv)) 424 if (SvOK (sv))
407 return SvPTR (sv, klass); 425 return SvPTR (sv, klass);
408 else 426 else
409 return 0; 427 return 0;
410} 428}
411 429
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 430static inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 431static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 432static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 433static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 434static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 435static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 436static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 437static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 438static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 439static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 440static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 441static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 442static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 443static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 444static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 445static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
428inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 446static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
429inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 447static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 448static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
431inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 449static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
432inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 450static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 451static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
434inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 452static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
435inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 453static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 454
437inline SV *to_sv (object & v) { return to_sv (&v); } 455static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 456static inline SV *to_sv (living & v) { return to_sv (&v); }
439 457
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 458static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 459static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 460
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 461static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 462
445inline SV *to_sv (dynbuf * v) 463static inline SV *to_sv (dynbuf * v)
446{ 464{
447 SV *sv = newSV (0); 465 SV *sv = newSV (0);
448 466
449 sv_upgrade (sv, SVt_PV); 467 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 468 SvGROW (sv, v->size () + 1);
… …
454 *SvEND (sv) = 0; 472 *SvEND (sv) = 0;
455 473
456 return sv; 474 return sv;
457} 475}
458 476
459inline SV *to_sv (dynbuf_text * v) 477static inline SV *to_sv (dynbuf_text * v)
460{ 478{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 479 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 480 SvUTF8_on (sv);
463 return sv; 481 return sv;
464} 482}
465 483
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 484static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 485static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 486static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 487static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 488static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 489static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 490static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 491static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 492static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 493static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 494static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
477inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 495static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
478inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 496static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 497static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 498static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
481inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 499static inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 500static inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 501static inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 502static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
485inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 503static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
486inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 504static inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 505static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 506static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
489inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 507static inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
490inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); } 508static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
491inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 509static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
492inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 510static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
493 511
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 512//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 513static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 514
497template<class T> 515template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 516static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 517
500template<int N> 518template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 519static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 520
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 521static inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
504inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 522static inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 523static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 524static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 525
508inline void sv_to (SV *sv, std::string &v) 526static inline void sv_to (SV *sv, std::string &v)
509{ 527{
510 STRLEN len; 528 STRLEN len;
511 char *data = SvPVbyte (sv, len); 529 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 530 v.assign (data, len);
513} 531}
514 532
515inline void sv_to (SV *sv, UUID &v) 533static inline void sv_to (SV *sv, UUID &v)
516{ 534{
517 if (!v.parse (SvPV_nolen (sv))) 535 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 536 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 537}
520 538
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 539static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 540
523static SV * 541static SV *
524newSVdt_va (va_list &ap, data_type type) 542newSVdt_va (va_list &ap, data_type type)
525{ 543{
526 SV *sv; 544 SV *sv;
… …
600 va_end (ap); 618 va_end (ap);
601 619
602 return sv; 620 return sv;
603} 621}
604 622
623// typemap support, mostly to avoid excessive inlining
624template<class type>
625static void noinline
626cf_obj_to (SV *arg, type &var)
627{
628 sv_to (arg, var);
629 if (!var)
630 croak ("must not pass invalid/null cf_obj here");
631}
632
633template<class object>
634static void noinline
635cf_obj_ornull_to (SV *arg, object *&var)
636{
637 if (SvOK (arg))
638 {
639 sv_to (arg, var);
640 if (!var)
641 croak ("unable to convert perl object to C++ object");
642 }
643 else
644 var = 0;
645}
646
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 647//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 648
607SV * 649static SV *
608registry (attachable *ext) 650registry (attachable *ext)
609{ 651{
610 if (!ext->cb) 652 if (!ext->cb)
611 ext->cb = newAV (); 653 ext->cb = newAV ();
612 654
… …
653 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 695 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
654 exit (EXIT_FAILURE); 696 exit (EXIT_FAILURE);
655 } 697 }
656} 698}
657 699
700void
658void cfperl_main () 701cfperl_main ()
659{ 702{
660 dSP; 703 dSP;
661 704
662 PUSHMARK (SP); 705 PUSHMARK (SP);
663 PUTBACK; 706 PUTBACK;
… …
688# undef def 731# undef def
689}; 732};
690 733
691#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 734#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
692 735
693static void 736static void noinline
694gather_callbacks (AV *&callbacks, AV *registry, event_type event) 737gather_callbacks (AV *&callbacks, AV *registry, event_type event)
695{ 738{
696 // event must be in array 739 // event must be in array
697 if (event >= 0 && event <= AvFILLp (registry)) 740 if (event >= 0 && event <= AvFILLp (registry))
698 { 741 {
… …
784{ 827{
785 attachable::gather_callbacks (callbacks, event); 828 attachable::gather_callbacks (callbacks, event);
786 ::gather_callbacks (callbacks, cb_map, event); 829 ::gather_callbacks (callbacks, cb_map, event);
787} 830}
788 831
789void 832static void noinline
790_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 833_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
791{ 834{
792 for (int event = 0; event <= AvFILLp (registry); ++event) 835 for (int event = 0; event <= AvFILLp (registry); ++event)
793 { 836 {
794 SV *cbs_ = AvARRAY (registry)[event]; 837 SV *cbs_ = AvARRAY (registry)[event];
… …
804 } 847 }
805 } 848 }
806} 849}
807 850
808// very slow and inefficient way to recalculate the global want bitsets 851// very slow and inefficient way to recalculate the global want bitsets
809void 852static void
810_recalc_want () 853_recalc_want ()
811{ 854{
812 ev_want_event.reset (); 855 ev_want_event.reset ();
813 856
814 _recalc_want (ev_want_event, cb_global); 857 _recalc_want (ev_want_event, cb_global);
… …
887 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 930 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
888 } 931 }
889 932
890 va_end (ap); 933 va_end (ap);
891 934
892 CALL_CALL ("cf::do_invoke", G_SCALAR); 935 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
893 count = count > 0 ? POPi : 0; 936 count = count > 0 ? POPi : 0;
894 937
895 CALL_END; 938 CALL_END;
896 939
897 return count; 940 return count;
898} 941}
899 942
900SV * 943static SV *
901cfperl_result (int idx) 944cfperl_result (int idx)
902{ 945{
903 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 946 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
904 if (!av) 947 if (!av)
905 return &PL_sv_undef; 948 return &PL_sv_undef;
… …
924} 967}
925 968
926///////////////////////////////////////////////////////////////////////////// 969/////////////////////////////////////////////////////////////////////////////
927// various c++ => perl glue functions 970// various c++ => perl glue functions
928 971
972void
929void cfperl_tick () 973cfperl_tick ()
930{ 974{
931 tick_pending = 1; 975 tick_pending = 1;
932 976
933 if (tick_inhibit) 977 if (tick_inhibit)
934 return; 978 return;
… …
937 981
938 dSP; 982 dSP;
939 983
940 PUSHMARK (SP); 984 PUSHMARK (SP);
941 PUTBACK; 985 PUTBACK;
942 call_pv ("cf::tick", G_DISCARD | G_VOID); 986 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
943 987
944 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 988 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
945} 989}
946 990
947void 991void
… …
977 CALL_BEGIN (4); 1021 CALL_BEGIN (4);
978 CALL_ARG (ns); 1022 CALL_ARG (ns);
979 CALL_ARG (type); 1023 CALL_ARG (type);
980 CALL_ARG_SV (newSVpv_utf8 (msg)); 1024 CALL_ARG_SV (newSVpv_utf8 (msg));
981 CALL_ARG (color); 1025 CALL_ARG (color);
982 CALL_CALL ("cf::client::send_msg", G_VOID); 1026 CALL_CALL (cv_cf_client_send_msg, G_VOID);
983 CALL_END; 1027 CALL_END;
984} 1028}
985 1029
986int 1030int
987cfperl_can_merge (object *ob1, object *ob2) 1031cfperl_can_merge (object *ob1, object *ob2)
… …
989 int can; 1033 int can;
990 1034
991 CALL_BEGIN (2); 1035 CALL_BEGIN (2);
992 CALL_ARG (ob1); 1036 CALL_ARG (ob1);
993 CALL_ARG (ob2); 1037 CALL_ARG (ob2);
994 CALL_CALL ("cf::_can_merge", G_SCALAR); 1038 CALL_CALL (cv_cf__can_merge, G_SCALAR);
995 can = count && SvTRUE (TOPs); 1039 can = count && SvTRUE (TOPs);
996 CALL_END; 1040 CALL_END;
997 1041
998 return can; 1042 return can;
1043}
1044
1045void
1046cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1047{
1048 CALL_BEGIN (4);
1049 CALL_ARG (ob);
1050 CALL_ARG (state);
1051 CALL_ARG (activator);
1052 CALL_ARG (originator);
1053 CALL_CALL ("cf::mapscript::activate", G_VOID);
1054 CALL_END;
999} 1055}
1000 1056
1001player * 1057player *
1002player::find (const char *name) 1058player::find (const char *name)
1003{ 1059{
… …
1067maptile::do_load_sync () 1123maptile::do_load_sync ()
1068{ 1124{
1069 CALL_BEGIN (1); 1125 CALL_BEGIN (1);
1070 CALL_ARG (this); 1126 CALL_ARG (this);
1071 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1127 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1072 CALL_END;
1073}
1074
1075void
1076maptile::change_all_map_light (int change)
1077{
1078 CALL_BEGIN (1);
1079 CALL_ARG (change);
1080 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1081 CALL_END; 1128 CALL_END;
1082} 1129}
1083 1130
1084void 1131void
1085object::enter_exit (object *exit) 1132object::enter_exit (object *exit)
… …
1152 CALL_CALL ("cf::_log_backtrace", G_VOID); 1199 CALL_CALL ("cf::_log_backtrace", G_VOID);
1153 CALL_END; 1200 CALL_END;
1154#endif 1201#endif
1155} 1202}
1156 1203
1204bool
1205is_match_expr (const char *expr)
1206{
1207 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1208}
1209
1210bool
1211match (const char *expr, object *ob, object *self, object *source, object *originator)
1212{
1213 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1214 expr += sizeof ("match ") - 1;
1215
1216 CALL_BEGIN (5);
1217 CALL_ARG (expr);
1218 CALL_ARG (ob);
1219 CALL_ARG (self);
1220 CALL_ARG (source);
1221 CALL_ARG (originator);
1222 CALL_CALL (cv_cf_match_match, G_SCALAR);
1223
1224 bool matched = count && SvTRUE (TOPs);
1225
1226 CALL_END;
1227
1228 return matched;
1229}
1230
1231object *
1232match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1233{
1234 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1235 expr += sizeof ("match ") - 1;
1236
1237 CALL_BEGIN (5);
1238 CALL_ARG (expr);
1239 CALL_ARG (ob);
1240 CALL_ARG (self);
1241 CALL_ARG (source);
1242 CALL_ARG (originator);
1243 CALL_CALL (cv_cf_match_match, G_ARRAY);
1244
1245 object *one = 0;
1246
1247 if (count)
1248 sv_to (TOPs, one);
1249
1250 CALL_END;
1251
1252 return one;
1253}
1254
1157///////////////////////////////////////////////////////////////////////////// 1255/////////////////////////////////////////////////////////////////////////////
1158 1256
1159struct EVAPI *evapi::GEVAPI; 1257struct EVAPI *evapi::GEVAPI;
1160struct CoroAPI *coroapi::GCoroAPI; 1258struct CoroAPI *coroapi::GCoroAPI;
1161 1259
1260void
1162void coroapi::do_cede_to_tick () 1261coroapi::do_cede_to_tick ()
1163{ 1262{
1164 cede_pending = 0; 1263 cede_pending = 0;
1165 cede (); 1264 cede ();
1166} 1265}
1167 1266
… …
1191 ev_io_set ((ev_io *)this, fd, events); 1290 ev_io_set ((ev_io *)this, fd, events);
1192 if (active) start (); 1291 if (active) start ();
1193 } 1292 }
1194} 1293}
1195 1294
1196void 1295static void
1197_connect_to_perl () 1296_connect_to_perl_1 ()
1198{ 1297{
1199 stash_cf = gv_stashpv ("cf", 1); 1298 stash_cf = gv_stashpv ("cf", 1);
1200 1299
1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1300 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1202 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1301 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1221 cb_client = get_av ("cf::CB_CLIENT", 1); 1320 cb_client = get_av ("cf::CB_CLIENT", 1);
1222 cb_type = get_av ("cf::CB_TYPE" , 1); 1321 cb_type = get_av ("cf::CB_TYPE" , 1);
1223 cb_map = get_av ("cf::CB_MAP" , 1); 1322 cb_map = get_av ("cf::CB_MAP" , 1);
1224} 1323}
1225 1324
1325static void
1326_connect_to_perl_2 ()
1327{
1328 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1329 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1330 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1331 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1332 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1333}
1334
1226MODULE = cf PACKAGE = cf PREFIX = cf_ 1335MODULE = cf PACKAGE = cf PREFIX = cf_
1227 1336
1228BOOT: 1337BOOT:
1229{ 1338{
1230 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1339 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1231 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1340 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1232 1341
1233 _connect_to_perl (); 1342 _connect_to_perl_1 ();
1234 1343
1235 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1344 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1236 1345
1237 //{ 1346 //{
1238 // require_pv ("Time::HiRes"); 1347 // require_pv ("Time::HiRes");
… …
1282 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1391 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1283 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1392 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1284 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1393 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1285 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1394 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1286 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1395 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1287 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1396 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1288 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1397 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1289 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1398 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1290 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1399 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1291 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1400 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1292 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1401 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1293 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1402 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1294 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1403 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1295 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1404 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1405 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1296 1406
1297 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1407 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1298 1408
1299 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1409 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1300 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1410 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1332 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1442 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1333 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1443 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1334 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1444 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1335 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1445 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1336 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1446 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1337 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1447 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1338 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1448 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1339 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1449 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1340 1450
1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1451 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1342 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1452 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1509 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1619 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1510 av_push (event, newSViv (eiv->klass)); 1620 av_push (event, newSViv (eiv->klass));
1511 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1621 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1512 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1622 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1513 } 1623 }
1624
1625 // used by autogenerated BOOT sections from genacc
1626 av_reflect = get_av ("cf::REFLECT", 1);
1514} 1627}
1515 1628
1516void _gv_clear (SV *gv) 1629void _gv_clear (SV *gv)
1517 CODE: 1630 CODE:
1518 assert (SvTYPE (gv) == SVt_PVGV); 1631 assert (SvTYPE (gv) == SVt_PVGV);
… …
1525 f (GvGP (gv)->gp_cv); 1638 f (GvGP (gv)->gp_cv);
1526 GvCVGEN (gv) = 0; 1639 GvCVGEN (gv) = 0;
1527 GvMULTI_off (gv); 1640 GvMULTI_off (gv);
1528# undef f 1641# undef f
1529 1642
1530void _connect_to_perl () 1643void _connect_to_perl_1 ()
1644
1645void _connect_to_perl_2 ()
1531 1646
1532void _recalc_want () 1647void _recalc_want ()
1533 1648
1534# not used by default anymore 1649# not used by default anymore
1535void _global_reattach () 1650void _global_reattach ()
… …
1592void init_experience () 1707void init_experience ()
1593 1708
1594void init_attackmess () 1709void init_attackmess ()
1595 1710
1596void init_dynamic () 1711void init_dynamic ()
1597
1598void init_block ()
1599 1712
1600void load_settings () 1713void load_settings ()
1601 1714
1602void load_materials () 1715void load_materials ()
1603 1716
… …
1788 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1901 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1789 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1902 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1790 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1903 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1791 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1904 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1792#endif 1905#endif
1793 EXTEND (SP, 2*2); 1906 EXTEND (SP, 5*2);
1794 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1907 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1795 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1908 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1796 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1909 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1910 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1911 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1797} 1912}
1798 1913
1799int find_animation (utf8_string text) 1914int find_animation (utf8_string text)
1800 PROTOTYPE: $ 1915 PROTOTYPE: $
1801 1916
… …
2053 CODE: 2168 CODE:
2054 player_apply_below (op); 2169 player_apply_below (op);
2055 2170
2056int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2171int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2057 2172
2173int casting_level (object *caster, object *spell)
2174
2058int pay_item (object *op, object *buyer) 2175int pay_item (object *op, object *buyer)
2059 CODE: 2176 CODE:
2060 RETVAL = pay_for_item (op, buyer); 2177 RETVAL = pay_for_item (op, buyer);
2061 OUTPUT: RETVAL 2178 OUTPUT: RETVAL
2062 2179
… …
2104 2221
2105void player_lvl_adj (object *who, object *skill = 0) 2222void player_lvl_adj (object *who, object *skill = 0)
2106 2223
2107int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2224int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2108 2225
2109int calc_skill_exp (object *who, object *op, object *skill); 2226int calc_skill_exp (object *who, object *op, object *skill)
2110 2227
2111void push_button (object *op); 2228void push_button (object *op, object *originator)
2112 2229
2113void use_trigger (object *op); 2230void use_trigger (object *op, object *originator)
2114 2231
2115void add_button_link (object *button, maptile *map, int connected);
2116
2117void remove_button_link (object *op);
2118
2119void handle_apply_yield (object *op); 2232void handle_apply_yield (object *op)
2233
2234int convert_item (object *item, object *converter)
2120 2235
2121 2236
2122MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2237MODULE = cf PACKAGE = cf::object PREFIX = cf_
2123 2238
2124# no clean way to get an object from an archetype - stupid idiotic 2239# no clean way to get an object from an archetype - stupid idiotic
… …
2137object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2252object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2138 PROTOTYPE: $$$$$$ 2253 PROTOTYPE: $$$$$$
2139 CODE: 2254 CODE:
2140{ 2255{
2141 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2256 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2257
2258 if (RETVAL->destroyed ())
2259 RETVAL = 0;
2142} 2260}
2143 2261
2144shstr 2262shstr
2145object::kv_get (shstr key) 2263object::kv_get (shstr key)
2146 2264
… …
2241 pl->ob->stats.hp = pl->ob->stats.maxhp; 2359 pl->ob->stats.hp = pl->ob->stats.maxhp;
2242 pl->ob->stats.sp = pl->ob->stats.maxsp; 2360 pl->ob->stats.sp = pl->ob->stats.maxsp;
2243 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2361 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2244 pl->orig_stats = pl->ob->stats; 2362 pl->orig_stats = pl->ob->stats;
2245 2363
2246void clear_los (player *pl) 2364# should only be temporary
2365void esrv_new_player (player *pl)
2247 2366
2367#d# TODO: replace by blocked_los accessor, fix code using this
2248bool 2368bool
2249cell_visible (player *pl, int dx, int dy) 2369cell_visible (player *pl, int dx, int dy)
2250 CODE: 2370 CODE:
2251 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2371 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2252 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2253 OUTPUT: 2372 OUTPUT:
2254 RETVAL 2373 RETVAL
2255 2374
2256void 2375void
2257send (player *pl, SV *packet) 2376send (player *pl, SV *packet)
… …
2325} 2444}
2326 2445
2327INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2446INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2328 2447
2329void 2448void
2449adjust_daylight ()
2450 CODE:
2451 maptile::adjust_daylight ();
2452
2453int
2454outdoor_darkness (int darkness = 0)
2455 CODE:
2456 RETVAL = maptile::outdoor_darkness;
2457 if (items)
2458 maptile::outdoor_darkness = darkness;
2459 OUTPUT:
2460 RETVAL
2461
2462void
2330maptile::instantiate () 2463maptile::instantiate ()
2331 2464
2332maptile *new () 2465maptile *new ()
2333 PROTOTYPE: 2466 PROTOTYPE:
2334 CODE: 2467 CODE:
… …
2441 } 2574 }
2442 2575
2443int out_of_map (maptile *map, int x, int y) 2576int out_of_map (maptile *map, int x, int y)
2444 2577
2445void 2578void
2446trigger (maptile *map, long connection, bool state = true) 2579find_link (maptile *map, shstr_tmp connection)
2447 CODE:
2448 activate_connection (map, connection, state);
2449
2450void
2451get_connection (maptile *map, long connection)
2452 PPCODE: 2580 PPCODE:
2453 oblinkpt *obp = get_connection_links (map, connection); 2581 if (oblinkpt *obp = map->find_link (connection))
2454 if (obp)
2455 for (objectlink *ol = obp->link; ol; ol = ol->next) 2582 for (objectlink *ol = obp->link; ol; ol = ol->next)
2456 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2583 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2457 2584
2458void 2585void
2459get_map_flags (maptile *map, int x, int y) 2586get_map_flags (maptile *map, int x, int y)
… …
2513 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2640 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2514 XPUSHs (sv_2mortal (to_sv (o))); 2641 XPUSHs (sv_2mortal (to_sv (o)));
2515} 2642}
2516 2643
2517SV * 2644SV *
2518bot_at (maptile *obj, unsigned int x, unsigned int y) 2645bot_at (maptile *map, unsigned int x, unsigned int y)
2519 PROTOTYPE: $$$ 2646 PROTOTYPE: $$$
2520 ALIAS: 2647 ALIAS:
2521 top_at = 1 2648 top_at = 1
2522 flags_at = 2 2649 flags_at = 2
2523 light_at = 3 2650 light_at = 3
2524 move_block_at = 4 2651 move_block_at = 4
2525 move_slow_at = 5 2652 move_slow_at = 5
2526 move_on_at = 6 2653 move_on_at = 6
2527 move_off_at = 7 2654 move_off_at = 7
2528 INIT:
2529 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2530 CODE: 2655 CODE:
2656{
2657 sint16 nx = x;
2658 sint16 ny = y;
2659
2660 if (!xy_normalise (map, nx, ny))
2661 XSRETURN_UNDEF;
2662
2663 mapspace &ms = map->at (nx, ny);
2664
2665 ms.update ();
2666
2531 switch (ix) 2667 switch (ix)
2532 { 2668 {
2533 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2669 case 0: RETVAL = to_sv (ms.bot ); break;
2534 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2670 case 1: RETVAL = to_sv (ms.top ); break;
2535 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2671 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2536 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2672 case 3: RETVAL = newSViv (ms.light ); break;
2537 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2673 case 4: RETVAL = newSVuv (ms.move_block); break;
2538 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2674 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2539 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2675 case 6: RETVAL = newSVuv (ms.move_on ); break;
2540 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2676 case 7: RETVAL = newSVuv (ms.move_off ); break;
2541 } 2677 }
2678}
2542 OUTPUT: RETVAL 2679 OUTPUT: RETVAL
2543
2544void fix_walls (maptile *map, int x, int y)
2545
2546void fix_walls_around (maptile *map, int x, int y)
2547 2680
2548# worst xs function of my life 2681# worst xs function of my life
2549bool 2682bool
2550_create_random_map (\ 2683_create_random_map (\
2551 maptile *self,\ 2684 maptile *self,\
… …
2679 PROTOTYPE: $ 2812 PROTOTYPE: $
2680 CODE: 2813 CODE:
2681 RETVAL = region::find (name); 2814 RETVAL = region::find (name);
2682 OUTPUT: RETVAL 2815 OUTPUT: RETVAL
2683 2816
2684region *find_fuzzy (utf8_string name)
2685 PROTOTYPE: $
2686 CODE:
2687 RETVAL = region::find_fuzzy (name);
2688 OUTPUT: RETVAL
2689
2690int specificity (region *rgn) 2817int specificity (region *rgn)
2691 CODE: 2818 CODE:
2692 RETVAL = 0; 2819 RETVAL = 0;
2693 while (rgn = rgn->parent) 2820 while (rgn = rgn->parent)
2694 RETVAL++; 2821 RETVAL++;

Diff Legend

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