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.124 by root, Mon Jan 1 00:41:03 2007 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{
887void 913void
888iw::alloc () 914iw::alloc ()
889{ 915{
890 pe = GEventAPI->new_idle (0, 0); 916 pe = GEventAPI->new_idle (0, 0);
891 917
918 WaREENTRANT_off (pe);
892 pe->base.callback = (void *)iw_dispatch; 919 pe->base.callback = (void *)iw_dispatch;
893 pe->base.ext_data = (void *)this; 920 pe->base.ext_data = (void *)this;
894} 921}
895 922
896static void iow_dispatch (pe_event *ev) 923static void iow_dispatch (pe_event *ev)
902void 929void
903iow::alloc () 930iow::alloc ()
904{ 931{
905 pe = GEventAPI->new_io (0, 0); 932 pe = GEventAPI->new_io (0, 0);
906 933
934 WaREENTRANT_off (pe);
907 pe->base.callback = (void *)iow_dispatch; 935 pe->base.callback = (void *)iow_dispatch;
908 pe->base.ext_data = (void *)this; 936 pe->base.ext_data = (void *)this;
909 937
910 pe->fd = -1; 938 pe->fd = -1;
911 pe->poll = 0; 939 pe->poll = 0;
1239 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1267 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240 const_iv (FLAG_IS_WATER) 1268 const_iv (FLAG_IS_WATER)
1241 const_iv (FLAG_CONTENT_ON_GEN) 1269 const_iv (FLAG_CONTENT_ON_GEN)
1242 const_iv (FLAG_IS_A_TEMPLATE) 1270 const_iv (FLAG_IS_A_TEMPLATE)
1243 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)
1244 1274
1245 const_iv (NDI_BLACK) 1275 const_iv (NDI_BLACK)
1246 const_iv (NDI_WHITE) 1276 const_iv (NDI_WHITE)
1247 const_iv (NDI_NAVY) 1277 const_iv (NDI_NAVY)
1248 const_iv (NDI_RED) 1278 const_iv (NDI_RED)
1433 const_iv (ATNR_BLIND) 1463 const_iv (ATNR_BLIND)
1434 const_iv (ATNR_INTERNAL) 1464 const_iv (ATNR_INTERNAL)
1435 const_iv (ATNR_LIFE_STEALING) 1465 const_iv (ATNR_LIFE_STEALING)
1436 const_iv (ATNR_DISEASE) 1466 const_iv (ATNR_DISEASE)
1437 1467
1438 const_iv (MAP_FLUSH)
1439 const_iv (MAP_PLAYER_UNIQUE)
1440 const_iv (MAP_BLOCK)
1441 const_iv (MAP_STYLE)
1442 const_iv (MAP_OVERLAY)
1443
1444 const_iv (MAP_IN_MEMORY) 1468 const_iv (MAP_IN_MEMORY)
1445 const_iv (MAP_SWAPPED) 1469 const_iv (MAP_SWAPPED)
1446 const_iv (MAP_LOADING) 1470 const_iv (MAP_LOADING)
1447 const_iv (MAP_SAVING) 1471 const_iv (MAP_SAVING)
1448 1472
1461 const_iv (ST_SETUP) 1485 const_iv (ST_SETUP)
1462 const_iv (ST_PLAYING) 1486 const_iv (ST_PLAYING)
1463 const_iv (ST_CUSTOM) 1487 const_iv (ST_CUSTOM)
1464 1488
1465 const_iv (ST_CHANGE_CLASS) 1489 const_iv (ST_CHANGE_CLASS)
1466 const_iv (ST_CONFIRM_QUIT)
1467 const_iv (ST_GET_PARTY_PASSWORD)
1468 1490
1469 const_iv (IO_HEADER) 1491 const_iv (IO_HEADER)
1470 const_iv (IO_OBJECTS) 1492 const_iv (IO_OBJECTS)
1471 const_iv (IO_UNIQUES) 1493 const_iv (IO_UNIQUES)
1472 1494
1526 1548
1527void _global_reattach () 1549void _global_reattach ()
1528 CODE: 1550 CODE:
1529{ 1551{
1530 // reattach to all attachable objects in the game. 1552 // reattach to all attachable objects in the game.
1531 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1553 for_all_clients (ns)
1532 (*i)->reattach (); 1554 ns->reattach ();
1533 1555
1534 for_all_players (pl) 1556 for_all_players (pl)
1535 pl->reattach (); 1557 pl->reattach ();
1536 1558
1537 //TODO 1559 //TODO
1538 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1560 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539 // i->second->reattach (); 1561 // i->second->reattach ();
1540 1562
1541 for (object *op = object::first; op; op = op->next) 1563 for_all_objects (op)
1542 op->reattach (); 1564 op->reattach ();
1543} 1565}
1544 1566
1545NV floor (NV x) 1567NV floor (NV x)
1546 1568
1547NV 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
1548 1582
1549void server_tick () 1583void server_tick ()
1550 CODE: 1584 CODE:
1551 runtime = SvNVx (sv_runtime); 1585 runtime = SvNVx (sv_runtime);
1552 server_tick (); 1586 server_tick ();
1599 } 1633 }
1600 OUTPUT: RETVAL 1634 OUTPUT: RETVAL
1601 1635
1602void abort () 1636void abort ()
1603 1637
1638void fork_abort (char *cause = "cf::fork_abort")
1639
1640void cleanup (const char *cause, bool make_core = false)
1641
1604void emergency_save () 1642void emergency_save ()
1605 1643
1644UV sv_2watcher (SV *w)
1645 CODE:
1646 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1647 OUTPUT:
1648 RETVAL
1649
1606void _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
1607 1659
1608int find_animation (char *text) 1660int find_animation (char *text)
1609 PROTOTYPE: $ 1661 PROTOTYPE: $
1610 1662
1611int random_roll (int min, int max, object *op, int goodbad); 1663int random_roll (int min, int max, object *op, int goodbad);
1658 CODE: 1710 CODE:
1659 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1711 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660 OUTPUT: 1712 OUTPUT:
1661 RETVAL 1713 RETVAL
1662 1714
1663#bool 1715int mortals_size ()
1664#destroyed (attachable *at) 1716 CODE:
1665# 1717 RETVAL = attachable::mortals.size ();
1666#void 1718 OUTPUT: RETVAL
1667#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 |
1668 1726
1669MODULE = cf PACKAGE = cf::global 1727MODULE = cf PACKAGE = cf::global
1670 1728
1671int invoke (SV *klass, int event, ...) 1729int invoke (SV *klass, int event, ...)
1672 CODE: 1730 CODE:
1688 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1746 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1689 OUTPUT: RETVAL 1747 OUTPUT: RETVAL
1690 1748
1691SV *registry (object *op) 1749SV *registry (object *op)
1692 1750
1693void mortals () 1751int objects_size ()
1694 PPCODE: 1752 CODE:
1695 EXTEND (SP, object::mortals.size ());
1696 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697 PUSHs (to_sv (*i));
1698
1699object *first ()
1700 CODE:
1701 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;
1702 OUTPUT: RETVAL 1769 OUTPUT: RETVAL
1703 1770
1704# missing properties 1771# missing properties
1705 1772
1706object *head (object *op) 1773object *head (object *op)
1707 PROTOTYPE: $ 1774 PROTOTYPE: $
1708 CODE: 1775 CODE:
1709 RETVAL = op->head ? op->head : op; 1776 RETVAL = op->head_ ();
1710 OUTPUT: RETVAL 1777 OUTPUT: RETVAL
1711 1778
1712int is_head (object *op) 1779int is_head (object *op)
1713 PROTOTYPE: $ 1780 PROTOTYPE: $
1714 CODE: 1781 CODE:
1715 RETVAL = !op->head; 1782 RETVAL = op->head_ () == op;
1716 OUTPUT: RETVAL 1783 OUTPUT: RETVAL
1717 1784
1718void 1785void
1719inv (object *obj) 1786inv (object *obj)
1720 PROTOTYPE: $ 1787 PROTOTYPE: $
1811 1878
1812void drop (object *who, object *op) 1879void drop (object *who, object *op)
1813 1880
1814void pick_up (object *who, object *op) 1881void pick_up (object *who, object *op)
1815 1882
1816object *cf_object_insert_object (object *op, object *container)
1817
1818object *cf_object_insert_in_ob (object *ob, object *where)
1819
1820int cf_object_teleport (object *op, maptile *map, int x, int y) 1883int cf_object_teleport (object *op, maptile *map, int x, int y)
1821 1884
1822void update_object (object *op, int action) 1885void update_object (object *op, int action)
1823 1886
1824object *cf_create_object_by_name (const char *name) 1887object *cf_create_object_by_name (const char *name)
1943void esrv_update_item (object *op, int what, object *item) 2006void esrv_update_item (object *op, int what, object *item)
1944 C_ARGS: what, op, item 2007 C_ARGS: what, op, item
1945 2008
1946void clear_los (object *op) 2009void clear_los (object *op)
1947 2010
1948int command_teleport (object *op, char *params)
1949
1950int command_summon (object *op, char *params) 2011int command_summon (object *op, char *params)
1951 2012
1952int command_arrest (object *op, char *params) 2013int command_arrest (object *op, char *params)
1953 2014
1954int command_kick (object *op, char *params) 2015int command_kick (object *op, char *params)
1975 CODE: 2036 CODE:
1976 pl->ob->stats.hp = pl->ob->stats.maxhp; 2037 pl->ob->stats.hp = pl->ob->stats.maxhp;
1977 pl->ob->stats.sp = pl->ob->stats.maxsp; 2038 pl->ob->stats.sp = pl->ob->stats.maxsp;
1978 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2039 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979 pl->orig_stats = pl->ob->stats; 2040 pl->orig_stats = pl->ob->stats;
1980
1981player *cf_player_find (char *name)
1982 PROTOTYPE: $
1983 2041
1984void cf_player_move (player *pl, int dir) 2042void cf_player_move (player *pl, int dir)
1985 2043
1986void 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);
1987 2045
2033 if (y) sv_to (y, pl->bed_y); 2091 if (y) sv_to (y, pl->bed_y);
2034 2092
2035void 2093void
2036list () 2094list ()
2037 PPCODE: 2095 PPCODE:
2038 for (player *pl = first_player; pl; pl = pl->next) 2096 for_all_players (pl)
2039 XPUSHs (sv_2mortal (to_sv (pl))); 2097 XPUSHs (sv_2mortal (to_sv (pl)));
2040
2041bool
2042peaceful (player *pl, bool new_setting = 0)
2043 PROTOTYPE: $;$
2044 CODE:
2045 RETVAL = pl->peaceful;
2046 if (items > 1)
2047 pl->peaceful = new_setting;
2048 OUTPUT:
2049 RETVAL
2050
2051living *
2052orig_stats (player *pl)
2053 CODE:
2054 RETVAL = &pl->orig_stats;
2055 OUTPUT: RETVAL
2056
2057living *
2058last_stats (player *pl)
2059 CODE:
2060 RETVAL = &pl->last_stats;
2061 OUTPUT: RETVAL
2062 2098
2063 2099
2064MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2100MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065 2101
2066int invoke (maptile *map, int event, ...) 2102int invoke (maptile *map, int event, ...)
2082 PROTOTYPE: 2118 PROTOTYPE:
2083 CODE: 2119 CODE:
2084 RETVAL = new maptile; 2120 RETVAL = new maptile;
2085 OUTPUT: 2121 OUTPUT:
2086 RETVAL 2122 RETVAL
2087
2088void
2089maptile::destroy ()
2090 2123
2091void 2124void
2092maptile::players () 2125maptile::players ()
2093 PPCODE: 2126 PPCODE:
2094 if (GIMME_V == G_SCALAR) 2127 if (GIMME_V == G_SCALAR)
2124 2157
2125object* 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)
2126 C_ARGS: str, map, nx, ny 2159 C_ARGS: str, map, nx, ny
2127 2160
2128void 2161void
2129cf_map_normalise (maptile *map, int x, int y) 2162get_map_flags (maptile *map, int x, int y)
2130 PPCODE: 2163 PPCODE:
2131{ 2164{
2132 maptile *nmap = 0; 2165 maptile *nmap = 0;
2133 I16 nx = 0, ny = 0; 2166 I16 nx = 0, ny = 0;
2134 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2167 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2196 CODE: 2229 CODE:
2197 RETVAL = get_name_of_region_for_map (m); 2230 RETVAL = get_name_of_region_for_map (m);
2198 OUTPUT: RETVAL 2231 OUTPUT: RETVAL
2199 2232
2200# worst xs function of my life 2233# worst xs function of my life
2201maptile * 2234bool
2202_create_random_map (\ 2235_create_random_map (\
2203 char *path,\ 2236 maptile *self,\
2204 char *wallstyle,\ 2237 char *wallstyle,\
2205 char *wall_name,\ 2238 char *wall_name,\
2206 char *floorstyle,\ 2239 char *floorstyle,\
2207 char *monsterstyle,\ 2240 char *monsterstyle,\
2208 char *treasurestyle,\ 2241 char *treasurestyle,\
2212 char *origin_map,\ 2245 char *origin_map,\
2213 char *final_map,\ 2246 char *final_map,\
2214 char *exitstyle,\ 2247 char *exitstyle,\
2215 char *this_map,\ 2248 char *this_map,\
2216 char *exit_on_final_map,\ 2249 char *exit_on_final_map,\
2217 int Xsize,\ 2250 int xsize,\
2218 int Ysize,\ 2251 int ysize,\
2219 int expand2x,\ 2252 int expand2x,\
2220 int layoutoptions1,\ 2253 int layoutoptions1,\
2221 int layoutoptions2,\ 2254 int layoutoptions2,\
2222 int layoutoptions3,\ 2255 int layoutoptions3,\
2223 int symmetry,\ 2256 int symmetry,\
2228 int dungeon_depth,\ 2261 int dungeon_depth,\
2229 int decoroptions,\ 2262 int decoroptions,\
2230 int orientation,\ 2263 int orientation,\
2231 int origin_y,\ 2264 int origin_y,\
2232 int origin_x,\ 2265 int origin_x,\
2233 int random_seed,\ 2266 U32 random_seed,\
2234 val64 total_map_hp,\ 2267 val64 total_map_hp,\
2235 int map_layout_style,\ 2268 int map_layout_style,\
2236 int treasureoptions,\ 2269 int treasureoptions,\
2237 int symmetry_used,\ 2270 int symmetry_used,\
2238 region *region\ 2271 region *region,\
2272 char *custom\
2239) 2273)
2240 CODE: 2274 CODE:
2241{ 2275{
2242 random_map_params rmp; 2276 random_map_params rmp;
2243 2277
2253 assign (rmp.exit_on_final_map, exit_on_final_map); 2287 assign (rmp.exit_on_final_map, exit_on_final_map);
2254 2288
2255 rmp.origin_map = origin_map; 2289 rmp.origin_map = origin_map;
2256 rmp.final_map = final_map; 2290 rmp.final_map = final_map;
2257 rmp.this_map = this_map; 2291 rmp.this_map = this_map;
2258 rmp.Xsize = Xsize; 2292 rmp.xsize = xsize;
2259 rmp.Ysize = Ysize; 2293 rmp.ysize = ysize;
2260 rmp.expand2x = expand2x; 2294 rmp.expand2x = expand2x;
2261 rmp.layoutoptions1 = layoutoptions1; 2295 rmp.layoutoptions1 = layoutoptions1;
2262 rmp.layoutoptions2 = layoutoptions2; 2296 rmp.layoutoptions2 = layoutoptions2;
2263 rmp.layoutoptions3 = layoutoptions3; 2297 rmp.layoutoptions3 = layoutoptions3;
2264 rmp.symmetry = symmetry; 2298 rmp.symmetry = symmetry;
2275 rmp.total_map_hp = total_map_hp; 2309 rmp.total_map_hp = total_map_hp;
2276 rmp.map_layout_style = map_layout_style; 2310 rmp.map_layout_style = map_layout_style;
2277 rmp.treasureoptions = treasureoptions; 2311 rmp.treasureoptions = treasureoptions;
2278 rmp.symmetry_used = symmetry_used; 2312 rmp.symmetry_used = symmetry_used;
2279 rmp.region = region; 2313 rmp.region = region;
2314 rmp.custom = custom;
2280 2315
2281 RETVAL = generate_random_map (path, &rmp); 2316 RETVAL = self->generate_random_map (&rmp);
2282} 2317}
2283 OUTPUT: 2318 OUTPUT:
2284 RETVAL 2319 RETVAL
2285 2320
2286MODULE = cf PACKAGE = cf::arch 2321MODULE = cf PACKAGE = cf::arch
2362 char *buf = SvPVbyte (packet, len); 2397 char *buf = SvPVbyte (packet, len);
2363 2398
2364 THIS->send_packet (buf, len); 2399 THIS->send_packet (buf, len);
2365} 2400}
2366 2401
2367void
2368client::destroy ()
2369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines