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

Diff Legend

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