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.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.342 by root, Fri Dec 18 03:49:46 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
408SvPTR_nc (SV *sv)
409{
410 sv = SvRV (sv);
411
412 // very important shortcut
413 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
414 return (long)SvMAGIC (sv)->mg_ptr;
415
416 if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
417 return (long)mg->mg_ptr;
418
419 croak ("perl code used object, but C object is already destroyed, caught");
420}
388 421
389static long 422static long
390SvPTR (SV *sv, const char *klass) 423SvPTR (SV *sv, const char *klass)
391{ 424{
392 if (!sv_derived_from (sv, klass)) 425 if (!sv_derived_from (sv, klass))
393 croak ("object of type %s expected", klass); 426 croak ("object of type %s expected", klass);
394 427
395 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 428 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} 429}
402 430
403static long 431static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 432SvPTR_ornull (SV *sv, const char *klass)
405{ 433{
406 if (SvOK (sv)) 434 if (expect_false (!SvOK (sv))) return 0;
435
407 return SvPTR (sv, klass); 436 return SvPTR (sv, klass);
408 else
409 return 0;
410} 437}
411 438
439static long noinline
440SvPTR_ornull_client (SV *sv)
441{
442 if (expect_false (!SvOK (sv))) return 0;
443
444 if (!SvROK (sv)
445 || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
446 && !sv_derived_from (sv, "cf::client")))
447 croak ("object of type cf::client expected");
448
449 return SvPTR_nc (sv);
450}
451
452static long noinline
453SvPTR_ornull_object (SV *sv)
454{
455 if (expect_false (!SvOK (sv))) return 0;
456
457 if (!SvROK (sv)
458 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
459 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
460 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
461 && !sv_derived_from (sv, "cf::object")))
462 croak ("object of type cf::object expected");
463
464 return SvPTR_nc (sv);
465}
466
467static long noinline
468SvPTR_ornull_player (SV *sv)
469{
470 if (expect_false (!SvOK (sv))) return 0;
471
472 if (!SvROK (sv)
473 || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
474 && !sv_derived_from (sv, "cf::player")))
475 croak ("object of type cf::player expected");
476
477 return SvPTR_nc (sv);
478}
479
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 480static 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); } 481static inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 482static inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 483static inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 484static inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 485static inline SV *to_sv ( signed short v) { return newSViv (v); }
418inline SV *to_sv (unsigned short v) { return newSVuv (v); } 486static inline SV *to_sv (unsigned short v) { return newSVuv (v); }
419inline SV *to_sv ( signed int v) { return newSViv (v); } 487static inline SV *to_sv ( signed int v) { return newSViv (v); }
420inline SV *to_sv (unsigned int v) { return newSVuv (v); } 488static inline SV *to_sv (unsigned int v) { return newSVuv (v); }
421inline SV *to_sv ( signed long v) { return newSViv (v); } 489static inline SV *to_sv ( signed long v) { return newSViv (v); }
422inline SV *to_sv (unsigned long v) { return newSVuv (v); } 490static inline SV *to_sv (unsigned long v) { return newSVuv (v); }
423inline SV *to_sv ( signed long long v) { return newSVval64 (v); } 491static inline SV *to_sv ( signed long long v) { return newSVval64 (v); }
424inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 492static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
425inline SV *to_sv (float v) { return newSVnv (v); } 493static inline SV *to_sv (float v) { return newSVnv (v); }
426inline SV *to_sv (double v) { return newSVnv (v); } 494static inline SV *to_sv (double v) { return newSVnv (v); }
427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 495static 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); } 496static 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); } 497static 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); } 498static 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); } 499static 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); } 500static 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); } 501static 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); } 502static 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); } 503static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 504
437inline SV *to_sv (object & v) { return to_sv (&v); } 505static inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 506static inline SV *to_sv (living & v) { return to_sv (&v); }
439 507
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 508static 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); } 509static inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 510
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 511static inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444 512
445inline SV *to_sv (dynbuf * v) 513static inline SV *to_sv (dynbuf * v)
446{ 514{
447 SV *sv = newSV (0); 515 SV *sv = newSV (0);
448 516
449 sv_upgrade (sv, SVt_PV); 517 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1); 518 SvGROW (sv, v->size () + 1);
454 *SvEND (sv) = 0; 522 *SvEND (sv) = 0;
455 523
456 return sv; 524 return sv;
457} 525}
458 526
459inline SV *to_sv (dynbuf_text * v) 527static inline SV *to_sv (dynbuf_text * v)
460{ 528{
461 SV *sv = to_sv (static_cast<dynbuf *> (v)); 529 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv); 530 SvUTF8_on (sv);
463 return sv; 531 return sv;
464} 532}
465 533
466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 534static 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; } 535static 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); } 536static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 537static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 538static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 539static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 540static inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 541static inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 542static inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 543static inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 544static 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); } 545static 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); } 546static 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); } 547static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 548static 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"); } 549static 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"); } 550static 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"); } 551static 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"); } 552static 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"); } 553static 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"); } 554static 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"); } 555static 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"); } 556static 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"); } 557static 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"); } 558static 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"); } 559static 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" ); } 560static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
493 561
494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 562//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)); } 563static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
496 564
497template<class T> 565template<class T>
498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 566static inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
499 567
500template<int N> 568template<int N>
501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 569static inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
502 570
503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 571static 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); } 572static 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); } 573static inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 574static inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
507 575
508inline void sv_to (SV *sv, std::string &v) 576static inline void sv_to (SV *sv, std::string &v)
509{ 577{
510 STRLEN len; 578 STRLEN len;
511 char *data = SvPVbyte (sv, len); 579 char *data = SvPVbyte (sv, len);
512 v.assign (data, len); 580 v.assign (data, len);
513} 581}
514 582
515inline void sv_to (SV *sv, UUID &v) 583static inline void sv_to (SV *sv, UUID &v)
516{ 584{
517 if (!v.parse (SvPV_nolen (sv))) 585 if (!v.parse (SvPV_nolen (sv)))
518 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 586 croak ("unparsable uuid: %s", SvPV_nolen (sv));
519} 587}
520 588
521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 589static inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
522 590
523static SV * 591static SV *
524newSVdt_va (va_list &ap, data_type type) 592newSVdt_va (va_list &ap, data_type type)
525{ 593{
526 SV *sv; 594 SV *sv;
600 va_end (ap); 668 va_end (ap);
601 669
602 return sv; 670 return sv;
603} 671}
604 672
673// typemap support, mostly to avoid excessive inlining
674template<class type>
675static void noinline
676cf_obj_to (SV *arg, type &var)
677{
678 sv_to (arg, var);
679 if (!var)
680 croak ("must not pass invalid/null cf_obj here");
681}
682
683template<class object>
684static void noinline
685cf_obj_ornull_to (SV *arg, object *&var)
686{
687 if (SvOK (arg))
688 {
689 sv_to (arg, var);
690 if (!var)
691 croak ("unable to convert perl object to C++ object");
692 }
693 else
694 var = 0;
695}
696
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 697//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 698
607SV * 699static SV *
608registry (attachable *ext) 700registry (attachable *ext)
609{ 701{
610 if (!ext->cb) 702 if (!ext->cb)
611 ext->cb = newAV (); 703 ext->cb = newAV ();
612 704
626 718
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 719 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 720
629 const char *argv[] = { 721 const char *argv[] = {
630 settings.argv [0], 722 settings.argv [0],
631 "-e" 723 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 724 };
637 725
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 726 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 727 || perl_run (perl))
640 { 728 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 729 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 730 exit (EXIT_FAILURE);
643 } 731 }
644 732
733 eval_pv (
734 "#line 1 'cfperl init'\n"
735 "use EV ();\n"
736 "use Coro ();\n"
737 "cf->bootstrap;\n"
738 "unshift @INC, cf::datadir ();\n"
739 "require cf;\n",
740 0
741 );
742
743 if (SvTRUE (ERRSV))
645 { 744 {
646 dSP; 745 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 746 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 747 }
652} 748}
653 749
750void
654void cfperl_main () 751cfperl_main ()
655{ 752{
656 dSP; 753 dSP;
657 754
658 PUSHMARK (SP); 755 PUSHMARK (SP);
659 PUTBACK; 756 PUTBACK;
684# undef def 781# undef def
685}; 782};
686 783
687#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 784#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688 785
689static void 786static void noinline
690gather_callbacks (AV *&callbacks, AV *registry, event_type event) 787gather_callbacks (AV *&callbacks, AV *registry, event_type event)
691{ 788{
692 // event must be in array 789 // event must be in array
693 if (event >= 0 && event <= AvFILLp (registry)) 790 if (event >= 0 && event <= AvFILLp (registry))
694 { 791 {
780{ 877{
781 attachable::gather_callbacks (callbacks, event); 878 attachable::gather_callbacks (callbacks, event);
782 ::gather_callbacks (callbacks, cb_map, event); 879 ::gather_callbacks (callbacks, cb_map, event);
783} 880}
784 881
785void 882static void noinline
786_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 883_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787{ 884{
788 for (int event = 0; event <= AvFILLp (registry); ++event) 885 for (int event = 0; event <= AvFILLp (registry); ++event)
789 { 886 {
790 SV *cbs_ = AvARRAY (registry)[event]; 887 SV *cbs_ = AvARRAY (registry)[event];
800 } 897 }
801 } 898 }
802} 899}
803 900
804// very slow and inefficient way to recalculate the global want bitsets 901// very slow and inefficient way to recalculate the global want bitsets
805void 902static void
806_recalc_want () 903_recalc_want ()
807{ 904{
808 ev_want_event.reset (); 905 ev_want_event.reset ();
809 906
810 _recalc_want (ev_want_event, cb_global); 907 _recalc_want (ev_want_event, cb_global);
883 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 980 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
884 } 981 }
885 982
886 va_end (ap); 983 va_end (ap);
887 984
888 CALL_CALL ("cf::do_invoke", G_SCALAR); 985 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
889 count = count > 0 ? POPi : 0; 986 count = count > 0 ? POPi : 0;
890 987
891 CALL_END; 988 CALL_END;
892 989
893 return count; 990 return count;
894} 991}
895 992
896SV * 993static SV *
897cfperl_result (int idx) 994cfperl_result (int idx)
898{ 995{
899 AV *av = get_av ("cf::INVOKE_RESULTS", 0); 996 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
900 if (!av) 997 if (!av)
901 return &PL_sv_undef; 998 return &PL_sv_undef;
920} 1017}
921 1018
922///////////////////////////////////////////////////////////////////////////// 1019/////////////////////////////////////////////////////////////////////////////
923// various c++ => perl glue functions 1020// various c++ => perl glue functions
924 1021
1022void
925void cfperl_tick () 1023cfperl_tick ()
926{ 1024{
927 tick_pending = 1; 1025 tick_pending = 1;
928 1026
929 if (tick_inhibit) 1027 if (tick_inhibit)
930 return; 1028 return;
933 1031
934 dSP; 1032 dSP;
935 1033
936 PUSHMARK (SP); 1034 PUSHMARK (SP);
937 PUTBACK; 1035 PUTBACK;
938 call_pv ("cf::tick", G_DISCARD | G_VOID); 1036 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
939 1037
940 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 1038 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
941} 1039}
942 1040
943void 1041void
973 CALL_BEGIN (4); 1071 CALL_BEGIN (4);
974 CALL_ARG (ns); 1072 CALL_ARG (ns);
975 CALL_ARG (type); 1073 CALL_ARG (type);
976 CALL_ARG_SV (newSVpv_utf8 (msg)); 1074 CALL_ARG_SV (newSVpv_utf8 (msg));
977 CALL_ARG (color); 1075 CALL_ARG (color);
978 CALL_CALL ("cf::client::send_msg", G_VOID); 1076 CALL_CALL (cv_cf_client_send_msg, G_VOID);
979 CALL_END; 1077 CALL_END;
980} 1078}
981 1079
982int 1080int
983cfperl_can_merge (object *ob1, object *ob2) 1081cfperl_can_merge (object *ob1, object *ob2)
985 int can; 1083 int can;
986 1084
987 CALL_BEGIN (2); 1085 CALL_BEGIN (2);
988 CALL_ARG (ob1); 1086 CALL_ARG (ob1);
989 CALL_ARG (ob2); 1087 CALL_ARG (ob2);
990 CALL_CALL ("cf::_can_merge", G_SCALAR); 1088 CALL_CALL (cv_cf__can_merge, G_SCALAR);
991 can = count && SvTRUE (TOPs); 1089 can = count && SvTRUE (TOPs);
992 CALL_END; 1090 CALL_END;
993 1091
994 return can; 1092 return can;
1093}
1094
1095void
1096cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1097{
1098 CALL_BEGIN (4);
1099 CALL_ARG (ob);
1100 CALL_ARG (state);
1101 CALL_ARG (activator);
1102 CALL_ARG (originator);
1103 CALL_CALL ("cf::mapscript::activate", G_VOID);
1104 CALL_END;
995} 1105}
996 1106
997player * 1107player *
998player::find (const char *name) 1108player::find (const char *name)
999{ 1109{
1063maptile::do_load_sync () 1173maptile::do_load_sync ()
1064{ 1174{
1065 CALL_BEGIN (1); 1175 CALL_BEGIN (1);
1066 CALL_ARG (this); 1176 CALL_ARG (this);
1067 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1177 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068 CALL_END;
1069}
1070
1071void
1072maptile::change_all_map_light (int change)
1073{
1074 CALL_BEGIN (1);
1075 CALL_ARG (change);
1076 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077 CALL_END; 1178 CALL_END;
1078} 1179}
1079 1180
1080void 1181void
1081object::enter_exit (object *exit) 1182object::enter_exit (object *exit)
1148 CALL_CALL ("cf::_log_backtrace", G_VOID); 1249 CALL_CALL ("cf::_log_backtrace", G_VOID);
1149 CALL_END; 1250 CALL_END;
1150#endif 1251#endif
1151} 1252}
1152 1253
1254bool
1255is_match_expr (const char *expr)
1256{
1257 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1258}
1259
1260bool
1261match (const char *expr, object *ob, object *self, object *source, object *originator)
1262{
1263 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1264 expr += sizeof ("match ") - 1;
1265
1266 CALL_BEGIN (5);
1267 CALL_ARG (expr);
1268 CALL_ARG (ob);
1269 CALL_ARG (self);
1270 CALL_ARG (source);
1271 CALL_ARG (originator);
1272 CALL_CALL (cv_cf_match_match, G_SCALAR);
1273
1274 bool matched = count && SvTRUE (TOPs);
1275
1276 CALL_END;
1277
1278 return matched;
1279}
1280
1281object *
1282match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1283{
1284 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1285 expr += sizeof ("match ") - 1;
1286
1287 CALL_BEGIN (5);
1288 CALL_ARG (expr);
1289 CALL_ARG (ob);
1290 CALL_ARG (self);
1291 CALL_ARG (source);
1292 CALL_ARG (originator);
1293 CALL_CALL (cv_cf_match_match, G_ARRAY);
1294
1295 object *one = 0;
1296
1297 if (count)
1298 sv_to (TOPs, one);
1299
1300 CALL_END;
1301
1302 return one;
1303}
1304
1153///////////////////////////////////////////////////////////////////////////// 1305/////////////////////////////////////////////////////////////////////////////
1154 1306
1155struct EVAPI *evapi::GEVAPI; 1307struct EVAPI *evapi::GEVAPI;
1156struct CoroAPI *coroapi::GCoroAPI; 1308struct CoroAPI *coroapi::GCoroAPI;
1157 1309
1310void
1158void coroapi::do_cede_to_tick () 1311coroapi::do_cede_to_tick ()
1159{ 1312{
1160 cede_pending = 0; 1313 cede_pending = 0;
1161 cede (); 1314 cede ();
1162} 1315}
1163 1316
1187 ev_io_set ((ev_io *)this, fd, events); 1340 ev_io_set ((ev_io *)this, fd, events);
1188 if (active) start (); 1341 if (active) start ();
1189 } 1342 }
1190} 1343}
1191 1344
1192void 1345static void
1193_connect_to_perl () 1346_connect_to_perl_1 ()
1194{ 1347{
1195 stash_cf = gv_stashpv ("cf", 1); 1348 stash_cf = gv_stashpv ("cf", 1);
1196 1349
1197 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1350 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1198 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1351 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1217 cb_client = get_av ("cf::CB_CLIENT", 1); 1370 cb_client = get_av ("cf::CB_CLIENT", 1);
1218 cb_type = get_av ("cf::CB_TYPE" , 1); 1371 cb_type = get_av ("cf::CB_TYPE" , 1);
1219 cb_map = get_av ("cf::CB_MAP" , 1); 1372 cb_map = get_av ("cf::CB_MAP" , 1);
1220} 1373}
1221 1374
1375static void
1376_connect_to_perl_2 ()
1377{
1378 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1379 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1380 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1381 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1382 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1383}
1384
1222MODULE = cf PACKAGE = cf PREFIX = cf_ 1385MODULE = cf PACKAGE = cf PREFIX = cf_
1223 1386
1224BOOT: 1387BOOT:
1225{ 1388{
1226 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1389 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1227 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1390 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1228 1391
1229 _connect_to_perl (); 1392 _connect_to_perl_1 ();
1230 1393
1231 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1394 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1232 1395
1233 //{ 1396 //{
1234 // require_pv ("Time::HiRes"); 1397 // require_pv ("Time::HiRes");
1278 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1441 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1279 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1442 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1280 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1443 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1281 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1444 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1282 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1445 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1283 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1446 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1284 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1447 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1285 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1448 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1286 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1449 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1287 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1450 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1288 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1451 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1289 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1452 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1290 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1453 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1291 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1454 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1455 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1292 1456
1293 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1457 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1294 1458
1295 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1459 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1296 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1460 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1313 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1477 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1314 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE) 1478 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1315 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING) 1479 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1316 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW) 1480 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1317 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE) 1481 const_iv (FLAG_UNDEAD) const_iv (FLAG_SCARED) const_iv (FLAG_UNAGGRESSIVE) const_iv (FLAG_REFL_MISSILE)
1318 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_NO_FIX_PLAYER) const_iv (FLAG_IS_LIGHTABLE) 1482 const_iv (FLAG_REFL_SPELL) const_iv (FLAG_NO_MAGIC) const_iv (FLAG_IS_LIGHTABLE)
1319 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE) 1483 const_iv (FLAG_TEAR_DOWN) const_iv (FLAG_RUN_AWAY) const_iv (FLAG_PICK_UP) const_iv (FLAG_UNIQUE)
1320 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL) 1484 const_iv (FLAG_NO_DROP) const_iv (FLAG_WIZCAST) const_iv (FLAG_CAST_SPELL) const_iv (FLAG_USE_SCROLL)
1321 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON) 1485 const_iv (FLAG_USE_RANGE) const_iv (FLAG_USE_BOW) const_iv (FLAG_USE_ARMOUR) const_iv (FLAG_USE_WEAPON)
1322 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS) 1486 const_iv (FLAG_USE_RING) const_iv (FLAG_READY_RANGE) const_iv (FLAG_READY_BOW) const_iv (FLAG_XRAYS)
1323 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH) 1487 const_iv (FLAG_NO_APPLY) const_iv (FLAG_IS_FLOOR) const_iv (FLAG_LIFESAVE) const_iv (FLAG_NO_STRENGTH)
1328 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1492 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1329 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1493 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1330 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1494 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1331 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1495 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1332 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1496 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1333 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1497 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1334 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1498 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1335 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1499 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336 1500
1337 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1501 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1338 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1502 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1505 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1669 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1506 av_push (event, newSViv (eiv->klass)); 1670 av_push (event, newSViv (eiv->klass));
1507 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1671 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1508 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1672 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1509 } 1673 }
1674
1675 // used by autogenerated BOOT sections from genacc
1676 av_reflect = get_av ("cf::REFLECT", 1);
1510} 1677}
1511 1678
1512void _gv_clear (SV *gv) 1679void _gv_clear (SV *gv)
1513 CODE: 1680 CODE:
1514 assert (SvTYPE (gv) == SVt_PVGV); 1681 assert (SvTYPE (gv) == SVt_PVGV);
1521 f (GvGP (gv)->gp_cv); 1688 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1689 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1690 GvMULTI_off (gv);
1524# undef f 1691# undef f
1525 1692
1526
1527void _connect_to_perl () 1693void _connect_to_perl_1 ()
1694
1695void _connect_to_perl_2 ()
1528 1696
1529void _recalc_want () 1697void _recalc_want ()
1530 1698
1699# not used by default anymore
1531void _global_reattach () 1700void _global_reattach ()
1532 CODE: 1701 CODE:
1533{ 1702{
1534 // reattach to all attachable objects in the game. 1703 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1704 for_all_clients (ns)
1578 len -= 3; 1747 len -= 3;
1579 } 1748 }
1580 1749
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1750 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 1751}
1752
1753void init_anim ()
1754
1755void init_globals ()
1756
1757void init_experience ()
1758
1759void init_attackmess ()
1760
1761void init_dynamic ()
1762
1763void load_settings ()
1764
1765void load_materials ()
1766
1767void init_uuid ()
1768 CODE:
1769 UUID::init ();
1770
1771void init_signals ()
1772
1773void init_commands ()
1774
1775void init_skills ()
1776
1777void init_beforeplay ()
1583 1778
1584void evthread_start (int aiofd) 1779void evthread_start (int aiofd)
1585 1780
1586void cede_to_tick () 1781void cede_to_tick ()
1587 CODE: 1782 CODE:
1756 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1951 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1757 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1952 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1758 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1953 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1759 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1954 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1760#endif 1955#endif
1761 EXTEND (SP, 2*2); 1956 EXTEND (SP, 5*2);
1762 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1957 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1763 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1958 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1764 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1959 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1960 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1961 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1765} 1962}
1766 1963
1767int find_animation (utf8_string text) 1964int find_animation (utf8_string text)
1768 PROTOTYPE: $ 1965 PROTOTYPE: $
1769 1966
1868 RETVAL 2065 RETVAL
1869 2066
1870void 2067void
1871debug_trace (attachable *obj, bool on = true) 2068debug_trace (attachable *obj, bool on = true)
1872 CODE: 2069 CODE:
1873 obj->flags &= ~attachable::F_DEBUG_TRACE; 2070 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1874 if (on) 2071 if (on)
1875 obj->flags |= attachable::F_DEBUG_TRACE; 2072 obj->attachable_flags |= attachable::F_DEBUG_TRACE;
1876 2073
1877int mortals_size () 2074int mortals_size ()
1878 CODE: 2075 CODE:
1879 RETVAL = attachable::mortals.size (); 2076 RETVAL = attachable::mortals.size ();
1880 OUTPUT: RETVAL 2077 OUTPUT: RETVAL
2021 CODE: 2218 CODE:
2022 player_apply_below (op); 2219 player_apply_below (op);
2023 2220
2024int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2221int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2025 2222
2223int casting_level (object *caster, object *spell)
2224
2026int pay_item (object *op, object *buyer) 2225int pay_item (object *op, object *buyer)
2027 CODE: 2226 CODE:
2028 RETVAL = pay_for_item (op, buyer); 2227 RETVAL = pay_for_item (op, buyer);
2029 OUTPUT: RETVAL 2228 OUTPUT: RETVAL
2030 2229
2072 2271
2073void player_lvl_adj (object *who, object *skill = 0) 2272void player_lvl_adj (object *who, object *skill = 0)
2074 2273
2075int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2274int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2076 2275
2077int calc_skill_exp (object *who, object *op, object *skill); 2276int calc_skill_exp (object *who, object *op, object *skill)
2078 2277
2079void push_button (object *op); 2278void push_button (object *op, object *originator)
2080 2279
2081void use_trigger (object *op); 2280void use_trigger (object *op, object *originator)
2082 2281
2083void add_button_link (object *button, maptile *map, int connected);
2084
2085void remove_button_link (object *op);
2086
2087void handle_apply_yield (object *op); 2282void handle_apply_yield (object *op)
2283
2284int convert_item (object *item, object *converter)
2088 2285
2089 2286
2090MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2287MODULE = cf PACKAGE = cf::object PREFIX = cf_
2091 2288
2092# no clean way to get an object from an archetype - stupid idiotic 2289# no clean way to get an object from an archetype - stupid idiotic
2105object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2302object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2106 PROTOTYPE: $$$$$$ 2303 PROTOTYPE: $$$$$$
2107 CODE: 2304 CODE:
2108{ 2305{
2109 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2306 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2307
2308 if (RETVAL->destroyed ())
2309 RETVAL = 0;
2110} 2310}
2111 2311
2112shstr 2312shstr
2113object::kv_get (shstr key) 2313object::kv_get (shstr key)
2114 2314
2209 pl->ob->stats.hp = pl->ob->stats.maxhp; 2409 pl->ob->stats.hp = pl->ob->stats.maxhp;
2210 pl->ob->stats.sp = pl->ob->stats.maxsp; 2410 pl->ob->stats.sp = pl->ob->stats.maxsp;
2211 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2411 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212 pl->orig_stats = pl->ob->stats; 2412 pl->orig_stats = pl->ob->stats;
2213 2413
2214void clear_los (player *pl) 2414# should only be temporary
2415void esrv_new_player (player *pl)
2215 2416
2417#d# TODO: replace by blocked_los accessor, fix code using this
2216bool 2418bool
2217cell_visible (player *pl, int dx, int dy) 2419cell_visible (player *pl, int dx, int dy)
2218 CODE: 2420 CODE:
2219 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2421 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221 OUTPUT: 2422 OUTPUT:
2222 RETVAL 2423 RETVAL
2223 2424
2224void 2425void
2225send (player *pl, SV *packet) 2426send (player *pl, SV *packet)
2293} 2494}
2294 2495
2295INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2496INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2296 2497
2297void 2498void
2499adjust_daylight ()
2500 CODE:
2501 maptile::adjust_daylight ();
2502
2503int
2504outdoor_darkness (int darkness = 0)
2505 CODE:
2506 RETVAL = maptile::outdoor_darkness;
2507 if (items)
2508 maptile::outdoor_darkness = darkness;
2509 OUTPUT:
2510 RETVAL
2511
2512void
2298maptile::instantiate () 2513maptile::instantiate ()
2299 2514
2300maptile *new () 2515maptile *new ()
2301 PROTOTYPE: 2516 PROTOTYPE:
2302 CODE: 2517 CODE:
2332 for (int x = 0; x < THIS->width; ++x) 2547 for (int x = 0; x < THIS->width; ++x)
2333 for (int y = 0; y < THIS->height; ++y) 2548 for (int y = 0; y < THIS->height; ++y)
2334 { 2549 {
2335 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2550 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2336 if (op->flag [FLAG_IS_FLOOR]) 2551 if (op->flag [FLAG_IS_FLOOR])
2337 goto skip_space; 2552 goto skip;
2338 2553
2339 { 2554 {
2340 int offs = offset + y * stride + x; 2555 int offs = offset + y * stride + x;
2556
2341 if (IN_RANGE_EXC (offs, 0, idxlen)) 2557 if (IN_RANGE_EXC (offs, 0, idxlen))
2342 { 2558 {
2343 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2559 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2344 { 2560 {
2345 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2561 object *ob = get_archetype (SvPVutf8_nolen (*elem));
2346 ob->flag [FLAG_NO_MAP_SAVE] = true; 2562 ob->flag [FLAG_NO_MAP_SAVE] = true;
2347 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2563 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2348 2564
2349 if (ob->randomitems) 2565 if (ob->randomitems && !ob->above)
2350 { 2566 {
2351 if (!ob->above)
2352 {
2353 ob->create_treasure (ob->randomitems); 2567 ob->create_treasure (ob->randomitems);
2354 2568
2355 for (object *op = ob->above; op; op = op->above) 2569 for (object *op = ob->above; op; op = op->above)
2356 op->flag [FLAG_NO_MAP_SAVE] = true; 2570 op->flag [FLAG_NO_MAP_SAVE] = true;
2357 } 2571 // TODO: if this is a pickable object, then the item
2358 2572 // will at a bit weird - saving inside the player
2359 ob->randomitems = 0; 2573 // will clear the flag, but when the player drops
2574 // it without logging out, it keeps the flag.
2575 // nobody ahs reported this, but this can be rather
2576 // annoying on persistent maps.
2360 } 2577 }
2361 } 2578 }
2362 } 2579 }
2363 } 2580 }
2364 2581
2365 skip_space: ; 2582 skip: ;
2366 } 2583 }
2367} 2584}
2368 2585
2369void 2586void
2370maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2587maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2409 } 2626 }
2410 2627
2411int out_of_map (maptile *map, int x, int y) 2628int out_of_map (maptile *map, int x, int y)
2412 2629
2413void 2630void
2414trigger (maptile *map, long connection, bool state = true) 2631find_link (maptile *map, shstr_tmp connection)
2415 CODE:
2416 activate_connection (map, connection, state);
2417
2418void
2419get_connection (maptile *map, long connection)
2420 PPCODE: 2632 PPCODE:
2421 oblinkpt *obp = get_connection_links (map, connection); 2633 if (oblinkpt *obp = map->find_link (connection))
2422 if (obp)
2423 for (objectlink *ol = obp->link; ol; ol = ol->next) 2634 for (objectlink *ol = obp->link; ol; ol = ol->next)
2424 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2635 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2425 2636
2426void 2637void
2427get_map_flags (maptile *map, int x, int y) 2638get_map_flags (maptile *map, int x, int y)
2481 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2692 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2482 XPUSHs (sv_2mortal (to_sv (o))); 2693 XPUSHs (sv_2mortal (to_sv (o)));
2483} 2694}
2484 2695
2485SV * 2696SV *
2486bot_at (maptile *obj, unsigned int x, unsigned int y) 2697bot_at (maptile *map, unsigned int x, unsigned int y)
2487 PROTOTYPE: $$$ 2698 PROTOTYPE: $$$
2488 ALIAS: 2699 ALIAS:
2489 top_at = 1 2700 top_at = 1
2490 flags_at = 2 2701 flags_at = 2
2491 light_at = 3 2702 light_at = 3
2492 move_block_at = 4 2703 move_block_at = 4
2493 move_slow_at = 5 2704 move_slow_at = 5
2494 move_on_at = 6 2705 move_on_at = 6
2495 move_off_at = 7 2706 move_off_at = 7
2496 INIT:
2497 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2498 CODE: 2707 CODE:
2708{
2709 sint16 nx = x;
2710 sint16 ny = y;
2711
2712 if (!xy_normalise (map, nx, ny))
2713 XSRETURN_UNDEF;
2714
2715 mapspace &ms = map->at (nx, ny);
2716
2717 ms.update ();
2718
2499 switch (ix) 2719 switch (ix)
2500 { 2720 {
2501 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2721 case 0: RETVAL = to_sv (ms.bot ); break;
2502 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2722 case 1: RETVAL = to_sv (ms.top ); break;
2503 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2723 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2724 case 3: RETVAL = newSViv (ms.light ); break;
2505 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2725 case 4: RETVAL = newSVuv (ms.move_block); break;
2506 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2726 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2727 case 6: RETVAL = newSVuv (ms.move_on ); break;
2508 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2728 case 7: RETVAL = newSVuv (ms.move_off ); break;
2509 } 2729 }
2730}
2510 OUTPUT: RETVAL 2731 OUTPUT: RETVAL
2511
2512void fix_walls (maptile *map, int x, int y)
2513
2514void fix_walls_around (maptile *map, int x, int y)
2515 2732
2516# worst xs function of my life 2733# worst xs function of my life
2517bool 2734bool
2518_create_random_map (\ 2735_create_random_map (\
2519 maptile *self,\ 2736 maptile *self,\
2615archetype *archetypes (U32 index) 2832archetype *archetypes (U32 index)
2616 CODE: 2833 CODE:
2617 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2834 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2618 OUTPUT: RETVAL 2835 OUTPUT: RETVAL
2619 2836
2620object *instantiate (archetype *arch)
2621 CODE:
2622 RETVAL = arch_to_object (arch);
2623 OUTPUT:
2624 RETVAL
2625
2626INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2837INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2627 2838
2628MODULE = cf PACKAGE = cf::party 2839MODULE = cf PACKAGE = cf::party
2629 2840
2630partylist *first () 2841partylist *first ()
2645 2856
2646region *find (utf8_string name) 2857region *find (utf8_string name)
2647 PROTOTYPE: $ 2858 PROTOTYPE: $
2648 CODE: 2859 CODE:
2649 RETVAL = region::find (name); 2860 RETVAL = region::find (name);
2650 OUTPUT: RETVAL
2651
2652region *find_fuzzy (utf8_string name)
2653 PROTOTYPE: $
2654 CODE:
2655 RETVAL = region::find_fuzzy (name);
2656 OUTPUT: RETVAL 2861 OUTPUT: RETVAL
2657 2862
2658int specificity (region *rgn) 2863int specificity (region *rgn)
2659 CODE: 2864 CODE:
2660 RETVAL = 0; 2865 RETVAL = 0;
2796 faceinfo *f = face_info (idx); assert (f); 3001 faceinfo *f = face_info (idx); assert (f);
2797 facedata *d = &(faceset ? f->data64 : f->data32); 3002 facedata *d = &(faceset ? f->data64 : f->data32);
2798 sv_to (data, d->data); 3003 sv_to (data, d->data);
2799 STRLEN clen; 3004 STRLEN clen;
2800 char *cdata = SvPVbyte (chksum, clen); 3005 char *cdata = SvPVbyte (chksum, clen);
2801 clen = min (CHKSUM_SIZE, clen); 3006 clen = min (CHKSUM_MAXLEN, clen);
2802 3007
2803 if (memcmp (d->chksum, cdata, clen)) 3008 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2804 { 3009 {
3010 d->chksum_len = clen;
2805 memcpy (d->chksum, cdata, clen); 3011 memcpy (d->chksum, cdata, clen);
2806 3012
2807 // invalidate existing client face info 3013 // invalidate existing client face info
2808 for_all_clients (ns) 3014 for_all_clients (ns)
2809 if (ns->faceset == faceset) 3015 if (ns->faceset == faceset)
2824 3030
2825SV *get_chksum (faceidx idx, int faceset = 0) 3031SV *get_chksum (faceidx idx, int faceset = 0)
2826 CODE: 3032 CODE:
2827 facedata *d = face_data (idx, faceset); 3033 facedata *d = face_data (idx, faceset);
2828 if (!d) XSRETURN_UNDEF; 3034 if (!d) XSRETURN_UNDEF;
2829 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 3035 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2830 OUTPUT: 3036 OUTPUT:
2831 RETVAL 3037 RETVAL
2832 3038
2833SV *get_data (faceidx idx, int faceset = 0) 3039SV *get_data (faceidx idx, int faceset = 0)
2834 CODE: 3040 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines