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.227 by root, Tue Jul 10 16:24:00 2007 UTC vs.
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de> 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"
25
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#define CEDES_PER_TICK 5
30 25
31#if HAVE_EXECINFO_H 26#if HAVE_EXECINFO_H
32# include <execinfo.h> 27# include <execinfo.h>
33#endif 28#endif
34 29
35#include <plugin_common.h>
36#include <sounds.h>
37#include <cstdarg> 30#include <cstdarg>
38#include <sproto.h> 31#include <typeinfo>
39 32
33#include "global.h"
40#include "loader.h" 34#include "loader.h"
35#include "../random_maps/random_map.h"
41#include "cfperl.h" 36#include "evthread.h"
42#include "shstr.h" 37#include "sproto.h"
43 38
44#include <unistd.h> 39#include <unistd.h>
45#if _POSIX_MEMLOCK 40#if _POSIX_MEMLOCK
46# include <sys/mman.h> 41# include <sys/mman.h>
47#endif 42#endif
48 43
44#if HAVE_MALLOC_H
45# include <malloc.h>
46#endif
47
48#if !__GLIBC__
49# define malloc_trim(pad) -1
50#endif
51
49#include <EXTERN.h> 52#include <EXTERN.h>
50#include <perl.h> 53#include <perl.h>
51#include <XSUB.h> 54#include <XSUB.h>
52 55
53#include "CoroAPI.h" 56#include "CoroAPI.h"
54#include "perlxsi.c" 57#include "perlxsi.c"
55 58
56extern sint64 *levels; // the experience table 59extern sint64 *levels; // the experience table
57 60
58typedef object object_ornull; 61typedef object_thawer &object_thawer_ref;
59typedef maptile maptile_ornull; 62typedef object_freezer &object_freezer_ref;
60
61typedef char *octet_string;
62typedef char *utf8_string;
63typedef const char *const_octet_string;
64typedef const char *const_utf8_string;
65 63
66typedef std::string std__string; 64typedef std::string std__string;
67 65
68#if IVSIZE >= 8
69 typedef IV val64;
70# define newSVval64 newSViv
71# define SvVAL64 SvIV
72#else
73 typedef double val64;
74# define newSVval64 newSVnv
75# define SvVAL64 SvNV
76#endif
77
78static f_plug_api gethook = cfapi_get_hooks;
79static f_plug_api object_insert = cfapi_object_insert;
80
81static PerlInterpreter *perl; 66static PerlInterpreter *perl;
82 67
83tstamp NOW, runtime; 68tstamp NOW, runtime;
69
70static int tick_inhibit;
71static int tick_pending;
84 72
85global gbl_ev; 73global gbl_ev;
86static 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;
87static SV *sv_runtime, *sv_next_tick; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
88 77
89bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
90bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
91 80
92static HV 81static HV
93 *stash_cf, 82 *stash_cf,
94 *stash_cf_object_wrap, 83 *stash_cf_object_wrap,
95 *stash_cf_object_player_wrap, 84 *stash_cf_object_player_wrap,
96 *stash_cf_player_wrap, 85 *stash_cf_player_wrap,
97 *stash_cf_map_wrap, 86 *stash_cf_map_wrap,
87 *stash_cf_mapspace_wrap,
98 *stash_cf_client_wrap, 88 *stash_cf_client_wrap,
99 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
100 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
101 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
102 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
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
102static inline SV *
103newSVpv_utf8 (const char *s)
104{
105 if (!s)
106 return newSV (0);
107
108 SV *sv = newSVpv (s, 0);
109 SvUTF8_on (sv);
110 return sv;
111}
112#endif
113
114#ifndef newSVpvn_utf8
115static inline SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{
118 if (!s)
119 return newSV (0);
120
121 SV *sv = newSVpvn (s, l);
122
123 if (utf8)
124 SvUTF8_on (sv);
125
126 return sv;
127}
128#endif
103 129
104// helper cast function, returns super class * or 0 130// helper cast function, returns super class * or 0
105template<class super> 131template<class super>
106static super * 132static super *
107is_a (attachable *at) 133is_a (attachable *at)
… …
140 SvREFCNT_inc (self); 166 SvREFCNT_inc (self);
141 hv_clear (self); 167 hv_clear (self);
142 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 168 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
143 SvREFCNT_dec (self); 169 SvREFCNT_dec (self);
144 170
145 // self *must* be null now because thats sv_unmagic's job. 171 // self *must* be null now because that's sv_unmagic's job.
146 assert (!this->self); 172 assert (!this->self);
147 } 173 }
148} 174}
149 175
150void 176void
… …
246 delete obj; 272 delete obj;
247 } 273 }
248 } 274 }
249} 275}
250 276
277void
278attachable::set_key (const char *key, const char *value, bool is_utf8)
279{
280 if (!self)
281 self = newHV ();
282
283 if (value)
284 hv_store (self, key, strlen (key), is_utf8 ? newSVpv_utf8 (value) : newSVpv (value, 0), 0);
285 else
286 hv_delete (self, key, strlen (key), G_DISCARD);
287}
288
251attachable & 289attachable &
252attachable::operator =(const attachable &src) 290attachable::operator =(const attachable &src)
253{ 291{
254 //if (self || cb) 292 //if (self || cb)
255 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 293 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
… …
287 fprintf (stderr, "P %p\n", pl); 325 fprintf (stderr, "P %p\n", pl);
288 326
289 for_all_clients (ns) 327 for_all_clients (ns)
290 if (find_backref (ptr, ns)) 328 if (find_backref (ptr, ns))
291 fprintf (stderr, "C %p\n", ns); 329 fprintf (stderr, "C %p\n", ns);
292
293} 330}
294 331
295////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 332//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
296 333
297static SV * 334static SV *
298newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 335newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
299{ 336{
300 SV *sv; 337 SV *sv;
301 338
302 if (!ptr) 339 if (!ptr)
303 return &PL_sv_undef; 340 return newSV (0);
304 341
305 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 342 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
306 return sv_bless (newRV_noinc ((SV *)hv), stash); 343 return sv_bless (newRV_noinc ((SV *)hv), stash);
307} 344}
308 345
… …
327 364
328static SV * 365static SV *
329newSVattachable (attachable *obj, HV *stash) 366newSVattachable (attachable *obj, HV *stash)
330{ 367{
331 if (!obj) 368 if (!obj)
332 return &PL_sv_undef; 369 return newSV (0);
333 370
334 if (!obj->self) 371 if (!obj->self)
372 obj->self = newHV ();
373
374 if (!SvOBJECT (obj->self))
335 { 375 {
336 obj->self = newHV ();
337 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 376 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
338 377
339 // now bless the object _once_ 378 // now bless the object _once_
379 //TODO: create a class registry with c++ type<=>perl name<=>stash and use it here and elsewhere
340 return sv_bless (newRV_inc ((SV *)obj->self), stash); 380 return sv_bless (newRV_inc ((SV *)obj->self), stash);
341 } 381 }
342 else 382 else
343 { 383 {
344 SV *sv = newRV_inc ((SV *)obj->self); 384 SV *sv = newRV_inc ((SV *)obj->self);
… …
372 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 412 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
373 413
374 return (long)mg->mg_ptr; 414 return (long)mg->mg_ptr;
375} 415}
376 416
377static long 417static long noinline
378SvPTR_ornull (SV *sv, const char *klass) 418SvPTR_ornull (SV *sv, const char *klass)
379{ 419{
380 if (SvOK (sv)) 420 if (SvOK (sv))
381 return SvPTR (sv, klass); 421 return SvPTR (sv, klass);
382 else 422 else
383 return 0; 423 return 0;
384} 424}
385 425
386static inline SV *
387newSVpv_utf8 (const char *s)
388{
389 SV *sv = newSVpv (s, 0);
390 SvUTF8_on (sv);
391 return sv;
392}
393
394static inline SV *
395newSVpvn_utf8 (const char *s, STRLEN l)
396{
397 SV *sv = newSVpvn (s, l);
398 SvUTF8_on (sv);
399 return sv;
400}
401
402inline SV *to_sv (const shstr & v) { return v ? newSVpvn_utf8 ((const char *)v, v.length ()) : &PL_sv_undef; } 426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
403inline SV *to_sv (const char * v) { return newSVpv (v, 0); } 427inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
404inline SV *to_sv (bool v) { return newSViv (v); } 428inline SV *to_sv (bool v) { return newSViv (v); }
405inline SV *to_sv ( signed char v) { return newSViv (v); } 429inline SV *to_sv ( signed char v) { return newSViv (v); }
406inline SV *to_sv (unsigned char v) { return newSViv (v); } 430inline SV *to_sv (unsigned char v) { return newSViv (v); }
407inline SV *to_sv ( signed short v) { return newSViv (v); } 431inline SV *to_sv ( signed short v) { return newSViv (v); }
408inline SV *to_sv (unsigned short v) { return newSVuv (v); } 432inline SV *to_sv (unsigned short v) { return newSVuv (v); }
… …
417inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 441inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
418inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 442inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
419inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 443inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
420inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 444inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
421inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 445inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
446inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
422inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 447inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
423inline SV *to_sv (region * v) { return newSVptr (v, stash_cf_region_wrap); }
424inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 448inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
449inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
425 450
426inline SV *to_sv (object & v) { return to_sv (&v); } 451inline SV *to_sv (object & v) { return to_sv (&v); }
427inline SV *to_sv (living & v) { return to_sv (&v); } 452inline SV *to_sv (living & v) { return to_sv (&v); }
428 453
429inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 454inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
430inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
431 456
457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458
432inline SV *to_sv (UUID v) 459inline SV *to_sv (dynbuf * v)
433{ 460{
434 char buf[128]; 461 SV *sv = newSV (0);
435 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
436 return newSVpv (buf, 0);
437}
438 462
463 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1);
465 SvPOK_only (sv);
466 v->linearise (SvPVX (sv));
467 SvCUR_set (sv, v->size ());
468 *SvEND (sv) = 0;
469
470 return sv;
471}
472
473inline SV *to_sv (dynbuf_text * v)
474{
475 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv);
477 return sv;
478}
479
439inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 480inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
440inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 481inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
441inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
442inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
443inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 484inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
444inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 485inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
445inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 486inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
446inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 487inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
447inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 488inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
448inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 489inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
449inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 490inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
450inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 491inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
451inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 492inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
452inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 493inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
453inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 494inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
454inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 495inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
455inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 496inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
456inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 497inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
457inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 498inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
458inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 499inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
500inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
459inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 501inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
460inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 502inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
461inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
462inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 503inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
504inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
505inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
506inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
463 507
464//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 508//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
465inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 509inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
466 510
467template<class T> 511template<class T>
468inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 512inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
469 513
470template<int N> 514template<int N>
471inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 515inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
472 516
473inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 517inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
474inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 518inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
475inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 519inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
476inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 520inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
477 521
478inline void sv_to (SV *sv, std::string &v) 522inline void sv_to (SV *sv, std::string &v)
479{ 523{
480 STRLEN len; 524 STRLEN len;
481 char *data = SvPVbyte (sv, len); 525 char *data = SvPVbyte (sv, len);
482 v.assign (data, len); 526 v.assign (data, len);
483} 527}
484 528
485inline void sv_to (SV *sv, UUID &v) 529inline void sv_to (SV *sv, UUID &v)
486{ 530{
487 unsigned int version; 531 if (!v.parse (SvPV_nolen (sv)))
488
489 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
490 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 532 croak ("unparsable uuid: %s", SvPV_nolen (sv));
491} 533}
492 534
493inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 535inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
494 536
… …
512 break; 554 break;
513 555
514 case DT_STRING: 556 case DT_STRING:
515 { 557 {
516 char *str = (char *)va_arg (ap, const char *); 558 char *str = (char *)va_arg (ap, const char *);
517 sv = str ? newSVpv (str, 0) : &PL_sv_undef; 559 sv = str ? newSVpv (str, 0) : newSV (0);
518 } 560 }
519 break; 561 break;
520 562
521 case DT_DATA: 563 case DT_DATA:
522 { 564 {
523 char *str = (char *)va_arg (ap, const void *); 565 char *str = (char *)va_arg (ap, const void *);
524 int len = va_arg (ap, int); 566 int len = va_arg (ap, int);
525 sv = str ? newSVpv (str, len) : &PL_sv_undef; 567 sv = str ? newSVpv (str, len) : newSV (0);
526 } 568 }
527 break; 569 break;
528 570
529 case DT_OBJECT: 571 case DT_OBJECT:
530 sv = to_sv (va_arg (ap, object *)); 572 sv = to_sv (va_arg (ap, object *));
… …
572 va_end (ap); 614 va_end (ap);
573 615
574 return sv; 616 return sv;
575} 617}
576 618
577static SV * 619// typemap support, mostly to avoid excessive inlining
578newSVcfapi (int type, ...) 620template<class type>
621static void noinline
622cf_obj_to (SV *arg, type &var)
579{ 623{
580 SV *sv; 624 sv_to (arg, var);
625 if (!var)
626 croak ("must not pass invalid/null cf_obj here");
627}
581 628
582 va_list ap; 629template<class object>
583 va_start (ap, type); 630static void noinline
584 631cf_obj_ornull_to (SV *arg, object *&var)
585 switch (type) 632{
633 if (SvOK (arg))
586 { 634 {
587 case CFAPI_INT: sv = newSViv (*va_arg (ap, int * )); break; 635 sv_to (arg, var);
588 case CFAPI_LONG: sv = newSVval64 (*va_arg (ap, sint64 *)); break; 636 if (!var)
589 case CFAPI_DOUBLE: sv = newSVnv (*va_arg (ap, double *)); break; 637 croak ("unable to convert perl object to C++ object");
590 case CFAPI_STRING: sv = newSVdt_va (ap, DT_STRING); break;
591 case CFAPI_POBJECT: sv = newSVdt_va (ap, DT_OBJECT); break;
592 case CFAPI_PMAP: sv = newSVdt_va (ap, DT_MAP ); break;
593 case CFAPI_PPLAYER: sv = newSVdt_va (ap, DT_PLAYER); break;
594 case CFAPI_PARCH: sv = newSVdt_va (ap, DT_ARCH ); break;
595 case CFAPI_PPARTY: sv = newSVdt_va (ap, DT_PARTY ); break;
596 case CFAPI_PREGION: sv = newSVdt_va (ap, DT_REGION); break;
597
598 default:
599 assert (("unhandled type in newSVcfapi", 0));
600 } 638 }
601 639 else
602 va_end (ap); 640 var = 0;
603
604 return sv;
605} 641}
606 642
607////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 643//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
608 644
609SV * 645SV *
… …
615 return newRV_inc ((SV *)ext->cb); 651 return newRV_inc ((SV *)ext->cb);
616} 652}
617 653
618///////////////////////////////////////////////////////////////////////////// 654/////////////////////////////////////////////////////////////////////////////
619 655
620extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
621{
622 return 0;
623}
624
625static CommArray_s rtn_cmd;
626
627static int
628runPluginCommand (object *obj, char *params)
629{
630 return -1;
631}
632
633extern "C" void *cfperl_getPluginProperty (int *type, ...)
634{
635 va_list args;
636 char *propname;
637 int i;
638 va_start (args, type);
639 propname = va_arg (args, char *);
640 //printf ("Property name: %s\n", propname);
641
642 if (!strcmp (propname, "command?"))
643 return NULL;
644 else if (!strcmp (propname, "Identification"))
645 {
646 va_end (args);
647 return (void *)PLUGIN_NAME;
648 }
649 else if (!strcmp (propname, "FullName"))
650 {
651 va_end (args);
652 return (void *)PLUGIN_VERSION;
653 }
654 else
655 va_end (args);
656
657 return NULL;
658}
659
660extern "C" int cfperl_postInitPlugin ()
661{
662 int hooktype = 1;
663 int rtype = 0;
664
665 cf_init_plugin (gethook);
666
667 return 0;
668}
669
670extern "C" int cfperl_closePlugin ()
671{
672 return 0;
673}
674
675void 656void
676cfperl_init () 657cfperl_init ()
677{ 658{
659 extern char **environ;
660
678 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0); 661 PERL_SYS_INIT3 (&settings.argc, &settings.argv, &environ);
679 perl = perl_alloc (); 662 perl = perl_alloc ();
680 perl_construct (perl); 663 perl_construct (perl);
681 664
682 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 665 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
683 666
684 const char *argv[] = { 667 const char *argv[] = {
685 settings.argv [0], 668 settings.argv [0],
686 "-e" 669 "-e0"
687 "use Event; use Coro;" // required for bootstrap
688 "cf->bootstrap;" // required for datadir :*>
689 "unshift @INC, cf::datadir ();"
690 "require cf;"
691 }; 670 };
692 671
693 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL) 672 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
694 || perl_run (perl)) 673 || perl_run (perl))
695 { 674 {
696 printf ("unable to initialize perl-interpreter, aborting.\n"); 675 printf ("unable to initialize perl-interpreter, aborting.\n");
697 exit (EXIT_FAILURE); 676 exit (EXIT_FAILURE);
698 } 677 }
699 678
679 eval_pv (
680 "#line 1 'cfperl init'\n"
681 "use EV ();\n"
682 "use Coro ();\n"
683 "cf->bootstrap;\n"
684 "unshift @INC, cf::datadir ();\n"
685 "require cf;\n",
686 0
687 );
688
689 if (SvTRUE (ERRSV))
700 { 690 {
701 dSP; 691 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
702 692 exit (EXIT_FAILURE);
703 PUSHMARK (SP);
704 PUTBACK;
705 call_pv ("cf::init", G_DISCARD | G_VOID);
706 } 693 }
707} 694}
708 695
696void
709void cfperl_main () 697cfperl_main ()
710{ 698{
711 dSP; 699 dSP;
712 700
713 PUSHMARK (SP); 701 PUSHMARK (SP);
714 PUTBACK; 702 PUTBACK;
… …
739# undef def 727# undef def
740}; 728};
741 729
742#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 730#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
743 731
744static void 732static void noinline
745gather_callbacks (AV *&callbacks, AV *registry, event_type event) 733gather_callbacks (AV *&callbacks, AV *registry, event_type event)
746{ 734{
747 // event must be in array 735 // event must be in array
748 if (event >= 0 && event <= AvFILLp (registry)) 736 if (event >= 0 && event <= AvFILLp (registry))
749 { 737 {
… …
835{ 823{
836 attachable::gather_callbacks (callbacks, event); 824 attachable::gather_callbacks (callbacks, event);
837 ::gather_callbacks (callbacks, cb_map, event); 825 ::gather_callbacks (callbacks, cb_map, event);
838} 826}
839 827
840void 828static void noinline
841_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 829_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
842{ 830{
843 for (int event = 0; event <= AvFILLp (registry); ++event) 831 for (int event = 0; event <= AvFILLp (registry); ++event)
844 { 832 {
845 SV *cbs_ = AvARRAY (registry)[event]; 833 SV *cbs_ = AvARRAY (registry)[event];
… …
855 } 843 }
856 } 844 }
857} 845}
858 846
859// very slow and inefficient way to recalculate the global want bitsets 847// very slow and inefficient way to recalculate the global want bitsets
860void 848static void
861_recalc_want () 849_recalc_want ()
862{ 850{
863 ev_want_event.reset (); 851 ev_want_event.reset ();
864 852
865 _recalc_want (ev_want_event, cb_global); 853 _recalc_want (ev_want_event, cb_global);
… …
938 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 926 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
939 } 927 }
940 928
941 va_end (ap); 929 va_end (ap);
942 930
943 CALL_CALL ("cf::do_invoke", G_SCALAR); 931 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
944 count = count > 0 ? POPi : 0; 932 count = count > 0 ? POPi : 0;
945 933
946 CALL_END; 934 CALL_END;
947 935
948 return count; 936 return count;
949} 937}
950 938
951SV * 939SV *
952cfperl_result (int idx) 940cfperl_result (int idx)
953{ 941{
954 AV *av = get_av ("cfperl::invoke_results", 0); 942 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
955 if (!av) 943 if (!av)
956 return &PL_sv_undef; 944 return &PL_sv_undef;
957 945
958 SV **sv = av_fetch (av, idx, 0); 946 SV **sv = av_fetch (av, idx, 0);
959 if (!sv) 947 if (!sv)
… …
973{ 961{
974 return SvNV (cfperl_result (idx)); 962 return SvNV (cfperl_result (idx));
975} 963}
976 964
977///////////////////////////////////////////////////////////////////////////// 965/////////////////////////////////////////////////////////////////////////////
966// various c++ => perl glue functions
967
968void
969cfperl_tick ()
970{
971 tick_pending = 1;
972
973 if (tick_inhibit)
974 return;
975
976 tick_pending = 0;
977
978 dSP;
979
980 PUSHMARK (SP);
981 PUTBACK;
982 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
983
984 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
985}
978 986
979void 987void
980cfperl_emergency_save () 988cfperl_emergency_save ()
981{ 989{
982 CALL_BEGIN (0); 990 CALL_BEGIN (0);
… …
1006void 1014void
1007cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1015cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
1008{ 1016{
1009 CALL_BEGIN (4); 1017 CALL_BEGIN (4);
1010 CALL_ARG (ns); 1018 CALL_ARG (ns);
1011 CALL_ARG (color);
1012 CALL_ARG (type); 1019 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1020 CALL_ARG_SV (newSVpv_utf8 (msg));
1021 CALL_ARG (color);
1014 CALL_CALL ("cf::client::send_msg", G_VOID); 1022 CALL_CALL (cv_cf_client_send_msg, G_VOID);
1015 CALL_END; 1023 CALL_END;
1024}
1025
1026int
1027cfperl_can_merge (object *ob1, object *ob2)
1028{
1029 int can;
1030
1031 CALL_BEGIN (2);
1032 CALL_ARG (ob1);
1033 CALL_ARG (ob2);
1034 CALL_CALL (cv_cf__can_merge, G_SCALAR);
1035 can = count && SvTRUE (TOPs);
1036 CALL_END;
1037
1038 return can;
1039}
1040
1041void
1042cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1043{
1044 CALL_BEGIN (4);
1045 CALL_ARG (ob);
1046 CALL_ARG (state);
1047 CALL_ARG (activator);
1048 CALL_ARG (originator);
1049 CALL_CALL ("cf::mapscript::activate", G_VOID);
1050 CALL_END;
1051}
1052
1053player *
1054player::find (const char *name)
1055{
1056 CALL_BEGIN (1);
1057 CALL_ARG (name);
1058 CALL_CALL ("cf::player::find", G_SCALAR);
1059
1060 player *retval = 0;
1061 if (count) sv_to (POPs, retval);
1062
1063 CALL_END;
1064
1065 return retval;
1066}
1067
1068maptile *
1069find_style (const char *dirname, const char *stylename, int difficulty)
1070{
1071 CALL_BEGIN (3);
1072 CALL_ARG (dirname);
1073 CALL_ARG (stylename);
1074 CALL_ARG (difficulty);
1075 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1076
1077 maptile *retval = 0;
1078 if (count) sv_to (POPs, retval);
1079
1080 CALL_END;
1081
1082 return retval;
1016} 1083}
1017 1084
1018maptile * 1085maptile *
1019maptile::find_sync (const char *path, maptile *origin) 1086maptile::find_sync (const char *path, maptile *origin)
1020{ 1087{
1021 CALL_BEGIN (2); 1088 CALL_BEGIN (2);
1022 CALL_ARG (path); 1089 CALL_ARG (path);
1023 CALL_ARG (origin); 1090 CALL_ARG (origin);
1024 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1091 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1025 1092
1026 maptile *retval; 1093 maptile *retval = 0;
1027
1028 if (count)
1029 sv_to (POPs, retval); 1094 if (count) sv_to (POPs, retval);
1030 else
1031 retval = 0;
1032 1095
1033 CALL_END; 1096 CALL_END;
1034 1097
1035 return retval; 1098 return retval;
1036} 1099}
1037 1100
1038maptile * 1101maptile *
1039maptile::find_async (const char *path, maptile *origin) 1102maptile::find_async (const char *path, maptile *origin, bool load)
1040{ 1103{
1041 CALL_BEGIN (2); 1104 CALL_BEGIN (3);
1042 CALL_ARG (path); 1105 CALL_ARG (path);
1043 CALL_ARG (origin); 1106 CALL_ARG (origin);
1107 CALL_ARG (load);
1044 CALL_CALL ("cf::map::find_async", G_SCALAR); 1108 CALL_CALL ("cf::map::find_async", G_SCALAR);
1045 1109
1046 maptile *retval; 1110 maptile *retval = 0;
1047
1048 if (count)
1049 sv_to (POPs, retval); 1111 if (count) sv_to (POPs, retval);
1050 else
1051 retval = 0;
1052 1112
1053 CALL_END; 1113 CALL_END;
1054 1114
1055 return retval; 1115 return retval;
1056} 1116}
… …
1059maptile::do_load_sync () 1119maptile::do_load_sync ()
1060{ 1120{
1061 CALL_BEGIN (1); 1121 CALL_BEGIN (1);
1062 CALL_ARG (this); 1122 CALL_ARG (this);
1063 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1123 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1064 CALL_END;
1065}
1066
1067void
1068maptile::change_all_map_light (int change)
1069{
1070 CALL_BEGIN (1);
1071 CALL_ARG (change);
1072 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1073 CALL_END; 1124 CALL_END;
1074} 1125}
1075 1126
1076void 1127void
1077object::enter_exit (object *exit) 1128object::enter_exit (object *exit)
… …
1082 CALL_BEGIN (2); 1133 CALL_BEGIN (2);
1083 CALL_ARG (this); 1134 CALL_ARG (this);
1084 CALL_ARG (exit); 1135 CALL_ARG (exit);
1085 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1136 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1086 CALL_END; 1137 CALL_END;
1138}
1139
1140void
1141object::player_goto (const char *path, int x, int y)
1142{
1143 if (type != PLAYER)
1144 return;
1145
1146 CALL_BEGIN (4);
1147 CALL_ARG (this);
1148 CALL_ARG (path);
1149 CALL_ARG (x);
1150 CALL_ARG (y);
1151 CALL_CALL ("cf::object::player::goto", G_VOID);
1152 CALL_END;
1153}
1154
1155const char *
1156object::ref () const
1157{
1158 if (type == PLAYER)
1159 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1160 else
1161 return 0;
1162}
1163
1164object *
1165object::deref (const char *ref)
1166{
1167 object *retval = 0;
1168
1169 if (ref)
1170 {
1171 CALL_BEGIN (1);
1172 CALL_ARG (ref);
1173 CALL_CALL ("cf::object::deref", G_SCALAR);
1174
1175 if (count)
1176 sv_to (POPs, retval);
1177
1178 CALL_END;
1179 }
1180
1181 return retval;
1087} 1182}
1088 1183
1089void 1184void
1090log_backtrace (const char *msg) 1185log_backtrace (const char *msg)
1091{ 1186{
… …
1100 CALL_CALL ("cf::_log_backtrace", G_VOID); 1195 CALL_CALL ("cf::_log_backtrace", G_VOID);
1101 CALL_END; 1196 CALL_END;
1102#endif 1197#endif
1103} 1198}
1104 1199
1200bool
1201is_match_expr (const char *expr)
1202{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204}
1205
1206bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator)
1208{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1;
1211
1212 CALL_BEGIN (5);
1213 CALL_ARG (expr);
1214 CALL_ARG (ob);
1215 CALL_ARG (self);
1216 CALL_ARG (source);
1217 CALL_ARG (originator);
1218 CALL_CALL (cv_cf_match_match, G_SCALAR);
1219
1220 bool matched = count && SvTRUE (TOPs);
1221
1222 CALL_END;
1223
1224 return matched;
1225}
1226
1227object *
1228match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1229{
1230 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1231 expr += sizeof ("match ") - 1;
1232
1233 CALL_BEGIN (5);
1234 CALL_ARG (expr);
1235 CALL_ARG (ob);
1236 CALL_ARG (self);
1237 CALL_ARG (source);
1238 CALL_ARG (originator);
1239 CALL_CALL (cv_cf_match_match, G_ARRAY);
1240
1241 object *one = 0;
1242
1243 if (count)
1244 sv_to (TOPs, one);
1245
1246 CALL_END;
1247
1248 return one;
1249}
1250
1105///////////////////////////////////////////////////////////////////////////// 1251/////////////////////////////////////////////////////////////////////////////
1106 1252
1107struct EventAPI *watcher_base::GEventAPI; 1253struct EVAPI *evapi::GEVAPI;
1108struct CoroAPI *coroapi::GCoroAPI; 1254struct CoroAPI *coroapi::GCoroAPI;
1109 1255
1110int coroapi::cede_counter; 1256void
1111tstamp coroapi::next_cede;
1112
1113void coroapi::do_cede_to_tick () 1257coroapi::do_cede_to_tick ()
1114{ 1258{
1115 cede_counter = 0; 1259 cede_pending = 0;
1116
1117 cede (); 1260 cede ();
1118
1119 next_cede += (TICK / CEDES_PER_TICK) * 0.99;
1120 if (next_cede > SvNV (sv_next_tick) - 0.02)
1121 next_cede = SvNV (sv_next_tick);
1122}
1123
1124void coroapi::do_cede_every ()
1125{
1126 cede_counter = 0;
1127
1128 if (coroapi::nready ())
1129 coroapi::cede ();
1130}
1131
1132void coroapi::do_cede_to_tick_every ()
1133{
1134 cede_counter = 0;
1135
1136 cede_to_tick ();
1137} 1261}
1138 1262
1139void 1263void
1140coroapi::wait_for_tick () 1264coroapi::wait_for_tick ()
1141{ 1265{
… …
1150 CALL_BEGIN (0); 1274 CALL_BEGIN (0);
1151 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD); 1275 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD);
1152 CALL_END; 1276 CALL_END;
1153} 1277}
1154 1278
1279void
1280iow::poll (int events)
1281{
1282 if (events != this->events)
1283 {
1284 int active = ev_is_active ((ev_io *)this);
1285 if (active) stop ();
1286 ev_io_set ((ev_io *)this, fd, events);
1287 if (active) start ();
1288 }
1289}
1290
1155static void 1291static void
1156iw_dispatch (pe_event *ev)
1157{
1158 iw *w = (iw *)ev->ext_data;
1159 w->call (*w);
1160}
1161
1162void
1163iw::alloc ()
1164{
1165 pe = GEventAPI->new_idle (0, 0);
1166
1167 WaREENTRANT_off (pe);
1168 pe->base.callback = (void *)iw_dispatch;
1169 pe->base.ext_data = (void *)this;
1170}
1171
1172static void iow_dispatch (pe_event *ev)
1173{
1174 iow *w = (iow *)ev->ext_data;
1175 w->call (*w, ((pe_ioevent *)ev)->got);
1176}
1177
1178void
1179iow::alloc ()
1180{
1181 pe = GEventAPI->new_io (0, 0);
1182
1183 WaREENTRANT_off (pe);
1184 pe->base.callback = (void *)iow_dispatch;
1185 pe->base.ext_data = (void *)this;
1186
1187 pe->fd = -1;
1188 pe->poll = 0;
1189}
1190
1191void
1192iow::fd (int fd)
1193{
1194 pe->fd = fd;
1195}
1196
1197int
1198iow::poll ()
1199{
1200 return pe->poll;
1201}
1202
1203void
1204iow::poll (int events)
1205{
1206 if (pe->poll != events)
1207 {
1208 if (pe->poll) stop ();
1209 pe->poll = events;
1210 if (pe->poll) start ();
1211 }
1212}
1213
1214void
1215_connect_to_perl () 1292_connect_to_perl_1 ()
1216{ 1293{
1217 stash_cf = gv_stashpv ("cf" , 1); 1294 stash_cf = gv_stashpv ("cf", 1);
1218 1295
1219 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1296 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1220 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1297 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1221 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1298 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1222 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1299 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1300 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1223 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1301 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1224 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1302 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1225 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1303 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1226 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1304 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1227 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1305 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1228 1306
1307 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1229 sv_runtime = get_sv ("cf::RUNTIME" , 1); sv_upgrade (sv_runtime , SVt_NV); 1308 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1309 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1230 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); sv_upgrade (sv_next_tick, SVt_NV); 1310 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1231 1311
1232 cb_global = get_av ("cf::CB_GLOBAL", 1); 1312 cb_global = get_av ("cf::CB_GLOBAL", 1);
1233 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1313 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1234 cb_object = get_av ("cf::CB_OBJECT", 1); 1314 cb_object = get_av ("cf::CB_OBJECT", 1);
1235 cb_player = get_av ("cf::CB_PLAYER", 1); 1315 cb_player = get_av ("cf::CB_PLAYER", 1);
1236 cb_client = get_av ("cf::CB_CLIENT", 1); 1316 cb_client = get_av ("cf::CB_CLIENT", 1);
1237 cb_type = get_av ("cf::CB_TYPE" , 1); 1317 cb_type = get_av ("cf::CB_TYPE" , 1);
1238 cb_map = get_av ("cf::CB_MAP" , 1); 1318 cb_map = get_av ("cf::CB_MAP" , 1);
1239} 1319}
1240 1320
1321static void
1322_connect_to_perl_2 ()
1323{
1324 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1325 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1326 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1327 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1328 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1329}
1330
1241MODULE = cf PACKAGE = cf PREFIX = cf_ 1331MODULE = cf PACKAGE = cf PREFIX = cf_
1242 1332
1243BOOT: 1333BOOT:
1244{ 1334{
1245 I_EVENT_API (PACKAGE); watcher_base::GEventAPI = GEventAPI; 1335 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1246 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1336 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1247 1337
1248 _connect_to_perl (); 1338 _connect_to_perl_1 ();
1249 1339
1250 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1340 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1251 1341
1252 //{ 1342 //{
1253 // require_pv ("Time::HiRes"); 1343 // require_pv ("Time::HiRes");
… …
1269 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1359 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1270 1360
1271 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1361 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1272 1362
1273 const_iv (MAX_TIME) 1363 const_iv (MAX_TIME)
1364 const_iv (MAXSOCKBUF)
1274 1365
1275 const_iv (NUM_BODY_LOCATIONS) 1366 const_iv (NUM_BODY_LOCATIONS)
1276 const_iv (body_range) const_iv (body_shield) const_iv (body_combat) 1367 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1277 const_iv (body_arm) const_iv (body_torso) const_iv (body_head) 1368 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1278 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger) 1369 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
… …
1296 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1387 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1297 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1388 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1298 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1389 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1299 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1390 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1300 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1391 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1301 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1392 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1302 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1393 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1303 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1394 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1304 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1395 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1305 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1396 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1306 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1397 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1307 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1398 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1308 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1399 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1309 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1400 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1401 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1310 1402
1311 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1403 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1312 1404
1313 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1405 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1314 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1406 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1344 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1436 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1345 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1437 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1346 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1438 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1347 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1439 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1348 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1440 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1349 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1441 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1350 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1442 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1351 const_iv (FLAG_OBJ_SAVE_ON_OVL) const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1443 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1352 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1444 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1353 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1445 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1354 1446
1355 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1447 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1356 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1448 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1357 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1449 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1358 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1450 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1359 const_iv (NDI_ALL) 1451 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1452 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1360 1453
1361 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1454 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1362 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1455 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1363 1456
1364 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1457 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1416 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1509 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1417 const_iv (F_LOCKED) 1510 const_iv (F_LOCKED)
1418 1511
1419 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1512 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1420 1513
1421 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1514 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1422 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1515 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1423 1516
1424 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1517 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1425 1518
1426 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1519 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1427 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR) const_iv (INS_MAP_LOAD) 1520 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1428 1521
1429 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL) 1522 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1430 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD) 1523 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1431 1524
1432 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1525 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
… …
1466 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION) 1559 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1467 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL) 1560 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1468 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL) 1561 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1469 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE) 1562 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1470 1563
1471 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1564 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1565 const_iv (MAP_INACTIVE)
1472 1566
1473 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1567 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1474 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1568 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1569
1570 const_iv (VERSION_CS) const_iv (VERSION_SC)
1475 1571
1476 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1572 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1477 1573
1478 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM) 1574 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1479 1575
… …
1489 1585
1490 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1586 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1491 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1587 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1492 1588
1493 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1589 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1494 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1590 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1495 const_iv (GT_MINIMAL) 1591
1592 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1593 const_iv (FT_RSRC) const_iv (FT_NUM)
1496 }; 1594 };
1497 1595
1498 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1596 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1499 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1597 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1500 1598
… …
1517 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1615 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1518 av_push (event, newSViv (eiv->klass)); 1616 av_push (event, newSViv (eiv->klass));
1519 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1617 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1520 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1618 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1521 } 1619 }
1522}
1523 1620
1621 // used by autogenerated BOOT sections from genacc
1622 av_reflect = get_av ("cf::REFLECT", 1);
1623}
1624
1625void _gv_clear (SV *gv)
1626 CODE:
1627 assert (SvTYPE (gv) == SVt_PVGV);
1628# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1629 f (GvGP (gv)->gp_form);
1630 f (GvGP (gv)->gp_io);
1631 f (GvGP (gv)->gp_sv);
1632 f (GvGP (gv)->gp_av);
1633 f (GvGP (gv)->gp_hv);
1634 f (GvGP (gv)->gp_cv);
1635 GvCVGEN (gv) = 0;
1636 GvMULTI_off (gv);
1637# undef f
1638
1524void _connect_to_perl () 1639void _connect_to_perl_1 ()
1640
1641void _connect_to_perl_2 ()
1525 1642
1526void _recalc_want () 1643void _recalc_want ()
1527 1644
1645# not used by default anymore
1528void _global_reattach () 1646void _global_reattach ()
1529 CODE: 1647 CODE:
1530{ 1648{
1531 // reattach to all attachable objects in the game. 1649 // reattach to all attachable objects in the game.
1532 for_all_clients (ns) 1650 for_all_clients (ns)
1533 ns->reattach (); 1651 ns->reattach ();
1534 1652
1535 for_all_objects (op) 1653 for_all_objects (op)
1536 op->reattach (); 1654 op->reattach ();
1537} 1655}
1538
1539void _post_tick ()
1540 CODE:
1541 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK);
1542 1656
1543# support function for map-world.ext 1657# support function for map-world.ext
1544void _quantise (SV *data_sv, SV *plt_sv) 1658void _quantise (SV *data_sv, SV *plt_sv)
1545 CODE: 1659 CODE:
1546{ 1660{
… …
1580 } 1694 }
1581 1695
1582 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1696 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1583} 1697}
1584 1698
1699void init_anim ()
1700
1701void init_globals ()
1702
1703void init_experience ()
1704
1705void init_attackmess ()
1706
1707void init_dynamic ()
1708
1709void load_settings ()
1710
1711void load_materials ()
1712
1713void init_uuid ()
1714 CODE:
1715 UUID::init ();
1716
1717void init_signals ()
1718
1719void init_commands ()
1720
1721void init_skills ()
1722
1723void init_beforeplay ()
1724
1725void evthread_start (int aiofd)
1726
1727void cede_to_tick ()
1728 CODE:
1729 coroapi::cede_to_tick ();
1730
1731NV till_tick ()
1732 CODE:
1733 RETVAL = SvNVX (sv_next_tick) - now ();
1734 OUTPUT:
1735 RETVAL
1736
1737int tick_inhibit ()
1738 CODE:
1739 RETVAL = tick_inhibit;
1740 OUTPUT:
1741 RETVAL
1742
1743void tick_inhibit_inc ()
1744 CODE:
1745 ++tick_inhibit;
1746
1747void tick_inhibit_dec ()
1748 CODE:
1749 if (!--tick_inhibit)
1750 if (tick_pending)
1751 {
1752 ev_async_send (EV_DEFAULT, &tick_watcher);
1753 coroapi::cede ();
1754 }
1755
1756void server_tick ()
1757 CODE:
1758{
1759 NOW = ev_now (EV_DEFAULT);
1760 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1761 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1762 runtime = SvNVX (sv_runtime);
1763
1764 server_tick ();
1765
1766 NOW = ev_time ();
1767 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1768 runtime += TICK;
1769 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1770}
1771
1585NV floor (NV x) 1772NV floor (NV x)
1586 1773
1587NV ceil (NV x) 1774NV ceil (NV x)
1588 1775
1589NV rndm (...) 1776NV rndm (...)
1777 ALIAS:
1778 rmg_rndm = 1
1590 CODE: 1779 CODE:
1780{
1781 rand_gen &gen = ix ? rmg_rndm : rndm;
1591 switch (items) 1782 switch (items)
1592 { 1783 {
1593 case 0: RETVAL = rndm (); break; 1784 case 0: RETVAL = gen (); break;
1594 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1785 case 1: RETVAL = gen (SvUV (ST (0))); break;
1595 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1786 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1596 default: croak ("cf::rndm requires none, one or two parameters."); break; 1787 default: croak ("cf::rndm requires none, one or two parameters."); break;
1597 } 1788 }
1789}
1598 OUTPUT: 1790 OUTPUT:
1599 RETVAL 1791 RETVAL
1600 1792
1601NV clamp (NV value, NV min_value, NV max_value) 1793NV clamp (NV value, NV min_value, NV max_value)
1602 CODE: 1794 CODE:
… …
1608 CODE: 1800 CODE:
1609 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1801 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1610 OUTPUT: 1802 OUTPUT:
1611 RETVAL 1803 RETVAL
1612 1804
1613void cede_to_tick () 1805void weaken (...)
1614 CODE: 1806 PROTOTYPE: @
1615 coroapi::cede_to_tick (); 1807 CODE:
1616 1808 while (items > 0)
1617void server_tick () 1809 sv_rvweaken (ST (--items));
1618 CODE:
1619 NOW = now ();
1620 runtime = SvNVx (sv_runtime);
1621 server_tick ();
1622 1810
1623void 1811void
1624log_backtrace (utf8_string msg) 1812log_backtrace (utf8_string msg)
1625 1813
1626void 1814void
… …
1631octet_string path_combine (octet_string base, octet_string path) 1819octet_string path_combine (octet_string base, octet_string path)
1632 PROTOTYPE: $$ 1820 PROTOTYPE: $$
1633 1821
1634octet_string path_combine_and_normalize (octet_string base, octet_string path) 1822octet_string path_combine_and_normalize (octet_string base, octet_string path)
1635 PROTOTYPE: $$ 1823 PROTOTYPE: $$
1636
1637const_octet_string
1638get_maps_directory (octet_string path)
1639 PROTOTYPE: $
1640 ALIAS: maps_directory = 0
1641 CODE:
1642 RETVAL = create_pathname (path);
1643 OUTPUT: RETVAL
1644 1824
1645void 1825void
1646sub_generation_inc () 1826sub_generation_inc ()
1647 CODE: 1827 CODE:
1648 PL_sub_generation++; 1828 PL_sub_generation++;
… …
1673 1853
1674void abort () 1854void abort ()
1675 1855
1676void reset_signals () 1856void reset_signals ()
1677 1857
1678void fork_abort (octet_string cause = "cf::fork_abort") 1858void fork_abort (const_octet_string cause = "cf::fork_abort")
1679 1859
1680void cleanup (octet_string cause, bool make_core = false) 1860void cleanup (const_octet_string cause, bool make_core = false)
1681 1861
1682void emergency_save () 1862void emergency_save ()
1683 1863
1684void _exit (int status = EXIT_SUCCESS) 1864void _exit (int status = EXIT_SUCCESS)
1685 1865
1686UV sv_2watcher (SV *w)
1687 CODE:
1688 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1689 OUTPUT:
1690 RETVAL
1691
1692#if _POSIX_MEMLOCK 1866#if _POSIX_MEMLOCK
1693 1867
1694int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1868int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1869 INIT:
1870#if __GLIBC__
1871 mallopt (M_TOP_PAD, 1024 * 1024);
1872 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1873 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1874 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1875#endif
1695 1876
1696int munlockall () 1877int munlockall ()
1697 1878
1698#endif 1879#endif
1880
1881int
1882malloc_trim (IV pad = 0)
1883
1884void
1885mallinfo ()
1886 PPCODE:
1887{
1888#if __GLIBC__
1889 struct mallinfo mai = mallinfo ();
1890 EXTEND (SP, 10*2);
1891 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1892 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1893 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1894 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1895 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1896 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1897 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1898 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1899 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1900 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1901#endif
1902 EXTEND (SP, 5*2);
1903 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1904 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1905 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1906 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1907 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1908}
1699 1909
1700int find_animation (utf8_string text) 1910int find_animation (utf8_string text)
1701 PROTOTYPE: $ 1911 PROTOTYPE: $
1702 1912
1703int random_roll (int min, int max, object *op, int goodbad); 1913int random_roll (int min, int max, object *op, int goodbad);
… …
1741 RETVAL = newSVpv (resist_plus[atnr], 0); 1951 RETVAL = newSVpv (resist_plus[atnr], 0);
1742 else 1952 else
1743 XSRETURN_UNDEF; 1953 XSRETURN_UNDEF;
1744 OUTPUT: RETVAL 1954 OUTPUT: RETVAL
1745 1955
1956UUID
1957uuid_cur ()
1958 CODE:
1959 RETVAL = UUID::cur;
1960 OUTPUT:
1961 RETVAL
1962
1963UUID
1964uuid_gen ()
1965 CODE:
1966 RETVAL = UUID::gen ();
1967 OUTPUT:
1968 RETVAL
1969
1970val64
1971uuid_seq (UUID uuid)
1972 CODE:
1973 RETVAL = uuid.seq;
1974 OUTPUT:
1975 RETVAL
1976
1977UUID
1978uuid_str (val64 seq)
1979 CODE:
1980 RETVAL.seq = seq;
1981 OUTPUT:
1982 RETVAL
1983
1984void
1985coin_names ()
1986 PPCODE:
1987 EXTEND (SP, NUM_COINS);
1988 for (int i = 0; i < NUM_COINS; ++i)
1989 PUSHs (sv_2mortal (newSVpv (coins [i], 0)));
1990
1991void
1992coin_archetypes ()
1993 PPCODE:
1994 EXTEND (SP, NUM_COINS);
1995 for (int i = 0; i < NUM_COINS; ++i)
1996 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1997
1746bool 1998bool
1747load_resource_file (octet_string filename) 1999load_resource_file_ (octet_string filename)
2000
2001void
2002fix_weight ()
1748 2003
1749MODULE = cf PACKAGE = cf::attachable 2004MODULE = cf PACKAGE = cf::attachable
1750 2005
1751int 2006int
1752valid (SV *obj) 2007valid (SV *obj)
… …
1770#object *mortals (U32 index) 2025#object *mortals (U32 index)
1771# CODE: 2026# CODE:
1772# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 2027# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1773# OUTPUT: RETVAL 2028# OUTPUT: RETVAL
1774 2029
1775INCLUDE: $PERL $srcdir/genacc attachable ../include/cfperl.h | 2030INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h |
1776 2031
1777MODULE = cf PACKAGE = cf::global 2032MODULE = cf PACKAGE = cf::global
1778 2033
1779int invoke (SV *klass, int event, ...) 2034int invoke (SV *klass, int event, ...)
1780 CODE: 2035 CODE:
… …
1816object *actives (U32 index) 2071object *actives (U32 index)
1817 CODE: 2072 CODE:
1818 RETVAL = index < actives.size () ? actives [index] : 0; 2073 RETVAL = index < actives.size () ? actives [index] : 0;
1819 OUTPUT: RETVAL 2074 OUTPUT: RETVAL
1820 2075
2076int mortals_size ()
2077 CODE:
2078 RETVAL = attachable::mortals.size ();
2079 OUTPUT: RETVAL
2080
1821const char *slot_use_name (U32 slot) 2081const char *slot_use_name (U32 slot)
1822 ALIAS: 2082 ALIAS:
1823 slot_nonuse_name = 1 2083 slot_nonuse_name = 1
1824 CODE: 2084 CODE:
1825{ 2085{
… …
1846void 2106void
1847inv (object *obj) 2107inv (object *obj)
1848 PROTOTYPE: $ 2108 PROTOTYPE: $
1849 PPCODE: 2109 PPCODE:
1850{ 2110{
1851 object *o;
1852 for (o = obj->inv; o; o = o->below) 2111 for (object *o = obj->inv; o; o = o->below)
1853 XPUSHs (sv_2mortal (to_sv (o))); 2112 XPUSHs (sv_2mortal (to_sv (o)));
1854} 2113}
1855 2114
1856void 2115void
1857set_animation (object *op, int idx) 2116set_animation (object *op, int idx)
… …
1889 2148
1890int need_identify (object *obj); 2149int need_identify (object *obj);
1891 2150
1892int apply_shop_mat (object *shop_mat, object *op); 2151int apply_shop_mat (object *shop_mat, object *op);
1893 2152
1894int move_player (object *op, int dir)
1895 CODE:
1896 RETVAL = move_player (op, dir);
1897 OUTPUT:
1898 RETVAL
1899
1900int move (object *op, int dir, object *originator = op) 2153int move (object *op, int dir, object *originator = op)
1901 CODE: 2154 CODE:
1902 RETVAL = move_ob (op, dir, originator); 2155 RETVAL = move_ob (op, dir, originator);
1903 OUTPUT: 2156 OUTPUT:
1904 RETVAL 2157 RETVAL
… …
1911 CODE: 2164 CODE:
1912 player_apply_below (op); 2165 player_apply_below (op);
1913 2166
1914int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2167int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1915 2168
1916object *cf_object_present_archname_inside (object *op, utf8_string whatstr) 2169int casting_level (object *caster, object *spell)
1917
1918int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1919
1920int cf_object_change_map (object *op, int x, int y, maptile *map)
1921
1922#//TODO
1923object *clone_ (object *op, int recursive = 0)
1924 CODE:
1925 if (recursive)
1926 RETVAL = object_create_clone (op);
1927 else
1928 {
1929 RETVAL = object::create ();
1930 op->copy_to (RETVAL);
1931 }
1932 OUTPUT: RETVAL
1933 2170
1934int pay_item (object *op, object *buyer) 2171int pay_item (object *op, object *buyer)
1935 CODE: 2172 CODE:
1936 RETVAL = pay_for_item (op, buyer); 2173 RETVAL = pay_for_item (op, buyer);
1937 OUTPUT: RETVAL 2174 OUTPUT: RETVAL
… …
1972 2209
1973void drop (object *who, object *op) 2210void drop (object *who, object *op)
1974 2211
1975void pick_up (object *who, object *op) 2212void pick_up (object *who, object *op)
1976 2213
1977int cf_object_teleport (object *op, maptile *map, int x, int y)
1978
1979void update_object (object *op, int action) 2214void update_object (object *op, int action)
1980 2215
1981object *cf_create_object_by_name (utf8_string name)
1982
1983void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2216void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0)
1984 2217
1985void player_lvl_adj (object *who, object *skill = 0) 2218void player_lvl_adj (object *who, object *skill = 0)
1986 2219
1987int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2220int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
1988 2221
1989int calc_skill_exp (object *who, object *op, object *skill); 2222int calc_skill_exp (object *who, object *op, object *skill);
1990 2223
1991void push_button (object *op); 2224void push_button (object *op, object *originator);
1992 2225
1993void use_trigger (object *op); 2226void use_trigger (object *op, object *originator);
1994 2227
1995void add_button_link (object *button, maptile *map, int connected); 2228void handle_apply_yield (object *op);
1996 2229
1997void remove_button_link (object *op); 2230int convert_item (object *item, object *converter);
1998 2231
1999 2232
2000MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2233MODULE = cf PACKAGE = cf::object PREFIX = cf_
2001
2002object *cf_insert_ob_in_ob (object *ob, object *where)
2003 2234
2004# no clean way to get an object from an archetype - stupid idiotic 2235# no clean way to get an object from an archetype - stupid idiotic
2005# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2236# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2006 2237
2007object *new (utf8_string archetype = 0) 2238object *new (utf8_string archetype = 0)
… …
2016# TODO: nuke 2247# TODO: nuke
2017object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2248object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2018 PROTOTYPE: $$$$$$ 2249 PROTOTYPE: $$$$$$
2019 CODE: 2250 CODE:
2020{ 2251{
2021 int unused_type; 2252 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2022 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
2023}
2024 2253
2025const_utf8_string get_ob_key_value (object *op, utf8_string key) 2254 if (RETVAL->destroyed ())
2255 RETVAL = 0;
2256}
2026 2257
2027bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2258shstr
2259object::kv_get (shstr key)
2260
2261void
2262object::kv_del (shstr key)
2263
2264void
2265object::kv_set (shstr key, shstr value)
2028 2266
2029object *get_nearest_player (object *ob) 2267object *get_nearest_player (object *ob)
2030 ALIAS: nearest_player = 0 2268 ALIAS: nearest_player = 0
2031 PREINIT: 2269 PREINIT:
2032 extern object *get_nearest_player (object *); 2270 extern object *get_nearest_player (object *);
… …
2034void rangevector (object *ob, object *other, int flags = 0) 2272void rangevector (object *ob, object *other, int flags = 0)
2035 PROTOTYPE: $$;$ 2273 PROTOTYPE: $$;$
2036 PPCODE: 2274 PPCODE:
2037{ 2275{
2038 rv_vector rv; 2276 rv_vector rv;
2277
2278 PUTBACK;
2039 get_rangevector (ob, other, &rv, flags); 2279 get_rangevector (ob, other, &rv, flags);
2280 SPAGAIN;
2281
2040 EXTEND (SP, 5); 2282 EXTEND (SP, 5);
2041 PUSHs (newSVuv (rv.distance)); 2283 PUSHs (newSVuv (rv.distance));
2042 PUSHs (newSViv (rv.distance_x)); 2284 PUSHs (newSViv (rv.distance_x));
2043 PUSHs (newSViv (rv.distance_y)); 2285 PUSHs (newSViv (rv.distance_y));
2044 PUSHs (newSViv (rv.direction)); 2286 PUSHs (newSViv (rv.direction));
2045 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part)); 2287 PUSHs (to_sv (rv.part));
2046} 2288}
2047 2289
2048bool on_same_map_as (object *ob, object *other) 2290bool on_same_map_as (object *ob, object *other)
2049 CODE: 2291 CODE:
2050 RETVAL = on_same_map (ob, other); 2292 RETVAL = on_same_map (ob, other);
… …
2054base_name (object *op, int plural = op->nrof > 1) 2296base_name (object *op, int plural = op->nrof > 1)
2055 CODE: 2297 CODE:
2056 RETVAL = query_base_name (op, plural); 2298 RETVAL = query_base_name (op, plural);
2057 OUTPUT: RETVAL 2299 OUTPUT: RETVAL
2058 2300
2059object *decrease_ob_nr (object *op, unsigned long i) 2301# return the tail of an object, excluding itself
2302void
2303tail (object *op)
2304 PPCODE:
2305 while ((op = op->more))
2306 XPUSHs (sv_2mortal (to_sv (op)));
2060 2307
2061MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2308MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
2062 2309
2063player *player (object *op) 2310player *player (object *op)
2064 CODE: 2311 CODE:
2065 RETVAL = op->contr; 2312 RETVAL = op->contr;
2066 OUTPUT: RETVAL 2313 OUTPUT: RETVAL
2067 2314
2315bool move_player (object *op, int dir)
2316
2068void check_score (object *op) 2317void check_score (object *op)
2069 2318
2070void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2319void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2071 CODE: 2320 CODE:
2072 new_draw_info (flags, 0, op, txt); 2321 new_draw_info (flags, 0, op, txt);
2073 2322
2074void kill_player (object *op) 2323void kill_player (object *op)
2075 2324
2325void esrv_send_item (object *pl, object *item)
2326
2076void esrv_update_item (object *op, int what, object *item) 2327void esrv_update_item (object *pl, int what, object *item)
2077 C_ARGS: what, op, item 2328 C_ARGS: what, pl, item
2329
2330void esrv_del_item (object *pl, int tag)
2331 C_ARGS: pl->contr, tag
2078 2332
2079int command_summon (object *op, utf8_string params) 2333int command_summon (object *op, utf8_string params)
2080 2334
2081int command_arrest (object *op, utf8_string params) 2335int command_arrest (object *op, utf8_string params)
2082 2336
… …
2101 pl->ob->stats.hp = pl->ob->stats.maxhp; 2355 pl->ob->stats.hp = pl->ob->stats.maxhp;
2102 pl->ob->stats.sp = pl->ob->stats.maxsp; 2356 pl->ob->stats.sp = pl->ob->stats.maxsp;
2103 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2357 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2104 pl->orig_stats = pl->ob->stats; 2358 pl->orig_stats = pl->ob->stats;
2105 2359
2106void clear_los (player *pl) 2360# should only be temporary
2361void esrv_new_player (player *pl)
2107 2362
2108void cf_player_move (player *pl, int dir) 2363#d# TODO: replace by blocked_los accessor, fix code using this
2109
2110void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2111
2112bool 2364bool
2113cell_visible (player *pl, int dx, int dy) 2365cell_visible (player *pl, int dx, int dy)
2114 CODE: 2366 CODE:
2115 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2367 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2116 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2117 OUTPUT: 2368 OUTPUT:
2118 RETVAL 2369 RETVAL
2119 2370
2120void 2371void
2121send (player *pl, SV *packet) 2372send (player *pl, SV *packet)
2122 CODE: 2373 CODE:
2123{ 2374{
2124 STRLEN len; 2375 STRLEN len;
2125 char *buf = SvPVbyte (packet, len); 2376 char *buf = SvPVbyte (packet, len);
2126 2377
2378 if (len > MAXSOCKBUF)
2379 pl->failmsg ("[packet too long for client]");
2127 if (pl->ns) 2380 else if (pl->ns)
2128 pl->ns->send_packet (buf, len); 2381 pl->ns->send_packet (buf, len);
2129} 2382}
2130
2131int
2132listening (player *pl, int new_value = -1)
2133 CODE:
2134 RETVAL = pl->listening;
2135 if (new_value >= 0)
2136 pl->listening = new_value;
2137 OUTPUT:
2138 RETVAL
2139 2383
2140void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2384void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2141 PROTOTYPE: $;$$$ 2385 PROTOTYPE: $;$$$
2142 PPCODE: 2386 PPCODE:
2143 if (GIMME_V != G_VOID) 2387 if (GIMME_V != G_VOID)
… …
2168 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END); 2412 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);
2169 OUTPUT: RETVAL 2413 OUTPUT: RETVAL
2170 2414
2171SV *registry (maptile *map) 2415SV *registry (maptile *map)
2172 2416
2417void
2418find_tagged_objects (maptile *map, utf8_string tag = 0)
2419 PPCODE:
2420{
2421 if (!map->spaces)
2422 XSRETURN_EMPTY;
2423
2424 if (tag)
2425 {
2426 shstr_cmp tag_ (tag);
2427
2428 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2429 for (object *op = ms->bot; op; op = op->above)
2430 if (op->tag == tag_)
2431 XPUSHs (sv_2mortal (to_sv (op)));
2432 }
2433 else
2434 {
2435 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2436 for (object *op = ms->bot; op; op = op->above)
2437 if (op->tag)
2438 XPUSHs (sv_2mortal (to_sv (op)));
2439 }
2440}
2441
2173INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2442INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2443
2444void
2445adjust_daylight ()
2446 CODE:
2447 maptile::adjust_daylight ();
2448
2449int
2450outdoor_darkness (int darkness = 0)
2451 CODE:
2452 RETVAL = maptile::outdoor_darkness;
2453 if (items)
2454 maptile::outdoor_darkness = darkness;
2455 OUTPUT:
2456 RETVAL
2174 2457
2175void 2458void
2176maptile::instantiate () 2459maptile::instantiate ()
2177 2460
2178maptile *new () 2461maptile *new ()
… …
2254 palette = SvRV (palette); 2537 palette = SvRV (palette);
2255 2538
2256 STRLEN idxlen; 2539 STRLEN idxlen;
2257 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2540 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2258 2541
2259 region **regionmap = (region **)malloc ( 2542 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2260 (av_len ((AV *)palette) + 1) * sizeof (region *));
2261 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2543 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2262 2544
2263 for (int i = av_len ((AV *)palette) + 1; i--; ) 2545 for (int i = av_len ((AV *)palette) + 1; i--; )
2264 regionmap [i] = region::find ( 2546 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2265 SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2266 2547
2267 for (int y = 0; y < THIS->height; ++y) 2548 for (int y = 0; y < THIS->height; ++y)
2268 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2549 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2269 2550
2270 sfree (THIS->regions, THIS->size ()); 2551 sfree (THIS->regions, THIS->size ());
2271 free (THIS->regionmap); 2552 delete [] THIS->regionmap;
2272 2553
2273 THIS->regions = regions; 2554 THIS->regions = regions;
2274 THIS->regionmap = regionmap; 2555 THIS->regionmap = regionmap;
2275} 2556}
2276 2557
2277void 2558void
2278maptile::create_region_treasure () 2559maptile::create_region_treasure ()
2279 CODE: 2560 CODE:
2280{
2281 object *op = object::create ();
2282 op->type = FLOOR;
2283 op->map = THIS;
2284
2285 for (int x = 0; x < THIS->width; ++x) 2561 for (int x = 0; x < THIS->width; ++x)
2286 for (int y = 0; y < THIS->height; ++y) 2562 for (int y = 0; y < THIS->height; ++y)
2287 { 2563 {
2288 region *rgn = THIS->region (x, y); 2564 region *rgn = THIS->region (x, y);
2289 2565
2290 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2566 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2567 if (object *op = THIS->at (x, y).top)
2291 if (rgn->treasure && rndm () < rgn->treasure_density) 2568 if (rgn->treasure && rndm () < rgn->treasure_density)
2292 {
2293 op->x = x;
2294 op->y = y;
2295 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2569 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2296 }
2297 } 2570 }
2298 2571
2299 op->destroy ();
2300}
2301
2302void play_sound_map (maptile *map, int x, int y, int sound_num)
2303
2304int out_of_map (maptile *map, int x, int y) 2572int out_of_map (maptile *map, int x, int y)
2305 2573
2306void 2574void
2307trigger (maptile *map, long connection, bool state = true) 2575find_link (maptile *map, shstr_tmp connection)
2308 CODE:
2309 activate_connection (map, connection, state);
2310
2311void
2312get_connection (maptile *map, long connection)
2313 PPCODE: 2576 PPCODE:
2314 oblinkpt *obp = get_connection_links (map, connection); 2577 if (oblinkpt *obp = map->find_link (connection))
2315 if (obp)
2316 for (objectlink *ol = obp->link; ol; ol = ol->next) 2578 for (objectlink *ol = obp->link; ol; ol = ol->next)
2317 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob))); 2579 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2318
2319object *cf_map_insert_object_there (maptile *where, object *op, object *originator, int flags)
2320
2321object *cf_map_insert_object (maptile *where, object* op, int x, int y)
2322
2323object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2324 C_ARGS: str, map, nx, ny
2325 2580
2326void 2581void
2327get_map_flags (maptile *map, int x, int y) 2582get_map_flags (maptile *map, int x, int y)
2328 PPCODE: 2583 PPCODE:
2329{ 2584{
2330 maptile *nmap = 0; 2585 maptile *nmap = 0;
2331 I16 nx = 0, ny = 0; 2586 I16 nx = 0, ny = 0;
2587
2588 PUTBACK;
2332 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2589 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2590 SPAGAIN;
2333 2591
2334 EXTEND (SP, 4); 2592 EXTEND (SP, 4);
2335 PUSHs (sv_2mortal (newSViv (flags))); 2593 PUSHs (sv_2mortal (newSViv (flags)));
2336 2594
2337 if (GIMME_V == G_ARRAY) 2595 if (GIMME_V == G_ARRAY)
2338 { 2596 {
2339 PUSHs (sv_2mortal (newSVcfapi (CFAPI_PMAP, nmap))); 2597 PUSHs (sv_2mortal (to_sv (nmap)));
2340 PUSHs (sv_2mortal (newSViv (nx))); 2598 PUSHs (sv_2mortal (newSViv (nx)));
2341 PUSHs (sv_2mortal (newSViv (ny))); 2599 PUSHs (sv_2mortal (newSViv (ny)));
2342 } 2600 }
2343} 2601}
2344 2602
2603mapspace *
2604ms (maptile *map, unsigned int x, unsigned int y)
2605 PROTOTYPE: $$$
2606 CODE:
2607{
2608 maptile *nmap = 0;
2609 I16 nx, ny;
2610
2611 PUTBACK;
2612 get_map_flags (map, &nmap, x, y, &nx, &ny);
2613 SPAGAIN;
2614
2615 if (!nmap)
2616 XSRETURN_UNDEF;
2617
2618 RETVAL = &nmap->at (nx, ny);
2619}
2620 OUTPUT:
2621 RETVAL
2622
2345void 2623void
2346at (maptile *map, unsigned int x, unsigned int y) 2624at (maptile *map, unsigned int x, unsigned int y)
2347 PROTOTYPE: $$$ 2625 PROTOTYPE: $$$
2348 PPCODE: 2626 PPCODE:
2349{ 2627{
2350 object *o;
2351 maptile *nmap = 0; 2628 maptile *nmap = 0;
2352 I16 nx, ny; 2629 I16 nx, ny;
2353 2630
2631 PUTBACK;
2354 get_map_flags (map, &nmap, x, y, &nx, &ny); 2632 get_map_flags (map, &nmap, x, y, &nx, &ny);
2633 SPAGAIN;
2355 2634
2356 if (nmap) 2635 if (nmap)
2357 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2636 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2358 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 2637 XPUSHs (sv_2mortal (to_sv (o)));
2359} 2638}
2360 2639
2361SV * 2640SV *
2362bot_at (maptile *obj, unsigned int x, unsigned int y) 2641bot_at (maptile *map, unsigned int x, unsigned int y)
2363 PROTOTYPE: $$$ 2642 PROTOTYPE: $$$
2364 ALIAS: 2643 ALIAS:
2365 top_at = 1 2644 top_at = 1
2366 flags_at = 2 2645 flags_at = 2
2367 light_at = 3 2646 light_at = 3
2368 move_block_at = 4 2647 move_block_at = 4
2369 move_slow_at = 5 2648 move_slow_at = 5
2370 move_on_at = 6 2649 move_on_at = 6
2371 move_off_at = 7 2650 move_off_at = 7
2372 INIT:
2373 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2374 CODE: 2651 CODE:
2652{
2653 sint16 nx = x;
2654 sint16 ny = y;
2655
2656 if (!xy_normalise (map, nx, ny))
2657 XSRETURN_UNDEF;
2658
2659 mapspace &ms = map->at (nx, ny);
2660
2661 ms.update ();
2662
2375 switch (ix) 2663 switch (ix)
2376 { 2664 {
2377 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break; 2665 case 0: RETVAL = to_sv (ms.bot ); break;
2378 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break; 2666 case 1: RETVAL = to_sv (ms.top ); break;
2379 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break; 2667 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2380 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break; 2668 case 3: RETVAL = newSViv (ms.light ); break;
2381 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2669 case 4: RETVAL = newSVuv (ms.move_block); break;
2382 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2670 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2383 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2671 case 6: RETVAL = newSVuv (ms.move_on ); break;
2384 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2672 case 7: RETVAL = newSVuv (ms.move_off ); break;
2385 } 2673 }
2674}
2386 OUTPUT: RETVAL 2675 OUTPUT: RETVAL
2387
2388void fix_walls (maptile *map, int x, int y)
2389
2390void fix_walls_around (maptile *map, int x, int y)
2391 2676
2392# worst xs function of my life 2677# worst xs function of my life
2393bool 2678bool
2394_create_random_map (\ 2679_create_random_map (\
2395 maptile *self,\ 2680 maptile *self,\
… …
2475 RETVAL = self->generate_random_map (&rmp); 2760 RETVAL = self->generate_random_map (&rmp);
2476} 2761}
2477 OUTPUT: 2762 OUTPUT:
2478 RETVAL 2763 RETVAL
2479 2764
2765MODULE = cf PACKAGE = cf::mapspace
2766
2767INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2768
2480MODULE = cf PACKAGE = cf::arch 2769MODULE = cf PACKAGE = cf::arch
2481
2482archetype *find (utf8_string name)
2483 CODE:
2484 RETVAL = archetype::find (name);
2485 OUTPUT:
2486 RETVAL
2487 2770
2488int archetypes_size () 2771int archetypes_size ()
2489 CODE: 2772 CODE:
2490 RETVAL = archetypes.size (); 2773 RETVAL = archetypes.size ();
2491 OUTPUT: RETVAL 2774 OUTPUT: RETVAL
… …
2525 PROTOTYPE: $ 2808 PROTOTYPE: $
2526 CODE: 2809 CODE:
2527 RETVAL = region::find (name); 2810 RETVAL = region::find (name);
2528 OUTPUT: RETVAL 2811 OUTPUT: RETVAL
2529 2812
2530region *find_fuzzy (utf8_string name)
2531 PROTOTYPE: $
2532 CODE:
2533 RETVAL = region::find_fuzzy (name);
2534 OUTPUT: RETVAL
2535
2536int specificity (region *rgn) 2813int specificity (region *rgn)
2537 CODE: 2814 CODE:
2538 RETVAL = 0; 2815 RETVAL = 0;
2539 while (rgn = rgn->parent) 2816 while (rgn = rgn->parent)
2540 RETVAL++; 2817 RETVAL++;
… …
2576 CODE: 2853 CODE:
2577{ 2854{
2578 STRLEN len; 2855 STRLEN len;
2579 char *buf = SvPVbyte (packet, len); 2856 char *buf = SvPVbyte (packet, len);
2580 2857
2858 if (len > MAXSOCKBUF)
2859 {
2860 // ugly
2861 if (THIS->pl)
2862 THIS->pl->failmsg ("[packet too long for client]");
2863 }
2864 else
2581 THIS->send_packet (buf, len); 2865 THIS->send_packet (buf, len);
2582} 2866}
2867
2868faceidx
2869client::need_face (utf8_string name, int pri = 0)
2870 CODE:
2871 RETVAL = face_find (name, 0);
2872 if (RETVAL)
2873 {
2874 THIS->send_face (RETVAL, pri);
2875 THIS->flush_fx ();
2876 }
2877 OUTPUT:
2878 RETVAL
2879
2880int
2881client::fx_want (int idx, int value = -1)
2882 CODE:
2883 if (0 < idx && idx < FT_NUM)
2884 {
2885 RETVAL = THIS->fx_want [idx];
2886 if (items > 2)
2887 THIS->fx_want [idx] = value;
2888 }
2889 else
2890 RETVAL = 0;
2891 OUTPUT:
2892 RETVAL
2893
2894MODULE = cf PACKAGE = cf::sound PREFIX = sound_
2895
2896faceidx sound_find (utf8_string name)
2897
2898void sound_set (utf8_string str, faceidx face)
2899
2900# dire hack
2901void old_sound_index (int idx, faceidx face)
2902 CODE:
2903 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2904 old_sound_index [idx] = face;
2583 2905
2584MODULE = cf PACKAGE = cf::face PREFIX = face_ 2906MODULE = cf PACKAGE = cf::face PREFIX = face_
2585 2907
2586#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2908#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h |
2587 2909
… …
2611 set_visibility = 1 2933 set_visibility = 1
2612 set_magicmap = 2 2934 set_magicmap = 2
2613 set_smooth = 3 2935 set_smooth = 3
2614 set_smoothlevel = 4 2936 set_smoothlevel = 4
2615 CODE: 2937 CODE:
2616 faceinfo *f = face_info (idx); 2938 faceinfo *f = face_info (idx); assert (f);
2617 assert (f);
2618 switch (ix) 2939 switch (ix)
2619 { 2940 {
2620 case 0: f->type = value; break; 2941 case 0: f->type = value; break;
2621 case 1: f->visibility = value; break; 2942 case 1: f->visibility = value; break;
2622 case 2: f->magicmap = value; break; 2943 case 2: f->magicmap = value; break;
… …
2625 } 2946 }
2626 2947
2627void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2948void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
2628 CODE: 2949 CODE:
2629{ 2950{
2630 facedata *d = face_data (idx, faceset); 2951 faceinfo *f = face_info (idx); assert (f);
2631 assert (d); 2952 facedata *d = &(faceset ? f->data64 : f->data32);
2632 sv_to (data, d->data); 2953 sv_to (data, d->data);
2633 STRLEN clen; 2954 STRLEN clen;
2634 char *cdata = SvPVbyte (chksum, clen); 2955 char *cdata = SvPVbyte (chksum, clen);
2635 clen = min (CHKSUM_SIZE, clen); 2956 clen = min (CHKSUM_SIZE, clen);
2636 2957
… …
2646 ns->force_newmap = true; 2967 ns->force_newmap = true;
2647 } 2968 }
2648 } 2969 }
2649} 2970}
2650 2971
2972int get_data_size (faceidx idx, int faceset = 0)
2973 CODE:
2974 facedata *d = face_data (idx, faceset);
2975 if (!d) XSRETURN_UNDEF;
2976 RETVAL = d->data.size ();
2977 OUTPUT:
2978 RETVAL
2979
2980SV *get_chksum (faceidx idx, int faceset = 0)
2981 CODE:
2982 facedata *d = face_data (idx, faceset);
2983 if (!d) XSRETURN_UNDEF;
2984 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2985 OUTPUT:
2986 RETVAL
2987
2988SV *get_data (faceidx idx, int faceset = 0)
2989 CODE:
2990 facedata *d = face_data (idx, faceset);
2991 if (!d) XSRETURN_UNDEF;
2992 RETVAL = newSVpvn (d->data.data (), d->data.length ());
2993 OUTPUT:
2994 RETVAL
2995
2651void invalidate (faceidx idx) 2996void invalidate (faceidx idx)
2652 CODE: 2997 CODE:
2653 for_all_clients (ns) 2998 for_all_clients (ns)
2654 { 2999 {
2655 ns->faces_sent [idx] = false; 3000 ns->faces_sent [idx] = false;
… …
2698void invalidate_all () 3043void invalidate_all ()
2699 CODE: 3044 CODE:
2700 for_all_clients (ns) 3045 for_all_clients (ns)
2701 ns->anims_sent.reset (); 3046 ns->anims_sent.reset ();
2702 3047
3048MODULE = cf PACKAGE = cf::object::freezer
3049
3050INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h |
3051
3052SV *
3053new (char *klass)
3054 CODE:
3055 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
3056 OUTPUT: RETVAL
3057
3058void
3059DESTROY (SV *sv)
3060 CODE:
3061 object_freezer *self;
3062 sv_to (sv, self);
3063 delete self;
3064
3065MODULE = cf PACKAGE = cf::object::thawer
3066
3067INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h |
3068
3069SV *
3070new_from_file (char *klass, octet_string path)
3071 CODE:
3072 object_thawer *f = new object_thawer (path);
3073 if (!*f)
3074 {
3075 delete f;
3076 XSRETURN_UNDEF;
3077 }
3078 RETVAL = newSVptr (f, gv_stashpv ("cf::object::thawer", 1));
3079 OUTPUT: RETVAL
3080
3081void
3082DESTROY (SV *sv)
3083 CODE:
3084 object_thawer *self;
3085 sv_to (sv, self);
3086 delete self;
3087
3088void
3089extract_tags (object_thawer *self)
3090 PPCODE:
3091 while (self->kw != KW_EOF)
3092 {
3093 PUTBACK;
3094 coroapi::cede_to_tick ();
3095 SPAGAIN;
3096
3097 if (self->kw == KW_tag)
3098 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
3099
3100 self->skip ();
3101 }
3102

Diff Legend

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