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.152 by root, Tue Jan 23 03:17:56 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}
108
109int
110attachable::refcnt_cnt () const
111{
112 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
113}
114
115void
116attachable::optimise ()
117{
118 if (self
119 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self))
121 {
122 SvREFCNT_dec ((SV *)self);
123 assert (!self);
124 }
117} 125}
118 126
119// check wether the object really is dead 127// check wether the object really is dead
120void 128void
121attachable::do_check () 129attachable::do_check ()
122{ 130{
123 if (refcnt > 0) 131 if (refcnt_cnt () > 0)
124 return; 132 return;
125 133
126 // try to unborrow the refcnt from perl 134 destroy ();
127 if (flags & F_BORROWED) 135
136 if (self)
128 { 137 {
129 assert (self);//D//TODO//remove when stable 138 hv_clear (self);
130 flags &= ~F_BORROWED; 139 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
131 refcnt_inc ();
132 SvREFCNT_dec (self); 140 SvREFCNT_dec (self);
141 self = 0;
133 } 142 }
134
135 if (refcnt > 0 || self)
136 return;
137
138 destroy ();
139} 143}
140 144
141void 145void
142attachable::do_destroy () 146attachable::do_destroy ()
143{ 147{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END); 148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145 149
146 //TODO: call generic destroy callback 150 if (self)
151 hv_clear (self);
152
147 mortals.push_back (this); 153 mortals.push_back (this);
148} 154}
149 155
150void 156void
151attachable::destroy () 157attachable::destroy ()
… …
155 161
156 flags |= F_DESTROYED; 162 flags |= F_DESTROYED;
157 do_destroy (); 163 do_destroy ();
158} 164}
159 165
166void
160void attachable::check_mortals () 167attachable::check_mortals ()
161{ 168{
162 for (int i = 0; i < mortals.size (); ) 169 static int i = 0;
170
171 for (;;)
163 { 172 {
173 if (i >= mortals.size ())
174 {
175 i = 0;
176
177 if (mortals.size () > 1000)
178 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
179
180 break;
181 }
182
164 attachable *obj = mortals [i]; 183 attachable *obj = mortals [i];
165 184
166 obj->refcnt_chk (); // unborrow from perl, if necessary 185 obj->refcnt_chk (); // unborrow from perl, if necessary
167 186
187 //if (obj->refcnt > 0 || obj->self)
168 if (obj->refcnt || obj->self) 188 if (obj->refcnt || obj->self)
169 { 189 {
170#if 0 190//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 191 ++i; // further delay freeing
192
193 if (!(i & 0x3ff))
194 break;
176 }//D 195 }
177 else 196 else
178 { 197 {
179 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180 mortals.erase (i); 198 mortals.erase (i);
181 delete obj; 199 delete obj;
182 } 200 }
183 } 201 }
184} 202}
… …
209 227
210static int 228static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 229attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 230{
213 attachable *at = (attachable *)mg->mg_ptr; 231 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable
215 at->self = 0; 232 at->self = 0;
216 // next line makes sense, but most objects still have refcnt 0 by default 233 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 234 //at->refcnt_chk ();
218 return 0; 235 return 0;
219} 236}
… …
229 if (!obj->self) 246 if (!obj->self)
230 { 247 {
231 obj->self = newHV (); 248 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 249 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 250
234 // borrow the refcnt from the object 251 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 252 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 253 }
254 else
255 {
256 SV *sv = newRV_inc ((SV *)obj->self);
238 257
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 258 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
259 SvAMAGIC_on (sv);
260
261 return sv;
262 }
240} 263}
241 264
242static void 265static void
243clearSVptr (SV *sv) 266clearSVptr (SV *sv)
244{ 267{
… …
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 320inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 321
299inline SV *to_sv (object & v) { return to_sv (&v); } 322inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 323inline SV *to_sv (living & v) { return to_sv (&v); }
301 324
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 325inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 326inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 327
306inline SV *to_sv (UUID v) 328inline SV *to_sv (UUID v)
307{ 329{
308 char buf[128]; 330 char buf[128];
… …
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 350inline 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"); } 351inline 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"); } 352inline 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"); } 353inline 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"); } 354inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
355inline 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"); } 356inline 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"); } 357inline 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"); } 358inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 359
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 360inline 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 361inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 362
340template<class T> 363template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 364inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 365
343template<int N> 366template<int N>
… …
478{ 501{
479 if (!ext->cb) 502 if (!ext->cb)
480 ext->cb = newAV (); 503 ext->cb = newAV ();
481 504
482 return newRV_inc ((SV *)ext->cb); 505 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} 506}
521 507
522///////////////////////////////////////////////////////////////////////////// 508/////////////////////////////////////////////////////////////////////////////
523 509
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 510extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
… …
820} 806}
821 807
822///////////////////////////////////////////////////////////////////////////// 808/////////////////////////////////////////////////////////////////////////////
823 809
824void 810void
825maptile::emergency_save () 811cfperl_emergency_save ()
826{ 812{
827 CALL_BEGIN (0); 813 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 814 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 815 CALL_END;
830} 816}
831 817
832maptile * 818maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 819maptile::find_sync (const char *path, maptile *origin)
834{ 820{
835 CALL_BEGIN (2); 821 CALL_BEGIN (2);
836 CALL_ARG (path); 822 CALL_ARG (path);
837 CALL_ARG (origin); 823 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 824 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 825
840 maptile *retval; 826 maptile *retval;
841 827
842 if (count) 828 if (count)
843 sv_to (POPs, retval); 829 sv_to (POPs, retval);
… …
845 retval = 0; 831 retval = 0;
846 832
847 CALL_END; 833 CALL_END;
848 834
849 return retval; 835 return retval;
836}
837
838maptile *
839maptile::find_async (const char *path, maptile *origin)
840{
841 CALL_BEGIN (2);
842 CALL_ARG (path);
843 CALL_ARG (origin);
844 CALL_CALL ("cf::map::find_async", G_SCALAR);
845
846 maptile *retval;
847
848 if (count)
849 sv_to (POPs, retval);
850 else
851 retval = 0;
852
853 CALL_END;
854
855 return retval;
856}
857
858void
859maptile::do_load_sync ()
860{
861 CALL_BEGIN (1);
862 CALL_ARG (this);
863 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
864 CALL_END;
850} 865}
851 866
852void 867void
853maptile::change_all_map_light (int change) 868maptile::change_all_map_light (int change)
854{ 869{
… …
887void 902void
888iw::alloc () 903iw::alloc ()
889{ 904{
890 pe = GEventAPI->new_idle (0, 0); 905 pe = GEventAPI->new_idle (0, 0);
891 906
907 WaREENTRANT_off (pe);
892 pe->base.callback = (void *)iw_dispatch; 908 pe->base.callback = (void *)iw_dispatch;
893 pe->base.ext_data = (void *)this; 909 pe->base.ext_data = (void *)this;
894} 910}
895 911
896static void iow_dispatch (pe_event *ev) 912static void iow_dispatch (pe_event *ev)
… …
902void 918void
903iow::alloc () 919iow::alloc ()
904{ 920{
905 pe = GEventAPI->new_io (0, 0); 921 pe = GEventAPI->new_io (0, 0);
906 922
923 WaREENTRANT_off (pe);
907 pe->base.callback = (void *)iow_dispatch; 924 pe->base.callback = (void *)iow_dispatch;
908 pe->base.ext_data = (void *)this; 925 pe->base.ext_data = (void *)this;
909 926
910 pe->fd = -1; 927 pe->fd = -1;
911 pe->poll = 0; 928 pe->poll = 0;
… …
1239 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1256 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240 const_iv (FLAG_IS_WATER) 1257 const_iv (FLAG_IS_WATER)
1241 const_iv (FLAG_CONTENT_ON_GEN) 1258 const_iv (FLAG_CONTENT_ON_GEN)
1242 const_iv (FLAG_IS_A_TEMPLATE) 1259 const_iv (FLAG_IS_A_TEMPLATE)
1243 const_iv (FLAG_IS_BUILDABLE) 1260 const_iv (FLAG_IS_BUILDABLE)
1261 const_iv (FLAG_DESTROY_ON_DEATH)
1262 const_iv (FLAG_NO_MAP_SAVE)
1244 1263
1245 const_iv (NDI_BLACK) 1264 const_iv (NDI_BLACK)
1246 const_iv (NDI_WHITE) 1265 const_iv (NDI_WHITE)
1247 const_iv (NDI_NAVY) 1266 const_iv (NDI_NAVY)
1248 const_iv (NDI_RED) 1267 const_iv (NDI_RED)
… …
1433 const_iv (ATNR_BLIND) 1452 const_iv (ATNR_BLIND)
1434 const_iv (ATNR_INTERNAL) 1453 const_iv (ATNR_INTERNAL)
1435 const_iv (ATNR_LIFE_STEALING) 1454 const_iv (ATNR_LIFE_STEALING)
1436 const_iv (ATNR_DISEASE) 1455 const_iv (ATNR_DISEASE)
1437 1456
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) 1457 const_iv (MAP_IN_MEMORY)
1445 const_iv (MAP_SWAPPED) 1458 const_iv (MAP_SWAPPED)
1446 const_iv (MAP_LOADING) 1459 const_iv (MAP_LOADING)
1447 const_iv (MAP_SAVING) 1460 const_iv (MAP_SAVING)
1448 1461
… …
1461 const_iv (ST_SETUP) 1474 const_iv (ST_SETUP)
1462 const_iv (ST_PLAYING) 1475 const_iv (ST_PLAYING)
1463 const_iv (ST_CUSTOM) 1476 const_iv (ST_CUSTOM)
1464 1477
1465 const_iv (ST_CHANGE_CLASS) 1478 const_iv (ST_CHANGE_CLASS)
1466 const_iv (ST_CONFIRM_QUIT)
1467 const_iv (ST_GET_PARTY_PASSWORD)
1468 1479
1469 const_iv (IO_HEADER) 1480 const_iv (IO_HEADER)
1470 const_iv (IO_OBJECTS) 1481 const_iv (IO_OBJECTS)
1471 const_iv (IO_UNIQUES) 1482 const_iv (IO_UNIQUES)
1472 1483
… …
1526 1537
1527void _global_reattach () 1538void _global_reattach ()
1528 CODE: 1539 CODE:
1529{ 1540{
1530 // reattach to all attachable objects in the game. 1541 // reattach to all attachable objects in the game.
1531 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1542 for_all_clients (ns)
1532 (*i)->reattach (); 1543 ns->reattach ();
1533 1544
1534 for_all_players (pl) 1545 for_all_players (pl)
1535 pl->reattach (); 1546 pl->reattach ();
1536 1547
1537 //TODO 1548 //TODO
1538 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1549 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539 // i->second->reattach (); 1550 // i->second->reattach ();
1540 1551
1541 for (object *op = object::first; op; op = op->next) 1552 for_all_objects (op)
1542 op->reattach (); 1553 op->reattach ();
1543} 1554}
1544 1555
1545NV floor (NV x) 1556NV floor (NV x)
1546 1557
1547NV ceil (NV x) 1558NV ceil (NV x)
1559
1560NV rndm (...)
1561 CODE:
1562 switch (items)
1563 {
1564 case 0: RETVAL = rndm (); break;
1565 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1566 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1567 default: croak ("cf::rndm requires none, one or two parameters."); break;
1568 }
1569 OUTPUT:
1570 RETVAL
1548 1571
1549void server_tick () 1572void server_tick ()
1550 CODE: 1573 CODE:
1551 runtime = SvNVx (sv_runtime); 1574 runtime = SvNVx (sv_runtime);
1552 server_tick (); 1575 server_tick ();
… …
1599 } 1622 }
1600 OUTPUT: RETVAL 1623 OUTPUT: RETVAL
1601 1624
1602void abort () 1625void abort ()
1603 1626
1627void fork_abort (char *cause = "cf::fork_abort")
1628
1629void cleanup (const char *cause, bool make_core = false)
1630
1604void emergency_save () 1631void emergency_save ()
1605 1632
1633UV sv_2watcher (SV *w)
1634 CODE:
1635 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1636 OUTPUT:
1637 RETVAL
1638
1606void _exit (int status = 0) 1639void _exit (int status = 0)
1640
1641#if _POSIX_MEMLOCK
1642
1643int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1644
1645int munlockall ()
1646
1647#endif
1607 1648
1608int find_animation (char *text) 1649int find_animation (char *text)
1609 PROTOTYPE: $ 1650 PROTOTYPE: $
1610 1651
1611int random_roll (int min, int max, object *op, int goodbad); 1652int random_roll (int min, int max, object *op, int goodbad);
… …
1658 CODE: 1699 CODE:
1659 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1700 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660 OUTPUT: 1701 OUTPUT:
1661 RETVAL 1702 RETVAL
1662 1703
1663#bool 1704INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1664#destroyed (attachable *at)
1665#
1666#void
1667#destroy (attachable *at)
1668 1705
1669MODULE = cf PACKAGE = cf::global 1706MODULE = cf PACKAGE = cf::global
1670 1707
1671int invoke (SV *klass, int event, ...) 1708int invoke (SV *klass, int event, ...)
1672 CODE: 1709 CODE:
… …
1694 PPCODE: 1731 PPCODE:
1695 EXTEND (SP, object::mortals.size ()); 1732 EXTEND (SP, object::mortals.size ());
1696 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1733 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697 PUSHs (to_sv (*i)); 1734 PUSHs (to_sv (*i));
1698 1735
1699object *first () 1736int objects_size ()
1700 CODE: 1737 CODE:
1701 RETVAL = object::first; 1738 RETVAL = objects.size ();
1739 OUTPUT: RETVAL
1740
1741object *objects (U32 index)
1742 CODE:
1743 RETVAL = index < objects.size () ? objects [index] : 0;
1744 OUTPUT: RETVAL
1745
1746int actives_size ()
1747 CODE:
1748 RETVAL = actives.size ();
1749 OUTPUT: RETVAL
1750
1751object *actives (U32 index)
1752 CODE:
1753 RETVAL = index < actives.size () ? actives [index] : 0;
1702 OUTPUT: RETVAL 1754 OUTPUT: RETVAL
1703 1755
1704# missing properties 1756# missing properties
1705 1757
1706object *head (object *op) 1758object *head (object *op)
1707 PROTOTYPE: $ 1759 PROTOTYPE: $
1708 CODE: 1760 CODE:
1709 RETVAL = op->head ? op->head : op; 1761 RETVAL = op->head_ ();
1710 OUTPUT: RETVAL 1762 OUTPUT: RETVAL
1711 1763
1712int is_head (object *op) 1764int is_head (object *op)
1713 PROTOTYPE: $ 1765 PROTOTYPE: $
1714 CODE: 1766 CODE:
1715 RETVAL = !op->head; 1767 RETVAL = op->head_ () == op;
1716 OUTPUT: RETVAL 1768 OUTPUT: RETVAL
1717 1769
1718void 1770void
1719inv (object *obj) 1771inv (object *obj)
1720 PROTOTYPE: $ 1772 PROTOTYPE: $
… …
1811 1863
1812void drop (object *who, object *op) 1864void drop (object *who, object *op)
1813 1865
1814void pick_up (object *who, object *op) 1866void pick_up (object *who, object *op)
1815 1867
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) 1868int cf_object_teleport (object *op, maptile *map, int x, int y)
1821 1869
1822void update_object (object *op, int action) 1870void update_object (object *op, int action)
1823 1871
1824object *cf_create_object_by_name (const char *name) 1872object *cf_create_object_by_name (const char *name)
… …
1943void esrv_update_item (object *op, int what, object *item) 1991void esrv_update_item (object *op, int what, object *item)
1944 C_ARGS: what, op, item 1992 C_ARGS: what, op, item
1945 1993
1946void clear_los (object *op) 1994void clear_los (object *op)
1947 1995
1948int command_teleport (object *op, char *params)
1949
1950int command_summon (object *op, char *params) 1996int command_summon (object *op, char *params)
1951 1997
1952int command_arrest (object *op, char *params) 1998int command_arrest (object *op, char *params)
1953 1999
1954int command_kick (object *op, char *params) 2000int command_kick (object *op, char *params)
… …
1975 CODE: 2021 CODE:
1976 pl->ob->stats.hp = pl->ob->stats.maxhp; 2022 pl->ob->stats.hp = pl->ob->stats.maxhp;
1977 pl->ob->stats.sp = pl->ob->stats.maxsp; 2023 pl->ob->stats.sp = pl->ob->stats.maxsp;
1978 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2024 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979 pl->orig_stats = pl->ob->stats; 2025 pl->orig_stats = pl->ob->stats;
1980
1981player *cf_player_find (char *name)
1982 PROTOTYPE: $
1983 2026
1984void cf_player_move (player *pl, int dir) 2027void cf_player_move (player *pl, int dir)
1985 2028
1986void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2029void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987 2030
… …
2033 if (y) sv_to (y, pl->bed_y); 2076 if (y) sv_to (y, pl->bed_y);
2034 2077
2035void 2078void
2036list () 2079list ()
2037 PPCODE: 2080 PPCODE:
2038 for (player *pl = first_player; pl; pl = pl->next) 2081 for_all_players (pl)
2039 XPUSHs (sv_2mortal (to_sv (pl))); 2082 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 2083
2063 2084
2064MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2085MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065 2086
2066int invoke (maptile *map, int event, ...) 2087int invoke (maptile *map, int event, ...)
… …
2082 PROTOTYPE: 2103 PROTOTYPE:
2083 CODE: 2104 CODE:
2084 RETVAL = new maptile; 2105 RETVAL = new maptile;
2085 OUTPUT: 2106 OUTPUT:
2086 RETVAL 2107 RETVAL
2087
2088void
2089maptile::destroy ()
2090 2108
2091void 2109void
2092maptile::players () 2110maptile::players ()
2093 PPCODE: 2111 PPCODE:
2094 if (GIMME_V == G_SCALAR) 2112 if (GIMME_V == G_SCALAR)
… …
2124 2142
2125object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2143object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2126 C_ARGS: str, map, nx, ny 2144 C_ARGS: str, map, nx, ny
2127 2145
2128void 2146void
2129cf_map_normalise (maptile *map, int x, int y) 2147get_map_flags (maptile *map, int x, int y)
2130 PPCODE: 2148 PPCODE:
2131{ 2149{
2132 maptile *nmap = 0; 2150 maptile *nmap = 0;
2133 I16 nx = 0, ny = 0; 2151 I16 nx = 0, ny = 0;
2134 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2152 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2196 CODE: 2214 CODE:
2197 RETVAL = get_name_of_region_for_map (m); 2215 RETVAL = get_name_of_region_for_map (m);
2198 OUTPUT: RETVAL 2216 OUTPUT: RETVAL
2199 2217
2200# worst xs function of my life 2218# worst xs function of my life
2201maptile * 2219bool
2202_create_random_map (\ 2220_create_random_map (\
2203 char *path,\ 2221 maptile *self,\
2204 char *wallstyle,\ 2222 char *wallstyle,\
2205 char *wall_name,\ 2223 char *wall_name,\
2206 char *floorstyle,\ 2224 char *floorstyle,\
2207 char *monsterstyle,\ 2225 char *monsterstyle,\
2208 char *treasurestyle,\ 2226 char *treasurestyle,\
… …
2212 char *origin_map,\ 2230 char *origin_map,\
2213 char *final_map,\ 2231 char *final_map,\
2214 char *exitstyle,\ 2232 char *exitstyle,\
2215 char *this_map,\ 2233 char *this_map,\
2216 char *exit_on_final_map,\ 2234 char *exit_on_final_map,\
2217 int Xsize,\ 2235 int xsize,\
2218 int Ysize,\ 2236 int ysize,\
2219 int expand2x,\ 2237 int expand2x,\
2220 int layoutoptions1,\ 2238 int layoutoptions1,\
2221 int layoutoptions2,\ 2239 int layoutoptions2,\
2222 int layoutoptions3,\ 2240 int layoutoptions3,\
2223 int symmetry,\ 2241 int symmetry,\
… …
2228 int dungeon_depth,\ 2246 int dungeon_depth,\
2229 int decoroptions,\ 2247 int decoroptions,\
2230 int orientation,\ 2248 int orientation,\
2231 int origin_y,\ 2249 int origin_y,\
2232 int origin_x,\ 2250 int origin_x,\
2233 int random_seed,\ 2251 U32 random_seed,\
2234 val64 total_map_hp,\ 2252 val64 total_map_hp,\
2235 int map_layout_style,\ 2253 int map_layout_style,\
2236 int treasureoptions,\ 2254 int treasureoptions,\
2237 int symmetry_used,\ 2255 int symmetry_used,\
2238 region *region\ 2256 region *region,\
2257 char *custom\
2239) 2258)
2240 CODE: 2259 CODE:
2241{ 2260{
2242 random_map_params rmp; 2261 random_map_params rmp;
2243 2262
… …
2253 assign (rmp.exit_on_final_map, exit_on_final_map); 2272 assign (rmp.exit_on_final_map, exit_on_final_map);
2254 2273
2255 rmp.origin_map = origin_map; 2274 rmp.origin_map = origin_map;
2256 rmp.final_map = final_map; 2275 rmp.final_map = final_map;
2257 rmp.this_map = this_map; 2276 rmp.this_map = this_map;
2258 rmp.Xsize = Xsize; 2277 rmp.xsize = xsize;
2259 rmp.Ysize = Ysize; 2278 rmp.ysize = ysize;
2260 rmp.expand2x = expand2x; 2279 rmp.expand2x = expand2x;
2261 rmp.layoutoptions1 = layoutoptions1; 2280 rmp.layoutoptions1 = layoutoptions1;
2262 rmp.layoutoptions2 = layoutoptions2; 2281 rmp.layoutoptions2 = layoutoptions2;
2263 rmp.layoutoptions3 = layoutoptions3; 2282 rmp.layoutoptions3 = layoutoptions3;
2264 rmp.symmetry = symmetry; 2283 rmp.symmetry = symmetry;
… …
2275 rmp.total_map_hp = total_map_hp; 2294 rmp.total_map_hp = total_map_hp;
2276 rmp.map_layout_style = map_layout_style; 2295 rmp.map_layout_style = map_layout_style;
2277 rmp.treasureoptions = treasureoptions; 2296 rmp.treasureoptions = treasureoptions;
2278 rmp.symmetry_used = symmetry_used; 2297 rmp.symmetry_used = symmetry_used;
2279 rmp.region = region; 2298 rmp.region = region;
2299 rmp.custom = custom;
2280 2300
2281 RETVAL = generate_random_map (path, &rmp); 2301 RETVAL = self->generate_random_map (&rmp);
2282} 2302}
2283 OUTPUT: 2303 OUTPUT:
2284 RETVAL 2304 RETVAL
2285 2305
2286MODULE = cf PACKAGE = cf::arch 2306MODULE = cf PACKAGE = cf::arch
… …
2362 char *buf = SvPVbyte (packet, len); 2382 char *buf = SvPVbyte (packet, len);
2363 2383
2364 THIS->send_packet (buf, len); 2384 THIS->send_packet (buf, len);
2365} 2385}
2366 2386
2367void
2368client::destroy ()
2369

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines