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.119 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.151 by root, Tue Jan 23 01:29:51 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
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}
… …
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 // borrow the refcnt from the object
235 obj->flags |= attachable::F_BORROWED; 252 // it is important thta no refcnt_chk is being executed here
236 obj->refcnt_dec (); 253 obj->refcnt_dec ();
254
255 // now bless the object _once_
256 return sv_bless (newRV_inc ((SV *)obj->self), stash);
237 } 257 }
258 else
259 {
260 SV *sv = newRV_inc ((SV *)obj->self);
238 261
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 262 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
263 SvAMAGIC_on (sv);
264
265 return sv;
266 }
240} 267}
241 268
242static void 269static void
243clearSVptr (SV *sv) 270clearSVptr (SV *sv)
244{ 271{
… …
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 324inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 325
299inline SV *to_sv (object & v) { return to_sv (&v); } 326inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 327inline SV *to_sv (living & v) { return to_sv (&v); }
301 328
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 329inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 330inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 331
306inline SV *to_sv (UUID v) 332inline SV *to_sv (UUID v)
307{ 333{
308 char buf[128]; 334 char buf[128];
… …
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 354inline 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"); } 355inline 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"); } 356inline 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"); } 357inline 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"); } 358inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
359inline 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"); } 360inline 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"); } 361inline 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"); } 362inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 363
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 364inline 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 365inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 366
340template<class T> 367template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 368inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 369
343template<int N> 370template<int N>
… …
478{ 505{
479 if (!ext->cb) 506 if (!ext->cb)
480 ext->cb = newAV (); 507 ext->cb = newAV ();
481 508
482 return newRV_inc ((SV *)ext->cb); 509 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} 510}
521 511
522///////////////////////////////////////////////////////////////////////////// 512/////////////////////////////////////////////////////////////////////////////
523 513
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 514extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
… …
820} 810}
821 811
822///////////////////////////////////////////////////////////////////////////// 812/////////////////////////////////////////////////////////////////////////////
823 813
824void 814void
825maptile::emergency_save () 815cfperl_emergency_save ()
826{ 816{
827 CALL_BEGIN (0); 817 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 818 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 819 CALL_END;
830} 820}
831 821
832maptile * 822maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 823maptile::find_sync (const char *path, maptile *origin)
834{ 824{
835 CALL_BEGIN (2); 825 CALL_BEGIN (2);
836 CALL_ARG (path); 826 CALL_ARG (path);
837 CALL_ARG (origin); 827 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 828 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 829
840 maptile *retval; 830 maptile *retval;
841 831
842 if (count) 832 if (count)
843 sv_to (POPs, retval); 833 sv_to (POPs, retval);
… …
845 retval = 0; 835 retval = 0;
846 836
847 CALL_END; 837 CALL_END;
848 838
849 return retval; 839 return retval;
840}
841
842maptile *
843maptile::find_async (const char *path, maptile *origin)
844{
845 CALL_BEGIN (2);
846 CALL_ARG (path);
847 CALL_ARG (origin);
848 CALL_CALL ("cf::map::find_async", G_SCALAR);
849
850 maptile *retval;
851
852 if (count)
853 sv_to (POPs, retval);
854 else
855 retval = 0;
856
857 CALL_END;
858
859 return retval;
860}
861
862void
863maptile::do_load_sync ()
864{
865 CALL_BEGIN (1);
866 CALL_ARG (this);
867 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
868 CALL_END;
850} 869}
851 870
852void 871void
853maptile::change_all_map_light (int change) 872maptile::change_all_map_light (int change)
854{ 873{
… …
874///////////////////////////////////////////////////////////////////////////// 893/////////////////////////////////////////////////////////////////////////////
875 894
876struct EventAPI *watcher_base::GEventAPI; 895struct EventAPI *watcher_base::GEventAPI;
877struct CoroAPI *coroapi::GCoroAPI; 896struct CoroAPI *coroapi::GCoroAPI;
878 897
898int coroapi::cede_counter;
899
879static void iw_dispatch (pe_event *ev) 900static void iw_dispatch (pe_event *ev)
880{ 901{
881 iw *w = (iw *)ev->ext_data; 902 iw *w = (iw *)ev->ext_data;
882 w->call (*w); 903 w->call (*w);
883} 904}
… …
885void 906void
886iw::alloc () 907iw::alloc ()
887{ 908{
888 pe = GEventAPI->new_idle (0, 0); 909 pe = GEventAPI->new_idle (0, 0);
889 910
911 WaREENTRANT_off (pe);
890 pe->base.callback = (void *)iw_dispatch; 912 pe->base.callback = (void *)iw_dispatch;
891 pe->base.ext_data = (void *)this; 913 pe->base.ext_data = (void *)this;
892} 914}
893 915
894static void iow_dispatch (pe_event *ev) 916static void iow_dispatch (pe_event *ev)
… …
900void 922void
901iow::alloc () 923iow::alloc ()
902{ 924{
903 pe = GEventAPI->new_io (0, 0); 925 pe = GEventAPI->new_io (0, 0);
904 926
927 WaREENTRANT_off (pe);
905 pe->base.callback = (void *)iow_dispatch; 928 pe->base.callback = (void *)iow_dispatch;
906 pe->base.ext_data = (void *)this; 929 pe->base.ext_data = (void *)this;
907 930
908 pe->fd = -1; 931 pe->fd = -1;
909 pe->poll = 0; 932 pe->poll = 0;
… …
1237 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1260 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238 const_iv (FLAG_IS_WATER) 1261 const_iv (FLAG_IS_WATER)
1239 const_iv (FLAG_CONTENT_ON_GEN) 1262 const_iv (FLAG_CONTENT_ON_GEN)
1240 const_iv (FLAG_IS_A_TEMPLATE) 1263 const_iv (FLAG_IS_A_TEMPLATE)
1241 const_iv (FLAG_IS_BUILDABLE) 1264 const_iv (FLAG_IS_BUILDABLE)
1265 const_iv (FLAG_DESTROY_ON_DEATH)
1266 const_iv (FLAG_NO_MAP_SAVE)
1242 1267
1243 const_iv (NDI_BLACK) 1268 const_iv (NDI_BLACK)
1244 const_iv (NDI_WHITE) 1269 const_iv (NDI_WHITE)
1245 const_iv (NDI_NAVY) 1270 const_iv (NDI_NAVY)
1246 const_iv (NDI_RED) 1271 const_iv (NDI_RED)
… …
1288 const_iv (P_BLOCKSVIEW) 1313 const_iv (P_BLOCKSVIEW)
1289 const_iv (P_PLAYER) 1314 const_iv (P_PLAYER)
1290 const_iv (P_NO_MAGIC) 1315 const_iv (P_NO_MAGIC)
1291 const_iv (P_IS_ALIVE) 1316 const_iv (P_IS_ALIVE)
1292 const_iv (P_NO_CLERIC) 1317 const_iv (P_NO_CLERIC)
1293 const_iv (P_NEED_UPDATE)
1294 const_iv (P_OUT_OF_MAP) 1318 const_iv (P_OUT_OF_MAP)
1295 const_iv (P_NEW_MAP) 1319 const_iv (P_NEW_MAP)
1320 const_iv (P_UPTODATE)
1296 1321
1297 const_iv (UP_OBJ_INSERT) 1322 const_iv (UP_OBJ_INSERT)
1298 const_iv (UP_OBJ_REMOVE) 1323 const_iv (UP_OBJ_REMOVE)
1299 const_iv (UP_OBJ_CHANGE) 1324 const_iv (UP_OBJ_CHANGE)
1300 const_iv (UP_OBJ_FACE) 1325 const_iv (UP_OBJ_FACE)
… …
1431 const_iv (ATNR_BLIND) 1456 const_iv (ATNR_BLIND)
1432 const_iv (ATNR_INTERNAL) 1457 const_iv (ATNR_INTERNAL)
1433 const_iv (ATNR_LIFE_STEALING) 1458 const_iv (ATNR_LIFE_STEALING)
1434 const_iv (ATNR_DISEASE) 1459 const_iv (ATNR_DISEASE)
1435 1460
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) 1461 const_iv (MAP_IN_MEMORY)
1443 const_iv (MAP_SWAPPED) 1462 const_iv (MAP_SWAPPED)
1444 const_iv (MAP_LOADING) 1463 const_iv (MAP_LOADING)
1445 const_iv (MAP_SAVING) 1464 const_iv (MAP_SAVING)
1446 1465
… …
1459 const_iv (ST_SETUP) 1478 const_iv (ST_SETUP)
1460 const_iv (ST_PLAYING) 1479 const_iv (ST_PLAYING)
1461 const_iv (ST_CUSTOM) 1480 const_iv (ST_CUSTOM)
1462 1481
1463 const_iv (ST_CHANGE_CLASS) 1482 const_iv (ST_CHANGE_CLASS)
1464 const_iv (ST_CONFIRM_QUIT)
1465 const_iv (ST_GET_PARTY_PASSWORD)
1466 1483
1467 const_iv (IO_HEADER) 1484 const_iv (IO_HEADER)
1468 const_iv (IO_OBJECTS) 1485 const_iv (IO_OBJECTS)
1469 const_iv (IO_UNIQUES) 1486 const_iv (IO_UNIQUES)
1470 1487
… …
1524 1541
1525void _global_reattach () 1542void _global_reattach ()
1526 CODE: 1543 CODE:
1527{ 1544{
1528 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1529 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1546 for_all_clients (ns)
1530 (*i)->reattach (); 1547 ns->reattach ();
1531 1548
1532 for_all_players (pl) 1549 for_all_players (pl)
1533 pl->reattach (); 1550 pl->reattach ();
1534 1551
1535 //TODO 1552 //TODO
1536 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1553 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537 // i->second->reattach (); 1554 // i->second->reattach ();
1538 1555
1539 for (object *op = object::first; op; op = op->next) 1556 for_all_objects (op)
1540 op->reattach (); 1557 op->reattach ();
1541} 1558}
1542 1559
1543NV floor (NV x) 1560NV floor (NV x)
1544 1561
1545NV ceil (NV x) 1562NV ceil (NV x)
1563
1564NV rndm (...)
1565 CODE:
1566 switch (items)
1567 {
1568 case 0: RETVAL = rndm (); break;
1569 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1570 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1571 default: croak ("cf::rndm requires none, one or two parameters."); break;
1572 }
1573 OUTPUT:
1574 RETVAL
1546 1575
1547void server_tick () 1576void server_tick ()
1548 CODE: 1577 CODE:
1549 runtime = SvNVx (sv_runtime); 1578 runtime = SvNVx (sv_runtime);
1550 server_tick (); 1579 server_tick ();
… …
1595 case 5: RETVAL = settings.playerdir; break; 1624 case 5: RETVAL = settings.playerdir; break;
1596 case 6: RETVAL = settings.datadir ; break; 1625 case 6: RETVAL = settings.datadir ; break;
1597 } 1626 }
1598 OUTPUT: RETVAL 1627 OUTPUT: RETVAL
1599 1628
1629void abort ()
1630
1631void fork_abort (char *cause = "cf::fork_abort")
1632
1633void cleanup (const char *cause, bool make_core = false)
1634
1600void emergency_save () 1635void emergency_save ()
1601 1636
1637UV sv_2watcher (SV *w)
1638 CODE:
1639 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1640 OUTPUT:
1641 RETVAL
1642
1602void _exit (int status = 0) 1643void _exit (int status = 0)
1644
1645#if _POSIX_MEMLOCK
1646
1647int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1648
1649int munlockall ()
1650
1651#endif
1603 1652
1604int find_animation (char *text) 1653int find_animation (char *text)
1605 PROTOTYPE: $ 1654 PROTOTYPE: $
1606 1655
1607int random_roll (int min, int max, object *op, int goodbad); 1656int random_roll (int min, int max, object *op, int goodbad);
… …
1654 CODE: 1703 CODE:
1655 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1704 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656 OUTPUT: 1705 OUTPUT:
1657 RETVAL 1706 RETVAL
1658 1707
1659#bool 1708INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1660#destroyed (attachable *at)
1661#
1662#void
1663#destroy (attachable *at)
1664 1709
1665MODULE = cf PACKAGE = cf::global 1710MODULE = cf PACKAGE = cf::global
1666 1711
1667int invoke (SV *klass, int event, ...) 1712int invoke (SV *klass, int event, ...)
1668 CODE: 1713 CODE:
… …
1690 PPCODE: 1735 PPCODE:
1691 EXTEND (SP, object::mortals.size ()); 1736 EXTEND (SP, object::mortals.size ());
1692 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1737 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693 PUSHs (to_sv (*i)); 1738 PUSHs (to_sv (*i));
1694 1739
1695object *first () 1740int objects_size ()
1696 CODE: 1741 CODE:
1697 RETVAL = object::first; 1742 RETVAL = objects.size ();
1743 OUTPUT: RETVAL
1744
1745object *objects (U32 index)
1746 CODE:
1747 RETVAL = index < objects.size () ? objects [index] : 0;
1748 OUTPUT: RETVAL
1749
1750int actives_size ()
1751 CODE:
1752 RETVAL = actives.size ();
1753 OUTPUT: RETVAL
1754
1755object *actives (U32 index)
1756 CODE:
1757 RETVAL = index < actives.size () ? actives [index] : 0;
1698 OUTPUT: RETVAL 1758 OUTPUT: RETVAL
1699 1759
1700# missing properties 1760# missing properties
1701 1761
1702object *head (object *op) 1762object *head (object *op)
1703 PROTOTYPE: $ 1763 PROTOTYPE: $
1704 CODE: 1764 CODE:
1705 RETVAL = op->head ? op->head : op; 1765 RETVAL = op->head_ ();
1706 OUTPUT: RETVAL 1766 OUTPUT: RETVAL
1707 1767
1708int is_head (object *op) 1768int is_head (object *op)
1709 PROTOTYPE: $ 1769 PROTOTYPE: $
1710 CODE: 1770 CODE:
1711 RETVAL = !op->head; 1771 RETVAL = op->head_ () == op;
1712 OUTPUT: RETVAL 1772 OUTPUT: RETVAL
1713 1773
1714void 1774void
1715inv (object *obj) 1775inv (object *obj)
1716 PROTOTYPE: $ 1776 PROTOTYPE: $
… …
1807 1867
1808void drop (object *who, object *op) 1868void drop (object *who, object *op)
1809 1869
1810void pick_up (object *who, object *op) 1870void pick_up (object *who, object *op)
1811 1871
1812object *cf_object_insert_object (object *op, object *container)
1813
1814object *cf_object_insert_in_ob (object *ob, object *where)
1815
1816int cf_object_teleport (object *op, maptile *map, int x, int y) 1872int cf_object_teleport (object *op, maptile *map, int x, int y)
1817 1873
1818void update_object (object *op, int action) 1874void update_object (object *op, int action)
1819 1875
1820object *cf_create_object_by_name (const char *name) 1876object *cf_create_object_by_name (const char *name)
… …
1913 RETVAL = op->contr; 1969 RETVAL = op->contr;
1914 OUTPUT: RETVAL 1970 OUTPUT: RETVAL
1915 1971
1916void check_score (object *op) 1972void check_score (object *op)
1917 1973
1918void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1974void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1975 CODE:
1976 new_draw_info (flags, 0, op, txt);
1919 1977
1920object *cf_player_send_inventory (object *op) 1978object *cf_player_send_inventory (object *op)
1921 1979
1922char *cf_player_get_ip (object *op) 1980char *cf_player_get_ip (object *op)
1923 ALIAS: ip = 0 1981 ALIAS: ip = 0
… …
1936 1994
1937void esrv_update_item (object *op, int what, object *item) 1995void esrv_update_item (object *op, int what, object *item)
1938 C_ARGS: what, op, item 1996 C_ARGS: what, op, item
1939 1997
1940void clear_los (object *op) 1998void clear_los (object *op)
1941
1942int command_teleport (object *op, char *params)
1943 1999
1944int command_summon (object *op, char *params) 2000int command_summon (object *op, char *params)
1945 2001
1946int command_arrest (object *op, char *params) 2002int command_arrest (object *op, char *params)
1947 2003
… …
1969 CODE: 2025 CODE:
1970 pl->ob->stats.hp = pl->ob->stats.maxhp; 2026 pl->ob->stats.hp = pl->ob->stats.maxhp;
1971 pl->ob->stats.sp = pl->ob->stats.maxsp; 2027 pl->ob->stats.sp = pl->ob->stats.maxsp;
1972 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2028 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973 pl->orig_stats = pl->ob->stats; 2029 pl->orig_stats = pl->ob->stats;
1974
1975player *cf_player_find (char *name)
1976 PROTOTYPE: $
1977 2030
1978void cf_player_move (player *pl, int dir) 2031void cf_player_move (player *pl, int dir)
1979 2032
1980void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2033void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981 2034
… …
2027 if (y) sv_to (y, pl->bed_y); 2080 if (y) sv_to (y, pl->bed_y);
2028 2081
2029void 2082void
2030list () 2083list ()
2031 PPCODE: 2084 PPCODE:
2032 for (player *pl = first_player; pl; pl = pl->next) 2085 for_all_players (pl)
2033 XPUSHs (sv_2mortal (to_sv (pl))); 2086 XPUSHs (sv_2mortal (to_sv (pl)));
2034
2035bool
2036peaceful (player *pl, bool new_setting = 0)
2037 PROTOTYPE: $;$
2038 CODE:
2039 RETVAL = pl->peaceful;
2040 if (items > 1)
2041 pl->peaceful = new_setting;
2042 OUTPUT:
2043 RETVAL
2044
2045living *
2046orig_stats (player *pl)
2047 CODE:
2048 RETVAL = &pl->orig_stats;
2049 OUTPUT: RETVAL
2050
2051living *
2052last_stats (player *pl)
2053 CODE:
2054 RETVAL = &pl->last_stats;
2055 OUTPUT: RETVAL
2056 2087
2057 2088
2058MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2089MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059 2090
2060int invoke (maptile *map, int event, ...) 2091int invoke (maptile *map, int event, ...)
… …
2076 PROTOTYPE: 2107 PROTOTYPE:
2077 CODE: 2108 CODE:
2078 RETVAL = new maptile; 2109 RETVAL = new maptile;
2079 OUTPUT: 2110 OUTPUT:
2080 RETVAL 2111 RETVAL
2081
2082void
2083maptile::destroy ()
2084 2112
2085void 2113void
2086maptile::players () 2114maptile::players ()
2087 PPCODE: 2115 PPCODE:
2088 if (GIMME_V == G_SCALAR) 2116 if (GIMME_V == G_SCALAR)
… …
2118 2146
2119object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2147object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2120 C_ARGS: str, map, nx, ny 2148 C_ARGS: str, map, nx, ny
2121 2149
2122void 2150void
2123cf_map_normalise (maptile *map, int x, int y) 2151get_map_flags (maptile *map, int x, int y)
2124 PPCODE: 2152 PPCODE:
2125{ 2153{
2126 maptile *nmap = 0; 2154 maptile *nmap = 0;
2127 I16 nx = 0, ny = 0; 2155 I16 nx = 0, ny = 0;
2128 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2156 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2177 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2205 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2178 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2206 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
2179 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2207 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
2180 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2208 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181 } 2209 }
2182 OUTPUT: 2210 OUTPUT: RETVAL
2183 RETVAL
2184 2211
2185void fix_walls (maptile *map, int x, int y) 2212void fix_walls (maptile *map, int x, int y)
2186 2213
2187void fix_walls_around (maptile *map, int x, int y) 2214void fix_walls_around (maptile *map, int x, int y)
2188 2215
2216const char *
2217region_name (maptile *m)
2218 CODE:
2219 RETVAL = get_name_of_region_for_map (m);
2220 OUTPUT: RETVAL
2221
2189# worst xs function of my life 2222# worst xs function of my life
2190maptile * 2223bool
2191_create_random_map (\ 2224_create_random_map (\
2192 char *path,\ 2225 maptile *self,\
2193 char *wallstyle,\ 2226 char *wallstyle,\
2194 char *wall_name,\ 2227 char *wall_name,\
2195 char *floorstyle,\ 2228 char *floorstyle,\
2196 char *monsterstyle,\ 2229 char *monsterstyle,\
2197 char *treasurestyle,\ 2230 char *treasurestyle,\
… …
2201 char *origin_map,\ 2234 char *origin_map,\
2202 char *final_map,\ 2235 char *final_map,\
2203 char *exitstyle,\ 2236 char *exitstyle,\
2204 char *this_map,\ 2237 char *this_map,\
2205 char *exit_on_final_map,\ 2238 char *exit_on_final_map,\
2206 int Xsize,\ 2239 int xsize,\
2207 int Ysize,\ 2240 int ysize,\
2208 int expand2x,\ 2241 int expand2x,\
2209 int layoutoptions1,\ 2242 int layoutoptions1,\
2210 int layoutoptions2,\ 2243 int layoutoptions2,\
2211 int layoutoptions3,\ 2244 int layoutoptions3,\
2212 int symmetry,\ 2245 int symmetry,\
… …
2217 int dungeon_depth,\ 2250 int dungeon_depth,\
2218 int decoroptions,\ 2251 int decoroptions,\
2219 int orientation,\ 2252 int orientation,\
2220 int origin_y,\ 2253 int origin_y,\
2221 int origin_x,\ 2254 int origin_x,\
2222 int random_seed,\ 2255 U32 random_seed,\
2223 val64 total_map_hp,\ 2256 val64 total_map_hp,\
2224 int map_layout_style,\ 2257 int map_layout_style,\
2225 int treasureoptions,\ 2258 int treasureoptions,\
2226 int symmetry_used,\ 2259 int symmetry_used,\
2227 region *region\ 2260 region *region,\
2261 char *custom\
2228) 2262)
2229 CODE: 2263 CODE:
2230{ 2264{
2231 random_map_params rmp; 2265 random_map_params rmp;
2232 2266
… …
2236 assign (rmp.monsterstyle , monsterstyle); 2270 assign (rmp.monsterstyle , monsterstyle);
2237 assign (rmp.treasurestyle , treasurestyle); 2271 assign (rmp.treasurestyle , treasurestyle);
2238 assign (rmp.layoutstyle , layoutstyle); 2272 assign (rmp.layoutstyle , layoutstyle);
2239 assign (rmp.doorstyle , doorstyle); 2273 assign (rmp.doorstyle , doorstyle);
2240 assign (rmp.decorstyle , decorstyle); 2274 assign (rmp.decorstyle , decorstyle);
2241 assign (rmp.origin_map , origin_map);
2242 assign (rmp.final_map , final_map);
2243 assign (rmp.exitstyle , exitstyle); 2275 assign (rmp.exitstyle , exitstyle);
2244 assign (rmp.this_map , this_map);
2245 assign (rmp.exit_on_final_map, exit_on_final_map); 2276 assign (rmp.exit_on_final_map, exit_on_final_map);
2246 2277
2278 rmp.origin_map = origin_map;
2279 rmp.final_map = final_map;
2280 rmp.this_map = this_map;
2247 rmp.Xsize = Xsize; 2281 rmp.xsize = xsize;
2248 rmp.Ysize = Ysize; 2282 rmp.ysize = ysize;
2249 rmp.expand2x = expand2x; 2283 rmp.expand2x = expand2x;
2250 rmp.layoutoptions1 = layoutoptions1; 2284 rmp.layoutoptions1 = layoutoptions1;
2251 rmp.layoutoptions2 = layoutoptions2; 2285 rmp.layoutoptions2 = layoutoptions2;
2252 rmp.layoutoptions3 = layoutoptions3; 2286 rmp.layoutoptions3 = layoutoptions3;
2253 rmp.symmetry = symmetry; 2287 rmp.symmetry = symmetry;
… …
2264 rmp.total_map_hp = total_map_hp; 2298 rmp.total_map_hp = total_map_hp;
2265 rmp.map_layout_style = map_layout_style; 2299 rmp.map_layout_style = map_layout_style;
2266 rmp.treasureoptions = treasureoptions; 2300 rmp.treasureoptions = treasureoptions;
2267 rmp.symmetry_used = symmetry_used; 2301 rmp.symmetry_used = symmetry_used;
2268 rmp.region = region; 2302 rmp.region = region;
2303 rmp.custom = custom;
2269 2304
2270 RETVAL = generate_random_map (path, &rmp); 2305 RETVAL = self->generate_random_map (&rmp);
2271} 2306}
2272 OUTPUT: 2307 OUTPUT:
2273 RETVAL 2308 RETVAL
2274 2309
2275MODULE = cf PACKAGE = cf::arch 2310MODULE = cf PACKAGE = cf::arch
… …
2298 2333
2299INCLUDE: $PERL genacc partylist ../include/player.h | 2334INCLUDE: $PERL genacc partylist ../include/player.h |
2300 2335
2301MODULE = cf PACKAGE = cf::region 2336MODULE = cf PACKAGE = cf::region
2302 2337
2303region *first () 2338region *first ()
2304 PROTOTYPE: 2339 PROTOTYPE:
2305 CODE: 2340 CODE:
2306 RETVAL = first_region; 2341 RETVAL = first_region;
2342 OUTPUT: RETVAL
2343
2344region *find (char *name)
2345 PROTOTYPE: $
2346 CODE:
2347 RETVAL = get_region_by_name (name);
2307 OUTPUT: RETVAL 2348 OUTPUT: RETVAL
2308 2349
2309INCLUDE: $PERL genacc region ../include/map.h | 2350INCLUDE: $PERL genacc region ../include/map.h |
2310 2351
2311MODULE = cf PACKAGE = cf::living 2352MODULE = cf PACKAGE = cf::living
… …
2345 char *buf = SvPVbyte (packet, len); 2386 char *buf = SvPVbyte (packet, len);
2346 2387
2347 THIS->send_packet (buf, len); 2388 THIS->send_packet (buf, len);
2348} 2389}
2349 2390
2350void
2351client::destroy ()
2352

Diff Legend

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