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.194 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.223 by root, Tue Jun 26 04:50:05 2007 UTC

1/*****************************************************************************/
2/* CrossFire, A Multiplayer game for the X Window System */
3/*****************************************************************************/
4
5/* 1/*
6 * This code is placed under the GNU General Public Licence (GPL) 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
7 * 3 *
4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
8 * Copyright (C) 2001-2005 by Chachkoff Yann 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
9 * Copyright (C) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
10 * 7 *
11 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
12 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
13 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
14 * (at your option) any later version. 11 * any later version.
15 * 12 *
16 * 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, but
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
19 * GNU General Public License for more details. 16 * for more details.
20 * 17 *
21 * 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 along
22 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
23 * Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
24 */ 23 */
24
25#include "autoconf.h"
25 26
26#define PLUGIN_NAME "perl" 27#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5" 28#define PLUGIN_VERSION "cfperl 0.5"
28 29
29#define CEDES_PER_TICK 5 30#define CEDES_PER_TICK 5
31
32#if HAVE_EXECINFO_H
33# include <execinfo.h>
34#endif
30 35
31#include <plugin_common.h> 36#include <plugin_common.h>
32#include <sounds.h> 37#include <sounds.h>
33#include <cstdarg> 38#include <cstdarg>
34#include <sproto.h> 39#include <sproto.h>
70# define newSVval64 newSVnv 75# define newSVval64 newSVnv
71# define SvVAL64 SvNV 76# define SvVAL64 SvNV
72#endif 77#endif
73 78
74static f_plug_api gethook = cfapi_get_hooks; 79static f_plug_api gethook = cfapi_get_hooks;
75static f_plug_api object_set_property = cfapi_object_set_property;
76static f_plug_api object_insert = cfapi_object_insert; 80static f_plug_api object_insert = cfapi_object_insert;
77 81
78static PerlInterpreter *perl; 82static PerlInterpreter *perl;
79 83
80double runtime; 84tstamp NOW, runtime;
81 85
82global gbl_ev; 86global gbl_ev;
83static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 87static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
84static SV *sv_runtime, *sv_next_tick; 88static SV *sv_runtime, *sv_next_tick;
89
90bitset<NUM_EVENT_TYPES> ev_want_event;
91bitset<NUM_TYPES> ev_want_type;
85 92
86static HV 93static HV
87 *stash_cf, 94 *stash_cf,
88 *stash_cf_object_wrap, 95 *stash_cf_object_wrap,
89 *stash_cf_object_player_wrap, 96 *stash_cf_object_player_wrap,
111 118
112unordered_vector<attachable *> attachable::mortals; 119unordered_vector<attachable *> attachable::mortals;
113 120
114attachable::~attachable () 121attachable::~attachable ()
115{ 122{
116 flags |=0x3300;//D
117 assert (!self); 123 assert (!self);
118 assert (!cb); 124 assert (!cb);
119} 125}
120 126
121int 127int
137 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 143 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
138 SvREFCNT_dec (self); 144 SvREFCNT_dec (self);
139 145
140 // self *must* be null now because thats sv_unmagic's job. 146 // self *must* be null now because thats sv_unmagic's job.
141 assert (!this->self); 147 assert (!this->self);
142 flags |= 0x80; // severed //D
143 } 148 }
144} 149}
145 150
146void 151void
147attachable::optimise () 152attachable::optimise ()
148{ 153{
149 if (self 154 if (self
150 && SvREFCNT (self) == 1 155 && SvREFCNT (self) == 1
151 && !HvTOTALKEYS (self)) 156 && !HvTOTALKEYS (self))
152 flags |= 0x40,//D
153 sever_self (); 157 sever_self ();
154} 158}
155 159
156// check wether the object really is dead 160// check wether the object really is dead
157void 161void
164} 168}
165 169
166void 170void
167attachable::do_destroy () 171attachable::do_destroy ()
168{ 172{
169 invoke (EVENT_ATTACHABLE_DESTROY, DT_END); 173 INVOKE_ATTACHABLE (DESTROY, this);
170 174
171 if (cb) 175 if (cb)
172 { 176 {
173 SvREFCNT_dec (cb); 177 SvREFCNT_dec (cb);
174 cb = 0; 178 cb = 0;
175 } 179 }
176 180
177 if (self)
178 sever_self ();
179
180 flags |= 0x20; //D
181 mortals.push_back (this); 181 mortals.push_back (this);
182} 182}
183 183
184void 184void
185attachable::destroy () 185attachable::destroy ()
187 if (destroyed ()) 187 if (destroyed ())
188 return; 188 return;
189 189
190 flags |= F_DESTROYED; 190 flags |= F_DESTROYED;
191 do_destroy (); 191 do_destroy ();
192 sever_self ();
192} 193}
193 194
194void 195void
195attachable::check_mortals () 196attachable::check_mortals ()
196{ 197{
200 { 201 {
201 if (i >= mortals.size ()) 202 if (i >= mortals.size ())
202 { 203 {
203 i = 0; 204 i = 0;
204 205
205 if (mortals.size () > 1000) 206 if (mortals.size () >= 512)
206 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ()); 207 {
208 static int last_mortalcount;
209 if (mortals.size () != last_mortalcount)
210 {
211 last_mortalcount = mortals.size ();
212 LOG (llevInfo, "%d mortals.\n", (int)mortals.size ());
213
214 if (0)
215 {
216 for (int j = 0; j < mortals.size (); ++j)//D
217 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
218 fprintf (stderr, "\n");//D
219 }
220 }
221 }
207 222
208 break; 223 break;
209 } 224 }
210 225
211 attachable *obj = mortals [i]; 226 attachable *obj = mortals [i];
212 227
213 obj->refcnt_chk (); // unborrow from perl, if necessary 228#if 0
214 229 if (obj->self)//D make this an assert later
215 //if (obj->refcnt > 0 || obj->self)
216 if (obj->refcnt || obj->self)
217 { 230 {
218//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D 231 LOG (llevError, "check_mortals: object '%s' still has self\n", typeid (obj).name ());
232 obj->sever_self ();
233 }
234#endif
235
236 if (obj->refcnt)
237 {
219 ++i; // further delay freeing 238 ++i; // further delay freeing
220 239
221 if (!(i & 0x3ff)) 240 if (!(i & 0x3ff))
222 break; 241 break;
223 } 242 }
224 else 243 else
225 { 244 {
226 mortals.erase (i); 245 mortals.erase (i);
246 obj->sever_self ();
227 delete obj; 247 delete obj;
228 } 248 }
229 } 249 }
230} 250}
231 251
235 //if (self || cb) 255 //if (self || cb)
236 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 256 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
237 257
238 attach = src.attach; 258 attach = src.attach;
239 return *this; 259 return *this;
260}
261
262template<typename T>
263static bool
264find_backref (void *ptr, T *obj)
265{
266 char *s = (char *)obj;
267 while (s < (char *)obj + sizeof (T))
268 {
269 if (ptr == *(void **)s)
270 return true;
271
272 s += sizeof (void *); // assume natural alignment
273 }
274
275 return false;
276}
277
278// for debugging, find "live" objects containing this ptr
279void
280find_backref (void *ptr)
281{
282 for_all_objects (op)
283 if (find_backref (ptr, op))
284 fprintf (stderr, "O %p %d:'%s'\n", op, op->count, &op->name);
285
286 for_all_players (pl)
287 if (find_backref (ptr, pl))
288 fprintf (stderr, "P %p\n", pl);
289
290 for_all_clients (ns)
291 if (find_backref (ptr, ns))
292 fprintf (stderr, "C %p\n", ns);
293
240} 294}
241 295
242////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 296//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
243 297
244static SV * 298static SV *
280 334
281 if (!obj->self) 335 if (!obj->self)
282 { 336 {
283 obj->self = newHV (); 337 obj->self = newHV ();
284 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 338 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
285 obj->flags |= (obj->flags & 0xc0) << 8;
286 obj->flags &= ~0xc0;//D
287 obj->flags |= 0x10;//D
288 339
289 // now bless the object _once_ 340 // now bless the object _once_
290 return sv_bless (newRV_inc ((SV *)obj->self), stash); 341 return sv_bless (newRV_inc ((SV *)obj->self), stash);
291 } 342 }
292 else 343 else
331 return SvPTR (sv, klass); 382 return SvPTR (sv, klass);
332 else 383 else
333 return 0; 384 return 0;
334} 385}
335 386
387static inline SV *
388newSVpvn_utf8 (const char *s, STRLEN l)
389{
390 SV *sv = newSVpvn (s, l);
391 SvUTF8_on (sv);
392 return sv;
393}
394
336inline SV *to_sv (const shstr & v) { return v ? newSVpvn ((const char *)v, v.length ()) : &PL_sv_undef; } 395inline SV *to_sv (const shstr & v) { return v ? newSVpvn_utf8 ((const char *)v, v.length ()) : &PL_sv_undef; }
337inline SV *to_sv (const char * v) { return newSVpv (v, 0); } 396inline SV *to_sv (const char * v) { return newSVpv (v, 0); }
338inline SV *to_sv (bool v) { return newSViv (v); } 397inline SV *to_sv (bool v) { return newSViv (v); }
339inline SV *to_sv ( signed char v) { return newSViv (v); } 398inline SV *to_sv ( signed char v) { return newSViv (v); }
340inline SV *to_sv (unsigned char v) { return newSViv (v); } 399inline SV *to_sv (unsigned char v) { return newSViv (v); }
341inline SV *to_sv ( signed short v) { return newSViv (v); } 400inline SV *to_sv ( signed short v) { return newSViv (v); }
368 char buf[128]; 427 char buf[128];
369 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq); 428 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
370 return newSVpv (buf, 0); 429 return newSVpv (buf, 0);
371} 430}
372 431
373inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 432inline 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; } 433inline 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); } 434inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
376inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 435inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
377inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 436inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
378inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 437inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
402inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 461inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
403 462
404template<int N> 463template<int N>
405inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); } 464inline void sv_to (SV *sv, char (&v)[N]) { assign (v, SvPV_nolen (sv)); }
406 465
407inline void sv_to (SV *sv, rangetype &v) { v = (rangetype) SvIV (sv); }
408inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); } 466inline void sv_to (SV *sv, bowtype_t &v) { v = (bowtype_t) SvIV (sv); }
409inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); } 467inline void sv_to (SV *sv, petmode_t &v) { v = (petmode_t) SvIV (sv); }
410inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); } 468inline void sv_to (SV *sv, usekeytype &v) { v = (usekeytype) SvIV (sv); }
411inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); } 469inline void sv_to (SV *sv, unapplymode &v) { v = (unapplymode) SvIV (sv); }
412 470
615 perl_construct (perl); 673 perl_construct (perl);
616 674
617 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 675 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
618 676
619 const char *argv[] = { 677 const char *argv[] = {
620 "", 678 settings.argv [0],
621 "-e" 679 "-e"
622 "use Event; use Coro;" // required for bootstrap 680 "use Event; use Coro;" // required for bootstrap
623 "cf->bootstrap;" // required for datadir :*> 681 "cf->bootstrap;" // required for datadir :*>
624 "unshift @INC, cf::datadir ();" 682 "unshift @INC, cf::datadir ();"
625 "require cf;" 683 "require cf;"
653void 711void
654attachable::instantiate () 712attachable::instantiate ()
655{ 713{
656 if (attach) 714 if (attach)
657 { 715 {
658 invoke (EVENT_ATTACHABLE_INSTANTIATE, ARG_STRING (attach), DT_END); 716 INVOKE_ATTACHABLE (INSTANTIATE, this, ARG_STRING (attach));
659 attach = 0; 717 attach = 0;
660 } 718 }
661} 719}
662 720
663void 721void
664attachable::reattach () 722attachable::reattach ()
665{ 723{
666 optimise (); 724 optimise ();
667 //TODO: check for _attachment's, very important for restarts 725 //TODO: check for _attachment's, very important for restarts
668 invoke (EVENT_ATTACHABLE_REATTACH, DT_END); 726 INVOKE_ATTACHABLE (REATTACH, this);
669} 727}
670 728
671static event_klass klass_of[NUM_EVENT_TYPES] = { 729static event_klass klass_of[NUM_EVENT_TYPES] = {
672# define def(type,name) KLASS_ ## type, 730# define def(type,name) KLASS_ ## type,
673# include "eventinc.h" 731# include "eventinc.h"
716} 774}
717 775
718void 776void
719global::gather_callbacks (AV *&callbacks, event_type event) const 777global::gather_callbacks (AV *&callbacks, event_type event) const
720{ 778{
721 ::gather_callbacks (callbacks, cb_object, event); 779 ::gather_callbacks (callbacks, cb_global, event);
722} 780}
723 781
724void 782void
725object::gather_callbacks (AV *&callbacks, event_type event) const 783object::gather_callbacks (AV *&callbacks, event_type event) const
726{ 784{
727 if (subtype && type + subtype * NUM_SUBTYPES <= AvFILLp (cb_type)) 785 if (subtype && type + subtype * NUM_TYPES <= AvFILLp (cb_type))
728 { 786 {
729 SV *registry = AvARRAY (cb_type)[type + subtype * NUM_SUBTYPES]; 787 SV *registry = AvARRAY (cb_type)[type + subtype * NUM_TYPES];
730 788
731 if (registry && SvROK (registry) && SvTYPE (SvRV (registry)) == SVt_PVAV) 789 if (registry && SvROK (registry) && SvTYPE (SvRV (registry)) == SVt_PVAV)
732 ::gather_callbacks (callbacks, (AV *)SvRV (registry), event); 790 ::gather_callbacks (callbacks, (AV *)SvRV (registry), event);
733 } 791 }
734 792
770{ 828{
771 attachable::gather_callbacks (callbacks, event); 829 attachable::gather_callbacks (callbacks, event);
772 ::gather_callbacks (callbacks, cb_map, event); 830 ::gather_callbacks (callbacks, cb_map, event);
773} 831}
774 832
833void
834_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
835{
836 for (int event = 0; event <= AvFILLp (registry); ++event)
837 {
838 SV *cbs_ = AvARRAY (registry)[event];
839
840 // element must be list of callback entries
841 if (cbs_ && SvROK (cbs_) && SvTYPE (SvRV (cbs_)) == SVt_PVAV)
842 {
843 AV *cbs = (AV *)SvRV (cbs_);
844
845 // no callback entries, no callbacks to call
846 if (AvFILLp (cbs) >= 0)
847 set.set (event);
848 }
849 }
850}
851
852// very slow and inefficient way to recalculate the global want bitsets
853void
854_recalc_want ()
855{
856 ev_want_event.reset ();
857
858 _recalc_want (ev_want_event, cb_global);
859 _recalc_want (ev_want_event, cb_attachable);
860 _recalc_want (ev_want_event, cb_object);
861 _recalc_want (ev_want_event, cb_client);
862 _recalc_want (ev_want_event, cb_player);
863 _recalc_want (ev_want_event, cb_map);
864
865 ev_want_type.reset ();
866
867 for (int type = 0; type <= AvFILLp (cb_type); ++type)
868 {
869 SV *cbs_ = AvARRAY (cb_type)[type];
870
871 // element must be list of callback entries
872 if (cbs_ && SvROK (cbs_) && SvTYPE (SvRV (cbs_)) == SVt_PVAV)
873 {
874 AV *cbs = (AV *)SvRV (cbs_);
875
876 // no callback entries, no callbacks to call
877 if (AvFILLp (cbs) >= 0)
878 ev_want_type.set (type % NUM_TYPES);
879 }
880 }
881}
882
775bool 883bool
776attachable::invoke (event_type event, ...) 884attachable::invoke (event_type event, ...)
777{ 885{
778 data_type dt; 886 data_type dt;
779 va_list ap;
780
781 va_start (ap, event);
782 887
783 // callback call ordering should be: 888 // callback call ordering should be:
784 // 1. per-object callback 889 // 1. per-object callback
785 // 2. per-class object 890 // 2. per-class object
786 // 3. per-type callback 891 // 3. per-type callback
790 gather_callbacks (callbacks, event); 895 gather_callbacks (callbacks, event);
791 896
792 // short-circuit processing if no callbacks found/defined 897 // short-circuit processing if no callbacks found/defined
793 if (!callbacks) 898 if (!callbacks)
794 return 0; 899 return 0;
900
901 va_list ap;
902 va_start (ap, event);
795 903
796 CALL_BEGIN (3); 904 CALL_BEGIN (3);
797 CALL_ARG_SV (newSViv (event)); // only used for debugging nowadays 905 CALL_ARG_SV (newSViv (event)); // only used for debugging nowadays
798 CALL_ARG_SV (newRV_noinc ((SV *)callbacks)); 906 CALL_ARG_SV (newRV_noinc ((SV *)callbacks));
799 907
876 CALL_ARG (make_core); 984 CALL_ARG (make_core);
877 CALL_CALL ("cf::post_cleanup", G_VOID); 985 CALL_CALL ("cf::post_cleanup", G_VOID);
878 CALL_END; 986 CALL_END;
879} 987}
880 988
989void
990cfperl_make_book (object *book, int level)
991{
992 CALL_BEGIN (2);
993 CALL_ARG (book);
994 CALL_ARG (level);
995 CALL_CALL ("ext::books::make_book", G_VOID);
996 CALL_END;
997}
998
999void
1000cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
1001{
1002 CALL_BEGIN (4);
1003 CALL_ARG (ns);
1004 CALL_ARG (color);
1005 CALL_ARG (type);
1006 CALL_ARG (msg);
1007 CALL_CALL ("cf::client::send_msg", G_VOID);
1008 CALL_END;
1009}
1010
881maptile * 1011maptile *
882maptile::find_sync (const char *path, maptile *origin) 1012maptile::find_sync (const char *path, maptile *origin)
883{ 1013{
884 CALL_BEGIN (2); 1014 CALL_BEGIN (2);
885 CALL_ARG (path); 1015 CALL_ARG (path);
947 CALL_ARG (exit); 1077 CALL_ARG (exit);
948 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1078 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
949 CALL_END; 1079 CALL_END;
950} 1080}
951 1081
1082void
1083log_backtrace (const char *msg)
1084{
1085#if HAVE_BACKTRACE
1086 void *addr [20];
1087 int size = backtrace (addr, 20);
1088
1089 CALL_BEGIN (size);
1090 CALL_ARG (msg);
1091 for (int i = 0; i < size; ++i)
1092 CALL_ARG ((IV)addr [i]);
1093 CALL_CALL ("cf::_log_backtrace", G_VOID);
1094 CALL_END;
1095#endif
1096}
1097
952///////////////////////////////////////////////////////////////////////////// 1098/////////////////////////////////////////////////////////////////////////////
953 1099
954struct EventAPI *watcher_base::GEventAPI; 1100struct EventAPI *watcher_base::GEventAPI;
955struct CoroAPI *coroapi::GCoroAPI; 1101struct CoroAPI *coroapi::GCoroAPI;
956 1102
957int coroapi::cede_counter; 1103int coroapi::cede_counter;
958double (*coroapi::time)();
959double coroapi::next_cede; 1104tstamp coroapi::next_cede;
960 1105
961void coroapi::do_cede_to_tick () 1106void coroapi::do_cede_to_tick ()
962{ 1107{
963 cede_counter = 0; 1108 cede_counter = 0;
964 1109
1095 1240
1096 _connect_to_perl (); 1241 _connect_to_perl ();
1097 1242
1098 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1243 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1099 1244
1100 { 1245 //{
1101 require_pv ("Time::HiRes"); 1246 // require_pv ("Time::HiRes");
1102 1247 //
1103 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 1248 // SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1104 if (!svp) croak ("Time::HiRes is required"); 1249 // if (!svp) croak ("Time::HiRes is required");
1105 if (!SvIOK(*svp)) croak ("Time::NVtime isn’t a function pointer"); 1250 // if (!SvIOK(*svp)) croak ("Time::NVtime isn’t a function pointer");
1106 coroapi::time = INT2PTR (double(*)(), SvIV(*svp)); 1251 // coroapi::time = INT2PTR (double(*)(), SvIV(*svp));
1107 } 1252 //}
1108 1253
1109 static const struct { 1254 static const struct {
1110 const char *name; 1255 const char *name;
1111 IV iv; 1256 IV iv;
1112 } *civ, const_iv[] = { 1257 } *civ, const_iv[] = {
1113# define const_iv(name) { # name, (IV)name }, 1258# define const_iv(name) { # name, (IV)name },
1114 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster) 1259 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1260 const_iv (logBacktrace)
1115 1261
1116 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1262 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1117 1263
1118 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1264 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1119 1265
1120 const_iv (MAX_TIME) 1266 const_iv (MAX_TIME)
1267
1268 const_iv (NUM_BODY_LOCATIONS)
1269 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1270 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1271 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1272 const_iv (body_shoulder) const_iv (body_foot) const_iv (body_hand)
1273 const_iv (body_wrist) const_iv (body_waist)
1121 1274
1122 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE) 1275 const_iv (PLAYER) const_iv (TRANSPORT) const_iv (ROD) const_iv (TREASURE)
1123 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK) 1276 const_iv (POTION) const_iv (FOOD) const_iv (POISON) const_iv (BOOK)
1124 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON) 1277 const_iv (CLOCK) const_iv (ARROW) const_iv (BOW) const_iv (WEAPON)
1125 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR) 1278 const_iv (ARMOUR) const_iv (PEDESTAL) const_iv (ALTAR) const_iv (LOCKED_DOOR)
1146 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1299 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1147 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1300 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1148 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1301 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1149 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1302 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1150 1303
1151 const_iv (NUM_SUBTYPES) 1304 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1152 1305
1153 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1306 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1154 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1307 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1155 1308
1156 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY) 1309 const_iv (AT_PHYSICAL) const_iv (AT_MAGIC) const_iv (AT_FIRE) const_iv (AT_ELECTRICITY)
1164 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE) 1317 const_iv (WEAP_HIT) const_iv (WEAP_SLASH) const_iv (WEAP_PIERCE) const_iv (WEAP_CLEAVE)
1165 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH) 1318 const_iv (WEAP_SLICE) const_iv (WEAP_STAB) const_iv (WEAP_WHIP) const_iv (WEAP_CRUSH)
1166 const_iv (WEAP_BLUD) 1319 const_iv (WEAP_BLUD)
1167 1320
1168 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED) 1321 const_iv (FLAG_ALIVE) const_iv (FLAG_WIZ) const_iv (FLAG_REMOVED) const_iv (FLAG_FREED)
1169 const_iv (FLAG_WAS_WIZ) const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD) 1322 const_iv (FLAG_APPLIED) const_iv (FLAG_UNPAID) const_iv (FLAG_USE_SHIELD)
1170 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY) 1323 const_iv (FLAG_NO_PICK) const_iv (FLAG_ANIMATE) const_iv (FLAG_MONSTER) const_iv (FLAG_FRIENDLY)
1171 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD) 1324 const_iv (FLAG_GENERATOR) const_iv (FLAG_IS_THROWN) const_iv (FLAG_AUTO_APPLY) const_iv (FLAG_PLAYER_SOLD)
1172 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE) 1325 const_iv (FLAG_SEE_INVISIBLE) const_iv (FLAG_CAN_ROLL) const_iv (FLAG_OVERLAY_FLOOR) const_iv (FLAG_IS_TURNABLE)
1173 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING) 1326 const_iv (FLAG_IS_USED_UP) const_iv (FLAG_IDENTIFIED) const_iv (FLAG_REFLECTING) const_iv (FLAG_CHANGING)
1174 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW) 1327 const_iv (FLAG_SPLITTING) const_iv (FLAG_HITBACK) const_iv (FLAG_STARTEQUIP) const_iv (FLAG_BLOCKSVIEW)
1201 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1354 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1202 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1355 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1203 1356
1204 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1357 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1205 1358
1359 const_iv (SP_RAISE_DEAD)
1360 const_iv (SP_RUNE)
1361 const_iv (SP_MAKE_MARK)
1362 const_iv (SP_BOLT)
1363 const_iv (SP_BULLET)
1364 const_iv (SP_EXPLOSION)
1365 const_iv (SP_CONE)
1366 const_iv (SP_BOMB)
1367 const_iv (SP_WONDER)
1368 const_iv (SP_SMITE)
1369 const_iv (SP_MAGIC_MISSILE)
1370 const_iv (SP_SUMMON_GOLEM)
1371 const_iv (SP_DIMENSION_DOOR)
1372 const_iv (SP_MAGIC_MAPPING)
1373 const_iv (SP_MAGIC_WALL)
1374 const_iv (SP_DESTRUCTION)
1375 const_iv (SP_PERCEIVE_SELF)
1376 const_iv (SP_WORD_OF_RECALL)
1377 const_iv (SP_INVISIBLE)
1378 const_iv (SP_PROBE)
1379 const_iv (SP_HEALING)
1380 const_iv (SP_CREATE_FOOD)
1381 const_iv (SP_EARTH_TO_DUST)
1382 const_iv (SP_CHANGE_ABILITY)
1383 const_iv (SP_BLESS)
1384 const_iv (SP_CURSE)
1385 const_iv (SP_SUMMON_MONSTER)
1386 const_iv (SP_CHARGING)
1387 const_iv (SP_POLYMORPH)
1388 const_iv (SP_ALCHEMY)
1389 const_iv (SP_REMOVE_CURSE)
1390 const_iv (SP_IDENTIFY)
1391 const_iv (SP_DETECTION)
1392 const_iv (SP_MOOD_CHANGE)
1393 const_iv (SP_MOVING_BALL)
1394 const_iv (SP_SWARM)
1395 const_iv (SP_CHANGE_MANA)
1396 const_iv (SP_DISPEL_RUNE)
1397 const_iv (SP_CREATE_MISSILE)
1398 const_iv (SP_CONSECRATE)
1399 const_iv (SP_ANIMATE_WEAPON)
1400 const_iv (SP_LIGHT)
1401 const_iv (SP_CHANGE_MAP_LIGHT)
1402 const_iv (SP_FAERY_FIRE)
1403 const_iv (SP_CAUSE_DISEASE)
1404 const_iv (SP_AURA)
1405 const_iv (SP_TOWN_PORTAL)
1406 const_iv (SP_PARTY_SPELL)
1407
1206 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC) 1408 const_iv (F_APPLIED) const_iv (F_LOCATION) const_iv (F_UNPAID) const_iv (F_MAGIC)
1207 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1409 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1208 const_iv (F_LOCKED) 1410 const_iv (F_LOCKED)
1209 1411
1210 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1412 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1266 1468
1267 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1469 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1268 1470
1269 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM) 1471 const_iv (ST_DEAD) const_iv (ST_SETUP) const_iv (ST_PLAYING) const_iv (ST_CUSTOM)
1270 1472
1271 const_iv (ST_CHANGE_CLASS)
1272
1273 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1473 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1274 1474
1275 // random map generator 1475 // random map generator
1276 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL) 1476 const_iv (LAYOUT_NONE) const_iv (LAYOUT_ONION) const_iv (LAYOUT_MAZE) const_iv (LAYOUT_SPIRAL)
1277 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL) 1477 const_iv (LAYOUT_ROGUELIKE) const_iv (LAYOUT_SNAKE) const_iv (LAYOUT_SQUARE_SPIRAL)
1280 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE) 1480 const_iv (RMOPT_BOTTOM_C) const_iv (RMOPT_BOTTOM_R) const_iv (RMOPT_IRR_SPACE)
1281 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS) 1481 const_iv (RMOPT_WALL_OFF) const_iv (RMOPT_WALLS_ONLY) const_iv (RMOPT_NO_DOORS)
1282 1482
1283 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1483 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1284 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1484 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1485
1486 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1487 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV)
1488 const_iv (GT_MINIMAL)
1285 }; 1489 };
1286 1490
1287 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1288 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1492 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1289 1493
1310 } 1514 }
1311} 1515}
1312 1516
1313void _connect_to_perl () 1517void _connect_to_perl ()
1314 1518
1519void _recalc_want ()
1520
1315void _global_reattach () 1521void _global_reattach ()
1316 CODE: 1522 CODE:
1317{ 1523{
1318 // reattach to all attachable objects in the game. 1524 // reattach to all attachable objects in the game.
1319 for_all_clients (ns) 1525 for_all_clients (ns)
1383 default: croak ("cf::rndm requires none, one or two parameters."); break; 1589 default: croak ("cf::rndm requires none, one or two parameters."); break;
1384 } 1590 }
1385 OUTPUT: 1591 OUTPUT:
1386 RETVAL 1592 RETVAL
1387 1593
1594NV clamp (NV value, NV min_value, NV max_value)
1595 CODE:
1596 RETVAL = clamp (value, min_value, max_value);
1597 OUTPUT:
1598 RETVAL
1599
1600NV lerp (NV value, NV min_in, NV max_in, NV min_out, NV max_out)
1601 CODE:
1602 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1603 OUTPUT:
1604 RETVAL
1605
1606void cede_to_tick ()
1607 CODE:
1608 coroapi::cede_to_tick ();
1609
1388void server_tick () 1610void server_tick ()
1389 CODE: 1611 CODE:
1612 NOW = now ();
1390 runtime = SvNVx (sv_runtime); 1613 runtime = SvNVx (sv_runtime);
1391 server_tick (); 1614 server_tick ();
1392 1615
1393void 1616void
1617log_backtrace (utf8_string msg)
1618
1619void
1394LOG (int level, utf8_string msg) 1620LOG (int flags, utf8_string msg)
1395 PROTOTYPE: $$ 1621 PROTOTYPE: $$
1396 C_ARGS: (LogLevel)level, "%s", msg 1622 C_ARGS: flags, "%s", msg
1397 1623
1398octet_string path_combine (octet_string base, octet_string path) 1624octet_string path_combine (octet_string base, octet_string path)
1399 PROTOTYPE: $$ 1625 PROTOTYPE: $$
1400 1626
1401octet_string path_combine_and_normalize (octet_string base, octet_string path) 1627octet_string path_combine_and_normalize (octet_string base, octet_string path)
1438 } 1664 }
1439 OUTPUT: RETVAL 1665 OUTPUT: RETVAL
1440 1666
1441void abort () 1667void abort ()
1442 1668
1669void reset_signals ()
1670
1443void fork_abort (octet_string cause = "cf::fork_abort") 1671void fork_abort (octet_string cause = "cf::fork_abort")
1444 1672
1445void cleanup (octet_string cause, bool make_core = false) 1673void cleanup (octet_string cause, bool make_core = false)
1446 1674
1447void emergency_save () 1675void emergency_save ()
1581object *actives (U32 index) 1809object *actives (U32 index)
1582 CODE: 1810 CODE:
1583 RETVAL = index < actives.size () ? actives [index] : 0; 1811 RETVAL = index < actives.size () ? actives [index] : 0;
1584 OUTPUT: RETVAL 1812 OUTPUT: RETVAL
1585 1813
1814const char *slot_use_name (U32 slot)
1815 ALIAS:
1816 slot_nonuse_name = 1
1817 CODE:
1818{
1819 if (slot >= NUM_BODY_LOCATIONS)
1820 croak ("body slot index out of range");
1821
1822 switch (ix)
1823 {
1824 case 0: RETVAL = body_locations[slot].use_name; break;
1825 case 1: RETVAL = body_locations[slot].nonuse_name; break;
1826 }
1827}
1828 OUTPUT:
1829 RETVAL
1830
1586# missing properties 1831# missing properties
1587 1832
1588object *head (object *op) 1833object *head (object *op)
1589 PROTOTYPE: $ 1834 PROTOTYPE: $
1590 CODE: 1835 CODE:
1591 RETVAL = op->head_ (); 1836 RETVAL = op->head_ ();
1592 OUTPUT: RETVAL
1593
1594int is_head (object *op)
1595 PROTOTYPE: $
1596 CODE:
1597 RETVAL = op->head_ () == op;
1598 OUTPUT: RETVAL 1837 OUTPUT: RETVAL
1599 1838
1600void 1839void
1601inv (object *obj) 1840inv (object *obj)
1602 PROTOTYPE: $ 1841 PROTOTYPE: $
1615int 1854int
1616num_animations (object *op) 1855num_animations (object *op)
1617 CODE: 1856 CODE:
1618 RETVAL = NUM_ANIMATIONS (op); 1857 RETVAL = NUM_ANIMATIONS (op);
1619 OUTPUT: RETVAL 1858 OUTPUT: RETVAL
1859
1860int slot_info (object *op, UV slot, int value = 0)
1861 ALIAS:
1862 slot_used = 1
1863 CODE:
1864{
1865 if (slot >= NUM_BODY_LOCATIONS)
1866 croak ("body slot index out of range");
1867
1868 RETVAL = ix ? op->slot[slot].used : op->slot[slot].info;
1869
1870 if (items > 2)
1871 if (ix)
1872 op->slot[slot].used = value;
1873 else
1874 op->slot[slot].info = value;
1875}
1876 OUTPUT:
1877 RETVAL
1620 1878
1621object *find_best_object_match (object *op, utf8_string match) 1879object *find_best_object_match (object *op, utf8_string match)
1622 1880
1623object *find_marked_object (object *op) 1881object *find_marked_object (object *op)
1624 1882
1740# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 1998# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1741 1999
1742object *new (utf8_string archetype = 0) 2000object *new (utf8_string archetype = 0)
1743 PROTOTYPE: ;$ 2001 PROTOTYPE: ;$
1744 CODE: 2002 CODE:
1745 RETVAL = archetype ? get_archetype (archetype) : cf_create_object (); 2003 RETVAL = archetype ? get_archetype (archetype) : object::create ();
1746 OUTPUT: 2004 OUTPUT:
1747 RETVAL 2005 RETVAL
1748 2006
2007# TODO: nuke
1749object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2008object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
1750 PROTOTYPE: $$$$$$ 2009 PROTOTYPE: $$$$$$
1751 CODE: 2010 CODE:
1752{ 2011{
1753 int unused_type; 2012 int unused_type;
1806 2065
1807void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2066void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1808 CODE: 2067 CODE:
1809 new_draw_info (flags, 0, op, txt); 2068 new_draw_info (flags, 0, op, txt);
1810 2069
1811object *cf_player_send_inventory (object *op)
1812
1813octet_string cf_player_get_ip (object *op)
1814 ALIAS: ip = 0
1815
1816object *cf_player_get_marked_item (object *op)
1817 ALIAS: marked_item = 0
1818
1819void cf_player_set_marked_item (object *op, object *ob)
1820
1821partylist *cf_player_get_party (object *op)
1822 ALIAS: party = 0
1823
1824void cf_player_set_party (object *op, partylist *party)
1825
1826void kill_player (object *op) 2070void kill_player (object *op)
1827 2071
1828void esrv_update_item (object *op, int what, object *item) 2072void esrv_update_item (object *op, int what, object *item)
1829 C_ARGS: what, op, item 2073 C_ARGS: what, op, item
1830
1831void clear_los (object *op)
1832 2074
1833int command_summon (object *op, utf8_string params) 2075int command_summon (object *op, utf8_string params)
1834 2076
1835int command_arrest (object *op, utf8_string params) 2077int command_arrest (object *op, utf8_string params)
1836 2078
1854 CODE: 2096 CODE:
1855 pl->ob->stats.hp = pl->ob->stats.maxhp; 2097 pl->ob->stats.hp = pl->ob->stats.maxhp;
1856 pl->ob->stats.sp = pl->ob->stats.maxsp; 2098 pl->ob->stats.sp = pl->ob->stats.maxsp;
1857 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2099 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1858 pl->orig_stats = pl->ob->stats; 2100 pl->orig_stats = pl->ob->stats;
2101
2102void clear_los (player *pl)
1859 2103
1860void cf_player_move (player *pl, int dir) 2104void cf_player_move (player *pl, int dir)
1861 2105
1862void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2106void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1863 2107
1973 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2217 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
1974 { 2218 {
1975 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2219 object *ob = get_archetype (SvPVutf8_nolen (*elem));
1976 ob->flag [FLAG_NO_MAP_SAVE] = true; 2220 ob->flag [FLAG_NO_MAP_SAVE] = true;
1977 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2221 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2222
2223 if (ob->randomitems)
2224 {
2225 if (!ob->above)
2226 {
2227 ob->create_treasure (ob->randomitems);
2228
2229 for (object *op = ob->above; op; op = op->above)
2230 op->flag [FLAG_NO_MAP_SAVE] = true;
2231 }
2232
2233 ob->randomitems = 0;
2234 }
1978 } 2235 }
1979 } 2236 }
1980 } 2237 }
1981 2238
1982 skip_space: ; 2239 skip_space: ;
2202 rmp.decoroptions = decoroptions; 2459 rmp.decoroptions = decoroptions;
2203 rmp.orientation = orientation; 2460 rmp.orientation = orientation;
2204 rmp.origin_y = origin_y; 2461 rmp.origin_y = origin_y;
2205 rmp.origin_x = origin_x; 2462 rmp.origin_x = origin_x;
2206 rmp.random_seed = random_seed; 2463 rmp.random_seed = random_seed;
2207 rmp.total_map_hp = total_map_hp; 2464 rmp.total_map_hp = (uint64_t) total_map_hp;
2208 rmp.map_layout_style = map_layout_style; 2465 rmp.map_layout_style = map_layout_style;
2209 rmp.treasureoptions = treasureoptions; 2466 rmp.treasureoptions = treasureoptions;
2210 rmp.symmetry_used = symmetry_used; 2467 rmp.symmetry_used = symmetry_used;
2211 rmp.region = region; 2468 rmp.region = region;
2212 rmp.custom = custom; 2469 rmp.custom = custom;
2222 CODE: 2479 CODE:
2223 RETVAL = archetype::find (name); 2480 RETVAL = archetype::find (name);
2224 OUTPUT: 2481 OUTPUT:
2225 RETVAL 2482 RETVAL
2226 2483
2227archetype *first() 2484int archetypes_size ()
2228 PROTOTYPE: 2485 CODE:
2229 CODE:
2230 RETVAL = first_archetype; 2486 RETVAL = archetypes.size ();
2487 OUTPUT: RETVAL
2488
2489archetype *archetypes (U32 index)
2490 CODE:
2491 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2492 OUTPUT: RETVAL
2493
2494object *instantiate (archetype *arch)
2495 CODE:
2496 RETVAL = arch_to_object (arch);
2497 OUTPUT:
2231 OUTPUT: RETVAL 2498 RETVAL
2232 2499
2233INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2500INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2234 2501
2235MODULE = cf PACKAGE = cf::party 2502MODULE = cf PACKAGE = cf::party
2236 2503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines