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.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.169 by root, Thu Feb 15 21:07:49 2007 UTC

4 4
5/* 5/*
6 * This code is placed under the GNU General Public Licence (GPL) 6 * This code is placed under the GNU General Public Licence (GPL)
7 * 7 *
8 * Copyright (C) 2001-2005 by Chachkoff Yann 8 * Copyright (C) 2001-2005 by Chachkoff Yann
9 * Copyright (C) 2006 by Marc Lehmann <cf@schmorp.de> 9 * Copyright (C) 2006,2007 by Marc Lehmann <cf@schmorp.de>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
29#include <plugin_common.h> 29#include <plugin_common.h>
30#include <sounds.h> 30#include <sounds.h>
31#include <cstdarg> 31#include <cstdarg>
32#include <sproto.h> 32#include <sproto.h>
33 33
34#include "loader.h"
34#include "cfperl.h" 35#include "cfperl.h"
35#include "shstr.h" 36#include "shstr.h"
36 37
37#include <unistd.h> 38#include <unistd.h>
38#if _POSIX_MEMLOCK 39#if _POSIX_MEMLOCK
101 102
102unordered_vector<attachable *> attachable::mortals; 103unordered_vector<attachable *> attachable::mortals;
103 104
104attachable::~attachable () 105attachable::~attachable ()
105{ 106{
106 assert (!(flags & F_BORROWED)); 107 assert (!self);
108 assert (!cb);
107} 109}
108 110
109int 111int
110attachable::refcnt_cnt () const 112attachable::refcnt_cnt () const
111{ 113{
112 return refcnt + (self ? SvREFCNT (self) : 0); 114 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
115}
116
117void
118attachable::sever_self ()
119{
120 if (HV *self = this->self)
121 {
122 // keep a refcount because sv_unmagic might call attachable_free,
123 // which might clear self, causing sv_unmagic to crash on a now
124 // invalid object.
125 SvREFCNT_inc (self);
126 hv_clear (self);
127 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
128 SvREFCNT_dec (self);
129
130 // self *must* be null now because thats sv_unmagic's job.
131 assert (!this->self);
132 flags |= 0x80; // severed //D
133 }
113} 134}
114 135
115void 136void
116attachable::optimise () 137attachable::optimise ()
117{ 138{
118 if (self 139 if (self
119 && SvREFCNT (self) == 1 140 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self)) 141 && !HvTOTALKEYS (self))
142 flags |= 0x40,//D
143 sever_self ();
144}
145
146// check wether the object really is dead
147void
148attachable::do_check ()
149{
150 if (refcnt_cnt () > 0)
151 return;
152
153 destroy ();
154}
155
156void
157attachable::do_destroy ()
158{
159 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
160
161 if (cb)
121 { 162 {
122 flags &= ~F_BORROWED;
123 refcnt_inc ();
124 SvREFCNT_dec ((SV *)self); 163 SvREFCNT_dec (cb);
164 cb = 0;
125 } 165 }
126}
127
128// check wether the object really is dead
129void
130attachable::do_check ()
131{
132 if (refcnt > 0)
133 return;
134
135 optimise ();
136 166
137 if (self) 167 if (self)
138 { 168 sever_self ();
139 if (refcnt + SvREFCNT (self) > 0)
140 return;
141 169
142 assert (flags & F_BORROWED); 170 flags |= 0x20; //D
143
144 flags &= ~F_BORROWED;
145 refcnt_inc ();
146 SvREFCNT_dec (self);
147 self = 0;
148 }
149
150 if (refcnt > 0)
151 return;
152
153 destroy ();
154}
155
156void
157attachable::do_destroy ()
158{
159 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
160
161 if (self)
162 hv_clear (self);
163
164 mortals.push_back (this); 171 mortals.push_back (this);
165} 172}
166 173
167void 174void
168attachable::destroy () 175attachable::destroy ()
175} 182}
176 183
177void 184void
178attachable::check_mortals () 185attachable::check_mortals ()
179{ 186{
180 for (int i = 0; i < mortals.size (); ) 187 static int i = 0;
188
189 for (;;)
181 { 190 {
191 if (i >= mortals.size ())
192 {
193 i = 0;
194
195 if (mortals.size () > 1000)
196 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
197
198 break;
199 }
200
182 attachable *obj = mortals [i]; 201 attachable *obj = mortals [i];
183 202
184 obj->refcnt_chk (); // unborrow from perl, if necessary 203 obj->refcnt_chk (); // unborrow from perl, if necessary
185 204
205 //if (obj->refcnt > 0 || obj->self)
186 if (obj->refcnt || obj->self) 206 if (obj->refcnt || obj->self)
187 { 207 {
188#if 0 208//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
189 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
190 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
191#endif
192
193 ++i; // further delay freeing 209 ++i; // further delay freeing
210
211 if (!(i & 0x3ff))
212 break;
194 }//D 213 }
195 else 214 else
196 { 215 {
197 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
198 mortals.erase (i); 216 mortals.erase (i);
199 delete obj; 217 delete obj;
200 } 218 }
201 } 219 }
202} 220}
227 245
228static int 246static int
229attachable_free (pTHX_ SV *sv, MAGIC *mg) 247attachable_free (pTHX_ SV *sv, MAGIC *mg)
230{ 248{
231 attachable *at = (attachable *)mg->mg_ptr; 249 attachable *at = (attachable *)mg->mg_ptr;
232 assert (!(at->flags & attachable::F_BORROWED)); 250
251 //TODO: check if transaction behaviour is really required here
252 if (SV *self = (SV *)at->self)
253 {
233 at->self = 0; 254 at->self = 0;
255 SvREFCNT_dec (self);
256 }
257
234 // next line makes sense, but most objects still have refcnt 0 by default 258 // next line makes sense, but most objects still have refcnt 0 by default
235 //at->refcnt_chk (); 259 //at->refcnt_chk ();
236 return 0; 260 return 0;
237} 261}
238 262
246 270
247 if (!obj->self) 271 if (!obj->self)
248 { 272 {
249 obj->self = newHV (); 273 obj->self = newHV ();
250 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 274 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
251 275 obj->flags |= (obj->flags & 0xc0) << 8;
252 // borrow the refcnt from the object 276 obj->flags &= ~0xc0;//D
253 obj->flags |= attachable::F_BORROWED; 277 obj->flags |= 0x10;//D
254 obj->refcnt_dec ();
255 278
256 // now bless the object _once_ 279 // now bless the object _once_
257 return sv_bless (newRV_inc ((SV *)obj->self), stash); 280 return sv_bless (newRV_inc ((SV *)obj->self), stash);
258 } 281 }
259 else 282 else
283 {
260 return newRV_inc ((SV *)obj->self); 284 SV *sv = newRV_inc ((SV *)obj->self);
285
286 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
287 SvAMAGIC_on (sv);
288
289 return sv;
290 }
261} 291}
262 292
263static void 293static void
264clearSVptr (SV *sv) 294clearSVptr (SV *sv)
265{ 295{
318inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 348inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
319 349
320inline SV *to_sv (object & v) { return to_sv (&v); } 350inline SV *to_sv (object & v) { return to_sv (&v); }
321inline SV *to_sv (living & v) { return to_sv (&v); } 351inline SV *to_sv (living & v) { return to_sv (&v); }
322 352
323//TODO:
324inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 353inline SV *to_sv (facetile * v) { return to_sv (v->name); }
325inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 354inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
326 355
327inline SV *to_sv (UUID v) 356inline SV *to_sv (UUID v)
328{ 357{
329 char buf[128]; 358 char buf[128];
330 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 359 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
331 return newSVpv (buf, 0); 360 return newSVpv (buf, 0);
332} 361}
333 362
334inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 363inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
335inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 364inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
354inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 383inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
355inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 384inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
356inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 385inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
357inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 386inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
358 387
359inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 388inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
360inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO 389inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
361 390
362template<class T> 391template<class T>
363inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 392inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
364 393
365template<int N> 394template<int N>
501 if (!ext->cb) 530 if (!ext->cb)
502 ext->cb = newAV (); 531 ext->cb = newAV ();
503 532
504 return newRV_inc ((SV *)ext->cb); 533 return newRV_inc ((SV *)ext->cb);
505} 534}
506
507#if 0
508void attachable::clear ()
509{
510 if (self)
511 {
512 // disconnect Perl from C, to avoid crashes
513 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
514
515 // clear the perl hash, might or might not be a good idea
516 hv_clear ((HV *)SvRV ((SV *)self));
517
518 SvREFCNT_dec (self);
519 self = 0;
520 }
521
522 if (cb)
523 {
524 SvREFCNT_dec (cb);
525 cb = 0;
526 }
527
528 attach = 0;
529}
530#endif
531 535
532///////////////////////////////////////////////////////////////////////////// 536/////////////////////////////////////////////////////////////////////////////
533 537
534extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 538extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
535{ 539{
607 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 611 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
608 { 612 {
609 printf ("unable to initialize perl-interpreter, aborting.\n"); 613 printf ("unable to initialize perl-interpreter, aborting.\n");
610 exit (EXIT_FAILURE); 614 exit (EXIT_FAILURE);
611 } 615 }
616
617 {
618 dSP;
619
620 PUSHMARK (SP);
621 PUTBACK;
622 call_pv ("cf::init", G_DISCARD | G_VOID);
623 }
612} 624}
613 625
614void cfperl_main () 626void cfperl_main ()
615{ 627{
616 dSP; 628 dSP;
830} 842}
831 843
832///////////////////////////////////////////////////////////////////////////// 844/////////////////////////////////////////////////////////////////////////////
833 845
834void 846void
835maptile::emergency_save () 847cfperl_emergency_save ()
836{ 848{
837 CALL_BEGIN (0); 849 CALL_BEGIN (0);
838 CALL_CALL ("cf::map::emergency_save", G_VOID); 850 CALL_CALL ("cf::emergency_save", G_VOID);
851 CALL_END;
852}
853
854void
855cfperl_cleanup (int make_core)
856{
857 CALL_BEGIN (1);
858 CALL_ARG (make_core);
859 CALL_CALL ("cf::post_cleanup", G_VOID);
839 CALL_END; 860 CALL_END;
840} 861}
841 862
842maptile * 863maptile *
843maptile::find_sync (const char *path, maptile *origin) 864maptile::find_sync (const char *path, maptile *origin)
844{ 865{
845 CALL_BEGIN (2); 866 CALL_BEGIN (2);
846 CALL_ARG (path); 867 CALL_ARG (path);
847 CALL_ARG (origin); 868 CALL_ARG (origin);
848 CALL_CALL ("cf::map::find_sync", G_SCALAR); 869 CALL_CALL ("cf::map::find_sync", G_SCALAR);
870
871 maptile *retval;
872
873 if (count)
874 sv_to (POPs, retval);
875 else
876 retval = 0;
877
878 CALL_END;
879
880 return retval;
881}
882
883maptile *
884maptile::find_async (const char *path, maptile *origin)
885{
886 CALL_BEGIN (2);
887 CALL_ARG (path);
888 CALL_ARG (origin);
889 CALL_CALL ("cf::map::find_async", G_SCALAR);
849 890
850 maptile *retval; 891 maptile *retval;
851 892
852 if (count) 893 if (count)
853 sv_to (POPs, retval); 894 sv_to (POPs, retval);
906void 947void
907iw::alloc () 948iw::alloc ()
908{ 949{
909 pe = GEventAPI->new_idle (0, 0); 950 pe = GEventAPI->new_idle (0, 0);
910 951
952 WaREENTRANT_off (pe);
911 pe->base.callback = (void *)iw_dispatch; 953 pe->base.callback = (void *)iw_dispatch;
912 pe->base.ext_data = (void *)this; 954 pe->base.ext_data = (void *)this;
913} 955}
914 956
915static void iow_dispatch (pe_event *ev) 957static void iow_dispatch (pe_event *ev)
921void 963void
922iow::alloc () 964iow::alloc ()
923{ 965{
924 pe = GEventAPI->new_io (0, 0); 966 pe = GEventAPI->new_io (0, 0);
925 967
968 WaREENTRANT_off (pe);
926 pe->base.callback = (void *)iow_dispatch; 969 pe->base.callback = (void *)iow_dispatch;
927 pe->base.ext_data = (void *)this; 970 pe->base.ext_data = (void *)this;
928 971
929 pe->fd = -1; 972 pe->fd = -1;
930 pe->poll = 0; 973 pe->poll = 0;
1258 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1301 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1259 const_iv (FLAG_IS_WATER) 1302 const_iv (FLAG_IS_WATER)
1260 const_iv (FLAG_CONTENT_ON_GEN) 1303 const_iv (FLAG_CONTENT_ON_GEN)
1261 const_iv (FLAG_IS_A_TEMPLATE) 1304 const_iv (FLAG_IS_A_TEMPLATE)
1262 const_iv (FLAG_IS_BUILDABLE) 1305 const_iv (FLAG_IS_BUILDABLE)
1306 const_iv (FLAG_DESTROY_ON_DEATH)
1307 const_iv (FLAG_NO_MAP_SAVE)
1263 1308
1264 const_iv (NDI_BLACK) 1309 const_iv (NDI_BLACK)
1265 const_iv (NDI_WHITE) 1310 const_iv (NDI_WHITE)
1266 const_iv (NDI_NAVY) 1311 const_iv (NDI_NAVY)
1267 const_iv (NDI_RED) 1312 const_iv (NDI_RED)
1452 const_iv (ATNR_BLIND) 1497 const_iv (ATNR_BLIND)
1453 const_iv (ATNR_INTERNAL) 1498 const_iv (ATNR_INTERNAL)
1454 const_iv (ATNR_LIFE_STEALING) 1499 const_iv (ATNR_LIFE_STEALING)
1455 const_iv (ATNR_DISEASE) 1500 const_iv (ATNR_DISEASE)
1456 1501
1457 const_iv (MAP_FLUSH)
1458 const_iv (MAP_PLAYER_UNIQUE)
1459 const_iv (MAP_BLOCK)
1460 const_iv (MAP_STYLE)
1461 const_iv (MAP_OVERLAY)
1462
1463 const_iv (MAP_IN_MEMORY) 1502 const_iv (MAP_IN_MEMORY)
1464 const_iv (MAP_SWAPPED) 1503 const_iv (MAP_SWAPPED)
1465 const_iv (MAP_LOADING) 1504 const_iv (MAP_LOADING)
1466 const_iv (MAP_SAVING) 1505 const_iv (MAP_SAVING)
1467 1506
1560} 1599}
1561 1600
1562NV floor (NV x) 1601NV floor (NV x)
1563 1602
1564NV ceil (NV x) 1603NV ceil (NV x)
1604
1605NV rndm (...)
1606 CODE:
1607 switch (items)
1608 {
1609 case 0: RETVAL = rndm (); break;
1610 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1611 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1612 default: croak ("cf::rndm requires none, one or two parameters."); break;
1613 }
1614 OUTPUT:
1615 RETVAL
1565 1616
1566void server_tick () 1617void server_tick ()
1567 CODE: 1618 CODE:
1568 runtime = SvNVx (sv_runtime); 1619 runtime = SvNVx (sv_runtime);
1569 server_tick (); 1620 server_tick ();
1616 } 1667 }
1617 OUTPUT: RETVAL 1668 OUTPUT: RETVAL
1618 1669
1619void abort () 1670void abort ()
1620 1671
1672void fork_abort (char *cause = "cf::fork_abort")
1673
1674void cleanup (const char *cause, bool make_core = false)
1675
1621void emergency_save () 1676void emergency_save ()
1622 1677
1623void _exit (int status = 0) 1678void _exit (int status = EXIT_SUCCESS)
1679
1680UV sv_2watcher (SV *w)
1681 CODE:
1682 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1683 OUTPUT:
1684 RETVAL
1624 1685
1625#if _POSIX_MEMLOCK 1686#if _POSIX_MEMLOCK
1626 1687
1627int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1688int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1628 1689
1674 RETVAL = newSVpv (resist_plus[atnr], 0); 1735 RETVAL = newSVpv (resist_plus[atnr], 0);
1675 else 1736 else
1676 XSRETURN_UNDEF; 1737 XSRETURN_UNDEF;
1677 OUTPUT: RETVAL 1738 OUTPUT: RETVAL
1678 1739
1740bool
1741load_resource_file (const char *filename)
1742
1679MODULE = cf PACKAGE = cf::attachable 1743MODULE = cf PACKAGE = cf::attachable
1680 1744
1681int 1745int
1682valid (SV *obj) 1746valid (SV *obj)
1683 CODE: 1747 CODE:
1684 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1748 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685 OUTPUT: 1749 OUTPUT:
1686 RETVAL 1750 RETVAL
1751
1752void
1753debug_trace (attachable *obj, bool on = true)
1754 CODE:
1755 obj->flags &= ~attachable::F_DEBUG_TRACE;
1756 if (on)
1757 obj->flags |= attachable::F_DEBUG_TRACE;
1758
1759int mortals_size ()
1760 CODE:
1761 RETVAL = attachable::mortals.size ();
1762 OUTPUT: RETVAL
1763
1764#object *mortals (U32 index)
1765# CODE:
1766# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1767# OUTPUT: RETVAL
1687 1768
1688INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1769INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1689 1770
1690MODULE = cf PACKAGE = cf::global 1771MODULE = cf PACKAGE = cf::global
1691 1772
1709 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1790 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1710 OUTPUT: RETVAL 1791 OUTPUT: RETVAL
1711 1792
1712SV *registry (object *op) 1793SV *registry (object *op)
1713 1794
1714void mortals () 1795int objects_size ()
1715 PPCODE: 1796 CODE:
1716 EXTEND (SP, object::mortals.size ());
1717 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1718 PUSHs (to_sv (*i));
1719
1720object *first ()
1721 CODE:
1722 RETVAL = object::first; 1797 RETVAL = objects.size ();
1798 OUTPUT: RETVAL
1799
1800object *objects (U32 index)
1801 CODE:
1802 RETVAL = index < objects.size () ? objects [index] : 0;
1803 OUTPUT: RETVAL
1804
1805int actives_size ()
1806 CODE:
1807 RETVAL = actives.size ();
1808 OUTPUT: RETVAL
1809
1810object *actives (U32 index)
1811 CODE:
1812 RETVAL = index < actives.size () ? actives [index] : 0;
1723 OUTPUT: RETVAL 1813 OUTPUT: RETVAL
1724 1814
1725# missing properties 1815# missing properties
1726 1816
1727object *head (object *op) 1817object *head (object *op)
1728 PROTOTYPE: $ 1818 PROTOTYPE: $
1729 CODE: 1819 CODE:
1730 RETVAL = op->head ? op->head : op; 1820 RETVAL = op->head_ ();
1731 OUTPUT: RETVAL 1821 OUTPUT: RETVAL
1732 1822
1733int is_head (object *op) 1823int is_head (object *op)
1734 PROTOTYPE: $ 1824 PROTOTYPE: $
1735 CODE: 1825 CODE:
1736 RETVAL = !op->head; 1826 RETVAL = op->head_ () == op;
1737 OUTPUT: RETVAL 1827 OUTPUT: RETVAL
1738 1828
1739void 1829void
1740inv (object *obj) 1830inv (object *obj)
1741 PROTOTYPE: $ 1831 PROTOTYPE: $
1749void 1839void
1750set_animation (object *op, int idx) 1840set_animation (object *op, int idx)
1751 CODE: 1841 CODE:
1752 SET_ANIMATION (op, idx); 1842 SET_ANIMATION (op, idx);
1753 1843
1844int
1845num_animations (object *op)
1846 CODE:
1847 RETVAL = NUM_ANIMATIONS (op);
1848 OUTPUT: RETVAL
1849
1754object *find_best_object_match (object *op, const char *match) 1850object *find_best_object_match (object *op, const char *match)
1755 1851
1756object *find_marked_object (object *op) 1852object *find_marked_object (object *op)
1757 1853
1758int need_identify (object *obj); 1854int need_identify (object *obj);
1770 manual_apply (applied, applier, flags); 1866 manual_apply (applied, applier, flags);
1771 1867
1772void apply_below (object *op) 1868void apply_below (object *op)
1773 CODE: 1869 CODE:
1774 player_apply_below (op); 1870 player_apply_below (op);
1871
1872int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1775 1873
1776object *cf_object_present_archname_inside (object *op, char *whatstr) 1874object *cf_object_present_archname_inside (object *op, char *whatstr)
1777 1875
1778int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0) 1876int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
1779 1877
1832 1930
1833void drop (object *who, object *op) 1931void drop (object *who, object *op)
1834 1932
1835void pick_up (object *who, object *op) 1933void pick_up (object *who, object *op)
1836 1934
1837object *cf_object_insert_object (object *op, object *container)
1838
1839object *cf_object_insert_in_ob (object *ob, object *where)
1840
1841int cf_object_teleport (object *op, maptile *map, int x, int y) 1935int cf_object_teleport (object *op, maptile *map, int x, int y)
1842 1936
1843void update_object (object *op, int action) 1937void update_object (object *op, int action)
1844 1938
1845object *cf_create_object_by_name (const char *name) 1939object *cf_create_object_by_name (const char *name)
1964void esrv_update_item (object *op, int what, object *item) 2058void esrv_update_item (object *op, int what, object *item)
1965 C_ARGS: what, op, item 2059 C_ARGS: what, op, item
1966 2060
1967void clear_los (object *op) 2061void clear_los (object *op)
1968 2062
1969int command_teleport (object *op, char *params)
1970
1971int command_summon (object *op, char *params) 2063int command_summon (object *op, char *params)
1972 2064
1973int command_arrest (object *op, char *params) 2065int command_arrest (object *op, char *params)
1974 2066
1975int command_kick (object *op, char *params) 2067int command_kick (object *op, char *params)
2000 pl->orig_stats = pl->ob->stats; 2092 pl->orig_stats = pl->ob->stats;
2001 2093
2002void cf_player_move (player *pl, int dir) 2094void cf_player_move (player *pl, int dir)
2003 2095
2004void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2096void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2005
2006player *first ()
2007 CODE:
2008 RETVAL = first_player;
2009 OUTPUT: RETVAL
2010 2097
2011bool 2098bool
2012cell_visible (player *pl, int dx, int dy) 2099cell_visible (player *pl, int dx, int dy)
2013 CODE: 2100 CODE:
2014 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2101 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2092 for_all_players (pl) 2179 for_all_players (pl)
2093 if (pl->ob && pl->ob->map == THIS) 2180 if (pl->ob && pl->ob->map == THIS)
2094 PUSHs (sv_2mortal (to_sv (pl->ob))); 2181 PUSHs (sv_2mortal (to_sv (pl->ob)));
2095 } 2182 }
2096 2183
2184void
2185maptile::add_underlay (SV *data, int offset, int stride, SV *palette)
2186 CODE:
2187{
2188 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV)
2189 croak ("maptile::add_underlay: palette must be arrayref");
2190
2191 palette = SvRV (palette);
2192
2193 STRLEN idxlen;
2194 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2195
2196 for (int x = 0; x < THIS->width; ++x)
2197 for (int y = 0; y < THIS->height; ++y)
2198 {
2199 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2200 if (op->flag [FLAG_IS_FLOOR])
2201 goto skip_space;
2202
2203 {
2204 int offs = offset + y * stride + x;
2205 if (IN_RANGE_EXC (offs, 0, idxlen))
2206 {
2207 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2208 {
2209 object *ob = get_archetype (SvPVutf8_nolen (*elem));
2210 ob->flag [FLAG_NO_MAP_SAVE] = true;
2211 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2212 }
2213 }
2214 }
2215
2216 skip_space: ;
2217 }
2218}
2219
2220void
2221maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
2222 CODE:
2223{
2224 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV)
2225 croak ("maptile::set_regiondata: palette must be arrayref");
2226
2227 palette = SvRV (palette);
2228
2229 STRLEN idxlen;
2230 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2231
2232 region **regionmap = (region **)malloc (
2233 (av_len ((AV *)palette) + 1) * sizeof (region *));
2234 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2235
2236 for (int i = av_len ((AV *)palette) + 1; i--; )
2237 regionmap [i] = region::find (
2238 SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2239
2240 for (int y = 0; y < THIS->height; ++y)
2241 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2242
2243 sfree (THIS->regions, THIS->size ());
2244 free (THIS->regionmap);
2245
2246 THIS->regions = regions;
2247 THIS->regionmap = regionmap;
2248}
2249
2097void play_sound_map (maptile *map, int x, int y, int sound_num) 2250void play_sound_map (maptile *map, int x, int y, int sound_num)
2098 2251
2099int out_of_map (maptile *map, int x, int y) 2252int out_of_map (maptile *map, int x, int y)
2100 2253
2101void 2254void
2117 2270
2118object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2271object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2119 C_ARGS: str, map, nx, ny 2272 C_ARGS: str, map, nx, ny
2120 2273
2121void 2274void
2122cf_map_normalise (maptile *map, int x, int y) 2275get_map_flags (maptile *map, int x, int y)
2123 PPCODE: 2276 PPCODE:
2124{ 2277{
2125 maptile *nmap = 0; 2278 maptile *nmap = 0;
2126 I16 nx = 0, ny = 0; 2279 I16 nx = 0, ny = 0;
2127 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2280 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2182 2335
2183void fix_walls (maptile *map, int x, int y) 2336void fix_walls (maptile *map, int x, int y)
2184 2337
2185void fix_walls_around (maptile *map, int x, int y) 2338void fix_walls_around (maptile *map, int x, int y)
2186 2339
2187const char *
2188region_name (maptile *m)
2189 CODE:
2190 RETVAL = get_name_of_region_for_map (m);
2191 OUTPUT: RETVAL
2192
2193# worst xs function of my life 2340# worst xs function of my life
2194maptile * 2341bool
2195_create_random_map (\ 2342_create_random_map (\
2196 char *path,\ 2343 maptile *self,\
2197 char *wallstyle,\ 2344 char *wallstyle,\
2198 char *wall_name,\ 2345 char *wall_name,\
2199 char *floorstyle,\ 2346 char *floorstyle,\
2200 char *monsterstyle,\ 2347 char *monsterstyle,\
2201 char *treasurestyle,\ 2348 char *treasurestyle,\
2205 char *origin_map,\ 2352 char *origin_map,\
2206 char *final_map,\ 2353 char *final_map,\
2207 char *exitstyle,\ 2354 char *exitstyle,\
2208 char *this_map,\ 2355 char *this_map,\
2209 char *exit_on_final_map,\ 2356 char *exit_on_final_map,\
2210 int Xsize,\ 2357 int xsize,\
2211 int Ysize,\ 2358 int ysize,\
2212 int expand2x,\ 2359 int expand2x,\
2213 int layoutoptions1,\ 2360 int layoutoptions1,\
2214 int layoutoptions2,\ 2361 int layoutoptions2,\
2215 int layoutoptions3,\ 2362 int layoutoptions3,\
2216 int symmetry,\ 2363 int symmetry,\
2221 int dungeon_depth,\ 2368 int dungeon_depth,\
2222 int decoroptions,\ 2369 int decoroptions,\
2223 int orientation,\ 2370 int orientation,\
2224 int origin_y,\ 2371 int origin_y,\
2225 int origin_x,\ 2372 int origin_x,\
2226 int random_seed,\ 2373 U32 random_seed,\
2227 val64 total_map_hp,\ 2374 val64 total_map_hp,\
2228 int map_layout_style,\ 2375 int map_layout_style,\
2229 int treasureoptions,\ 2376 int treasureoptions,\
2230 int symmetry_used,\ 2377 int symmetry_used,\
2231 region *region\ 2378 region *region,\
2379 char *custom\
2232) 2380)
2233 CODE: 2381 CODE:
2234{ 2382{
2235 random_map_params rmp; 2383 random_map_params rmp;
2236 2384
2246 assign (rmp.exit_on_final_map, exit_on_final_map); 2394 assign (rmp.exit_on_final_map, exit_on_final_map);
2247 2395
2248 rmp.origin_map = origin_map; 2396 rmp.origin_map = origin_map;
2249 rmp.final_map = final_map; 2397 rmp.final_map = final_map;
2250 rmp.this_map = this_map; 2398 rmp.this_map = this_map;
2251 rmp.Xsize = Xsize; 2399 rmp.xsize = xsize;
2252 rmp.Ysize = Ysize; 2400 rmp.ysize = ysize;
2253 rmp.expand2x = expand2x; 2401 rmp.expand2x = expand2x;
2254 rmp.layoutoptions1 = layoutoptions1; 2402 rmp.layoutoptions1 = layoutoptions1;
2255 rmp.layoutoptions2 = layoutoptions2; 2403 rmp.layoutoptions2 = layoutoptions2;
2256 rmp.layoutoptions3 = layoutoptions3; 2404 rmp.layoutoptions3 = layoutoptions3;
2257 rmp.symmetry = symmetry; 2405 rmp.symmetry = symmetry;
2268 rmp.total_map_hp = total_map_hp; 2416 rmp.total_map_hp = total_map_hp;
2269 rmp.map_layout_style = map_layout_style; 2417 rmp.map_layout_style = map_layout_style;
2270 rmp.treasureoptions = treasureoptions; 2418 rmp.treasureoptions = treasureoptions;
2271 rmp.symmetry_used = symmetry_used; 2419 rmp.symmetry_used = symmetry_used;
2272 rmp.region = region; 2420 rmp.region = region;
2421 rmp.custom = custom;
2273 2422
2274 RETVAL = generate_random_map (path, &rmp); 2423 RETVAL = self->generate_random_map (&rmp);
2275} 2424}
2276 OUTPUT: 2425 OUTPUT:
2277 RETVAL 2426 RETVAL
2278 2427
2279MODULE = cf PACKAGE = cf::arch 2428MODULE = cf PACKAGE = cf::arch
2302 2451
2303INCLUDE: $PERL genacc partylist ../include/player.h | 2452INCLUDE: $PERL genacc partylist ../include/player.h |
2304 2453
2305MODULE = cf PACKAGE = cf::region 2454MODULE = cf PACKAGE = cf::region
2306 2455
2307region *first () 2456void
2308 PROTOTYPE: 2457list ()
2309 CODE: 2458 PPCODE:
2310 RETVAL = first_region; 2459 for_all_regions (rgn)
2311 OUTPUT: RETVAL 2460 XPUSHs (sv_2mortal (to_sv (rgn)));
2312 2461
2313region *find (char *name) 2462region *find (char *name)
2314 PROTOTYPE: $ 2463 PROTOTYPE: $
2315 CODE: 2464 CODE:
2316 RETVAL = get_region_by_name (name); 2465 RETVAL = region::find (name);
2466 OUTPUT: RETVAL
2467
2468region *find_fuzzy (char *name)
2469 PROTOTYPE: $
2470 CODE:
2471 RETVAL = region::find_fuzzy (name);
2317 OUTPUT: RETVAL 2472 OUTPUT: RETVAL
2318 2473
2319INCLUDE: $PERL genacc region ../include/map.h | 2474INCLUDE: $PERL genacc region ../include/map.h |
2320 2475
2321MODULE = cf PACKAGE = cf::living 2476MODULE = cf PACKAGE = cf::living

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines