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.122 by root, Sun Dec 31 21:02:05 2006 UTC vs.
Revision 1.153 by root, Fri Jan 26 20:59:57 2007 UTC

32#include <sproto.h> 32#include <sproto.h>
33 33
34#include "cfperl.h" 34#include "cfperl.h"
35#include "shstr.h" 35#include "shstr.h"
36 36
37#include <unistd.h>
38#if _POSIX_MEMLOCK
39# include <sys/mman.h>
40#endif
41
37#include <EXTERN.h> 42#include <EXTERN.h>
38#include <perl.h> 43#include <perl.h>
39#include <XSUB.h> 44#include <XSUB.h>
40 45
41#include "CoroAPI.h" 46#include "CoroAPI.h"
94 99
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 100//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96 101
97unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
98 103
99#if 0
100attachable *attachable::rc_first;
101
102attachable::attachable ()
103{
104 refcnt = 0;
105 rc_next = rc_first;
106 rc_first = this;
107}
108#endif
109
110attachable::~attachable () 104attachable::~attachable ()
111{ 105{
112 assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113#if 0
114 assert (!rc_next);
115 assert (!refcnt); 106 assert (!self);
116#endif 107 assert (!cb);
108}
109
110int
111attachable::refcnt_cnt () const
112{
113 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
114}
115
116void
117attachable::optimise ()
118{
119 if (self
120 && SvREFCNT (self) == 1
121 && !HvTOTALKEYS (self))
122 {
123 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
124 assert (!self);
125 }
117} 126}
118 127
119// check wether the object really is dead 128// check wether the object really is dead
120void 129void
121attachable::do_check () 130attachable::do_check ()
122{ 131{
123 if (refcnt > 0) 132 if (refcnt_cnt () > 0)
124 return; 133 return;
125 134
126 // try to unborrow the refcnt from perl 135 destroy ();
127 if (flags & F_BORROWED) 136}
137
138void
139attachable::do_destroy ()
140{
141 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
142
143 if (cb)
128 { 144 {
129 assert (self);//D//TODO//remove when stable
130 flags &= ~F_BORROWED;
131 refcnt_inc ();
132 SvREFCNT_dec (self); 145 SvREFCNT_dec (cb);
146 cb = 0;
133 } 147 }
134 148
135 if (refcnt > 0 || self) 149 if (self)
136 return; 150 {
151 hv_clear (self);
152 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
153 // self is now 0
154 assert (!self);//D//TODO remove soon
155 }
137 156
138 destroy ();
139}
140
141void
142attachable::do_destroy ()
143{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145
146 //TODO: call generic destroy callback
147 mortals.push_back (this); 157 mortals.push_back (this);
148} 158}
149 159
150void 160void
151attachable::destroy () 161attachable::destroy ()
155 165
156 flags |= F_DESTROYED; 166 flags |= F_DESTROYED;
157 do_destroy (); 167 do_destroy ();
158} 168}
159 169
170void
160void attachable::check_mortals () 171attachable::check_mortals ()
161{ 172{
162 for (int i = 0; i < mortals.size (); ) 173 static int i = 0;
174
175 for (;;)
163 { 176 {
177 if (i >= mortals.size ())
178 {
179 i = 0;
180
181 if (mortals.size () > 1000)
182 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
183
184 break;
185 }
186
164 attachable *obj = mortals [i]; 187 attachable *obj = mortals [i];
165 188
166 obj->refcnt_chk (); // unborrow from perl, if necessary 189 obj->refcnt_chk (); // unborrow from perl, if necessary
167 190
191 //if (obj->refcnt > 0 || obj->self)
168 if (obj->refcnt || obj->self) 192 if (obj->refcnt || obj->self)
169 { 193 {
170#if 0 194//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
171 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
172 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
173#endif
174
175 ++i; // further delay freeing 195 ++i; // further delay freeing
196
197 if (!(i & 0x3ff))
198 break;
176 }//D 199 }
177 else 200 else
178 { 201 {
179 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180 mortals.erase (i); 202 mortals.erase (i);
181 delete obj; 203 delete obj;
182 } 204 }
183 } 205 }
184} 206}
209 231
210static int 232static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 233attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 234{
213 attachable *at = (attachable *)mg->mg_ptr; 235 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable 236
237 //TODO: check if transaction behaviour is really required here
238 if (SV *self = (SV *)at->self)
239 {
215 at->self = 0; 240 at->self = 0;
241 SvREFCNT_dec (self);
242 }
243
216 // next line makes sense, but most objects still have refcnt 0 by default 244 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 245 //at->refcnt_chk ();
218 return 0; 246 return 0;
219} 247}
220 248
229 if (!obj->self) 257 if (!obj->self)
230 { 258 {
231 obj->self = newHV (); 259 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 260 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 261
234 // borrow the refcnt from the object 262 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 263 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 264 }
265 else
266 {
267 SV *sv = newRV_inc ((SV *)obj->self);
238 268
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 269 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
270 SvAMAGIC_on (sv);
271
272 return sv;
273 }
240} 274}
241 275
242static void 276static void
243clearSVptr (SV *sv) 277clearSVptr (SV *sv)
244{ 278{
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 331inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 332
299inline SV *to_sv (object & v) { return to_sv (&v); } 333inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 334inline SV *to_sv (living & v) { return to_sv (&v); }
301 335
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 336inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 337inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 338
306inline SV *to_sv (UUID v) 339inline SV *to_sv (UUID v)
307{ 340{
308 char buf[128]; 341 char buf[128];
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 361inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
329inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 362inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
330inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 363inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
331inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 364inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
332inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 365inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
366inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
333inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 367inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
334inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 368inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
335inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 369inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 370
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 371inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
338inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO 372inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 373
340template<class T> 374template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 375inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 376
343template<int N> 377template<int N>
478{ 512{
479 if (!ext->cb) 513 if (!ext->cb)
480 ext->cb = newAV (); 514 ext->cb = newAV ();
481 515
482 return newRV_inc ((SV *)ext->cb); 516 return newRV_inc ((SV *)ext->cb);
483}
484
485#if 0
486void attachable::clear ()
487{
488 if (self)
489 {
490 // disconnect Perl from C, to avoid crashes
491 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
492
493 // clear the perl hash, might or might not be a good idea
494 hv_clear ((HV *)SvRV ((SV *)self));
495
496 SvREFCNT_dec (self);
497 self = 0;
498 }
499
500 if (cb)
501 {
502 SvREFCNT_dec (cb);
503 cb = 0;
504 }
505
506 attach = 0;
507}
508#endif
509
510void attachable::optimise ()
511{
512 if (self
513 && SvREFCNT (self) == 1
514 && !HvTOTALKEYS (self))
515 {
516 flags &= ~F_BORROWED;
517 refcnt_inc ();
518 SvREFCNT_dec ((SV *)self);
519 }
520} 517}
521 518
522///////////////////////////////////////////////////////////////////////////// 519/////////////////////////////////////////////////////////////////////////////
523 520
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 521extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
820} 817}
821 818
822///////////////////////////////////////////////////////////////////////////// 819/////////////////////////////////////////////////////////////////////////////
823 820
824void 821void
825maptile::emergency_save () 822cfperl_emergency_save ()
826{ 823{
827 CALL_BEGIN (0); 824 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 825 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 826 CALL_END;
830} 827}
831 828
832maptile * 829maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 830maptile::find_sync (const char *path, maptile *origin)
834{ 831{
835 CALL_BEGIN (2); 832 CALL_BEGIN (2);
836 CALL_ARG (path); 833 CALL_ARG (path);
837 CALL_ARG (origin); 834 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 835 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 836
840 maptile *retval; 837 maptile *retval;
841 838
842 if (count) 839 if (count)
843 sv_to (POPs, retval); 840 sv_to (POPs, retval);
845 retval = 0; 842 retval = 0;
846 843
847 CALL_END; 844 CALL_END;
848 845
849 return retval; 846 return retval;
847}
848
849maptile *
850maptile::find_async (const char *path, maptile *origin)
851{
852 CALL_BEGIN (2);
853 CALL_ARG (path);
854 CALL_ARG (origin);
855 CALL_CALL ("cf::map::find_async", G_SCALAR);
856
857 maptile *retval;
858
859 if (count)
860 sv_to (POPs, retval);
861 else
862 retval = 0;
863
864 CALL_END;
865
866 return retval;
867}
868
869void
870maptile::do_load_sync ()
871{
872 CALL_BEGIN (1);
873 CALL_ARG (this);
874 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
875 CALL_END;
850} 876}
851 877
852void 878void
853maptile::change_all_map_light (int change) 879maptile::change_all_map_light (int change)
854{ 880{
874///////////////////////////////////////////////////////////////////////////// 900/////////////////////////////////////////////////////////////////////////////
875 901
876struct EventAPI *watcher_base::GEventAPI; 902struct EventAPI *watcher_base::GEventAPI;
877struct CoroAPI *coroapi::GCoroAPI; 903struct CoroAPI *coroapi::GCoroAPI;
878 904
905int coroapi::cede_counter;
906
879static void iw_dispatch (pe_event *ev) 907static void iw_dispatch (pe_event *ev)
880{ 908{
881 iw *w = (iw *)ev->ext_data; 909 iw *w = (iw *)ev->ext_data;
882 w->call (*w); 910 w->call (*w);
883} 911}
885void 913void
886iw::alloc () 914iw::alloc ()
887{ 915{
888 pe = GEventAPI->new_idle (0, 0); 916 pe = GEventAPI->new_idle (0, 0);
889 917
918 WaREENTRANT_off (pe);
890 pe->base.callback = (void *)iw_dispatch; 919 pe->base.callback = (void *)iw_dispatch;
891 pe->base.ext_data = (void *)this; 920 pe->base.ext_data = (void *)this;
892} 921}
893 922
894static void iow_dispatch (pe_event *ev) 923static void iow_dispatch (pe_event *ev)
900void 929void
901iow::alloc () 930iow::alloc ()
902{ 931{
903 pe = GEventAPI->new_io (0, 0); 932 pe = GEventAPI->new_io (0, 0);
904 933
934 WaREENTRANT_off (pe);
905 pe->base.callback = (void *)iow_dispatch; 935 pe->base.callback = (void *)iow_dispatch;
906 pe->base.ext_data = (void *)this; 936 pe->base.ext_data = (void *)this;
907 937
908 pe->fd = -1; 938 pe->fd = -1;
909 pe->poll = 0; 939 pe->poll = 0;
1237 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1267 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238 const_iv (FLAG_IS_WATER) 1268 const_iv (FLAG_IS_WATER)
1239 const_iv (FLAG_CONTENT_ON_GEN) 1269 const_iv (FLAG_CONTENT_ON_GEN)
1240 const_iv (FLAG_IS_A_TEMPLATE) 1270 const_iv (FLAG_IS_A_TEMPLATE)
1241 const_iv (FLAG_IS_BUILDABLE) 1271 const_iv (FLAG_IS_BUILDABLE)
1272 const_iv (FLAG_DESTROY_ON_DEATH)
1273 const_iv (FLAG_NO_MAP_SAVE)
1242 1274
1243 const_iv (NDI_BLACK) 1275 const_iv (NDI_BLACK)
1244 const_iv (NDI_WHITE) 1276 const_iv (NDI_WHITE)
1245 const_iv (NDI_NAVY) 1277 const_iv (NDI_NAVY)
1246 const_iv (NDI_RED) 1278 const_iv (NDI_RED)
1431 const_iv (ATNR_BLIND) 1463 const_iv (ATNR_BLIND)
1432 const_iv (ATNR_INTERNAL) 1464 const_iv (ATNR_INTERNAL)
1433 const_iv (ATNR_LIFE_STEALING) 1465 const_iv (ATNR_LIFE_STEALING)
1434 const_iv (ATNR_DISEASE) 1466 const_iv (ATNR_DISEASE)
1435 1467
1436 const_iv (MAP_FLUSH)
1437 const_iv (MAP_PLAYER_UNIQUE)
1438 const_iv (MAP_BLOCK)
1439 const_iv (MAP_STYLE)
1440 const_iv (MAP_OVERLAY)
1441
1442 const_iv (MAP_IN_MEMORY) 1468 const_iv (MAP_IN_MEMORY)
1443 const_iv (MAP_SWAPPED) 1469 const_iv (MAP_SWAPPED)
1444 const_iv (MAP_LOADING) 1470 const_iv (MAP_LOADING)
1445 const_iv (MAP_SAVING) 1471 const_iv (MAP_SAVING)
1446 1472
1459 const_iv (ST_SETUP) 1485 const_iv (ST_SETUP)
1460 const_iv (ST_PLAYING) 1486 const_iv (ST_PLAYING)
1461 const_iv (ST_CUSTOM) 1487 const_iv (ST_CUSTOM)
1462 1488
1463 const_iv (ST_CHANGE_CLASS) 1489 const_iv (ST_CHANGE_CLASS)
1464 const_iv (ST_CONFIRM_QUIT)
1465 const_iv (ST_GET_PARTY_PASSWORD)
1466 1490
1467 const_iv (IO_HEADER) 1491 const_iv (IO_HEADER)
1468 const_iv (IO_OBJECTS) 1492 const_iv (IO_OBJECTS)
1469 const_iv (IO_UNIQUES) 1493 const_iv (IO_UNIQUES)
1470 1494
1524 1548
1525void _global_reattach () 1549void _global_reattach ()
1526 CODE: 1550 CODE:
1527{ 1551{
1528 // reattach to all attachable objects in the game. 1552 // reattach to all attachable objects in the game.
1529 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1553 for_all_clients (ns)
1530 (*i)->reattach (); 1554 ns->reattach ();
1531 1555
1532 for_all_players (pl) 1556 for_all_players (pl)
1533 pl->reattach (); 1557 pl->reattach ();
1534 1558
1535 //TODO 1559 //TODO
1536 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1560 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537 // i->second->reattach (); 1561 // i->second->reattach ();
1538 1562
1539 for (object *op = object::first; op; op = op->next) 1563 for_all_objects (op)
1540 op->reattach (); 1564 op->reattach ();
1541} 1565}
1542 1566
1543NV floor (NV x) 1567NV floor (NV x)
1544 1568
1545NV ceil (NV x) 1569NV ceil (NV x)
1570
1571NV rndm (...)
1572 CODE:
1573 switch (items)
1574 {
1575 case 0: RETVAL = rndm (); break;
1576 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1577 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1578 default: croak ("cf::rndm requires none, one or two parameters."); break;
1579 }
1580 OUTPUT:
1581 RETVAL
1546 1582
1547void server_tick () 1583void server_tick ()
1548 CODE: 1584 CODE:
1549 runtime = SvNVx (sv_runtime); 1585 runtime = SvNVx (sv_runtime);
1550 server_tick (); 1586 server_tick ();
1597 } 1633 }
1598 OUTPUT: RETVAL 1634 OUTPUT: RETVAL
1599 1635
1600void abort () 1636void abort ()
1601 1637
1638void fork_abort (char *cause = "cf::fork_abort")
1639
1640void cleanup (const char *cause, bool make_core = false)
1641
1602void emergency_save () 1642void emergency_save ()
1603 1643
1644UV sv_2watcher (SV *w)
1645 CODE:
1646 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1647 OUTPUT:
1648 RETVAL
1649
1604void _exit (int status = 0) 1650void _exit (int status = 0)
1651
1652#if _POSIX_MEMLOCK
1653
1654int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1655
1656int munlockall ()
1657
1658#endif
1605 1659
1606int find_animation (char *text) 1660int find_animation (char *text)
1607 PROTOTYPE: $ 1661 PROTOTYPE: $
1608 1662
1609int random_roll (int min, int max, object *op, int goodbad); 1663int random_roll (int min, int max, object *op, int goodbad);
1656 CODE: 1710 CODE:
1657 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1711 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1658 OUTPUT: 1712 OUTPUT:
1659 RETVAL 1713 RETVAL
1660 1714
1661#bool 1715int mortals_size ()
1662#destroyed (attachable *at) 1716 CODE:
1663# 1717 RETVAL = attachable::mortals.size ();
1664#void 1718 OUTPUT: RETVAL
1665#destroy (attachable *at) 1719
1720#object *mortals (U32 index)
1721# CODE:
1722# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1723# OUTPUT: RETVAL
1724
1725INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1666 1726
1667MODULE = cf PACKAGE = cf::global 1727MODULE = cf PACKAGE = cf::global
1668 1728
1669int invoke (SV *klass, int event, ...) 1729int invoke (SV *klass, int event, ...)
1670 CODE: 1730 CODE:
1686 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1746 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1687 OUTPUT: RETVAL 1747 OUTPUT: RETVAL
1688 1748
1689SV *registry (object *op) 1749SV *registry (object *op)
1690 1750
1691void mortals () 1751int objects_size ()
1692 PPCODE: 1752 CODE:
1693 EXTEND (SP, object::mortals.size ());
1694 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1695 PUSHs (to_sv (*i));
1696
1697object *first ()
1698 CODE:
1699 RETVAL = object::first; 1753 RETVAL = objects.size ();
1754 OUTPUT: RETVAL
1755
1756object *objects (U32 index)
1757 CODE:
1758 RETVAL = index < objects.size () ? objects [index] : 0;
1759 OUTPUT: RETVAL
1760
1761int actives_size ()
1762 CODE:
1763 RETVAL = actives.size ();
1764 OUTPUT: RETVAL
1765
1766object *actives (U32 index)
1767 CODE:
1768 RETVAL = index < actives.size () ? actives [index] : 0;
1700 OUTPUT: RETVAL 1769 OUTPUT: RETVAL
1701 1770
1702# missing properties 1771# missing properties
1703 1772
1704object *head (object *op) 1773object *head (object *op)
1705 PROTOTYPE: $ 1774 PROTOTYPE: $
1706 CODE: 1775 CODE:
1707 RETVAL = op->head ? op->head : op; 1776 RETVAL = op->head_ ();
1708 OUTPUT: RETVAL 1777 OUTPUT: RETVAL
1709 1778
1710int is_head (object *op) 1779int is_head (object *op)
1711 PROTOTYPE: $ 1780 PROTOTYPE: $
1712 CODE: 1781 CODE:
1713 RETVAL = !op->head; 1782 RETVAL = op->head_ () == op;
1714 OUTPUT: RETVAL 1783 OUTPUT: RETVAL
1715 1784
1716void 1785void
1717inv (object *obj) 1786inv (object *obj)
1718 PROTOTYPE: $ 1787 PROTOTYPE: $
1809 1878
1810void drop (object *who, object *op) 1879void drop (object *who, object *op)
1811 1880
1812void pick_up (object *who, object *op) 1881void pick_up (object *who, object *op)
1813 1882
1814object *cf_object_insert_object (object *op, object *container)
1815
1816object *cf_object_insert_in_ob (object *ob, object *where)
1817
1818int cf_object_teleport (object *op, maptile *map, int x, int y) 1883int cf_object_teleport (object *op, maptile *map, int x, int y)
1819 1884
1820void update_object (object *op, int action) 1885void update_object (object *op, int action)
1821 1886
1822object *cf_create_object_by_name (const char *name) 1887object *cf_create_object_by_name (const char *name)
1941void esrv_update_item (object *op, int what, object *item) 2006void esrv_update_item (object *op, int what, object *item)
1942 C_ARGS: what, op, item 2007 C_ARGS: what, op, item
1943 2008
1944void clear_los (object *op) 2009void clear_los (object *op)
1945 2010
1946int command_teleport (object *op, char *params)
1947
1948int command_summon (object *op, char *params) 2011int command_summon (object *op, char *params)
1949 2012
1950int command_arrest (object *op, char *params) 2013int command_arrest (object *op, char *params)
1951 2014
1952int command_kick (object *op, char *params) 2015int command_kick (object *op, char *params)
1973 CODE: 2036 CODE:
1974 pl->ob->stats.hp = pl->ob->stats.maxhp; 2037 pl->ob->stats.hp = pl->ob->stats.maxhp;
1975 pl->ob->stats.sp = pl->ob->stats.maxsp; 2038 pl->ob->stats.sp = pl->ob->stats.maxsp;
1976 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2039 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1977 pl->orig_stats = pl->ob->stats; 2040 pl->orig_stats = pl->ob->stats;
1978
1979player *cf_player_find (char *name)
1980 PROTOTYPE: $
1981 2041
1982void cf_player_move (player *pl, int dir) 2042void cf_player_move (player *pl, int dir)
1983 2043
1984void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2044void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1985 2045
2031 if (y) sv_to (y, pl->bed_y); 2091 if (y) sv_to (y, pl->bed_y);
2032 2092
2033void 2093void
2034list () 2094list ()
2035 PPCODE: 2095 PPCODE:
2036 for (player *pl = first_player; pl; pl = pl->next) 2096 for_all_players (pl)
2037 XPUSHs (sv_2mortal (to_sv (pl))); 2097 XPUSHs (sv_2mortal (to_sv (pl)));
2038
2039bool
2040peaceful (player *pl, bool new_setting = 0)
2041 PROTOTYPE: $;$
2042 CODE:
2043 RETVAL = pl->peaceful;
2044 if (items > 1)
2045 pl->peaceful = new_setting;
2046 OUTPUT:
2047 RETVAL
2048
2049living *
2050orig_stats (player *pl)
2051 CODE:
2052 RETVAL = &pl->orig_stats;
2053 OUTPUT: RETVAL
2054
2055living *
2056last_stats (player *pl)
2057 CODE:
2058 RETVAL = &pl->last_stats;
2059 OUTPUT: RETVAL
2060 2098
2061 2099
2062MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2100MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2063 2101
2064int invoke (maptile *map, int event, ...) 2102int invoke (maptile *map, int event, ...)
2080 PROTOTYPE: 2118 PROTOTYPE:
2081 CODE: 2119 CODE:
2082 RETVAL = new maptile; 2120 RETVAL = new maptile;
2083 OUTPUT: 2121 OUTPUT:
2084 RETVAL 2122 RETVAL
2085
2086void
2087maptile::destroy ()
2088 2123
2089void 2124void
2090maptile::players () 2125maptile::players ()
2091 PPCODE: 2126 PPCODE:
2092 if (GIMME_V == G_SCALAR) 2127 if (GIMME_V == G_SCALAR)
2122 2157
2123object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2158object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2124 C_ARGS: str, map, nx, ny 2159 C_ARGS: str, map, nx, ny
2125 2160
2126void 2161void
2127cf_map_normalise (maptile *map, int x, int y) 2162get_map_flags (maptile *map, int x, int y)
2128 PPCODE: 2163 PPCODE:
2129{ 2164{
2130 maptile *nmap = 0; 2165 maptile *nmap = 0;
2131 I16 nx = 0, ny = 0; 2166 I16 nx = 0, ny = 0;
2132 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2167 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2194 CODE: 2229 CODE:
2195 RETVAL = get_name_of_region_for_map (m); 2230 RETVAL = get_name_of_region_for_map (m);
2196 OUTPUT: RETVAL 2231 OUTPUT: RETVAL
2197 2232
2198# worst xs function of my life 2233# worst xs function of my life
2199maptile * 2234bool
2200_create_random_map (\ 2235_create_random_map (\
2201 char *path,\ 2236 maptile *self,\
2202 char *wallstyle,\ 2237 char *wallstyle,\
2203 char *wall_name,\ 2238 char *wall_name,\
2204 char *floorstyle,\ 2239 char *floorstyle,\
2205 char *monsterstyle,\ 2240 char *monsterstyle,\
2206 char *treasurestyle,\ 2241 char *treasurestyle,\
2210 char *origin_map,\ 2245 char *origin_map,\
2211 char *final_map,\ 2246 char *final_map,\
2212 char *exitstyle,\ 2247 char *exitstyle,\
2213 char *this_map,\ 2248 char *this_map,\
2214 char *exit_on_final_map,\ 2249 char *exit_on_final_map,\
2215 int Xsize,\ 2250 int xsize,\
2216 int Ysize,\ 2251 int ysize,\
2217 int expand2x,\ 2252 int expand2x,\
2218 int layoutoptions1,\ 2253 int layoutoptions1,\
2219 int layoutoptions2,\ 2254 int layoutoptions2,\
2220 int layoutoptions3,\ 2255 int layoutoptions3,\
2221 int symmetry,\ 2256 int symmetry,\
2226 int dungeon_depth,\ 2261 int dungeon_depth,\
2227 int decoroptions,\ 2262 int decoroptions,\
2228 int orientation,\ 2263 int orientation,\
2229 int origin_y,\ 2264 int origin_y,\
2230 int origin_x,\ 2265 int origin_x,\
2231 int random_seed,\ 2266 U32 random_seed,\
2232 val64 total_map_hp,\ 2267 val64 total_map_hp,\
2233 int map_layout_style,\ 2268 int map_layout_style,\
2234 int treasureoptions,\ 2269 int treasureoptions,\
2235 int symmetry_used,\ 2270 int symmetry_used,\
2236 region *region\ 2271 region *region,\
2272 char *custom\
2237) 2273)
2238 CODE: 2274 CODE:
2239{ 2275{
2240 random_map_params rmp; 2276 random_map_params rmp;
2241 memset (&rmp, 0, sizeof (rmp)); // just to be sure
2242 2277
2243 assign (rmp.wallstyle , wallstyle); 2278 assign (rmp.wallstyle , wallstyle);
2244 assign (rmp.wall_name , wall_name); 2279 assign (rmp.wall_name , wall_name);
2245 assign (rmp.floorstyle , floorstyle); 2280 assign (rmp.floorstyle , floorstyle);
2246 assign (rmp.monsterstyle , monsterstyle); 2281 assign (rmp.monsterstyle , monsterstyle);
2252 assign (rmp.exit_on_final_map, exit_on_final_map); 2287 assign (rmp.exit_on_final_map, exit_on_final_map);
2253 2288
2254 rmp.origin_map = origin_map; 2289 rmp.origin_map = origin_map;
2255 rmp.final_map = final_map; 2290 rmp.final_map = final_map;
2256 rmp.this_map = this_map; 2291 rmp.this_map = this_map;
2257 rmp.Xsize = Xsize; 2292 rmp.xsize = xsize;
2258 rmp.Ysize = Ysize; 2293 rmp.ysize = ysize;
2259 rmp.expand2x = expand2x; 2294 rmp.expand2x = expand2x;
2260 rmp.layoutoptions1 = layoutoptions1; 2295 rmp.layoutoptions1 = layoutoptions1;
2261 rmp.layoutoptions2 = layoutoptions2; 2296 rmp.layoutoptions2 = layoutoptions2;
2262 rmp.layoutoptions3 = layoutoptions3; 2297 rmp.layoutoptions3 = layoutoptions3;
2263 rmp.symmetry = symmetry; 2298 rmp.symmetry = symmetry;
2274 rmp.total_map_hp = total_map_hp; 2309 rmp.total_map_hp = total_map_hp;
2275 rmp.map_layout_style = map_layout_style; 2310 rmp.map_layout_style = map_layout_style;
2276 rmp.treasureoptions = treasureoptions; 2311 rmp.treasureoptions = treasureoptions;
2277 rmp.symmetry_used = symmetry_used; 2312 rmp.symmetry_used = symmetry_used;
2278 rmp.region = region; 2313 rmp.region = region;
2314 rmp.custom = custom;
2279 2315
2280 RETVAL = generate_random_map (path, &rmp); 2316 RETVAL = self->generate_random_map (&rmp);
2281} 2317}
2282 OUTPUT: 2318 OUTPUT:
2283 RETVAL 2319 RETVAL
2284 2320
2285MODULE = cf PACKAGE = cf::arch 2321MODULE = cf PACKAGE = cf::arch
2361 char *buf = SvPVbyte (packet, len); 2397 char *buf = SvPVbyte (packet, len);
2362 2398
2363 THIS->send_packet (buf, len); 2399 THIS->send_packet (buf, len);
2364} 2400}
2365 2401
2366void
2367client::destroy ()
2368

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines