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.303 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.339 by root, Thu Nov 26 08:08:40 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
… …
195attachable::destroy () 210attachable::destroy ()
196{ 211{
197 if (destroyed ()) 212 if (destroyed ())
198 return; 213 return;
199 214
200 flags |= F_DESTROYED; 215 attachable_flags |= F_DESTROYED;
201 do_destroy (); 216 do_destroy ();
202 sever_self (); 217 sever_self ();
203} 218}
204 219
205void 220void
… …
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
406
407static long SvPTR_nc (SV *sv)
408{
409 sv = SvRV (sv);
410
411 // very important shortcut
412 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
413 return (long)SvMAGIC (sv)->mg_ptr;
414
415 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
416 return (long)mg->mg_ptr;
417
418 croak ("perl code used object, but C object is already destroyed, caught");
419}
388 420
389static long 421static long
390SvPTR (SV *sv, const char *klass) 422SvPTR (SV *sv, const char *klass)
391{ 423{
392 if (!sv_derived_from (sv, klass)) 424 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 425 croak ("object of type %s expected", klass);
394 426
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 427 return SvPTR_nc (sv);
396
397 if (!mg)
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399
400 return (long)mg->mg_ptr;
401} 428}
402 429
403static long 430static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 431SvPTR_ornull (SV *sv, const char *klass)
405{ 432{
406 if (SvOK (sv)) 433 if (expect_false (!SvOK (sv))) return 0;
434
407 return SvPTR (sv, klass); 435 return SvPTR (sv, klass);
408 else
409 return 0;
410} 436}
411 437
438static long noinline
439SvPTR_ornull_client (SV *sv)
440{
441 if (expect_false (!SvOK (sv))) return 0;
442
443 if (!SvROK (sv)
444 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
445 && !sv_derived_from (sv, "cf::client")))
446 croak ("object of type cf::client expected");
447
448 return SvPTR_nc (sv);
449}
450
451static long noinline
452SvPTR_ornull_object (SV *sv)
453{
454 if (expect_false (!SvOK (sv))) return 0;
455
456 if (!SvROK (sv)
457 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
458 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
459 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
460 && !sv_derived_from (sv, "cf::object")))
461 croak ("object of type cf::object expected");
462
463 return SvPTR_nc (sv);
464}
465
466static long noinline
467SvPTR_ornull_player (SV *sv)
468{
469 if (expect_false (!SvOK (sv))) return 0;
470
471 if (!SvROK (sv)
472 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
473 && !sv_derived_from (sv, "cf::player")))
474 croak ("object of type cf::player expected");
475
476 return SvPTR_nc (sv);
477}
478
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 479static 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); } 480static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 481static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 482static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 483static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 484static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 485static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 486static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 487static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 488static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 489static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 490static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 491static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 492static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 493static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 494static 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); } 495static 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); } 496static 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); } 497static 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); } 498static 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); } 499static 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); } 500static 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); } 501static 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); } 502static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 503
437inline SV *to_sv (object & v) { return to_sv (&v); } 504static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 505static inline SV *to_sv (living & v) { return to_sv (&v); }
439 506
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 507static 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); } 508static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 509
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 510static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 511
445inline SV *to_sv (dynbuf * v) 512static inline SV *to_sv (dynbuf * v)
446{ 513{
447 SV *sv = newSV (0); 514 SV *sv = newSV (0);
448 515
449 sv_upgrade (sv, SVt_PV); 516 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 517 SvGROW (sv, v->size () + 1);
… …
454 *SvEND (sv) = 0; 521 *SvEND (sv) = 0;
455 522
456 return sv; 523 return sv;
457} 524}
458 525
459inline SV *to_sv (dynbuf_text * v) 526static inline SV *to_sv (dynbuf_text * v)
460{ 527{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 528 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 529 SvUTF8_on (sv);
463 return sv; 530 return sv;
464} 531}
465 532
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 533static 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; } 534static 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); } 535static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 536static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 537static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 538static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 539static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 540static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 541static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 542static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 543static 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); } 544static 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); } 545static 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); } 546static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 547static 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"); } 548static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 549static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 550static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 551static 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"); } 552static 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"); } 553static 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"); } 554static 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"); } 555static 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"); } 556static 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"); } 557static 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"); } 558static 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" ); } 559static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
493 560
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 561//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)); } 562static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 563
497template<class T> 564template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 565static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 566
500template<int N> 567template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 568static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 569
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 570static 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); } 571static 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); } 572static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 573static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 574
508inline void sv_to (SV *sv, std::string &v) 575static inline void sv_to (SV *sv, std::string &v)
509{ 576{
510 STRLEN len; 577 STRLEN len;
511 char *data = SvPVbyte (sv, len); 578 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 579 v.assign (data, len);
513} 580}
514 581
515inline void sv_to (SV *sv, UUID &v) 582static inline void sv_to (SV *sv, UUID &v)
516{ 583{
517 if (!v.parse (SvPV_nolen (sv))) 584 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 585 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 586}
520 587
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 588static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 589
523static SV * 590static SV *
524newSVdt_va (va_list &ap, data_type type) 591newSVdt_va (va_list &ap, data_type type)
525{ 592{
526 SV *sv; 593 SV *sv;
… …
600 va_end (ap); 667 va_end (ap);
601 668
602 return sv; 669 return sv;
603} 670}
604 671
672// typemap support, mostly to avoid excessive inlining
673template<class type>
674static void noinline
675cf_obj_to (SV *arg, type &var)
676{
677 sv_to (arg, var);
678 if (!var)
679 croak ("must not pass invalid/null cf_obj here");
680}
681
682template<class object>
683static void noinline
684cf_obj_ornull_to (SV *arg, object *&var)
685{
686 if (SvOK (arg))
687 {
688 sv_to (arg, var);
689 if (!var)
690 croak ("unable to convert perl object to C++ object");
691 }
692 else
693 var = 0;
694}
695
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 696//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 697
607SV * 698static SV *
608registry (attachable *ext) 699registry (attachable *ext)
609{ 700{
610 if (!ext->cb) 701 if (!ext->cb)
611 ext->cb = newAV (); 702 ext->cb = newAV ();
612 703
… …
626 717
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 718 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 719
629 const char *argv[] = { 720 const char *argv[] = {
630 settings.argv [0], 721 settings.argv [0],
631 "-e" 722 "-e0"
632 "use EV ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 723 };
638 724
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 725 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 726 || perl_run (perl))
641 { 727 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 728 printf ("unable to initialize perl-interpreter, aborting.\n");
643 exit (EXIT_FAILURE); 729 exit (EXIT_FAILURE);
644 } 730 }
645}
646 731
732 eval_pv (
733 "#line 1 'cfperl init'\n"
734 "use EV ();\n"
735 "use Coro ();\n"
736 "cf->bootstrap;\n"
737 "unshift @INC, cf::datadir ();\n"
738 "require cf;\n",
739 0
740 );
741
742 if (SvTRUE (ERRSV))
743 {
744 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
745 exit (EXIT_FAILURE);
746 }
747}
748
749void
647void cfperl_main () 750cfperl_main ()
648{ 751{
649 dSP; 752 dSP;
650 753
651 PUSHMARK (SP); 754 PUSHMARK (SP);
652 PUTBACK; 755 PUTBACK;
… …
677# undef def 780# undef def
678}; 781};
679 782
680#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 783#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
681 784
682static void 785static void noinline
683gather_callbacks (AV *&callbacks, AV *registry, event_type event) 786gather_callbacks (AV *&callbacks, AV *registry, event_type event)
684{ 787{
685 // event must be in array 788 // event must be in array
686 if (event >= 0 && event <= AvFILLp (registry)) 789 if (event >= 0 && event <= AvFILLp (registry))
687 { 790 {
… …
773{ 876{
774 attachable::gather_callbacks (callbacks, event); 877 attachable::gather_callbacks (callbacks, event);
775 ::gather_callbacks (callbacks, cb_map, event); 878 ::gather_callbacks (callbacks, cb_map, event);
776} 879}
777 880
778void 881static void noinline
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 882_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{ 883{
781 for (int event = 0; event <= AvFILLp (registry); ++event) 884 for (int event = 0; event <= AvFILLp (registry); ++event)
782 { 885 {
783 SV *cbs_ = AvARRAY (registry)[event]; 886 SV *cbs_ = AvARRAY (registry)[event];
… …
793 } 896 }
794 } 897 }
795} 898}
796 899
797// very slow and inefficient way to recalculate the global want bitsets 900// very slow and inefficient way to recalculate the global want bitsets
798void 901static void
799_recalc_want () 902_recalc_want ()
800{ 903{
801 ev_want_event.reset (); 904 ev_want_event.reset ();
802 905
803 _recalc_want (ev_want_event, cb_global); 906 _recalc_want (ev_want_event, cb_global);
… …
876 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 979 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
877 } 980 }
878 981
879 va_end (ap); 982 va_end (ap);
880 983
881 CALL_CALL ("cf::do_invoke", G_SCALAR); 984 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
882 count = count > 0 ? POPi : 0; 985 count = count > 0 ? POPi : 0;
883 986
884 CALL_END; 987 CALL_END;
885 988
886 return count; 989 return count;
887} 990}
888 991
889SV * 992static SV *
890cfperl_result (int idx) 993cfperl_result (int idx)
891{ 994{
892 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 995 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
893 if (!av) 996 if (!av)
894 return &PL_sv_undef; 997 return &PL_sv_undef;
… …
913} 1016}
914 1017
915///////////////////////////////////////////////////////////////////////////// 1018/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions 1019// various c++ => perl glue functions
917 1020
1021void
918void cfperl_tick () 1022cfperl_tick ()
919{ 1023{
920 tick_pending = 1; 1024 tick_pending = 1;
921 1025
922 if (tick_inhibit) 1026 if (tick_inhibit)
923 return; 1027 return;
… …
926 1030
927 dSP; 1031 dSP;
928 1032
929 PUSHMARK (SP); 1033 PUSHMARK (SP);
930 PUTBACK; 1034 PUTBACK;
931 call_pv ("cf::tick", G_DISCARD | G_VOID); 1035 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
932 1036
933 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1037 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
934} 1038}
935 1039
936void 1040void
… …
966 CALL_BEGIN (4); 1070 CALL_BEGIN (4);
967 CALL_ARG (ns); 1071 CALL_ARG (ns);
968 CALL_ARG (type); 1072 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg)); 1073 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color); 1074 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID); 1075 CALL_CALL (cv_cf_client_send_msg, G_VOID);
972 CALL_END; 1076 CALL_END;
973} 1077}
974 1078
975int 1079int
976cfperl_can_merge (object *ob1, object *ob2) 1080cfperl_can_merge (object *ob1, object *ob2)
… …
978 int can; 1082 int can;
979 1083
980 CALL_BEGIN (2); 1084 CALL_BEGIN (2);
981 CALL_ARG (ob1); 1085 CALL_ARG (ob1);
982 CALL_ARG (ob2); 1086 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR); 1087 CALL_CALL (cv_cf__can_merge, G_SCALAR);
984 can = count && SvTRUE (TOPs); 1088 can = count && SvTRUE (TOPs);
985 CALL_END; 1089 CALL_END;
986 1090
987 return can; 1091 return can;
1092}
1093
1094void
1095cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1096{
1097 CALL_BEGIN (4);
1098 CALL_ARG (ob);
1099 CALL_ARG (state);
1100 CALL_ARG (activator);
1101 CALL_ARG (originator);
1102 CALL_CALL ("cf::mapscript::activate", G_VOID);
1103 CALL_END;
988} 1104}
989 1105
990player * 1106player *
991player::find (const char *name) 1107player::find (const char *name)
992{ 1108{
… …
1056maptile::do_load_sync () 1172maptile::do_load_sync ()
1057{ 1173{
1058 CALL_BEGIN (1); 1174 CALL_BEGIN (1);
1059 CALL_ARG (this); 1175 CALL_ARG (this);
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1176 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1061 CALL_END;
1062}
1063
1064void
1065maptile::change_all_map_light (int change)
1066{
1067 CALL_BEGIN (1);
1068 CALL_ARG (change);
1069 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1070 CALL_END; 1177 CALL_END;
1071} 1178}
1072 1179
1073void 1180void
1074object::enter_exit (object *exit) 1181object::enter_exit (object *exit)
… …
1141 CALL_CALL ("cf::_log_backtrace", G_VOID); 1248 CALL_CALL ("cf::_log_backtrace", G_VOID);
1142 CALL_END; 1249 CALL_END;
1143#endif 1250#endif
1144} 1251}
1145 1252
1253bool
1254is_match_expr (const char *expr)
1255{
1256 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1257}
1258
1259bool
1260match (const char *expr, object *ob, object *self, object *source, object *originator)
1261{
1262 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1263 expr += sizeof ("match ") - 1;
1264
1265 CALL_BEGIN (5);
1266 CALL_ARG (expr);
1267 CALL_ARG (ob);
1268 CALL_ARG (self);
1269 CALL_ARG (source);
1270 CALL_ARG (originator);
1271 CALL_CALL (cv_cf_match_match, G_SCALAR);
1272
1273 bool matched = count && SvTRUE (TOPs);
1274
1275 CALL_END;
1276
1277 return matched;
1278}
1279
1280object *
1281match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1282{
1283 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1284 expr += sizeof ("match ") - 1;
1285
1286 CALL_BEGIN (5);
1287 CALL_ARG (expr);
1288 CALL_ARG (ob);
1289 CALL_ARG (self);
1290 CALL_ARG (source);
1291 CALL_ARG (originator);
1292 CALL_CALL (cv_cf_match_match, G_ARRAY);
1293
1294 object *one = 0;
1295
1296 if (count)
1297 sv_to (TOPs, one);
1298
1299 CALL_END;
1300
1301 return one;
1302}
1303
1146///////////////////////////////////////////////////////////////////////////// 1304/////////////////////////////////////////////////////////////////////////////
1147 1305
1148struct EVAPI *evapi::GEVAPI; 1306struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1307struct CoroAPI *coroapi::GCoroAPI;
1150 1308
1309void
1151void coroapi::do_cede_to_tick () 1310coroapi::do_cede_to_tick ()
1152{ 1311{
1153 cede_pending = 0; 1312 cede_pending = 0;
1154 cede (); 1313 cede ();
1155} 1314}
1156 1315
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1339 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1340 if (active) start ();
1182 } 1341 }
1183} 1342}
1184 1343
1185void 1344static void
1186_connect_to_perl () 1345_connect_to_perl_1 ()
1187{ 1346{
1188 stash_cf = gv_stashpv ("cf", 1); 1347 stash_cf = gv_stashpv ("cf", 1);
1189 1348
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1349 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1350 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1210 cb_client = get_av ("cf::CB_CLIENT", 1); 1369 cb_client = get_av ("cf::CB_CLIENT", 1);
1211 cb_type = get_av ("cf::CB_TYPE" , 1); 1370 cb_type = get_av ("cf::CB_TYPE" , 1);
1212 cb_map = get_av ("cf::CB_MAP" , 1); 1371 cb_map = get_av ("cf::CB_MAP" , 1);
1213} 1372}
1214 1373
1374static void
1375_connect_to_perl_2 ()
1376{
1377 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1378 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1379 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1380 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1381 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1382}
1383
1215MODULE = cf PACKAGE = cf PREFIX = cf_ 1384MODULE = cf PACKAGE = cf PREFIX = cf_
1216 1385
1217BOOT: 1386BOOT:
1218{ 1387{
1219 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1388 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1220 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1389 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1221 1390
1222 _connect_to_perl (); 1391 _connect_to_perl_1 ();
1223 1392
1224 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1393 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1225 1394
1226 //{ 1395 //{
1227 // require_pv ("Time::HiRes"); 1396 // require_pv ("Time::HiRes");
… …
1271 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1440 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1272 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1441 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1273 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1442 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1274 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1443 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1275 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1444 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1276 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1445 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1277 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1446 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1278 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1447 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1279 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1448 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1280 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1449 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1281 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1450 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1282 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1451 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1283 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1452 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1284 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1453 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1454 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1285 1455
1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1456 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1287 1457
1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1458 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1289 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1459 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1306 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1476 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1307 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE) 1477 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1308 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING) 1478 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1309 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW) 1479 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1310 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE) 1480 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1311 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE) 1481 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1312 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE) 1482 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1313 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL) 1483 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1314 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON) 1484 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1315 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS) 1485 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1316 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH) 1486 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
… …
1321 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1491 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1322 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1492 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1323 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1493 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1324 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1494 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1325 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1495 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1326 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1496 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1327 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1497 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1328 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1498 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329 1499
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1500 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1331 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1501 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1498 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1668 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1669 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1670 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1671 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502 } 1672 }
1673
1674 // used by autogenerated BOOT sections from genacc
1675 av_reflect = get_av ("cf::REFLECT", 1);
1503} 1676}
1504 1677
1505void _gv_clear (SV *gv) 1678void _gv_clear (SV *gv)
1506 CODE: 1679 CODE:
1507 assert (SvTYPE (gv) == SVt_PVGV); 1680 assert (SvTYPE (gv) == SVt_PVGV);
… …
1514 f (GvGP (gv)->gp_cv); 1687 f (GvGP (gv)->gp_cv);
1515 GvCVGEN (gv) = 0; 1688 GvCVGEN (gv) = 0;
1516 GvMULTI_off (gv); 1689 GvMULTI_off (gv);
1517# undef f 1690# undef f
1518 1691
1519void _connect_to_perl () 1692void _connect_to_perl_1 ()
1693
1694void _connect_to_perl_2 ()
1520 1695
1521void _recalc_want () 1696void _recalc_want ()
1522 1697
1698# not used by default anymore
1523void _global_reattach () 1699void _global_reattach ()
1524 CODE: 1700 CODE:
1525{ 1701{
1526 // reattach to all attachable objects in the game. 1702 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1703 for_all_clients (ns)
… …
1580void init_experience () 1756void init_experience ()
1581 1757
1582void init_attackmess () 1758void init_attackmess ()
1583 1759
1584void init_dynamic () 1760void init_dynamic ()
1585
1586void init_block ()
1587 1761
1588void load_settings () 1762void load_settings ()
1589 1763
1590void load_materials () 1764void load_materials ()
1591 1765
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1950 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1777 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1951 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1778 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1952 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1779 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1953 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1954#endif
1781 EXTEND (SP, 2*2); 1955 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1956 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1783 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1957 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1784 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1958 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1959 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1960 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1961}
1786 1962
1787int find_animation (utf8_string text) 1963int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1964 PROTOTYPE: $
1789 1965
… …
1888 RETVAL 2064 RETVAL
1889 2065
1890void 2066void
1891debug_trace (attachable *obj, bool on = true) 2067debug_trace (attachable *obj, bool on = true)
1892 CODE: 2068 CODE:
1893 obj->flags &= ~attachable::F_DEBUG_TRACE; 2069 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1894 if (on) 2070 if (on)
1895 obj->flags |= attachable::F_DEBUG_TRACE; 2071 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1896 2072
1897int mortals_size () 2073int mortals_size ()
1898 CODE: 2074 CODE:
1899 RETVAL = attachable::mortals.size (); 2075 RETVAL = attachable::mortals.size ();
1900 OUTPUT: RETVAL 2076 OUTPUT: RETVAL
… …
2041 CODE: 2217 CODE:
2042 player_apply_below (op); 2218 player_apply_below (op);
2043 2219
2044int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2220int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2045 2221
2222int casting_level (object *caster, object *spell)
2223
2046int pay_item (object *op, object *buyer) 2224int pay_item (object *op, object *buyer)
2047 CODE: 2225 CODE:
2048 RETVAL = pay_for_item (op, buyer); 2226 RETVAL = pay_for_item (op, buyer);
2049 OUTPUT: RETVAL 2227 OUTPUT: RETVAL
2050 2228
… …
2092 2270
2093void player_lvl_adj (object *who, object *skill = 0) 2271void player_lvl_adj (object *who, object *skill = 0)
2094 2272
2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2273int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2096 2274
2097int calc_skill_exp (object *who, object *op, object *skill); 2275int calc_skill_exp (object *who, object *op, object *skill)
2098 2276
2099void push_button (object *op); 2277void push_button (object *op, object *originator)
2100 2278
2101void use_trigger (object *op); 2279void use_trigger (object *op, object *originator)
2102 2280
2103void add_button_link (object *button, maptile *map, int connected);
2104
2105void remove_button_link (object *op);
2106
2107void handle_apply_yield (object *op); 2281void handle_apply_yield (object *op)
2282
2283int convert_item (object *item, object *converter)
2108 2284
2109 2285
2110MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2286MODULE = cf PACKAGE = cf::object PREFIX = cf_
2111 2287
2112# no clean way to get an object from an archetype - stupid idiotic 2288# no clean way to get an object from an archetype - stupid idiotic
… …
2125object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2301object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2126 PROTOTYPE: $$$$$$ 2302 PROTOTYPE: $$$$$$
2127 CODE: 2303 CODE:
2128{ 2304{
2129 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2305 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2306
2307 if (RETVAL->destroyed ())
2308 RETVAL = 0;
2130} 2309}
2131 2310
2132shstr 2311shstr
2133object::kv_get (shstr key) 2312object::kv_get (shstr key)
2134 2313
… …
2229 pl->ob->stats.hp = pl->ob->stats.maxhp; 2408 pl->ob->stats.hp = pl->ob->stats.maxhp;
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2409 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2410 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2411 pl->orig_stats = pl->ob->stats;
2233 2412
2234void clear_los (player *pl) 2413# should only be temporary
2414void esrv_new_player (player *pl)
2235 2415
2416#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2417bool
2237cell_visible (player *pl, int dx, int dy) 2418cell_visible (player *pl, int dx, int dy)
2238 CODE: 2419 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2420 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2421 OUTPUT:
2242 RETVAL 2422 RETVAL
2243 2423
2244void 2424void
2245send (player *pl, SV *packet) 2425send (player *pl, SV *packet)
… …
2313} 2493}
2314 2494
2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2495INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2316 2496
2317void 2497void
2498adjust_daylight ()
2499 CODE:
2500 maptile::adjust_daylight ();
2501
2502int
2503outdoor_darkness (int darkness = 0)
2504 CODE:
2505 RETVAL = maptile::outdoor_darkness;
2506 if (items)
2507 maptile::outdoor_darkness = darkness;
2508 OUTPUT:
2509 RETVAL
2510
2511void
2318maptile::instantiate () 2512maptile::instantiate ()
2319 2513
2320maptile *new () 2514maptile *new ()
2321 PROTOTYPE: 2515 PROTOTYPE:
2322 CODE: 2516 CODE:
… …
2429 } 2623 }
2430 2624
2431int out_of_map (maptile *map, int x, int y) 2625int out_of_map (maptile *map, int x, int y)
2432 2626
2433void 2627void
2434trigger (maptile *map, long connection, bool state = true) 2628find_link (maptile *map, shstr_tmp connection)
2435 CODE:
2436 activate_connection (map, connection, state);
2437
2438void
2439get_connection (maptile *map, long connection)
2440 PPCODE: 2629 PPCODE:
2441 oblinkpt *obp = get_connection_links (map, connection); 2630 if (oblinkpt *obp = map->find_link (connection))
2442 if (obp)
2443 for (objectlink *ol = obp->link; ol; ol = ol->next) 2631 for (objectlink *ol = obp->link; ol; ol = ol->next)
2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2632 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2445 2633
2446void 2634void
2447get_map_flags (maptile *map, int x, int y) 2635get_map_flags (maptile *map, int x, int y)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2689 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2690 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2691}
2504 2692
2505SV * 2693SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2694bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2695 PROTOTYPE: $$$
2508 ALIAS: 2696 ALIAS:
2509 top_at = 1 2697 top_at = 1
2510 flags_at = 2 2698 flags_at = 2
2511 light_at = 3 2699 light_at = 3
2512 move_block_at = 4 2700 move_block_at = 4
2513 move_slow_at = 5 2701 move_slow_at = 5
2514 move_on_at = 6 2702 move_on_at = 6
2515 move_off_at = 7 2703 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2704 CODE:
2705{
2706 sint16 nx = x;
2707 sint16 ny = y;
2708
2709 if (!xy_normalise (map, nx, ny))
2710 XSRETURN_UNDEF;
2711
2712 mapspace &ms = map->at (nx, ny);
2713
2714 ms.update ();
2715
2519 switch (ix) 2716 switch (ix)
2520 { 2717 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2718 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2719 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2720 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2721 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2722 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2723 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2724 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2725 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2726 }
2727}
2530 OUTPUT: RETVAL 2728 OUTPUT: RETVAL
2531
2532void fix_walls (maptile *map, int x, int y)
2533
2534void fix_walls_around (maptile *map, int x, int y)
2535 2729
2536# worst xs function of my life 2730# worst xs function of my life
2537bool 2731bool
2538_create_random_map (\ 2732_create_random_map (\
2539 maptile *self,\ 2733 maptile *self,\
… …
2667 PROTOTYPE: $ 2861 PROTOTYPE: $
2668 CODE: 2862 CODE:
2669 RETVAL = region::find (name); 2863 RETVAL = region::find (name);
2670 OUTPUT: RETVAL 2864 OUTPUT: RETVAL
2671 2865
2672region *find_fuzzy (utf8_string name)
2673 PROTOTYPE: $
2674 CODE:
2675 RETVAL = region::find_fuzzy (name);
2676 OUTPUT: RETVAL
2677
2678int specificity (region *rgn) 2866int specificity (region *rgn)
2679 CODE: 2867 CODE:
2680 RETVAL = 0; 2868 RETVAL = 0;
2681 while (rgn = rgn->parent) 2869 while (rgn = rgn->parent)
2682 RETVAL++; 2870 RETVAL++;
… …
2816 faceinfo *f = face_info (idx); assert (f); 3004 faceinfo *f = face_info (idx); assert (f);
2817 facedata *d = &(faceset ? f->data64 : f->data32); 3005 facedata *d = &(faceset ? f->data64 : f->data32);
2818 sv_to (data, d->data); 3006 sv_to (data, d->data);
2819 STRLEN clen; 3007 STRLEN clen;
2820 char *cdata = SvPVbyte (chksum, clen); 3008 char *cdata = SvPVbyte (chksum, clen);
2821 clen = min (CHKSUM_SIZE, clen); 3009 clen = min (CHKSUM_MAXLEN, clen);
2822 3010
2823 if (memcmp (d->chksum, cdata, clen)) 3011 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2824 { 3012 {
3013 d->chksum_len = clen;
2825 memcpy (d->chksum, cdata, clen); 3014 memcpy (d->chksum, cdata, clen);
2826 3015
2827 // invalidate existing client face info 3016 // invalidate existing client face info
2828 for_all_clients (ns) 3017 for_all_clients (ns)
2829 if (ns->faceset == faceset) 3018 if (ns->faceset == faceset)
… …
2844 3033
2845SV *get_chksum (faceidx idx, int faceset = 0) 3034SV *get_chksum (faceidx idx, int faceset = 0)
2846 CODE: 3035 CODE:
2847 facedata *d = face_data (idx, faceset); 3036 facedata *d = face_data (idx, faceset);
2848 if (!d) XSRETURN_UNDEF; 3037 if (!d) XSRETURN_UNDEF;
2849 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3038 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2850 OUTPUT: 3039 OUTPUT:
2851 RETVAL 3040 RETVAL
2852 3041
2853SV *get_data (faceidx idx, int faceset = 0) 3042SV *get_data (faceidx idx, int faceset = 0)
2854 CODE: 3043 CODE:

Diff Legend

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