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.209 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.303 by root, Tue Sep 23 04:29:11 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * This code is placed under the GNU General Public Licence (GPL) 4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 *
6 * Copyright (C) 2001-2005 by Chachkoff Yann 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
7 * Copyright (C) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
8 * 7 *
9 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
12 * (at your option) any later version. 11 * (at your option) any later version.
13 * 12 *
14 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details. 16 * GNU General Public License for more details.
18 * 17 *
19 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 *
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_set_property = cfapi_object_set_property;
80static f_plug_api object_insert = cfapi_object_insert;
81
82static PerlInterpreter *perl; 66static PerlInterpreter *perl;
83 67
84double runtime; 68tstamp NOW, runtime;
69
70static int tick_inhibit;
71static int tick_pending;
85 72
86global gbl_ev; 73global gbl_ev;
87static 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;
88static SV *sv_runtime, *sv_next_tick; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76
77bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type;
89 79
90static HV 80static HV
91 *stash_cf, 81 *stash_cf,
92 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
93 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
94 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
95 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
96 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
97 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
98 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
99 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
100 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
92
93static inline SV *
94newSVpv_utf8 (const char *s)
95{
96 if (!s)
97 return newSV (0);
98
99 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv);
101 return sv;
102}
103
104static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l)
106{
107 if (!s)
108 return newSV (0);
109
110 SV *sv = newSVpvn (s, l);
111 SvUTF8_on (sv);
112 return sv;
113}
101 114
102// helper cast function, returns super class * or 0 115// helper cast function, returns super class * or 0
103template<class super> 116template<class super>
104static super * 117static super *
105is_a (attachable *at) 118is_a (attachable *at)
165} 178}
166 179
167void 180void
168attachable::do_destroy () 181attachable::do_destroy ()
169{ 182{
170 invoke (EVENT_ATTACHABLE_DESTROY, DT_END); 183 INVOKE_ATTACHABLE (DESTROY, this);
171 184
172 if (cb) 185 if (cb)
173 { 186 {
174 SvREFCNT_dec (cb); 187 SvREFCNT_dec (cb);
175 cb = 0; 188 cb = 0;
198 { 211 {
199 if (i >= mortals.size ()) 212 if (i >= mortals.size ())
200 { 213 {
201 i = 0; 214 i = 0;
202 215
203 if (mortals.size () > 1000) 216 if (mortals.size () >= 512)
217 {
218 static int last_mortalcount;
219 if (mortals.size () != last_mortalcount)
220 {
221 last_mortalcount = mortals.size ();
204 LOG (llevInfo, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ()); 222 LOG (llevInfo, "%d mortals.\n", (int)mortals.size ());
223
224 if (0)
225 {
226 for (int j = 0; j < mortals.size (); ++j)//D
227 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
228 fprintf (stderr, "\n");//D
229 }
230 }
231 }
205 232
206 break; 233 break;
207 } 234 }
208 235
209 attachable *obj = mortals [i]; 236 attachable *obj = mortals [i];
230 delete obj; 257 delete obj;
231 } 258 }
232 } 259 }
233} 260}
234 261
262void
263attachable::set_key (const char *key, const char *value, bool is_utf8)
264{
265 if (!self)
266 self = newHV ();
267
268 if (value)
269 hv_store (self, key, strlen (key), is_utf8 ? newSVpv_utf8 (value) : newSVpv (value, 0), 0);
270 else
271 hv_delete (self, key, strlen (key), G_DISCARD);
272}
273
235attachable & 274attachable &
236attachable::operator =(const attachable &src) 275attachable::operator =(const attachable &src)
237{ 276{
238 //if (self || cb) 277 //if (self || cb)
239 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 278 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
240 279
241 attach = src.attach; 280 attach = src.attach;
242 return *this; 281 return *this;
243} 282}
244 283
284template<typename T>
285static bool
286find_backref (void *ptr, T *obj)
287{
288 char *s = (char *)obj;
289 while (s < (char *)obj + sizeof (T))
290 {
291 if (ptr == *(void **)s)
292 return true;
293
294 s += sizeof (void *); // assume natural alignment
295 }
296
297 return false;
298}
299
300// for debugging, find "live" objects containing this ptr
301void
302find_backref (void *ptr)
303{
304 for_all_objects (op)
305 if (find_backref (ptr, op))
306 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
307
308 for_all_players (pl)
309 if (find_backref (ptr, pl))
310 fprintf (stderr, "P %p\n", pl);
311
312 for_all_clients (ns)
313 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns);
315
316}
317
245////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 318//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
246 319
247static SV * 320static SV *
248newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 321newSVptr (void *ptr, HV *stash, HV *hv = newHV ())
249{ 322{
250 SV *sv; 323 SV *sv;
251 324
252 if (!ptr) 325 if (!ptr)
253 return &PL_sv_undef; 326 return newSV (0);
254 327
255 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 328 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
256 return sv_bless (newRV_noinc ((SV *)hv), stash); 329 return sv_bless (newRV_noinc ((SV *)hv), stash);
257} 330}
258 331
277 350
278static SV * 351static SV *
279newSVattachable (attachable *obj, HV *stash) 352newSVattachable (attachable *obj, HV *stash)
280{ 353{
281 if (!obj) 354 if (!obj)
282 return &PL_sv_undef; 355 return newSV (0);
283 356
284 if (!obj->self) 357 if (!obj->self)
358 obj->self = newHV ();
359
360 if (!SvOBJECT (obj->self))
285 { 361 {
286 obj->self = newHV ();
287 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 362 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
288 363
289 // now bless the object _once_ 364 // now bless the object _once_
365 //TODO: create a class registry with c++ type<=>perl name<=>stash and use it here and elsewhere
290 return sv_bless (newRV_inc ((SV *)obj->self), stash); 366 return sv_bless (newRV_inc ((SV *)obj->self), stash);
291 } 367 }
292 else 368 else
293 { 369 {
294 SV *sv = newRV_inc ((SV *)obj->self); 370 SV *sv = newRV_inc ((SV *)obj->self);
331 return SvPTR (sv, klass); 407 return SvPTR (sv, klass);
332 else 408 else
333 return 0; 409 return 0;
334} 410}
335 411
336inline SV *to_sv (const shstr & v) { return v ? newSVpvn ((const char *)v, v.length ()) : &PL_sv_undef; } 412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); }
337inline SV *to_sv (const char * v) { return newSVpv (v, 0); } 413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
338inline SV *to_sv (bool v) { return newSViv (v); } 414inline SV *to_sv (bool v) { return newSViv (v); }
339inline SV *to_sv ( signed char v) { return newSViv (v); } 415inline SV *to_sv ( signed char v) { return newSViv (v); }
340inline SV *to_sv (unsigned char v) { return newSViv (v); } 416inline SV *to_sv (unsigned char v) { return newSViv (v); }
341inline SV *to_sv ( signed short v) { return newSViv (v); } 417inline SV *to_sv ( signed short v) { return newSViv (v); }
342inline SV *to_sv (unsigned short v) { return newSVuv (v); } 418inline SV *to_sv (unsigned short v) { return newSVuv (v); }
351inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 427inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
352inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 428inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
353inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 429inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
354inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
355inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 431inline 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); }
356inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
357inline SV *to_sv (region * v) { return newSVptr (v, stash_cf_region_wrap); }
358inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 434inline 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); }
359 436
360inline SV *to_sv (object & v) { return to_sv (&v); } 437inline SV *to_sv (object & v) { return to_sv (&v); }
361inline SV *to_sv (living & v) { return to_sv (&v); } 438inline SV *to_sv (living & v) { return to_sv (&v); }
362 439
363inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
364inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
365 442
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444
366inline SV *to_sv (UUID v) 445inline SV *to_sv (dynbuf * v)
367{ 446{
368 char buf[128]; 447 SV *sv = newSV (0);
369 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
370 return newSVpv (buf, 0);
371}
372 448
449 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1);
451 SvPOK_only (sv);
452 v->linearise (SvPVX (sv));
453 SvCUR_set (sv, v->size ());
454 *SvEND (sv) = 0;
455
456 return sv;
457}
458
459inline SV *to_sv (dynbuf_text * v)
460{
461 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv);
463 return sv;
464}
465
373inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
374inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
375inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
376inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
377inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 470inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
378inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 471inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
379inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); } 472inline void sv_to (SV *sv, unsigned short &v) { v = SvIV (sv); }
380inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); } 473inline void sv_to (SV *sv, signed int &v) { v = SvIV (sv); }
381inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); } 474inline void sv_to (SV *sv, unsigned int &v) { v = SvUV (sv); }
382inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, signed long &v) { v = SvIV (sv); }
383inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 476inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
384inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 477inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
385inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 478inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
386inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 479inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
387inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 480inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
388inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 481inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
389inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 482inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
390inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 483inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
391inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 484inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
392inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 485inline 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"); }
393inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
394inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
395inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
396inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 489inline 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"); }
491inline 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" ); }
397 493
398//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
399inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
400 496
401template<class T> 497template<class T>
402inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 498inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
403 499
404template<int N> 500template<int N>
405inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 501inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
406 502
407inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 503inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
408inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 504inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
409inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 505inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
410inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 506inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
411 507
412inline void sv_to (SV *sv, std::string &v) 508inline void sv_to (SV *sv, std::string &v)
413{ 509{
414 STRLEN len; 510 STRLEN len;
415 char *data = SvPVbyte (sv, len); 511 char *data = SvPVbyte (sv, len);
416 v.assign (data, len); 512 v.assign (data, len);
417} 513}
418 514
419inline void sv_to (SV *sv, UUID &v) 515inline void sv_to (SV *sv, UUID &v)
420{ 516{
421 unsigned int version; 517 if (!v.parse (SvPV_nolen (sv)))
422
423 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
424 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 518 croak ("unparsable uuid: %s", SvPV_nolen (sv));
425} 519}
426 520
427inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 521inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
428 522
446 break; 540 break;
447 541
448 case DT_STRING: 542 case DT_STRING:
449 { 543 {
450 char *str = (char *)va_arg (ap, const char *); 544 char *str = (char *)va_arg (ap, const char *);
451 sv = str ? newSVpv (str, 0) : &PL_sv_undef; 545 sv = str ? newSVpv (str, 0) : newSV (0);
452 } 546 }
453 break; 547 break;
454 548
455 case DT_DATA: 549 case DT_DATA:
456 { 550 {
457 char *str = (char *)va_arg (ap, const void *); 551 char *str = (char *)va_arg (ap, const void *);
458 int len = va_arg (ap, int); 552 int len = va_arg (ap, int);
459 sv = str ? newSVpv (str, len) : &PL_sv_undef; 553 sv = str ? newSVpv (str, len) : newSV (0);
460 } 554 }
461 break; 555 break;
462 556
463 case DT_OBJECT: 557 case DT_OBJECT:
464 sv = to_sv (va_arg (ap, object *)); 558 sv = to_sv (va_arg (ap, object *));
506 va_end (ap); 600 va_end (ap);
507 601
508 return sv; 602 return sv;
509} 603}
510 604
511static SV *
512newSVcfapi (int type, ...)
513{
514 SV *sv;
515
516 va_list ap;
517 va_start (ap, type);
518
519 switch (type)
520 {
521 case CFAPI_INT: sv = newSViv (*va_arg (ap, int * )); break;
522 case CFAPI_LONG: sv = newSVval64 (*va_arg (ap, sint64 *)); break;
523 case CFAPI_DOUBLE: sv = newSVnv (*va_arg (ap, double *)); break;
524 case CFAPI_STRING: sv = newSVdt_va (ap, DT_STRING); break;
525 case CFAPI_POBJECT: sv = newSVdt_va (ap, DT_OBJECT); break;
526 case CFAPI_PMAP: sv = newSVdt_va (ap, DT_MAP ); break;
527 case CFAPI_PPLAYER: sv = newSVdt_va (ap, DT_PLAYER); break;
528 case CFAPI_PARCH: sv = newSVdt_va (ap, DT_ARCH ); break;
529 case CFAPI_PPARTY: sv = newSVdt_va (ap, DT_PARTY ); break;
530 case CFAPI_PREGION: sv = newSVdt_va (ap, DT_REGION); break;
531
532 default:
533 assert (("unhandled type in newSVcfapi", 0));
534 }
535
536 va_end (ap);
537
538 return sv;
539}
540
541////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 605//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
542 606
543SV * 607SV *
544registry (attachable *ext) 608registry (attachable *ext)
545{ 609{
549 return newRV_inc ((SV *)ext->cb); 613 return newRV_inc ((SV *)ext->cb);
550} 614}
551 615
552///////////////////////////////////////////////////////////////////////////// 616/////////////////////////////////////////////////////////////////////////////
553 617
554extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
555{
556 return 0;
557}
558
559static CommArray_s rtn_cmd;
560
561static int
562runPluginCommand (object *obj, char *params)
563{
564 return -1;
565}
566
567extern "C" void *cfperl_getPluginProperty (int *type, ...)
568{
569 va_list args;
570 char *propname;
571 int i;
572 va_start (args, type);
573 propname = va_arg (args, char *);
574 //printf ("Property name: %s\n", propname);
575
576 if (!strcmp (propname, "command?"))
577 return NULL;
578 else if (!strcmp (propname, "Identification"))
579 {
580 va_end (args);
581 return (void *)PLUGIN_NAME;
582 }
583 else if (!strcmp (propname, "FullName"))
584 {
585 va_end (args);
586 return (void *)PLUGIN_VERSION;
587 }
588 else
589 va_end (args);
590
591 return NULL;
592}
593
594extern "C" int cfperl_postInitPlugin ()
595{
596 int hooktype = 1;
597 int rtype = 0;
598
599 cf_init_plugin (gethook);
600
601 return 0;
602}
603
604extern "C" int cfperl_closePlugin ()
605{
606 return 0;
607}
608
609void 618void
610cfperl_init () 619cfperl_init ()
611{ 620{
621 extern char **environ;
622
612 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0); 623 PERL_SYS_INIT3 (&settings.argc, &settings.argv, &environ);
613 perl = perl_alloc (); 624 perl = perl_alloc ();
614 perl_construct (perl); 625 perl_construct (perl);
615 626
616 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
617 628
618 const char *argv[] = { 629 const char *argv[] = {
619 settings.argv [0], 630 settings.argv [0],
620 "-e" 631 "-e"
621 "use Event; use Coro;" // required for bootstrap 632 "use EV ();"
622 "cf->bootstrap;" // required for datadir :*> 633 "use Coro ();"
634 "cf->bootstrap;"
623 "unshift @INC, cf::datadir ();" 635 "unshift @INC, cf::datadir ();"
624 "require cf;" 636 "require cf;"
625 }; 637 };
626 638
627 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL) 639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
628 || perl_run (perl)) 640 || perl_run (perl))
629 { 641 {
630 printf ("unable to initialize perl-interpreter, aborting.\n"); 642 printf ("unable to initialize perl-interpreter, aborting.\n");
631 exit (EXIT_FAILURE); 643 exit (EXIT_FAILURE);
632 } 644 }
633
634 {
635 dSP;
636
637 PUSHMARK (SP);
638 PUTBACK;
639 call_pv ("cf::init", G_DISCARD | G_VOID);
640 }
641} 645}
642 646
643void cfperl_main () 647void cfperl_main ()
644{ 648{
645 dSP; 649 dSP;
652void 656void
653attachable::instantiate () 657attachable::instantiate ()
654{ 658{
655 if (attach) 659 if (attach)
656 { 660 {
657 invoke (EVENT_ATTACHABLE_INSTANTIATE, ARG_STRING (attach), DT_END); 661 INVOKE_ATTACHABLE (INSTANTIATE, this, ARG_STRING (attach));
658 attach = 0; 662 attach = 0;
659 } 663 }
660} 664}
661 665
662void 666void
663attachable::reattach () 667attachable::reattach ()
664{ 668{
665 optimise (); 669 optimise ();
666 //TODO: check for _attachment's, very important for restarts 670 //TODO: check for _attachment's, very important for restarts
667 invoke (EVENT_ATTACHABLE_REATTACH, DT_END); 671 INVOKE_ATTACHABLE (REATTACH, this);
668} 672}
669 673
670static event_klass klass_of[NUM_EVENT_TYPES] = { 674static event_klass klass_of[NUM_EVENT_TYPES] = {
671# define def(type,name) KLASS_ ## type, 675# define def(type,name) KLASS_ ## type,
672# include "eventinc.h" 676# include "eventinc.h"
715} 719}
716 720
717void 721void
718global::gather_callbacks (AV *&callbacks, event_type event) const 722global::gather_callbacks (AV *&callbacks, event_type event) const
719{ 723{
720 ::gather_callbacks (callbacks, cb_object, event); 724 ::gather_callbacks (callbacks, cb_global, event);
721} 725}
722 726
723void 727void
724object::gather_callbacks (AV *&callbacks, event_type event) const 728object::gather_callbacks (AV *&callbacks, event_type event) const
725{ 729{
726 if (subtype && type + subtype * NUM_SUBTYPES <= AvFILLp (cb_type)) 730 if (subtype && type + subtype * NUM_TYPES <= AvFILLp (cb_type))
727 { 731 {
728 SV *registry = AvARRAY (cb_type)[type + subtype * NUM_SUBTYPES]; 732 SV *registry = AvARRAY (cb_type)[type + subtype * NUM_TYPES];
729 733
730 if (registry && SvROK (registry) && SvTYPE (SvRV (registry)) == SVt_PVAV) 734 if (registry && SvROK (registry) && SvTYPE (SvRV (registry)) == SVt_PVAV)
731 ::gather_callbacks (callbacks, (AV *)SvRV (registry), event); 735 ::gather_callbacks (callbacks, (AV *)SvRV (registry), event);
732 } 736 }
733 737
769{ 773{
770 attachable::gather_callbacks (callbacks, event); 774 attachable::gather_callbacks (callbacks, event);
771 ::gather_callbacks (callbacks, cb_map, event); 775 ::gather_callbacks (callbacks, cb_map, event);
772} 776}
773 777
778void
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{
781 for (int event = 0; event <= AvFILLp (registry); ++event)
782 {
783 SV *cbs_ = AvARRAY (registry)[event];
784
785 // element must be list of callback entries
786 if (cbs_ && SvROK (cbs_) && SvTYPE (SvRV (cbs_)) == SVt_PVAV)
787 {
788 AV *cbs = (AV *)SvRV (cbs_);
789
790 // no callback entries, no callbacks to call
791 if (AvFILLp (cbs) >= 0)
792 set.set (event);
793 }
794 }
795}
796
797// very slow and inefficient way to recalculate the global want bitsets
798void
799_recalc_want ()
800{
801 ev_want_event.reset ();
802
803 _recalc_want (ev_want_event, cb_global);
804 _recalc_want (ev_want_event, cb_attachable);
805 _recalc_want (ev_want_event, cb_object);
806 _recalc_want (ev_want_event, cb_client);
807 _recalc_want (ev_want_event, cb_player);
808 _recalc_want (ev_want_event, cb_map);
809
810 ev_want_type.reset ();
811
812 for (int type = 0; type <= AvFILLp (cb_type); ++type)
813 {
814 SV *cbs_ = AvARRAY (cb_type)[type];
815
816 // element must be list of callback entries
817 if (cbs_ && SvROK (cbs_) && SvTYPE (SvRV (cbs_)) == SVt_PVAV)
818 {
819 AV *cbs = (AV *)SvRV (cbs_);
820
821 // no callback entries, no callbacks to call
822 if (AvFILLp (cbs) >= 0)
823 ev_want_type.set (type % NUM_TYPES);
824 }
825 }
826}
827
774bool 828bool
775attachable::invoke (event_type event, ...) 829attachable::invoke (event_type event, ...)
776{ 830{
777 data_type dt; 831 data_type dt;
778 va_list ap;
779
780 va_start (ap, event);
781 832
782 // callback call ordering should be: 833 // callback call ordering should be:
783 // 1. per-object callback 834 // 1. per-object callback
784 // 2. per-class object 835 // 2. per-class object
785 // 3. per-type callback 836 // 3. per-type callback
789 gather_callbacks (callbacks, event); 840 gather_callbacks (callbacks, event);
790 841
791 // short-circuit processing if no callbacks found/defined 842 // short-circuit processing if no callbacks found/defined
792 if (!callbacks) 843 if (!callbacks)
793 return 0; 844 return 0;
845
846 va_list ap;
847 va_start (ap, event);
794 848
795 CALL_BEGIN (3); 849 CALL_BEGIN (3);
796 CALL_ARG_SV (newSViv (event)); // only used for debugging nowadays 850 CALL_ARG_SV (newSViv (event)); // only used for debugging nowadays
797 CALL_ARG_SV (newRV_noinc ((SV *)callbacks)); 851 CALL_ARG_SV (newRV_noinc ((SV *)callbacks));
798 852
833} 887}
834 888
835SV * 889SV *
836cfperl_result (int idx) 890cfperl_result (int idx)
837{ 891{
838 AV *av = get_av ("cfperl::invoke_results", 0); 892 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
839 if (!av) 893 if (!av)
840 return &PL_sv_undef; 894 return &PL_sv_undef;
841 895
842 SV **sv = av_fetch (av, idx, 0); 896 SV **sv = av_fetch (av, idx, 0);
843 if (!sv) 897 if (!sv)
857{ 911{
858 return SvNV (cfperl_result (idx)); 912 return SvNV (cfperl_result (idx));
859} 913}
860 914
861///////////////////////////////////////////////////////////////////////////// 915/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions
917
918void cfperl_tick ()
919{
920 tick_pending = 1;
921
922 if (tick_inhibit)
923 return;
924
925 tick_pending = 0;
926
927 dSP;
928
929 PUSHMARK (SP);
930 PUTBACK;
931 call_pv ("cf::tick", G_DISCARD | G_VOID);
932
933 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
934}
862 935
863void 936void
864cfperl_emergency_save () 937cfperl_emergency_save ()
865{ 938{
866 CALL_BEGIN (0); 939 CALL_BEGIN (0);
875 CALL_ARG (make_core); 948 CALL_ARG (make_core);
876 CALL_CALL ("cf::post_cleanup", G_VOID); 949 CALL_CALL ("cf::post_cleanup", G_VOID);
877 CALL_END; 950 CALL_END;
878} 951}
879 952
953void
954cfperl_make_book (object *book, int level)
955{
956 CALL_BEGIN (2);
957 CALL_ARG (book);
958 CALL_ARG (level);
959 CALL_CALL ("ext::books::make_book", G_VOID);
960 CALL_END;
961}
962
963void
964cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
965{
966 CALL_BEGIN (4);
967 CALL_ARG (ns);
968 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID);
972 CALL_END;
973}
974
975int
976cfperl_can_merge (object *ob1, object *ob2)
977{
978 int can;
979
980 CALL_BEGIN (2);
981 CALL_ARG (ob1);
982 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR);
984 can = count && SvTRUE (TOPs);
985 CALL_END;
986
987 return can;
988}
989
990player *
991player::find (const char *name)
992{
993 CALL_BEGIN (1);
994 CALL_ARG (name);
995 CALL_CALL ("cf::player::find", G_SCALAR);
996
997 player *retval = 0;
998 if (count) sv_to (POPs, retval);
999
1000 CALL_END;
1001
1002 return retval;
1003}
1004
1005maptile *
1006find_style (const char *dirname, const char *stylename, int difficulty)
1007{
1008 CALL_BEGIN (3);
1009 CALL_ARG (dirname);
1010 CALL_ARG (stylename);
1011 CALL_ARG (difficulty);
1012 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1013
1014 maptile *retval = 0;
1015 if (count) sv_to (POPs, retval);
1016
1017 CALL_END;
1018
1019 return retval;
1020}
1021
880maptile * 1022maptile *
881maptile::find_sync (const char *path, maptile *origin) 1023maptile::find_sync (const char *path, maptile *origin)
882{ 1024{
883 CALL_BEGIN (2); 1025 CALL_BEGIN (2);
884 CALL_ARG (path); 1026 CALL_ARG (path);
885 CALL_ARG (origin); 1027 CALL_ARG (origin);
886 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1028 CALL_CALL ("cf::map::find_sync", G_SCALAR);
887 1029
888 maptile *retval; 1030 maptile *retval = 0;
889
890 if (count)
891 sv_to (POPs, retval); 1031 if (count) sv_to (POPs, retval);
892 else
893 retval = 0;
894 1032
895 CALL_END; 1033 CALL_END;
896 1034
897 return retval; 1035 return retval;
898} 1036}
899 1037
900maptile * 1038maptile *
901maptile::find_async (const char *path, maptile *origin) 1039maptile::find_async (const char *path, maptile *origin, bool load)
902{ 1040{
903 CALL_BEGIN (2); 1041 CALL_BEGIN (3);
904 CALL_ARG (path); 1042 CALL_ARG (path);
905 CALL_ARG (origin); 1043 CALL_ARG (origin);
1044 CALL_ARG (load);
906 CALL_CALL ("cf::map::find_async", G_SCALAR); 1045 CALL_CALL ("cf::map::find_async", G_SCALAR);
907 1046
908 maptile *retval; 1047 maptile *retval = 0;
909
910 if (count)
911 sv_to (POPs, retval); 1048 if (count) sv_to (POPs, retval);
912 else
913 retval = 0;
914 1049
915 CALL_END; 1050 CALL_END;
916 1051
917 return retval; 1052 return retval;
918} 1053}
944 CALL_BEGIN (2); 1079 CALL_BEGIN (2);
945 CALL_ARG (this); 1080 CALL_ARG (this);
946 CALL_ARG (exit); 1081 CALL_ARG (exit);
947 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1082 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
948 CALL_END; 1083 CALL_END;
1084}
1085
1086void
1087object::player_goto (const char *path, int x, int y)
1088{
1089 if (type != PLAYER)
1090 return;
1091
1092 CALL_BEGIN (4);
1093 CALL_ARG (this);
1094 CALL_ARG (path);
1095 CALL_ARG (x);
1096 CALL_ARG (y);
1097 CALL_CALL ("cf::object::player::goto", G_VOID);
1098 CALL_END;
1099}
1100
1101const char *
1102object::ref () const
1103{
1104 if (type == PLAYER)
1105 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1106 else
1107 return 0;
1108}
1109
1110object *
1111object::deref (const char *ref)
1112{
1113 object *retval = 0;
1114
1115 if (ref)
1116 {
1117 CALL_BEGIN (1);
1118 CALL_ARG (ref);
1119 CALL_CALL ("cf::object::deref", G_SCALAR);
1120
1121 if (count)
1122 sv_to (POPs, retval);
1123
1124 CALL_END;
1125 }
1126
1127 return retval;
949} 1128}
950 1129
951void 1130void
952log_backtrace (const char *msg) 1131log_backtrace (const char *msg)
953{ 1132{
964#endif 1143#endif
965} 1144}
966 1145
967///////////////////////////////////////////////////////////////////////////// 1146/////////////////////////////////////////////////////////////////////////////
968 1147
969struct EventAPI *watcher_base::GEventAPI; 1148struct EVAPI *evapi::GEVAPI;
970struct CoroAPI *coroapi::GCoroAPI; 1149struct CoroAPI *coroapi::GCoroAPI;
971
972int coroapi::cede_counter;
973double (*coroapi::time)();
974double coroapi::next_cede;
975 1150
976void coroapi::do_cede_to_tick () 1151void coroapi::do_cede_to_tick ()
977{ 1152{
978 cede_counter = 0; 1153 cede_pending = 0;
979
980 cede (); 1154 cede ();
981
982 next_cede += (TICK / CEDES_PER_TICK) * 0.99;
983 if (next_cede > SvNV (sv_next_tick) - 0.02)
984 next_cede = SvNV (sv_next_tick);
985}
986
987void coroapi::do_cede_every ()
988{
989 cede_counter = 0;
990
991 if (coroapi::nready ())
992 coroapi::cede ();
993}
994
995void coroapi::do_cede_to_tick_every ()
996{
997 cede_counter = 0;
998
999 cede_to_tick ();
1000} 1155}
1001 1156
1002void 1157void
1003coroapi::wait_for_tick () 1158coroapi::wait_for_tick ()
1004{ 1159{
1013 CALL_BEGIN (0); 1168 CALL_BEGIN (0);
1014 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD); 1169 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD);
1015 CALL_END; 1170 CALL_END;
1016} 1171}
1017 1172
1018static void
1019iw_dispatch (pe_event *ev)
1020{
1021 iw *w = (iw *)ev->ext_data;
1022 w->call (*w);
1023}
1024
1025void
1026iw::alloc ()
1027{
1028 pe = GEventAPI->new_idle (0, 0);
1029
1030 WaREENTRANT_off (pe);
1031 pe->base.callback = (void *)iw_dispatch;
1032 pe->base.ext_data = (void *)this;
1033}
1034
1035static void iow_dispatch (pe_event *ev)
1036{
1037 iow *w = (iow *)ev->ext_data;
1038 w->call (*w, ((pe_ioevent *)ev)->got);
1039}
1040
1041void
1042iow::alloc ()
1043{
1044 pe = GEventAPI->new_io (0, 0);
1045
1046 WaREENTRANT_off (pe);
1047 pe->base.callback = (void *)iow_dispatch;
1048 pe->base.ext_data = (void *)this;
1049
1050 pe->fd = -1;
1051 pe->poll = 0;
1052}
1053
1054void
1055iow::fd (int fd)
1056{
1057 pe->fd = fd;
1058}
1059
1060int
1061iow::poll ()
1062{
1063 return pe->poll;
1064}
1065
1066void 1173void
1067iow::poll (int events) 1174iow::poll (int events)
1068{ 1175{
1069 if (pe->poll != events) 1176 if (events != this->events)
1070 { 1177 {
1178 int active = ev_is_active ((ev_io *)this);
1071 if (pe->poll) stop (); 1179 if (active) stop ();
1072 pe->poll = events; 1180 ev_io_set ((ev_io *)this, fd, events);
1073 if (pe->poll) start (); 1181 if (active) start ();
1074 } 1182 }
1075} 1183}
1076 1184
1077void 1185void
1078_connect_to_perl () 1186_connect_to_perl ()
1079{ 1187{
1080 stash_cf = gv_stashpv ("cf" , 1); 1188 stash_cf = gv_stashpv ("cf", 1);
1081 1189
1082 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1083 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1191 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1084 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1192 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1085 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1193 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1194 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1086 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1195 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1087 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1196 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1088 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1197 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1089 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1198 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1090 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1199 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1091 1200
1201 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1092 sv_runtime = get_sv ("cf::RUNTIME" , 1); sv_upgrade (sv_runtime , SVt_NV); 1202 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1203 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1093 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); sv_upgrade (sv_next_tick, SVt_NV); 1204 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1094 1205
1095 cb_global = get_av ("cf::CB_GLOBAL", 1); 1206 cb_global = get_av ("cf::CB_GLOBAL", 1);
1096 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1207 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1097 cb_object = get_av ("cf::CB_OBJECT", 1); 1208 cb_object = get_av ("cf::CB_OBJECT", 1);
1098 cb_player = get_av ("cf::CB_PLAYER", 1); 1209 cb_player = get_av ("cf::CB_PLAYER", 1);
1103 1214
1104MODULE = cf PACKAGE = cf PREFIX = cf_ 1215MODULE = cf PACKAGE = cf PREFIX = cf_
1105 1216
1106BOOT: 1217BOOT:
1107{ 1218{
1108 I_EVENT_API (PACKAGE); watcher_base::GEventAPI = GEventAPI; 1219 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1109 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1220 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1110 1221
1111 _connect_to_perl (); 1222 _connect_to_perl ();
1112 1223
1113 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1224 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1114 1225
1115 { 1226 //{
1116 require_pv ("Time::HiRes"); 1227 // require_pv ("Time::HiRes");
1117 1228 //
1118 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 1229 // SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1119 if (!svp) croak ("Time::HiRes is required"); 1230 // if (!svp) croak ("Time::HiRes is required");
1120 if (!SvIOK(*svp)) croak ("Time::NVtime isn’t a function pointer"); 1231 // if (!SvIOK(*svp)) croak ("Time::NVtime isn’t a function pointer");
1121 coroapi::time = INT2PTR (double(*)(), SvIV(*svp)); 1232 // coroapi::time = INT2PTR (double(*)(), SvIV(*svp));
1122 } 1233 //}
1123 1234
1124 static const struct { 1235 static const struct {
1125 const char *name; 1236 const char *name;
1126 IV iv; 1237 IV iv;
1127 } *civ, const_iv[] = { 1238 } *civ, const_iv[] = {
1132 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1243 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1133 1244
1134 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1245 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1135 1246
1136 const_iv (MAX_TIME) 1247 const_iv (MAX_TIME)
1248 const_iv (MAXSOCKBUF)
1137 1249
1138 const_iv (NUM_BODY_LOCATIONS) 1250 const_iv (NUM_BODY_LOCATIONS)
1139 const_iv (body_range) const_iv (body_shield) const_iv (body_combat) 1251 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1140 const_iv (body_arm) const_iv (body_torso) const_iv (body_head) 1252 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1141 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger) 1253 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1169 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1281 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1170 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1282 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1171 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1283 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1172 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1284 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1173 1285
1174 const_iv (NUM_SUBTYPES) 1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1175 1287
1176 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1177 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1289 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1178 1290
1179 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY) 1291 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1207 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1319 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1208 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1320 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1209 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1321 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1210 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1322 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1211 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1323 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1212 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1324 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1213 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1325 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1214 const_iv (FLAG_OBJ_SAVE_ON_OVL) const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1326 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1215 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1327 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1216 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1328 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1217 1329
1218 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1219 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1331 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1220 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1332 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1221 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1333 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1222 const_iv (NDI_ALL) 1334 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1335 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1223 1336
1224 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1337 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1225 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1338 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1226 1339
1227 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1340 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1341
1342 const_iv (SP_RAISE_DEAD)
1343 const_iv (SP_RUNE)
1344 const_iv (SP_MAKE_MARK)
1345 const_iv (SP_BOLT)
1346 const_iv (SP_BULLET)
1347 const_iv (SP_EXPLOSION)
1348 const_iv (SP_CONE)
1349 const_iv (SP_BOMB)
1350 const_iv (SP_WONDER)
1351 const_iv (SP_SMITE)
1352 const_iv (SP_MAGIC_MISSILE)
1353 const_iv (SP_SUMMON_GOLEM)
1354 const_iv (SP_DIMENSION_DOOR)
1355 const_iv (SP_MAGIC_MAPPING)
1356 const_iv (SP_MAGIC_WALL)
1357 const_iv (SP_DESTRUCTION)
1358 const_iv (SP_PERCEIVE_SELF)
1359 const_iv (SP_WORD_OF_RECALL)
1360 const_iv (SP_INVISIBLE)
1361 const_iv (SP_PROBE)
1362 const_iv (SP_HEALING)
1363 const_iv (SP_CREATE_FOOD)
1364 const_iv (SP_EARTH_TO_DUST)
1365 const_iv (SP_CHANGE_ABILITY)
1366 const_iv (SP_BLESS)
1367 const_iv (SP_CURSE)
1368 const_iv (SP_SUMMON_MONSTER)
1369 const_iv (SP_CHARGING)
1370 const_iv (SP_POLYMORPH)
1371 const_iv (SP_ALCHEMY)
1372 const_iv (SP_REMOVE_CURSE)
1373 const_iv (SP_IDENTIFY)
1374 const_iv (SP_DETECTION)
1375 const_iv (SP_MOOD_CHANGE)
1376 const_iv (SP_MOVING_BALL)
1377 const_iv (SP_SWARM)
1378 const_iv (SP_CHANGE_MANA)
1379 const_iv (SP_DISPEL_RUNE)
1380 const_iv (SP_CREATE_MISSILE)
1381 const_iv (SP_CONSECRATE)
1382 const_iv (SP_ANIMATE_WEAPON)
1383 const_iv (SP_LIGHT)
1384 const_iv (SP_CHANGE_MAP_LIGHT)
1385 const_iv (SP_FAERY_FIRE)
1386 const_iv (SP_CAUSE_DISEASE)
1387 const_iv (SP_AURA)
1388 const_iv (SP_TOWN_PORTAL)
1389 const_iv (SP_PARTY_SPELL)
1228 1390
1229 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1391 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1230 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1392 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1231 const_iv (F_LOCKED) 1393 const_iv (F_LOCKED)
1232 1394
1233 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1395 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1234 1396
1235 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1397 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1236 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1398 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1237 1399
1238 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1400 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1239 1401
1240 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1402 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1241 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR) const_iv (INS_MAP_LOAD) 1403 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1242 1404
1243 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL) 1405 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1244 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD) 1406 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1245 1407
1246 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1408 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1280 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION) 1442 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1281 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL) 1443 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1282 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL) 1444 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1283 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE) 1445 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1284 1446
1285 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1447 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1448 const_iv (MAP_INACTIVE)
1286 1449
1287 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1450 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1288 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1451 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1452
1453 const_iv (VERSION_CS) const_iv (VERSION_SC)
1289 1454
1290 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1455 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1291 1456
1292 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM) 1457 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1293 1458
1303 1468
1304 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1469 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1305 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1470 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1306 1471
1307 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1472 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1308 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1473 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1309 const_iv (GT_MINIMAL) 1474
1475 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1476 const_iv (FT_RSRC) const_iv (FT_NUM)
1310 }; 1477 };
1311 1478
1312 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1313 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1314 1481
1333 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1334 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1335 } 1502 }
1336} 1503}
1337 1504
1505void _gv_clear (SV *gv)
1506 CODE:
1507 assert (SvTYPE (gv) == SVt_PVGV);
1508# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1509 f (GvGP (gv)->gp_form);
1510 f (GvGP (gv)->gp_io);
1511 f (GvGP (gv)->gp_sv);
1512 f (GvGP (gv)->gp_av);
1513 f (GvGP (gv)->gp_hv);
1514 f (GvGP (gv)->gp_cv);
1515 GvCVGEN (gv) = 0;
1516 GvMULTI_off (gv);
1517# undef f
1518
1338void _connect_to_perl () 1519void _connect_to_perl ()
1520
1521void _recalc_want ()
1339 1522
1340void _global_reattach () 1523void _global_reattach ()
1341 CODE: 1524 CODE:
1342{ 1525{
1343 // reattach to all attachable objects in the game. 1526 // reattach to all attachable objects in the game.
1345 ns->reattach (); 1528 ns->reattach ();
1346 1529
1347 for_all_objects (op) 1530 for_all_objects (op)
1348 op->reattach (); 1531 op->reattach ();
1349} 1532}
1350
1351void _post_tick ()
1352 CODE:
1353 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK);
1354 1533
1355# support function for map-world.ext 1534# support function for map-world.ext
1356void _quantise (SV *data_sv, SV *plt_sv) 1535void _quantise (SV *data_sv, SV *plt_sv)
1357 CODE: 1536 CODE:
1358{ 1537{
1392 } 1571 }
1393 1572
1394 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1573 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1395} 1574}
1396 1575
1576void init_anim ()
1577
1578void init_globals ()
1579
1580void init_experience ()
1581
1582void init_attackmess ()
1583
1584void init_dynamic ()
1585
1586void init_block ()
1587
1588void load_settings ()
1589
1590void load_materials ()
1591
1592void init_uuid ()
1593 CODE:
1594 UUID::init ();
1595
1596void init_signals ()
1597
1598void init_commands ()
1599
1600void init_skills ()
1601
1602void init_beforeplay ()
1603
1604void evthread_start (int aiofd)
1605
1606void cede_to_tick ()
1607 CODE:
1608 coroapi::cede_to_tick ();
1609
1610NV till_tick ()
1611 CODE:
1612 RETVAL = SvNVX (sv_next_tick) - now ();
1613 OUTPUT:
1614 RETVAL
1615
1616int tick_inhibit ()
1617 CODE:
1618 RETVAL = tick_inhibit;
1619 OUTPUT:
1620 RETVAL
1621
1622void tick_inhibit_inc ()
1623 CODE:
1624 ++tick_inhibit;
1625
1626void tick_inhibit_dec ()
1627 CODE:
1628 if (!--tick_inhibit)
1629 if (tick_pending)
1630 {
1631 ev_async_send (EV_DEFAULT, &tick_watcher);
1632 coroapi::cede ();
1633 }
1634
1635void server_tick ()
1636 CODE:
1637{
1638 NOW = ev_now (EV_DEFAULT);
1639 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1640 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1641 runtime = SvNVX (sv_runtime);
1642
1643 server_tick ();
1644
1645 NOW = ev_time ();
1646 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1647 runtime += TICK;
1648 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1649}
1650
1397NV floor (NV x) 1651NV floor (NV x)
1398 1652
1399NV ceil (NV x) 1653NV ceil (NV x)
1400 1654
1401NV rndm (...) 1655NV rndm (...)
1656 ALIAS:
1657 rmg_rndm = 1
1402 CODE: 1658 CODE:
1659{
1660 rand_gen &gen = ix ? rmg_rndm : rndm;
1403 switch (items) 1661 switch (items)
1404 { 1662 {
1405 case 0: RETVAL = rndm (); break; 1663 case 0: RETVAL = gen (); break;
1406 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1664 case 1: RETVAL = gen (SvUV (ST (0))); break;
1407 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1665 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1408 default: croak ("cf::rndm requires none, one or two parameters."); break; 1666 default: croak ("cf::rndm requires none, one or two parameters."); break;
1409 } 1667 }
1668}
1410 OUTPUT: 1669 OUTPUT:
1411 RETVAL 1670 RETVAL
1412 1671
1413NV clamp (NV value, NV min_value, NV max_value) 1672NV clamp (NV value, NV min_value, NV max_value)
1414 CODE: 1673 CODE:
1420 CODE: 1679 CODE:
1421 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1680 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1422 OUTPUT: 1681 OUTPUT:
1423 RETVAL 1682 RETVAL
1424 1683
1425void cede_to_tick () 1684void weaken (...)
1426 CODE: 1685 PROTOTYPE: @
1427 coroapi::cede_to_tick (); 1686 CODE:
1428 1687 while (items > 0)
1429void server_tick () 1688 sv_rvweaken (ST (--items));
1430 CODE:
1431 runtime = SvNVx (sv_runtime);
1432 server_tick ();
1433 1689
1434void 1690void
1435log_backtrace (utf8_string msg) 1691log_backtrace (utf8_string msg)
1436 1692
1437void 1693void
1442octet_string path_combine (octet_string base, octet_string path) 1698octet_string path_combine (octet_string base, octet_string path)
1443 PROTOTYPE: $$ 1699 PROTOTYPE: $$
1444 1700
1445octet_string path_combine_and_normalize (octet_string base, octet_string path) 1701octet_string path_combine_and_normalize (octet_string base, octet_string path)
1446 PROTOTYPE: $$ 1702 PROTOTYPE: $$
1447
1448const_octet_string
1449get_maps_directory (octet_string path)
1450 PROTOTYPE: $
1451 ALIAS: maps_directory = 0
1452 CODE:
1453 RETVAL = create_pathname (path);
1454 OUTPUT: RETVAL
1455 1703
1456void 1704void
1457sub_generation_inc () 1705sub_generation_inc ()
1458 CODE: 1706 CODE:
1459 PL_sub_generation++; 1707 PL_sub_generation++;
1484 1732
1485void abort () 1733void abort ()
1486 1734
1487void reset_signals () 1735void reset_signals ()
1488 1736
1489void fork_abort (octet_string cause = "cf::fork_abort") 1737void fork_abort (const_octet_string cause = "cf::fork_abort")
1490 1738
1491void cleanup (octet_string cause, bool make_core = false) 1739void cleanup (const_octet_string cause, bool make_core = false)
1492 1740
1493void emergency_save () 1741void emergency_save ()
1494 1742
1495void _exit (int status = EXIT_SUCCESS) 1743void _exit (int status = EXIT_SUCCESS)
1496 1744
1497UV sv_2watcher (SV *w)
1498 CODE:
1499 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1500 OUTPUT:
1501 RETVAL
1502
1503#if _POSIX_MEMLOCK 1745#if _POSIX_MEMLOCK
1504 1746
1505int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1747int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1748 INIT:
1749#if __GLIBC__
1750 mallopt (M_TOP_PAD, 1024 * 1024);
1751 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1752 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1753 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1754#endif
1506 1755
1507int munlockall () 1756int munlockall ()
1508 1757
1509#endif 1758#endif
1759
1760int
1761malloc_trim (IV pad = 0)
1762
1763void
1764mallinfo ()
1765 PPCODE:
1766{
1767#if __GLIBC__
1768 struct mallinfo mai = mallinfo ();
1769 EXTEND (SP, 10*2);
1770 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1771 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1772 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1773 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1774 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1775 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1777 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1778 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1779 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif
1781 EXTEND (SP, 2*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1783 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1784 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1785}
1510 1786
1511int find_animation (utf8_string text) 1787int find_animation (utf8_string text)
1512 PROTOTYPE: $ 1788 PROTOTYPE: $
1513 1789
1514int random_roll (int min, int max, object *op, int goodbad); 1790int random_roll (int min, int max, object *op, int goodbad);
1552 RETVAL = newSVpv (resist_plus[atnr], 0); 1828 RETVAL = newSVpv (resist_plus[atnr], 0);
1553 else 1829 else
1554 XSRETURN_UNDEF; 1830 XSRETURN_UNDEF;
1555 OUTPUT: RETVAL 1831 OUTPUT: RETVAL
1556 1832
1833UUID
1834uuid_cur ()
1835 CODE:
1836 RETVAL = UUID::cur;
1837 OUTPUT:
1838 RETVAL
1839
1840UUID
1841uuid_gen ()
1842 CODE:
1843 RETVAL = UUID::gen ();
1844 OUTPUT:
1845 RETVAL
1846
1847val64
1848uuid_seq (UUID uuid)
1849 CODE:
1850 RETVAL = uuid.seq;
1851 OUTPUT:
1852 RETVAL
1853
1854UUID
1855uuid_str (val64 seq)
1856 CODE:
1857 RETVAL.seq = seq;
1858 OUTPUT:
1859 RETVAL
1860
1861void
1862coin_names ()
1863 PPCODE:
1864 EXTEND (SP, NUM_COINS);
1865 for (int i = 0; i < NUM_COINS; ++i)
1866 PUSHs (sv_2mortal (newSVpv (coins [i], 0)));
1867
1868void
1869coin_archetypes ()
1870 PPCODE:
1871 EXTEND (SP, NUM_COINS);
1872 for (int i = 0; i < NUM_COINS; ++i)
1873 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1874
1557bool 1875bool
1558load_resource_file (octet_string filename) 1876load_resource_file_ (octet_string filename)
1877
1878void
1879fix_weight ()
1559 1880
1560MODULE = cf PACKAGE = cf::attachable 1881MODULE = cf PACKAGE = cf::attachable
1561 1882
1562int 1883int
1563valid (SV *obj) 1884valid (SV *obj)
1581#object *mortals (U32 index) 1902#object *mortals (U32 index)
1582# CODE: 1903# CODE:
1583# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0; 1904# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1584# OUTPUT: RETVAL 1905# OUTPUT: RETVAL
1585 1906
1586INCLUDE: $PERL $srcdir/genacc attachable ../include/cfperl.h | 1907INCLUDE: $PERL $srcdir/genacc attachable ../include/util.h ../include/cfperl.h |
1587 1908
1588MODULE = cf PACKAGE = cf::global 1909MODULE = cf PACKAGE = cf::global
1589 1910
1590int invoke (SV *klass, int event, ...) 1911int invoke (SV *klass, int event, ...)
1591 CODE: 1912 CODE:
1627object *actives (U32 index) 1948object *actives (U32 index)
1628 CODE: 1949 CODE:
1629 RETVAL = index < actives.size () ? actives [index] : 0; 1950 RETVAL = index < actives.size () ? actives [index] : 0;
1630 OUTPUT: RETVAL 1951 OUTPUT: RETVAL
1631 1952
1953int mortals_size ()
1954 CODE:
1955 RETVAL = attachable::mortals.size ();
1956 OUTPUT: RETVAL
1957
1632const char *slot_save_name (U32 slot) 1958const char *slot_use_name (U32 slot)
1633 ALIAS: 1959 ALIAS:
1634 slot_use_name = 1
1635 slot_nonuse_name = 2 1960 slot_nonuse_name = 1
1636 CODE: 1961 CODE:
1637{ 1962{
1638 if (slot >= NUM_BODY_LOCATIONS) 1963 if (slot >= NUM_BODY_LOCATIONS)
1639 croak ("body slot index out of range"); 1964 croak ("body slot index out of range");
1640 1965
1641 switch (ix) 1966 switch (ix)
1642 { 1967 {
1643 case 0: RETVAL = body_locations[slot].save_name; break;
1644 case 1: RETVAL = body_locations[slot].use_name; break; 1968 case 0: RETVAL = body_locations[slot].use_name; break;
1645 case 2: RETVAL = body_locations[slot].nonuse_name; break; 1969 case 1: RETVAL = body_locations[slot].nonuse_name; break;
1646 } 1970 }
1647} 1971}
1648 OUTPUT: 1972 OUTPUT:
1649 RETVAL 1973 RETVAL
1650 1974
1652 1976
1653object *head (object *op) 1977object *head (object *op)
1654 PROTOTYPE: $ 1978 PROTOTYPE: $
1655 CODE: 1979 CODE:
1656 RETVAL = op->head_ (); 1980 RETVAL = op->head_ ();
1657 OUTPUT: RETVAL
1658
1659int is_head (object *op)
1660 PROTOTYPE: $
1661 CODE:
1662 RETVAL = op->head_ () == op;
1663 OUTPUT: RETVAL 1981 OUTPUT: RETVAL
1664 1982
1665void 1983void
1666inv (object *obj) 1984inv (object *obj)
1667 PROTOTYPE: $ 1985 PROTOTYPE: $
1668 PPCODE: 1986 PPCODE:
1669{ 1987{
1670 object *o;
1671 for (o = obj->inv; o; o = o->below) 1988 for (object *o = obj->inv; o; o = o->below)
1672 XPUSHs (sv_2mortal (to_sv (o))); 1989 XPUSHs (sv_2mortal (to_sv (o)));
1673} 1990}
1674 1991
1675void 1992void
1676set_animation (object *op, int idx) 1993set_animation (object *op, int idx)
1708 2025
1709int need_identify (object *obj); 2026int need_identify (object *obj);
1710 2027
1711int apply_shop_mat (object *shop_mat, object *op); 2028int apply_shop_mat (object *shop_mat, object *op);
1712 2029
1713int move_player (object *op, int dir)
1714 CODE:
1715 RETVAL = move_player (op, dir);
1716 OUTPUT:
1717 RETVAL
1718
1719int move (object *op, int dir, object *originator = op) 2030int move (object *op, int dir, object *originator = op)
1720 CODE: 2031 CODE:
1721 RETVAL = move_ob (op, dir, originator); 2032 RETVAL = move_ob (op, dir, originator);
1722 OUTPUT: 2033 OUTPUT:
1723 RETVAL 2034 RETVAL
1730 CODE: 2041 CODE:
1731 player_apply_below (op); 2042 player_apply_below (op);
1732 2043
1733int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2044int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1734 2045
1735object *cf_object_present_archname_inside (object *op, utf8_string whatstr)
1736
1737int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1738
1739int cf_object_change_map (object *op, int x, int y, maptile *map)
1740
1741#//TODO
1742object *clone_ (object *op, int recursive = 0)
1743 CODE:
1744 if (recursive)
1745 RETVAL = object_create_clone (op);
1746 else
1747 {
1748 RETVAL = object::create ();
1749 op->copy_to (RETVAL);
1750 }
1751 OUTPUT: RETVAL
1752
1753int pay_item (object *op, object *buyer) 2046int pay_item (object *op, object *buyer)
1754 CODE: 2047 CODE:
1755 RETVAL = pay_for_item (op, buyer); 2048 RETVAL = pay_for_item (op, buyer);
1756 OUTPUT: RETVAL 2049 OUTPUT: RETVAL
1757 2050
1791 2084
1792void drop (object *who, object *op) 2085void drop (object *who, object *op)
1793 2086
1794void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
1795 2088
1796int cf_object_teleport (object *op, maptile *map, int x, int y)
1797
1798void update_object (object *op, int action) 2089void update_object (object *op, int action)
1799 2090
1800object *cf_create_object_by_name (utf8_string name)
1801
1802void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2091void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0)
1803 2092
1804void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
1805 2094
1806int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
1813 2102
1814void add_button_link (object *button, maptile *map, int connected); 2103void add_button_link (object *button, maptile *map, int connected);
1815 2104
1816void remove_button_link (object *op); 2105void remove_button_link (object *op);
1817 2106
2107void handle_apply_yield (object *op);
2108
1818 2109
1819MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2110MODULE = cf PACKAGE = cf::object PREFIX = cf_
1820
1821object *cf_insert_ob_in_ob (object *ob, object *where)
1822 2111
1823# no clean way to get an object from an archetype - stupid idiotic 2112# no clean way to get an object from an archetype - stupid idiotic
1824# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2113# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1825 2114
1826object *new (utf8_string archetype = 0) 2115object *new (utf8_string archetype = 0)
1827 PROTOTYPE: ;$ 2116 PROTOTYPE: ;$
1828 CODE: 2117 CODE:
1829 RETVAL = archetype ? get_archetype (archetype) : cf_create_object (); 2118 RETVAL = archetype ? get_archetype (archetype) : object::create ();
1830 OUTPUT: 2119 OUTPUT:
1831 RETVAL 2120 RETVAL
1832 2121
2122object *find_object (U32 tag)
2123
2124# TODO: nuke
1833object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2125object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
1834 PROTOTYPE: $$$$$$ 2126 PROTOTYPE: $$$$$$
1835 CODE: 2127 CODE:
1836{ 2128{
1837 int unused_type; 2129 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
1838 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1839} 2130}
1840 2131
1841player *contr (object *op) 2132shstr
1842 CODE: 2133object::kv_get (shstr key)
1843 RETVAL = op->contr;
1844 OUTPUT: RETVAL
1845 2134
1846const_utf8_string get_ob_key_value (object *op, utf8_string key) 2135void
2136object::kv_del (shstr key)
1847 2137
1848bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2138void
2139object::kv_set (shstr key, shstr value)
1849 2140
1850object *get_nearest_player (object *ob) 2141object *get_nearest_player (object *ob)
1851 ALIAS: nearest_player = 0 2142 ALIAS: nearest_player = 0
1852 PREINIT: 2143 PREINIT:
1853 extern object *get_nearest_player (object *); 2144 extern object *get_nearest_player (object *);
1855void rangevector (object *ob, object *other, int flags = 0) 2146void rangevector (object *ob, object *other, int flags = 0)
1856 PROTOTYPE: $$;$ 2147 PROTOTYPE: $$;$
1857 PPCODE: 2148 PPCODE:
1858{ 2149{
1859 rv_vector rv; 2150 rv_vector rv;
2151
2152 PUTBACK;
1860 get_rangevector (ob, other, &rv, flags); 2153 get_rangevector (ob, other, &rv, flags);
2154 SPAGAIN;
2155
1861 EXTEND (SP, 5); 2156 EXTEND (SP, 5);
1862 PUSHs (newSVuv (rv.distance)); 2157 PUSHs (newSVuv (rv.distance));
1863 PUSHs (newSViv (rv.distance_x)); 2158 PUSHs (newSViv (rv.distance_x));
1864 PUSHs (newSViv (rv.distance_y)); 2159 PUSHs (newSViv (rv.distance_y));
1865 PUSHs (newSViv (rv.direction)); 2160 PUSHs (newSViv (rv.direction));
1866 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part)); 2161 PUSHs (to_sv (rv.part));
1867} 2162}
1868 2163
1869bool on_same_map_as (object *ob, object *other) 2164bool on_same_map_as (object *ob, object *other)
1870 CODE: 2165 CODE:
1871 RETVAL = on_same_map (ob, other); 2166 RETVAL = on_same_map (ob, other);
1875base_name (object *op, int plural = op->nrof > 1) 2170base_name (object *op, int plural = op->nrof > 1)
1876 CODE: 2171 CODE:
1877 RETVAL = query_base_name (op, plural); 2172 RETVAL = query_base_name (op, plural);
1878 OUTPUT: RETVAL 2173 OUTPUT: RETVAL
1879 2174
1880object *decrease_ob_nr (object *op, unsigned long i) 2175# return the tail of an object, excluding itself
2176void
2177tail (object *op)
2178 PPCODE:
2179 while ((op = op->more))
2180 XPUSHs (sv_2mortal (to_sv (op)));
1881 2181
1882MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2182MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1883 2183
1884player *player (object *op) 2184player *player (object *op)
1885 CODE: 2185 CODE:
1886 RETVAL = op->contr; 2186 RETVAL = op->contr;
1887 OUTPUT: RETVAL 2187 OUTPUT: RETVAL
1888 2188
2189bool move_player (object *op, int dir)
2190
1889void check_score (object *op) 2191void check_score (object *op)
1890 2192
1891void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2193void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1892 CODE: 2194 CODE:
1893 new_draw_info (flags, 0, op, txt); 2195 new_draw_info (flags, 0, op, txt);
1894 2196
1895object *cf_player_send_inventory (object *op)
1896
1897octet_string cf_player_get_ip (object *op)
1898 ALIAS: ip = 0
1899
1900object *cf_player_get_marked_item (object *op)
1901 ALIAS: marked_item = 0
1902
1903void cf_player_set_marked_item (object *op, object *ob)
1904
1905partylist *cf_player_get_party (object *op)
1906 ALIAS: party = 0
1907
1908void cf_player_set_party (object *op, partylist *party)
1909
1910void kill_player (object *op) 2197void kill_player (object *op)
1911 2198
2199void esrv_send_item (object *pl, object *item)
2200
1912void esrv_update_item (object *op, int what, object *item) 2201void esrv_update_item (object *pl, int what, object *item)
1913 C_ARGS: what, op, item 2202 C_ARGS: what, pl, item
1914 2203
1915void clear_los (object *op) 2204void esrv_del_item (object *pl, int tag)
2205 C_ARGS: pl->contr, tag
1916 2206
1917int command_summon (object *op, utf8_string params) 2207int command_summon (object *op, utf8_string params)
1918 2208
1919int command_arrest (object *op, utf8_string params) 2209int command_arrest (object *op, utf8_string params)
1920 2210
1939 pl->ob->stats.hp = pl->ob->stats.maxhp; 2229 pl->ob->stats.hp = pl->ob->stats.maxhp;
1940 pl->ob->stats.sp = pl->ob->stats.maxsp; 2230 pl->ob->stats.sp = pl->ob->stats.maxsp;
1941 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2231 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1942 pl->orig_stats = pl->ob->stats; 2232 pl->orig_stats = pl->ob->stats;
1943 2233
1944void cf_player_move (player *pl, int dir) 2234void clear_los (player *pl)
1945
1946void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1947 2235
1948bool 2236bool
1949cell_visible (player *pl, int dx, int dy) 2237cell_visible (player *pl, int dx, int dy)
1950 CODE: 2238 CODE:
1951 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
1958 CODE: 2246 CODE:
1959{ 2247{
1960 STRLEN len; 2248 STRLEN len;
1961 char *buf = SvPVbyte (packet, len); 2249 char *buf = SvPVbyte (packet, len);
1962 2250
2251 if (len > MAXSOCKBUF)
2252 pl->failmsg ("[packet too long for client]");
1963 if (pl->ns) 2253 else if (pl->ns)
1964 pl->ns->send_packet (buf, len); 2254 pl->ns->send_packet (buf, len);
1965} 2255}
1966
1967int
1968listening (player *pl, int new_value = -1)
1969 CODE:
1970 RETVAL = pl->listening;
1971 if (new_value >= 0)
1972 pl->listening = new_value;
1973 OUTPUT:
1974 RETVAL
1975 2256
1976void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2257void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
1977 PROTOTYPE: $;$$$ 2258 PROTOTYPE: $;$$$
1978 PPCODE: 2259 PPCODE:
1979 if (GIMME_V != G_VOID) 2260 if (GIMME_V != G_VOID)
2004 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END); 2285 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);
2005 OUTPUT: RETVAL 2286 OUTPUT: RETVAL
2006 2287
2007SV *registry (maptile *map) 2288SV *registry (maptile *map)
2008 2289
2290void
2291find_tagged_objects (maptile *map, utf8_string tag = 0)
2292 PPCODE:
2293{
2294 if (!map->spaces)
2295 XSRETURN_EMPTY;
2296
2297 if (tag)
2298 {
2299 shstr_cmp tag_ (tag);
2300
2301 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2302 for (object *op = ms->bot; op; op = op->above)
2303 if (op->tag == tag_)
2304 XPUSHs (sv_2mortal (to_sv (op)));
2305 }
2306 else
2307 {
2308 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2309 for (object *op = ms->bot; op; op = op->above)
2310 if (op->tag)
2311 XPUSHs (sv_2mortal (to_sv (op)));
2312 }
2313}
2314
2009INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2010 2316
2011void 2317void
2012maptile::instantiate () 2318maptile::instantiate ()
2013 2319
2090 palette = SvRV (palette); 2396 palette = SvRV (palette);
2091 2397
2092 STRLEN idxlen; 2398 STRLEN idxlen;
2093 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2399 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2094 2400
2095 region **regionmap = (region **)malloc ( 2401 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2096 (av_len ((AV *)palette) + 1) * sizeof (region *));
2097 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2402 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2098 2403
2099 for (int i = av_len ((AV *)palette) + 1; i--; ) 2404 for (int i = av_len ((AV *)palette) + 1; i--; )
2100 regionmap [i] = region::find ( 2405 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2101 SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2102 2406
2103 for (int y = 0; y < THIS->height; ++y) 2407 for (int y = 0; y < THIS->height; ++y)
2104 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2408 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2105 2409
2106 sfree (THIS->regions, THIS->size ()); 2410 sfree (THIS->regions, THIS->size ());
2107 free (THIS->regionmap); 2411 delete [] THIS->regionmap;
2108 2412
2109 THIS->regions = regions; 2413 THIS->regions = regions;
2110 THIS->regionmap = regionmap; 2414 THIS->regionmap = regionmap;
2111} 2415}
2112 2416
2113void 2417void
2114maptile::create_region_treasure () 2418maptile::create_region_treasure ()
2115 CODE: 2419 CODE:
2116{
2117 object *op = object::create ();
2118 op->type = FLOOR;
2119 op->map = THIS;
2120
2121 for (int x = 0; x < THIS->width; ++x) 2420 for (int x = 0; x < THIS->width; ++x)
2122 for (int y = 0; y < THIS->height; ++y) 2421 for (int y = 0; y < THIS->height; ++y)
2123 { 2422 {
2124 region *rgn = THIS->region (x, y); 2423 region *rgn = THIS->region (x, y);
2125 2424
2126 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2425 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2426 if (object *op = THIS->at (x, y).top)
2127 if (rgn->treasure && rndm () < rgn->treasure_density) 2427 if (rgn->treasure && rndm () < rgn->treasure_density)
2128 {
2129 op->x = x;
2130 op->y = y;
2131 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2428 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2132 }
2133 } 2429 }
2134
2135 op->destroy ();
2136}
2137
2138void play_sound_map (maptile *map, int x, int y, int sound_num)
2139 2430
2140int out_of_map (maptile *map, int x, int y) 2431int out_of_map (maptile *map, int x, int y)
2141 2432
2142void 2433void
2143trigger (maptile *map, long connection, bool state = true) 2434trigger (maptile *map, long connection, bool state = true)
2148get_connection (maptile *map, long connection) 2439get_connection (maptile *map, long connection)
2149 PPCODE: 2440 PPCODE:
2150 oblinkpt *obp = get_connection_links (map, connection); 2441 oblinkpt *obp = get_connection_links (map, connection);
2151 if (obp) 2442 if (obp)
2152 for (objectlink *ol = obp->link; ol; ol = ol->next) 2443 for (objectlink *ol = obp->link; ol; ol = ol->next)
2153 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob))); 2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2154
2155object *cf_map_insert_object_there (maptile *where, object *op, object *originator, int flags)
2156
2157object *cf_map_insert_object (maptile *where, object* op, int x, int y)
2158
2159object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2160 C_ARGS: str, map, nx, ny
2161 2445
2162void 2446void
2163get_map_flags (maptile *map, int x, int y) 2447get_map_flags (maptile *map, int x, int y)
2164 PPCODE: 2448 PPCODE:
2165{ 2449{
2166 maptile *nmap = 0; 2450 maptile *nmap = 0;
2167 I16 nx = 0, ny = 0; 2451 I16 nx = 0, ny = 0;
2452
2453 PUTBACK;
2168 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2454 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2455 SPAGAIN;
2169 2456
2170 EXTEND (SP, 4); 2457 EXTEND (SP, 4);
2171 PUSHs (sv_2mortal (newSViv (flags))); 2458 PUSHs (sv_2mortal (newSViv (flags)));
2172 2459
2173 if (GIMME_V == G_ARRAY) 2460 if (GIMME_V == G_ARRAY)
2174 { 2461 {
2175 PUSHs (sv_2mortal (newSVcfapi (CFAPI_PMAP, nmap))); 2462 PUSHs (sv_2mortal (to_sv (nmap)));
2176 PUSHs (sv_2mortal (newSViv (nx))); 2463 PUSHs (sv_2mortal (newSViv (nx)));
2177 PUSHs (sv_2mortal (newSViv (ny))); 2464 PUSHs (sv_2mortal (newSViv (ny)));
2178 } 2465 }
2179} 2466}
2180 2467
2468mapspace *
2469ms (maptile *map, unsigned int x, unsigned int y)
2470 PROTOTYPE: $$$
2471 CODE:
2472{
2473 maptile *nmap = 0;
2474 I16 nx, ny;
2475
2476 PUTBACK;
2477 get_map_flags (map, &nmap, x, y, &nx, &ny);
2478 SPAGAIN;
2479
2480 if (!nmap)
2481 XSRETURN_UNDEF;
2482
2483 RETVAL = &nmap->at (nx, ny);
2484}
2485 OUTPUT:
2486 RETVAL
2487
2181void 2488void
2182at (maptile *map, unsigned int x, unsigned int y) 2489at (maptile *map, unsigned int x, unsigned int y)
2183 PROTOTYPE: $$$ 2490 PROTOTYPE: $$$
2184 PPCODE: 2491 PPCODE:
2185{ 2492{
2186 object *o;
2187 maptile *nmap = 0; 2493 maptile *nmap = 0;
2188 I16 nx, ny; 2494 I16 nx, ny;
2189 2495
2496 PUTBACK;
2190 get_map_flags (map, &nmap, x, y, &nx, &ny); 2497 get_map_flags (map, &nmap, x, y, &nx, &ny);
2498 SPAGAIN;
2191 2499
2192 if (nmap) 2500 if (nmap)
2193 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2194 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 2502 XPUSHs (sv_2mortal (to_sv (o)));
2195} 2503}
2196 2504
2197SV * 2505SV *
2198bot_at (maptile *obj, unsigned int x, unsigned int y) 2506bot_at (maptile *obj, unsigned int x, unsigned int y)
2199 PROTOTYPE: $$$ 2507 PROTOTYPE: $$$
2208 INIT: 2516 INIT:
2209 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF; 2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2210 CODE: 2518 CODE:
2211 switch (ix) 2519 switch (ix)
2212 { 2520 {
2213 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break; 2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;
2214 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break; 2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;
2215 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break; 2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;
2216 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break; 2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;
2217 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2218 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;
2219 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;
2220 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;
2221 } 2529 }
2222 OUTPUT: RETVAL 2530 OUTPUT: RETVAL
2223 2531
2224void fix_walls (maptile *map, int x, int y) 2532void fix_walls (maptile *map, int x, int y)
2225 2533
2299 rmp.decoroptions = decoroptions; 2607 rmp.decoroptions = decoroptions;
2300 rmp.orientation = orientation; 2608 rmp.orientation = orientation;
2301 rmp.origin_y = origin_y; 2609 rmp.origin_y = origin_y;
2302 rmp.origin_x = origin_x; 2610 rmp.origin_x = origin_x;
2303 rmp.random_seed = random_seed; 2611 rmp.random_seed = random_seed;
2304 rmp.total_map_hp = total_map_hp; 2612 rmp.total_map_hp = (uint64_t) total_map_hp;
2305 rmp.map_layout_style = map_layout_style; 2613 rmp.map_layout_style = map_layout_style;
2306 rmp.treasureoptions = treasureoptions; 2614 rmp.treasureoptions = treasureoptions;
2307 rmp.symmetry_used = symmetry_used; 2615 rmp.symmetry_used = symmetry_used;
2308 rmp.region = region; 2616 rmp.region = region;
2309 rmp.custom = custom; 2617 rmp.custom = custom;
2311 RETVAL = self->generate_random_map (&rmp); 2619 RETVAL = self->generate_random_map (&rmp);
2312} 2620}
2313 OUTPUT: 2621 OUTPUT:
2314 RETVAL 2622 RETVAL
2315 2623
2624MODULE = cf PACKAGE = cf::mapspace
2625
2626INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2627
2316MODULE = cf PACKAGE = cf::arch 2628MODULE = cf PACKAGE = cf::arch
2317 2629
2318archetype *find (utf8_string name) 2630int archetypes_size ()
2319 CODE: 2631 CODE:
2320 RETVAL = archetype::find (name); 2632 RETVAL = archetypes.size ();
2321 OUTPUT: 2633 OUTPUT: RETVAL
2322 RETVAL
2323 2634
2324archetype *first() 2635archetype *archetypes (U32 index)
2325 PROTOTYPE: 2636 CODE:
2326 CODE: 2637 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2327 RETVAL = first_archetype; 2638 OUTPUT: RETVAL
2639
2640object *instantiate (archetype *arch)
2641 CODE:
2642 RETVAL = arch_to_object (arch);
2643 OUTPUT:
2328 OUTPUT: RETVAL 2644 RETVAL
2329 2645
2330INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2646INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2331 2647
2332MODULE = cf PACKAGE = cf::party 2648MODULE = cf PACKAGE = cf::party
2333 2649
2402 CODE: 2718 CODE:
2403{ 2719{
2404 STRLEN len; 2720 STRLEN len;
2405 char *buf = SvPVbyte (packet, len); 2721 char *buf = SvPVbyte (packet, len);
2406 2722
2723 if (len > MAXSOCKBUF)
2724 {
2725 // ugly
2726 if (THIS->pl)
2727 THIS->pl->failmsg ("[packet too long for client]");
2728 }
2729 else
2407 THIS->send_packet (buf, len); 2730 THIS->send_packet (buf, len);
2408} 2731}
2732
2733faceidx
2734client::need_face (utf8_string name, int pri = 0)
2735 CODE:
2736 RETVAL = face_find (name, 0);
2737 if (RETVAL)
2738 {
2739 THIS->send_face (RETVAL, pri);
2740 THIS->flush_fx ();
2741 }
2742 OUTPUT:
2743 RETVAL
2744
2745int
2746client::fx_want (int idx, int value = -1)
2747 CODE:
2748 if (0 < idx && idx < FT_NUM)
2749 {
2750 RETVAL = THIS->fx_want [idx];
2751 if (items > 2)
2752 THIS->fx_want [idx] = value;
2753 }
2754 else
2755 RETVAL = 0;
2756 OUTPUT:
2757 RETVAL
2758
2759MODULE = cf PACKAGE = cf::sound PREFIX = sound_
2760
2761faceidx sound_find (utf8_string name)
2762
2763void sound_set (utf8_string str, faceidx face)
2764
2765# dire hack
2766void old_sound_index (int idx, faceidx face)
2767 CODE:
2768 extern faceidx old_sound_index [SOUND_CAST_SPELL_0];
2769 old_sound_index [idx] = face;
2409 2770
2410MODULE = cf PACKAGE = cf::face PREFIX = face_ 2771MODULE = cf PACKAGE = cf::face PREFIX = face_
2411 2772
2412#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2773#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h |
2413 2774
2429 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2790 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL;
2430 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2791 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL;
2431} 2792}
2432 OUTPUT: RETVAL 2793 OUTPUT: RETVAL
2433 2794
2434void set (faceidx idx, int visibility, int magicmap) 2795void set_type (faceidx idx, int value)
2435 CODE: 2796 ALIAS:
2436 faceinfo *f = face_info (idx); 2797 set_type = 0
2437 assert (f); 2798 set_visibility = 1
2438 f->visibility = visibility; 2799 set_magicmap = 2
2439 f->magicmap = magicmap; 2800 set_smooth = 3
2440 2801 set_smoothlevel = 4
2441void set_smooth (faceidx idx, faceidx smooth, int smoothlevel)
2442 CODE: 2802 CODE:
2443 faceinfo *f = face_info (idx); assert (f); 2803 faceinfo *f = face_info (idx); assert (f);
2444 f->smooth = smooth; 2804 switch (ix)
2445 f->smoothlevel = smoothlevel; 2805 {
2806 case 0: f->type = value; break;
2807 case 1: f->visibility = value; break;
2808 case 2: f->magicmap = value; break;
2809 case 3: f->smooth = value; break;
2810 case 4: f->smoothlevel = value; break;
2811 }
2446 2812
2447void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2813void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
2448 CODE: 2814 CODE:
2449{ 2815{
2450 facedata *d = face_data (idx, faceset); 2816 faceinfo *f = face_info (idx); assert (f);
2451 assert (d); 2817 facedata *d = &(faceset ? f->data64 : f->data32);
2452 sv_to (data, d->data); 2818 sv_to (data, d->data);
2453 STRLEN clen; 2819 STRLEN clen;
2454 char *cdata = SvPVbyte (chksum, clen); 2820 char *cdata = SvPVbyte (chksum, clen);
2455 clen = min (CHKSUM_SIZE, clen); 2821 clen = min (CHKSUM_SIZE, clen);
2456 2822
2466 ns->force_newmap = true; 2832 ns->force_newmap = true;
2467 } 2833 }
2468 } 2834 }
2469} 2835}
2470 2836
2837int get_data_size (faceidx idx, int faceset = 0)
2838 CODE:
2839 facedata *d = face_data (idx, faceset);
2840 if (!d) XSRETURN_UNDEF;
2841 RETVAL = d->data.size ();
2842 OUTPUT:
2843 RETVAL
2844
2845SV *get_chksum (faceidx idx, int faceset = 0)
2846 CODE:
2847 facedata *d = face_data (idx, faceset);
2848 if (!d) XSRETURN_UNDEF;
2849 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2850 OUTPUT:
2851 RETVAL
2852
2853SV *get_data (faceidx idx, int faceset = 0)
2854 CODE:
2855 facedata *d = face_data (idx, faceset);
2856 if (!d) XSRETURN_UNDEF;
2857 RETVAL = newSVpvn (d->data.data (), d->data.length ());
2858 OUTPUT:
2859 RETVAL
2860
2471void invalidate (faceidx idx) 2861void invalidate (faceidx idx)
2472 CODE: 2862 CODE:
2473 for_all_clients (ns) 2863 for_all_clients (ns)
2474 { 2864 {
2475 ns->faces_sent [idx] = false; 2865 ns->faces_sent [idx] = false;
2518void invalidate_all () 2908void invalidate_all ()
2519 CODE: 2909 CODE:
2520 for_all_clients (ns) 2910 for_all_clients (ns)
2521 ns->anims_sent.reset (); 2911 ns->anims_sent.reset ();
2522 2912
2913MODULE = cf PACKAGE = cf::object::freezer
2914
2915INCLUDE: $PERL $srcdir/genacc object_freezer ../include/cfperl.h |
2916
2917SV *
2918new (char *klass)
2919 CODE:
2920 RETVAL = newSVptr (new object_freezer, gv_stashpv ("cf::object::freezer", 1));
2921 OUTPUT: RETVAL
2922
2923void
2924DESTROY (SV *sv)
2925 CODE:
2926 object_freezer *self;
2927 sv_to (sv, self);
2928 delete self;
2929
2930MODULE = cf PACKAGE = cf::object::thawer
2931
2932INCLUDE: $PERL $srcdir/genacc object_thawer ../include/cfperl.h |
2933
2934SV *
2935new_from_file (char *klass, octet_string path)
2936 CODE:
2937 object_thawer *f = new object_thawer (path);
2938 if (!*f)
2939 {
2940 delete f;
2941 XSRETURN_UNDEF;
2942 }
2943 RETVAL = newSVptr (f, gv_stashpv ("cf::object::thawer", 1));
2944 OUTPUT: RETVAL
2945
2946void
2947DESTROY (SV *sv)
2948 CODE:
2949 object_thawer *self;
2950 sv_to (sv, self);
2951 delete self;
2952
2953void
2954extract_tags (object_thawer *self)
2955 PPCODE:
2956 while (self->kw != KW_EOF)
2957 {
2958 PUTBACK;
2959 coroapi::cede_to_tick ();
2960 SPAGAIN;
2961
2962 if (self->kw == KW_tag)
2963 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2964
2965 self->skip ();
2966 }
2967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines