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.118 by root, Sat Dec 30 20:32:30 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::find_map (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::find_map", 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);
… …
847 CALL_END; 837 CALL_END;
848 838
849 return retval; 839 return retval;
850} 840}
851 841
852void
853maptile::do_load ()
854{
855 CALL_BEGIN (1);
856 CALL_ARG (this);
857 CALL_CALL ("cf::map::do_load", G_VOID);
858 CALL_END;
859}
860
861maptile * 842maptile *
862maptile::customise_for (object *op) 843maptile::find_async (const char *path, maptile *origin)
863{ 844{
864 CALL_BEGIN (2); 845 CALL_BEGIN (2);
865 CALL_ARG (this); 846 CALL_ARG (path);
866 CALL_ARG (op); 847 CALL_ARG (origin);
867 CALL_CALL ("cf::map::customise_for", G_SCALAR); 848 CALL_CALL ("cf::map::find_async", G_SCALAR);
868 849
869 maptile *retval; 850 maptile *retval;
870 851
871 if (count) 852 if (count)
872 sv_to (POPs, retval); 853 sv_to (POPs, retval);
873 else 854 else
874 retval = 0; 855 retval = 0;
875 856
876 CALL_END; 857 CALL_END;
877 858
878 return retval ? retval : this; 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;
879} 869}
880 870
881void 871void
882maptile::change_all_map_light (int change) 872maptile::change_all_map_light (int change)
883{ 873{
… …
903///////////////////////////////////////////////////////////////////////////// 893/////////////////////////////////////////////////////////////////////////////
904 894
905struct EventAPI *watcher_base::GEventAPI; 895struct EventAPI *watcher_base::GEventAPI;
906struct CoroAPI *coroapi::GCoroAPI; 896struct CoroAPI *coroapi::GCoroAPI;
907 897
898int coroapi::cede_counter;
899
908static void iw_dispatch (pe_event *ev) 900static void iw_dispatch (pe_event *ev)
909{ 901{
910 iw *w = (iw *)ev->ext_data; 902 iw *w = (iw *)ev->ext_data;
911 w->call (*w); 903 w->call (*w);
912} 904}
… …
914void 906void
915iw::alloc () 907iw::alloc ()
916{ 908{
917 pe = GEventAPI->new_idle (0, 0); 909 pe = GEventAPI->new_idle (0, 0);
918 910
911 WaREENTRANT_off (pe);
919 pe->base.callback = (void *)iw_dispatch; 912 pe->base.callback = (void *)iw_dispatch;
920 pe->base.ext_data = (void *)this; 913 pe->base.ext_data = (void *)this;
921} 914}
922 915
923static void iow_dispatch (pe_event *ev) 916static void iow_dispatch (pe_event *ev)
… …
929void 922void
930iow::alloc () 923iow::alloc ()
931{ 924{
932 pe = GEventAPI->new_io (0, 0); 925 pe = GEventAPI->new_io (0, 0);
933 926
927 WaREENTRANT_off (pe);
934 pe->base.callback = (void *)iow_dispatch; 928 pe->base.callback = (void *)iow_dispatch;
935 pe->base.ext_data = (void *)this; 929 pe->base.ext_data = (void *)this;
936 930
937 pe->fd = -1; 931 pe->fd = -1;
938 pe->poll = 0; 932 pe->poll = 0;
… …
1266 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1260 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1267 const_iv (FLAG_IS_WATER) 1261 const_iv (FLAG_IS_WATER)
1268 const_iv (FLAG_CONTENT_ON_GEN) 1262 const_iv (FLAG_CONTENT_ON_GEN)
1269 const_iv (FLAG_IS_A_TEMPLATE) 1263 const_iv (FLAG_IS_A_TEMPLATE)
1270 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)
1271 1267
1272 const_iv (NDI_BLACK) 1268 const_iv (NDI_BLACK)
1273 const_iv (NDI_WHITE) 1269 const_iv (NDI_WHITE)
1274 const_iv (NDI_NAVY) 1270 const_iv (NDI_NAVY)
1275 const_iv (NDI_RED) 1271 const_iv (NDI_RED)
… …
1317 const_iv (P_BLOCKSVIEW) 1313 const_iv (P_BLOCKSVIEW)
1318 const_iv (P_PLAYER) 1314 const_iv (P_PLAYER)
1319 const_iv (P_NO_MAGIC) 1315 const_iv (P_NO_MAGIC)
1320 const_iv (P_IS_ALIVE) 1316 const_iv (P_IS_ALIVE)
1321 const_iv (P_NO_CLERIC) 1317 const_iv (P_NO_CLERIC)
1322 const_iv (P_NEED_UPDATE)
1323 const_iv (P_OUT_OF_MAP) 1318 const_iv (P_OUT_OF_MAP)
1324 const_iv (P_NEW_MAP) 1319 const_iv (P_NEW_MAP)
1320 const_iv (P_UPTODATE)
1325 1321
1326 const_iv (UP_OBJ_INSERT) 1322 const_iv (UP_OBJ_INSERT)
1327 const_iv (UP_OBJ_REMOVE) 1323 const_iv (UP_OBJ_REMOVE)
1328 const_iv (UP_OBJ_CHANGE) 1324 const_iv (UP_OBJ_CHANGE)
1329 const_iv (UP_OBJ_FACE) 1325 const_iv (UP_OBJ_FACE)
… …
1460 const_iv (ATNR_BLIND) 1456 const_iv (ATNR_BLIND)
1461 const_iv (ATNR_INTERNAL) 1457 const_iv (ATNR_INTERNAL)
1462 const_iv (ATNR_LIFE_STEALING) 1458 const_iv (ATNR_LIFE_STEALING)
1463 const_iv (ATNR_DISEASE) 1459 const_iv (ATNR_DISEASE)
1464 1460
1465 const_iv (MAP_FLUSH)
1466 const_iv (MAP_PLAYER_UNIQUE)
1467 const_iv (MAP_BLOCK)
1468 const_iv (MAP_STYLE)
1469 const_iv (MAP_OVERLAY)
1470
1471 const_iv (MAP_IN_MEMORY) 1461 const_iv (MAP_IN_MEMORY)
1472 const_iv (MAP_SWAPPED) 1462 const_iv (MAP_SWAPPED)
1473 const_iv (MAP_LOADING) 1463 const_iv (MAP_LOADING)
1474 const_iv (MAP_SAVING) 1464 const_iv (MAP_SAVING)
1475 1465
… …
1488 const_iv (ST_SETUP) 1478 const_iv (ST_SETUP)
1489 const_iv (ST_PLAYING) 1479 const_iv (ST_PLAYING)
1490 const_iv (ST_CUSTOM) 1480 const_iv (ST_CUSTOM)
1491 1481
1492 const_iv (ST_CHANGE_CLASS) 1482 const_iv (ST_CHANGE_CLASS)
1493 const_iv (ST_CONFIRM_QUIT)
1494 const_iv (ST_GET_PARTY_PASSWORD)
1495 1483
1496 const_iv (IO_HEADER) 1484 const_iv (IO_HEADER)
1497 const_iv (IO_OBJECTS) 1485 const_iv (IO_OBJECTS)
1498 const_iv (IO_UNIQUES) 1486 const_iv (IO_UNIQUES)
1499 1487
… …
1553 1541
1554void _global_reattach () 1542void _global_reattach ()
1555 CODE: 1543 CODE:
1556{ 1544{
1557 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1558 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1546 for_all_clients (ns)
1559 (*i)->reattach (); 1547 ns->reattach ();
1560 1548
1561 for_all_players (pl) 1549 for_all_players (pl)
1562 pl->reattach (); 1550 pl->reattach ();
1563 1551
1564 //TODO 1552 //TODO
1565 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1553 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1566 // i->second->reattach (); 1554 // i->second->reattach ();
1567 1555
1568 for (object *op = object::first; op; op = op->next) 1556 for_all_objects (op)
1569 op->reattach (); 1557 op->reattach ();
1570} 1558}
1571 1559
1572NV floor (NV x) 1560NV floor (NV x)
1573 1561
1574NV 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
1575 1575
1576void server_tick () 1576void server_tick ()
1577 CODE: 1577 CODE:
1578 runtime = SvNVx (sv_runtime); 1578 runtime = SvNVx (sv_runtime);
1579 server_tick (); 1579 server_tick ();
… …
1624 case 5: RETVAL = settings.playerdir; break; 1624 case 5: RETVAL = settings.playerdir; break;
1625 case 6: RETVAL = settings.datadir ; break; 1625 case 6: RETVAL = settings.datadir ; break;
1626 } 1626 }
1627 OUTPUT: RETVAL 1627 OUTPUT: RETVAL
1628 1628
1629void abort ()
1630
1631void fork_abort (char *cause = "cf::fork_abort")
1632
1633void cleanup (const char *cause, bool make_core = false)
1634
1629void emergency_save () 1635void emergency_save ()
1630 1636
1637UV sv_2watcher (SV *w)
1638 CODE:
1639 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1640 OUTPUT:
1641 RETVAL
1642
1631void _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
1632 1652
1633int find_animation (char *text) 1653int find_animation (char *text)
1634 PROTOTYPE: $ 1654 PROTOTYPE: $
1635 1655
1636int random_roll (int min, int max, object *op, int goodbad); 1656int random_roll (int min, int max, object *op, int goodbad);
… …
1683 CODE: 1703 CODE:
1684 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1704 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685 OUTPUT: 1705 OUTPUT:
1686 RETVAL 1706 RETVAL
1687 1707
1688#bool 1708INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1689#destroyed (attachable *at)
1690#
1691#void
1692#destroy (attachable *at)
1693 1709
1694MODULE = cf PACKAGE = cf::global 1710MODULE = cf PACKAGE = cf::global
1695 1711
1696int invoke (SV *klass, int event, ...) 1712int invoke (SV *klass, int event, ...)
1697 CODE: 1713 CODE:
… …
1719 PPCODE: 1735 PPCODE:
1720 EXTEND (SP, object::mortals.size ()); 1736 EXTEND (SP, object::mortals.size ());
1721 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1737 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1722 PUSHs (to_sv (*i)); 1738 PUSHs (to_sv (*i));
1723 1739
1724object *first () 1740int objects_size ()
1725 CODE: 1741 CODE:
1726 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;
1727 OUTPUT: RETVAL 1758 OUTPUT: RETVAL
1728 1759
1729# missing properties 1760# missing properties
1730 1761
1731object *head (object *op) 1762object *head (object *op)
1732 PROTOTYPE: $ 1763 PROTOTYPE: $
1733 CODE: 1764 CODE:
1734 RETVAL = op->head ? op->head : op; 1765 RETVAL = op->head_ ();
1735 OUTPUT: RETVAL 1766 OUTPUT: RETVAL
1736 1767
1737int is_head (object *op) 1768int is_head (object *op)
1738 PROTOTYPE: $ 1769 PROTOTYPE: $
1739 CODE: 1770 CODE:
1740 RETVAL = !op->head; 1771 RETVAL = op->head_ () == op;
1741 OUTPUT: RETVAL 1772 OUTPUT: RETVAL
1742 1773
1743void 1774void
1744inv (object *obj) 1775inv (object *obj)
1745 PROTOTYPE: $ 1776 PROTOTYPE: $
… …
1836 1867
1837void drop (object *who, object *op) 1868void drop (object *who, object *op)
1838 1869
1839void pick_up (object *who, object *op) 1870void pick_up (object *who, object *op)
1840 1871
1841object *cf_object_insert_object (object *op, object *container)
1842
1843object *cf_object_insert_in_ob (object *ob, object *where)
1844
1845int cf_object_teleport (object *op, maptile *map, int x, int y) 1872int cf_object_teleport (object *op, maptile *map, int x, int y)
1846 1873
1847void update_object (object *op, int action) 1874void update_object (object *op, int action)
1848 1875
1849object *cf_create_object_by_name (const char *name) 1876object *cf_create_object_by_name (const char *name)
… …
1942 RETVAL = op->contr; 1969 RETVAL = op->contr;
1943 OUTPUT: RETVAL 1970 OUTPUT: RETVAL
1944 1971
1945void check_score (object *op) 1972void check_score (object *op)
1946 1973
1947void 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);
1948 1977
1949object *cf_player_send_inventory (object *op) 1978object *cf_player_send_inventory (object *op)
1950 1979
1951char *cf_player_get_ip (object *op) 1980char *cf_player_get_ip (object *op)
1952 ALIAS: ip = 0 1981 ALIAS: ip = 0
… …
1965 1994
1966void esrv_update_item (object *op, int what, object *item) 1995void esrv_update_item (object *op, int what, object *item)
1967 C_ARGS: what, op, item 1996 C_ARGS: what, op, item
1968 1997
1969void clear_los (object *op) 1998void clear_los (object *op)
1970
1971int command_teleport (object *op, char *params)
1972 1999
1973int command_summon (object *op, char *params) 2000int command_summon (object *op, char *params)
1974 2001
1975int command_arrest (object *op, char *params) 2002int command_arrest (object *op, char *params)
1976 2003
… …
1998 CODE: 2025 CODE:
1999 pl->ob->stats.hp = pl->ob->stats.maxhp; 2026 pl->ob->stats.hp = pl->ob->stats.maxhp;
2000 pl->ob->stats.sp = pl->ob->stats.maxsp; 2027 pl->ob->stats.sp = pl->ob->stats.maxsp;
2001 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2028 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2002 pl->orig_stats = pl->ob->stats; 2029 pl->orig_stats = pl->ob->stats;
2003
2004player *cf_player_find (char *name)
2005 PROTOTYPE: $
2006 2030
2007void cf_player_move (player *pl, int dir) 2031void cf_player_move (player *pl, int dir)
2008 2032
2009void 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);
2010 2034
… …
2056 if (y) sv_to (y, pl->bed_y); 2080 if (y) sv_to (y, pl->bed_y);
2057 2081
2058void 2082void
2059list () 2083list ()
2060 PPCODE: 2084 PPCODE:
2061 for (player *pl = first_player; pl; pl = pl->next) 2085 for_all_players (pl)
2062 XPUSHs (sv_2mortal (to_sv (pl))); 2086 XPUSHs (sv_2mortal (to_sv (pl)));
2063
2064bool
2065peaceful (player *pl, bool new_setting = 0)
2066 PROTOTYPE: $;$
2067 CODE:
2068 RETVAL = pl->peaceful;
2069 if (items > 1)
2070 pl->peaceful = new_setting;
2071 OUTPUT:
2072 RETVAL
2073
2074living *
2075orig_stats (player *pl)
2076 CODE:
2077 RETVAL = &pl->orig_stats;
2078 OUTPUT: RETVAL
2079
2080living *
2081last_stats (player *pl)
2082 CODE:
2083 RETVAL = &pl->last_stats;
2084 OUTPUT: RETVAL
2085 2087
2086 2088
2087MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2089MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2088 2090
2089int invoke (maptile *map, int event, ...) 2091int invoke (maptile *map, int event, ...)
… …
2105 PROTOTYPE: 2107 PROTOTYPE:
2106 CODE: 2108 CODE:
2107 RETVAL = new maptile; 2109 RETVAL = new maptile;
2108 OUTPUT: 2110 OUTPUT:
2109 RETVAL 2111 RETVAL
2110
2111void
2112maptile::destroy ()
2113 2112
2114void 2113void
2115maptile::players () 2114maptile::players ()
2116 PPCODE: 2115 PPCODE:
2117 if (GIMME_V == G_SCALAR) 2116 if (GIMME_V == G_SCALAR)
… …
2147 2146
2148object* 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)
2149 C_ARGS: str, map, nx, ny 2148 C_ARGS: str, map, nx, ny
2150 2149
2151void 2150void
2152cf_map_normalise (maptile *map, int x, int y) 2151get_map_flags (maptile *map, int x, int y)
2153 PPCODE: 2152 PPCODE:
2154{ 2153{
2155 maptile *nmap = 0; 2154 maptile *nmap = 0;
2156 I16 nx = 0, ny = 0; 2155 I16 nx = 0, ny = 0;
2157 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2156 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2206 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;
2207 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;
2208 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;
2209 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;
2210 } 2209 }
2211 OUTPUT: 2210 OUTPUT: RETVAL
2212 RETVAL
2213 2211
2214void fix_walls (maptile *map, int x, int y) 2212void fix_walls (maptile *map, int x, int y)
2215 2213
2216void fix_walls_around (maptile *map, int x, int y) 2214void fix_walls_around (maptile *map, int x, int y)
2217 2215
2216const char *
2217region_name (maptile *m)
2218 CODE:
2219 RETVAL = get_name_of_region_for_map (m);
2220 OUTPUT: RETVAL
2221
2218# worst xs function of my life 2222# worst xs function of my life
2219maptile * 2223bool
2220_create_random_map (\ 2224_create_random_map (\
2221 char *path,\ 2225 maptile *self,\
2222 char *wallstyle,\ 2226 char *wallstyle,\
2223 char *wall_name,\ 2227 char *wall_name,\
2224 char *floorstyle,\ 2228 char *floorstyle,\
2225 char *monsterstyle,\ 2229 char *monsterstyle,\
2226 char *treasurestyle,\ 2230 char *treasurestyle,\
… …
2230 char *origin_map,\ 2234 char *origin_map,\
2231 char *final_map,\ 2235 char *final_map,\
2232 char *exitstyle,\ 2236 char *exitstyle,\
2233 char *this_map,\ 2237 char *this_map,\
2234 char *exit_on_final_map,\ 2238 char *exit_on_final_map,\
2235 int Xsize,\ 2239 int xsize,\
2236 int Ysize,\ 2240 int ysize,\
2237 int expand2x,\ 2241 int expand2x,\
2238 int layoutoptions1,\ 2242 int layoutoptions1,\
2239 int layoutoptions2,\ 2243 int layoutoptions2,\
2240 int layoutoptions3,\ 2244 int layoutoptions3,\
2241 int symmetry,\ 2245 int symmetry,\
… …
2246 int dungeon_depth,\ 2250 int dungeon_depth,\
2247 int decoroptions,\ 2251 int decoroptions,\
2248 int orientation,\ 2252 int orientation,\
2249 int origin_y,\ 2253 int origin_y,\
2250 int origin_x,\ 2254 int origin_x,\
2251 int random_seed,\ 2255 U32 random_seed,\
2252 val64 total_map_hp,\ 2256 val64 total_map_hp,\
2253 int map_layout_style,\ 2257 int map_layout_style,\
2254 int treasureoptions,\ 2258 int treasureoptions,\
2255 int symmetry_used,\ 2259 int symmetry_used,\
2256 region *region\ 2260 region *region,\
2261 char *custom\
2257) 2262)
2258 CODE: 2263 CODE:
2259{ 2264{
2260 random_map_params rmp; 2265 random_map_params rmp;
2261 2266
… …
2265 assign (rmp.monsterstyle , monsterstyle); 2270 assign (rmp.monsterstyle , monsterstyle);
2266 assign (rmp.treasurestyle , treasurestyle); 2271 assign (rmp.treasurestyle , treasurestyle);
2267 assign (rmp.layoutstyle , layoutstyle); 2272 assign (rmp.layoutstyle , layoutstyle);
2268 assign (rmp.doorstyle , doorstyle); 2273 assign (rmp.doorstyle , doorstyle);
2269 assign (rmp.decorstyle , decorstyle); 2274 assign (rmp.decorstyle , decorstyle);
2270 assign (rmp.origin_map , origin_map);
2271 assign (rmp.final_map , final_map);
2272 assign (rmp.exitstyle , exitstyle); 2275 assign (rmp.exitstyle , exitstyle);
2273 assign (rmp.this_map , this_map);
2274 assign (rmp.exit_on_final_map, exit_on_final_map); 2276 assign (rmp.exit_on_final_map, exit_on_final_map);
2275 2277
2278 rmp.origin_map = origin_map;
2279 rmp.final_map = final_map;
2280 rmp.this_map = this_map;
2276 rmp.Xsize = Xsize; 2281 rmp.xsize = xsize;
2277 rmp.Ysize = Ysize; 2282 rmp.ysize = ysize;
2278 rmp.expand2x = expand2x; 2283 rmp.expand2x = expand2x;
2279 rmp.layoutoptions1 = layoutoptions1; 2284 rmp.layoutoptions1 = layoutoptions1;
2280 rmp.layoutoptions2 = layoutoptions2; 2285 rmp.layoutoptions2 = layoutoptions2;
2281 rmp.layoutoptions3 = layoutoptions3; 2286 rmp.layoutoptions3 = layoutoptions3;
2282 rmp.symmetry = symmetry; 2287 rmp.symmetry = symmetry;
… …
2293 rmp.total_map_hp = total_map_hp; 2298 rmp.total_map_hp = total_map_hp;
2294 rmp.map_layout_style = map_layout_style; 2299 rmp.map_layout_style = map_layout_style;
2295 rmp.treasureoptions = treasureoptions; 2300 rmp.treasureoptions = treasureoptions;
2296 rmp.symmetry_used = symmetry_used; 2301 rmp.symmetry_used = symmetry_used;
2297 rmp.region = region; 2302 rmp.region = region;
2303 rmp.custom = custom;
2298 2304
2299 RETVAL = generate_random_map (path, &rmp); 2305 RETVAL = self->generate_random_map (&rmp);
2300} 2306}
2301 OUTPUT: 2307 OUTPUT:
2302 RETVAL 2308 RETVAL
2303 2309
2304MODULE = cf PACKAGE = cf::arch 2310MODULE = cf PACKAGE = cf::arch
… …
2323 PROTOTYPE: 2329 PROTOTYPE:
2324 CODE: 2330 CODE:
2325 RETVAL = get_firstparty (); 2331 RETVAL = get_firstparty ();
2326 OUTPUT: RETVAL 2332 OUTPUT: RETVAL
2327 2333
2328partylist *next (partylist *party) 2334INCLUDE: $PERL genacc partylist ../include/player.h |
2329 CODE:
2330 RETVAL = party->next;
2331 OUTPUT: RETVAL
2332
2333const char *name (partylist *party)
2334 CODE:
2335 RETVAL = party->partyname;
2336 OUTPUT: RETVAL
2337
2338const char *password (partylist *party)
2339 CODE:
2340 RETVAL = party->passwd;
2341 OUTPUT: RETVAL
2342 2335
2343MODULE = cf PACKAGE = cf::region 2336MODULE = cf PACKAGE = cf::region
2344 2337
2345region *first () 2338region *first ()
2346 PROTOTYPE: 2339 PROTOTYPE:
2347 CODE: 2340 CODE:
2348 RETVAL = first_region; 2341 RETVAL = first_region;
2349 OUTPUT: RETVAL 2342 OUTPUT: RETVAL
2350 2343
2351region *next (region *reg) 2344region *find (char *name)
2345 PROTOTYPE: $
2352 CODE: 2346 CODE:
2353 RETVAL = reg->next; 2347 RETVAL = get_region_by_name (name);
2354 OUTPUT: RETVAL 2348 OUTPUT: RETVAL
2355 2349
2356const char *name (region *reg) 2350INCLUDE: $PERL genacc region ../include/map.h |
2357 CODE:
2358 RETVAL = reg->name;
2359 OUTPUT: RETVAL
2360
2361region *parent (region *reg)
2362 CODE:
2363 RETVAL = reg->parent;
2364 OUTPUT: RETVAL
2365
2366const char *longname (region *reg)
2367 CODE:
2368 RETVAL = reg->longname;
2369 OUTPUT: RETVAL
2370
2371const char *msg (region *reg)
2372 CODE:
2373 RETVAL = reg->msg;
2374 OUTPUT: RETVAL
2375 2351
2376MODULE = cf PACKAGE = cf::living 2352MODULE = cf PACKAGE = cf::living
2377 2353
2378INCLUDE: $PERL genacc living ../include/living.h | 2354INCLUDE: $PERL genacc living ../include/living.h |
2379 2355
… …
2410 char *buf = SvPVbyte (packet, len); 2386 char *buf = SvPVbyte (packet, len);
2411 2387
2412 THIS->send_packet (buf, len); 2388 THIS->send_packet (buf, len);
2413} 2389}
2414 2390
2415void
2416client::destroy ()
2417

Diff Legend

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