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

Diff Legend

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