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.117 by root, Sat Dec 30 18:45:28 2006 UTC vs.
Revision 1.154 by root, Fri Jan 26 21:44:11 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 assert (!cb);
108}
109
110int
111attachable::refcnt_cnt () const
112{
113 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
114}
115
116void
117attachable::optimise ()
118{
119 if (self
120 && SvREFCNT (self) == 1
121 && !HvTOTALKEYS (self))
122 {
123 SV *self = (SV *)this->self;
124
125 SvREFCNT_inc (self);
126 sv_unmagic (self, PERL_MAGIC_ext);
127 SvREFCNT_dec (self);
128 assert (!this->self);
129 }
117} 130}
118 131
119// check wether the object really is dead 132// check wether the object really is dead
120void 133void
121attachable::do_check () 134attachable::do_check ()
122{ 135{
123 if (refcnt > 0) 136 if (refcnt_cnt () > 0)
124 return; 137 return;
125 138
126 // try to unborrow the refcnt from perl 139 destroy ();
127 if (flags & F_BORROWED) 140}
141
142void
143attachable::do_destroy ()
144{
145 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
146
147 if (cb)
128 { 148 {
129 assert (self);//D//TODO//remove when stable 149 SvREFCNT_dec (cb);
130 flags &= ~F_BORROWED; 150 cb = 0;
131 refcnt_inc (); 151 }
152
153 if (self)
154 {
155 hv_clear (self);
156
157 SV *self = (SV *)this->self;
158 SvREFCNT_inc (self);
159 sv_unmagic (self, PERL_MAGIC_ext);
132 SvREFCNT_dec (self); 160 SvREFCNT_dec (self);
161 // self is now 0
162 assert (!this->self);//D//TODO remove soon
133 } 163 }
134 164
135 if (refcnt > 0 || self)
136 return;
137
138 destroy ();
139}
140
141void
142attachable::do_destroy ()
143{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145
146 //TODO: call generic destroy callback
147 mortals.push_back (this); 165 mortals.push_back (this);
148} 166}
149 167
150void 168void
151attachable::destroy () 169attachable::destroy ()
… …
155 173
156 flags |= F_DESTROYED; 174 flags |= F_DESTROYED;
157 do_destroy (); 175 do_destroy ();
158} 176}
159 177
178void
160void attachable::check_mortals () 179attachable::check_mortals ()
161{ 180{
162 for (int i = 0; i < mortals.size (); ) 181 static int i = 0;
182
183 for (;;)
163 { 184 {
185 if (i >= mortals.size ())
186 {
187 i = 0;
188
189 if (mortals.size () > 1000)
190 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
191
192 break;
193 }
194
164 attachable *obj = mortals [i]; 195 attachable *obj = mortals [i];
165 196
166 obj->refcnt_chk (); // unborrow from perl, if necessary 197 obj->refcnt_chk (); // unborrow from perl, if necessary
167 198
199 //if (obj->refcnt > 0 || obj->self)
168 if (obj->refcnt || obj->self) 200 if (obj->refcnt || obj->self)
169 { 201 {
170#if 0 202//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 203 ++i; // further delay freeing
204
205 if (!(i & 0x3ff))
206 break;
176 }//D 207 }
177 else 208 else
178 { 209 {
179 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180 mortals.erase (i); 210 mortals.erase (i);
181 delete obj; 211 delete obj;
182 } 212 }
183 } 213 }
184} 214}
… …
209 239
210static int 240static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 241attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 242{
213 attachable *at = (attachable *)mg->mg_ptr; 243 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable 244
245 //TODO: check if transaction behaviour is really required here
246 if (SV *self = (SV *)at->self)
247 {
215 at->self = 0; 248 at->self = 0;
249 SvREFCNT_dec (self);
250 }
251
216 // next line makes sense, but most objects still have refcnt 0 by default 252 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 253 //at->refcnt_chk ();
218 return 0; 254 return 0;
219} 255}
220 256
… …
229 if (!obj->self) 265 if (!obj->self)
230 { 266 {
231 obj->self = newHV (); 267 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 268 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 269
234 // borrow the refcnt from the object 270 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 271 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 272 }
273 else
274 {
275 SV *sv = newRV_inc ((SV *)obj->self);
238 276
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 277 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
278 SvAMAGIC_on (sv);
279
280 return sv;
281 }
240} 282}
241 283
242static void 284static void
243clearSVptr (SV *sv) 285clearSVptr (SV *sv)
244{ 286{
… …
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 339inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 340
299inline SV *to_sv (object & v) { return to_sv (&v); } 341inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 342inline SV *to_sv (living & v) { return to_sv (&v); }
301 343
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 344inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 345inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 346
306inline SV *to_sv (UUID v) 347inline SV *to_sv (UUID v)
307{ 348{
308 char buf[128]; 349 char buf[128];
… …
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 369inline 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"); } 370inline 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"); } 371inline 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"); } 372inline 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"); } 373inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
374inline 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"); } 375inline 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"); } 376inline 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"); } 377inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 378
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 379inline 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 380inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 381
340template<class T> 382template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 383inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 384
343template<int N> 385template<int N>
… …
478{ 520{
479 if (!ext->cb) 521 if (!ext->cb)
480 ext->cb = newAV (); 522 ext->cb = newAV ();
481 523
482 return newRV_inc ((SV *)ext->cb); 524 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} 525}
521 526
522///////////////////////////////////////////////////////////////////////////// 527/////////////////////////////////////////////////////////////////////////////
523 528
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 529extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
… …
820} 825}
821 826
822///////////////////////////////////////////////////////////////////////////// 827/////////////////////////////////////////////////////////////////////////////
823 828
824void 829void
825maptile::emergency_save () 830cfperl_emergency_save ()
826{ 831{
827 CALL_BEGIN (0); 832 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 833 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 834 CALL_END;
830} 835}
831 836
832maptile * 837maptile *
833maptile::find_map (const char *path, maptile *origin) 838maptile::find_sync (const char *path, maptile *origin)
834{ 839{
835 CALL_BEGIN (2); 840 CALL_BEGIN (2);
836 CALL_ARG (path); 841 CALL_ARG (path);
837 CALL_ARG (origin); 842 CALL_ARG (origin);
838 CALL_CALL ("cf::map::find_map", G_SCALAR); 843 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 844
840 maptile *retval; 845 maptile *retval;
841 846
842 if (count) 847 if (count)
843 sv_to (POPs, retval); 848 sv_to (POPs, retval);
… …
847 CALL_END; 852 CALL_END;
848 853
849 return retval; 854 return retval;
850} 855}
851 856
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 * 857maptile *
862maptile::customise_for (object *op) 858maptile::find_async (const char *path, maptile *origin)
863{ 859{
864 CALL_BEGIN (2); 860 CALL_BEGIN (2);
865 CALL_ARG (this); 861 CALL_ARG (path);
866 CALL_ARG (op); 862 CALL_ARG (origin);
867 CALL_CALL ("cf::map::customise_for", G_SCALAR); 863 CALL_CALL ("cf::map::find_async", G_SCALAR);
868 864
869 maptile *retval; 865 maptile *retval;
870 866
871 if (count) 867 if (count)
872 sv_to (POPs, retval); 868 sv_to (POPs, retval);
873 else 869 else
874 retval = 0; 870 retval = 0;
875 871
876 CALL_END; 872 CALL_END;
877 873
878 return retval ? retval : this; 874 return retval;
875}
876
877void
878maptile::do_load_sync ()
879{
880 CALL_BEGIN (1);
881 CALL_ARG (this);
882 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
883 CALL_END;
879} 884}
880 885
881void 886void
882maptile::change_all_map_light (int change) 887maptile::change_all_map_light (int change)
883{ 888{
… …
903///////////////////////////////////////////////////////////////////////////// 908/////////////////////////////////////////////////////////////////////////////
904 909
905struct EventAPI *watcher_base::GEventAPI; 910struct EventAPI *watcher_base::GEventAPI;
906struct CoroAPI *coroapi::GCoroAPI; 911struct CoroAPI *coroapi::GCoroAPI;
907 912
913int coroapi::cede_counter;
914
908static void iw_dispatch (pe_event *ev) 915static void iw_dispatch (pe_event *ev)
909{ 916{
910 iw *w = (iw *)ev->ext_data; 917 iw *w = (iw *)ev->ext_data;
911 w->call (*w); 918 w->call (*w);
912} 919}
… …
914void 921void
915iw::alloc () 922iw::alloc ()
916{ 923{
917 pe = GEventAPI->new_idle (0, 0); 924 pe = GEventAPI->new_idle (0, 0);
918 925
926 WaREENTRANT_off (pe);
919 pe->base.callback = (void *)iw_dispatch; 927 pe->base.callback = (void *)iw_dispatch;
920 pe->base.ext_data = (void *)this; 928 pe->base.ext_data = (void *)this;
921} 929}
922 930
923static void iow_dispatch (pe_event *ev) 931static void iow_dispatch (pe_event *ev)
… …
929void 937void
930iow::alloc () 938iow::alloc ()
931{ 939{
932 pe = GEventAPI->new_io (0, 0); 940 pe = GEventAPI->new_io (0, 0);
933 941
942 WaREENTRANT_off (pe);
934 pe->base.callback = (void *)iow_dispatch; 943 pe->base.callback = (void *)iow_dispatch;
935 pe->base.ext_data = (void *)this; 944 pe->base.ext_data = (void *)this;
936 945
937 pe->fd = -1; 946 pe->fd = -1;
938 pe->poll = 0; 947 pe->poll = 0;
… …
1266 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1275 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1267 const_iv (FLAG_IS_WATER) 1276 const_iv (FLAG_IS_WATER)
1268 const_iv (FLAG_CONTENT_ON_GEN) 1277 const_iv (FLAG_CONTENT_ON_GEN)
1269 const_iv (FLAG_IS_A_TEMPLATE) 1278 const_iv (FLAG_IS_A_TEMPLATE)
1270 const_iv (FLAG_IS_BUILDABLE) 1279 const_iv (FLAG_IS_BUILDABLE)
1280 const_iv (FLAG_DESTROY_ON_DEATH)
1281 const_iv (FLAG_NO_MAP_SAVE)
1271 1282
1272 const_iv (NDI_BLACK) 1283 const_iv (NDI_BLACK)
1273 const_iv (NDI_WHITE) 1284 const_iv (NDI_WHITE)
1274 const_iv (NDI_NAVY) 1285 const_iv (NDI_NAVY)
1275 const_iv (NDI_RED) 1286 const_iv (NDI_RED)
… …
1317 const_iv (P_BLOCKSVIEW) 1328 const_iv (P_BLOCKSVIEW)
1318 const_iv (P_PLAYER) 1329 const_iv (P_PLAYER)
1319 const_iv (P_NO_MAGIC) 1330 const_iv (P_NO_MAGIC)
1320 const_iv (P_IS_ALIVE) 1331 const_iv (P_IS_ALIVE)
1321 const_iv (P_NO_CLERIC) 1332 const_iv (P_NO_CLERIC)
1322 const_iv (P_NEED_UPDATE)
1323 const_iv (P_OUT_OF_MAP) 1333 const_iv (P_OUT_OF_MAP)
1324 const_iv (P_NEW_MAP) 1334 const_iv (P_NEW_MAP)
1335 const_iv (P_UPTODATE)
1325 1336
1326 const_iv (UP_OBJ_INSERT) 1337 const_iv (UP_OBJ_INSERT)
1327 const_iv (UP_OBJ_REMOVE) 1338 const_iv (UP_OBJ_REMOVE)
1328 const_iv (UP_OBJ_CHANGE) 1339 const_iv (UP_OBJ_CHANGE)
1329 const_iv (UP_OBJ_FACE) 1340 const_iv (UP_OBJ_FACE)
… …
1460 const_iv (ATNR_BLIND) 1471 const_iv (ATNR_BLIND)
1461 const_iv (ATNR_INTERNAL) 1472 const_iv (ATNR_INTERNAL)
1462 const_iv (ATNR_LIFE_STEALING) 1473 const_iv (ATNR_LIFE_STEALING)
1463 const_iv (ATNR_DISEASE) 1474 const_iv (ATNR_DISEASE)
1464 1475
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) 1476 const_iv (MAP_IN_MEMORY)
1472 const_iv (MAP_SWAPPED) 1477 const_iv (MAP_SWAPPED)
1473 const_iv (MAP_LOADING) 1478 const_iv (MAP_LOADING)
1474 const_iv (MAP_SAVING) 1479 const_iv (MAP_SAVING)
1475 1480
… …
1488 const_iv (ST_SETUP) 1493 const_iv (ST_SETUP)
1489 const_iv (ST_PLAYING) 1494 const_iv (ST_PLAYING)
1490 const_iv (ST_CUSTOM) 1495 const_iv (ST_CUSTOM)
1491 1496
1492 const_iv (ST_CHANGE_CLASS) 1497 const_iv (ST_CHANGE_CLASS)
1493 const_iv (ST_CONFIRM_QUIT)
1494 const_iv (ST_GET_PARTY_PASSWORD)
1495 1498
1496 const_iv (IO_HEADER) 1499 const_iv (IO_HEADER)
1497 const_iv (IO_OBJECTS) 1500 const_iv (IO_OBJECTS)
1498 const_iv (IO_UNIQUES) 1501 const_iv (IO_UNIQUES)
1499 1502
… …
1553 1556
1554void _global_reattach () 1557void _global_reattach ()
1555 CODE: 1558 CODE:
1556{ 1559{
1557 // reattach to all attachable objects in the game. 1560 // reattach to all attachable objects in the game.
1558 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1561 for_all_clients (ns)
1559 (*i)->reattach (); 1562 ns->reattach ();
1560 1563
1561 for_all_players (pl) 1564 for_all_players (pl)
1562 pl->reattach (); 1565 pl->reattach ();
1563 1566
1564 //TODO 1567 //TODO
1565 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1568 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1566 // i->second->reattach (); 1569 // i->second->reattach ();
1567 1570
1568 for (object *op = object::first; op; op = op->next) 1571 for_all_objects (op)
1569 op->reattach (); 1572 op->reattach ();
1570} 1573}
1571 1574
1572NV floor (NV x) 1575NV floor (NV x)
1573 1576
1574NV ceil (NV x) 1577NV ceil (NV x)
1578
1579NV rndm (...)
1580 CODE:
1581 switch (items)
1582 {
1583 case 0: RETVAL = rndm (); break;
1584 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1585 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1586 default: croak ("cf::rndm requires none, one or two parameters."); break;
1587 }
1588 OUTPUT:
1589 RETVAL
1575 1590
1576void server_tick () 1591void server_tick ()
1577 CODE: 1592 CODE:
1578 runtime = SvNVx (sv_runtime); 1593 runtime = SvNVx (sv_runtime);
1579 server_tick (); 1594 server_tick ();
… …
1624 case 5: RETVAL = settings.playerdir; break; 1639 case 5: RETVAL = settings.playerdir; break;
1625 case 6: RETVAL = settings.datadir ; break; 1640 case 6: RETVAL = settings.datadir ; break;
1626 } 1641 }
1627 OUTPUT: RETVAL 1642 OUTPUT: RETVAL
1628 1643
1644void abort ()
1645
1646void fork_abort (char *cause = "cf::fork_abort")
1647
1648void cleanup (const char *cause, bool make_core = false)
1649
1629void emergency_save () 1650void emergency_save ()
1630 1651
1652UV sv_2watcher (SV *w)
1653 CODE:
1654 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1655 OUTPUT:
1656 RETVAL
1657
1631void _exit (int status = 0) 1658void _exit (int status = 0)
1659
1660#if _POSIX_MEMLOCK
1661
1662int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1663
1664int munlockall ()
1665
1666#endif
1632 1667
1633int find_animation (char *text) 1668int find_animation (char *text)
1634 PROTOTYPE: $ 1669 PROTOTYPE: $
1635 1670
1636int random_roll (int min, int max, object *op, int goodbad); 1671int random_roll (int min, int max, object *op, int goodbad);
… …
1683 CODE: 1718 CODE:
1684 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1719 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1685 OUTPUT: 1720 OUTPUT:
1686 RETVAL 1721 RETVAL
1687 1722
1688#bool 1723int mortals_size ()
1689#destroyed (attachable *at) 1724 CODE:
1690# 1725 RETVAL = attachable::mortals.size ();
1691#void 1726 OUTPUT: RETVAL
1692#destroy (attachable *at) 1727
1728#object *mortals (U32 index)
1729# CODE:
1730# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1731# OUTPUT: RETVAL
1732
1733INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1693 1734
1694MODULE = cf PACKAGE = cf::global 1735MODULE = cf PACKAGE = cf::global
1695 1736
1696int invoke (SV *klass, int event, ...) 1737int invoke (SV *klass, int event, ...)
1697 CODE: 1738 CODE:
… …
1713 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1754 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1714 OUTPUT: RETVAL 1755 OUTPUT: RETVAL
1715 1756
1716SV *registry (object *op) 1757SV *registry (object *op)
1717 1758
1718void mortals () 1759int objects_size ()
1719 PPCODE: 1760 CODE:
1720 EXTEND (SP, object::mortals.size ());
1721 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1722 PUSHs (to_sv (*i));
1723
1724object *first ()
1725 CODE:
1726 RETVAL = object::first; 1761 RETVAL = objects.size ();
1762 OUTPUT: RETVAL
1763
1764object *objects (U32 index)
1765 CODE:
1766 RETVAL = index < objects.size () ? objects [index] : 0;
1767 OUTPUT: RETVAL
1768
1769int actives_size ()
1770 CODE:
1771 RETVAL = actives.size ();
1772 OUTPUT: RETVAL
1773
1774object *actives (U32 index)
1775 CODE:
1776 RETVAL = index < actives.size () ? actives [index] : 0;
1727 OUTPUT: RETVAL 1777 OUTPUT: RETVAL
1728 1778
1729# missing properties 1779# missing properties
1730 1780
1731object *head (object *op) 1781object *head (object *op)
1732 PROTOTYPE: $ 1782 PROTOTYPE: $
1733 CODE: 1783 CODE:
1734 RETVAL = op->head ? op->head : op; 1784 RETVAL = op->head_ ();
1735 OUTPUT: RETVAL 1785 OUTPUT: RETVAL
1736 1786
1737int is_head (object *op) 1787int is_head (object *op)
1738 PROTOTYPE: $ 1788 PROTOTYPE: $
1739 CODE: 1789 CODE:
1740 RETVAL = !op->head; 1790 RETVAL = op->head_ () == op;
1741 OUTPUT: RETVAL 1791 OUTPUT: RETVAL
1742 1792
1743void 1793void
1744inv (object *obj) 1794inv (object *obj)
1745 PROTOTYPE: $ 1795 PROTOTYPE: $
… …
1836 1886
1837void drop (object *who, object *op) 1887void drop (object *who, object *op)
1838 1888
1839void pick_up (object *who, object *op) 1889void pick_up (object *who, object *op)
1840 1890
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) 1891int cf_object_teleport (object *op, maptile *map, int x, int y)
1846 1892
1847void update_object (object *op, int action) 1893void update_object (object *op, int action)
1848 1894
1849object *cf_create_object_by_name (const char *name) 1895object *cf_create_object_by_name (const char *name)
… …
1942 RETVAL = op->contr; 1988 RETVAL = op->contr;
1943 OUTPUT: RETVAL 1989 OUTPUT: RETVAL
1944 1990
1945void check_score (object *op) 1991void check_score (object *op)
1946 1992
1947void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1993void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1994 CODE:
1995 new_draw_info (flags, 0, op, txt);
1948 1996
1949object *cf_player_send_inventory (object *op) 1997object *cf_player_send_inventory (object *op)
1950 1998
1951char *cf_player_get_ip (object *op) 1999char *cf_player_get_ip (object *op)
1952 ALIAS: ip = 0 2000 ALIAS: ip = 0
… …
1965 2013
1966void esrv_update_item (object *op, int what, object *item) 2014void esrv_update_item (object *op, int what, object *item)
1967 C_ARGS: what, op, item 2015 C_ARGS: what, op, item
1968 2016
1969void clear_los (object *op) 2017void clear_los (object *op)
1970
1971int command_teleport (object *op, char *params)
1972 2018
1973int command_summon (object *op, char *params) 2019int command_summon (object *op, char *params)
1974 2020
1975int command_arrest (object *op, char *params) 2021int command_arrest (object *op, char *params)
1976 2022
… …
1998 CODE: 2044 CODE:
1999 pl->ob->stats.hp = pl->ob->stats.maxhp; 2045 pl->ob->stats.hp = pl->ob->stats.maxhp;
2000 pl->ob->stats.sp = pl->ob->stats.maxsp; 2046 pl->ob->stats.sp = pl->ob->stats.maxsp;
2001 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2047 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2002 pl->orig_stats = pl->ob->stats; 2048 pl->orig_stats = pl->ob->stats;
2003
2004player *cf_player_find (char *name)
2005 PROTOTYPE: $
2006 2049
2007void cf_player_move (player *pl, int dir) 2050void cf_player_move (player *pl, int dir)
2008 2051
2009void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2052void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2010 2053
… …
2056 if (y) sv_to (y, pl->bed_y); 2099 if (y) sv_to (y, pl->bed_y);
2057 2100
2058void 2101void
2059list () 2102list ()
2060 PPCODE: 2103 PPCODE:
2061 for (player *pl = first_player; pl; pl = pl->next) 2104 for_all_players (pl)
2062 XPUSHs (sv_2mortal (to_sv (pl))); 2105 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 2106
2086 2107
2087MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2108MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2088 2109
2089int invoke (maptile *map, int event, ...) 2110int invoke (maptile *map, int event, ...)
… …
2107 RETVAL = new maptile; 2128 RETVAL = new maptile;
2108 OUTPUT: 2129 OUTPUT:
2109 RETVAL 2130 RETVAL
2110 2131
2111void 2132void
2112maptile::destroy ()
2113
2114void
2115maptile::players () 2133maptile::players ()
2116 PPCODE: 2134 PPCODE:
2117 if (GIMME_V == G_SCALAR) 2135 if (GIMME_V == G_SCALAR)
2118 XPUSHs (to_sv (THIS->players)); 2136 XPUSHs (sv_2mortal (to_sv (THIS->players)));
2119 else if (GIMME_V == G_ARRAY) 2137 else if (GIMME_V == G_ARRAY)
2120 { 2138 {
2121 EXTEND (SP, THIS->players); 2139 EXTEND (SP, THIS->players);
2122 for_all_players (pl) 2140 for_all_players (pl)
2123 if (pl->ob && pl->ob->map == THIS) 2141 if (pl->ob && pl->ob->map == THIS)
2124 PUSHs (to_sv (pl->ob)); 2142 PUSHs (sv_2mortal (to_sv (pl->ob)));
2125 } 2143 }
2126 2144
2127void play_sound_map (maptile *map, int x, int y, int sound_num) 2145void play_sound_map (maptile *map, int x, int y, int sound_num)
2128 2146
2129int out_of_map (maptile *map, int x, int y) 2147int out_of_map (maptile *map, int x, int y)
… …
2147 2165
2148object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2166object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2149 C_ARGS: str, map, nx, ny 2167 C_ARGS: str, map, nx, ny
2150 2168
2151void 2169void
2152cf_map_normalise (maptile *map, int x, int y) 2170get_map_flags (maptile *map, int x, int y)
2153 PPCODE: 2171 PPCODE:
2154{ 2172{
2155 maptile *nmap = 0; 2173 maptile *nmap = 0;
2156 I16 nx = 0, ny = 0; 2174 I16 nx = 0, ny = 0;
2157 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2175 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2206 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2224 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; 2225 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; 2226 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; 2227 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2210 } 2228 }
2211 OUTPUT: 2229 OUTPUT: RETVAL
2212 RETVAL
2213 2230
2214void fix_walls (maptile *map, int x, int y) 2231void fix_walls (maptile *map, int x, int y)
2215 2232
2216void fix_walls_around (maptile *map, int x, int y) 2233void fix_walls_around (maptile *map, int x, int y)
2217 2234
2235const char *
2236region_name (maptile *m)
2237 CODE:
2238 RETVAL = get_name_of_region_for_map (m);
2239 OUTPUT: RETVAL
2240
2218# worst xs function of my life 2241# worst xs function of my life
2219maptile * 2242bool
2220_create_random_map (\ 2243_create_random_map (\
2221 char *path,\ 2244 maptile *self,\
2222 char *wallstyle,\ 2245 char *wallstyle,\
2223 char *wall_name,\ 2246 char *wall_name,\
2224 char *floorstyle,\ 2247 char *floorstyle,\
2225 char *monsterstyle,\ 2248 char *monsterstyle,\
2226 char *treasurestyle,\ 2249 char *treasurestyle,\
… …
2230 char *origin_map,\ 2253 char *origin_map,\
2231 char *final_map,\ 2254 char *final_map,\
2232 char *exitstyle,\ 2255 char *exitstyle,\
2233 char *this_map,\ 2256 char *this_map,\
2234 char *exit_on_final_map,\ 2257 char *exit_on_final_map,\
2235 int Xsize,\ 2258 int xsize,\
2236 int Ysize,\ 2259 int ysize,\
2237 int expand2x,\ 2260 int expand2x,\
2238 int layoutoptions1,\ 2261 int layoutoptions1,\
2239 int layoutoptions2,\ 2262 int layoutoptions2,\
2240 int layoutoptions3,\ 2263 int layoutoptions3,\
2241 int symmetry,\ 2264 int symmetry,\
… …
2246 int dungeon_depth,\ 2269 int dungeon_depth,\
2247 int decoroptions,\ 2270 int decoroptions,\
2248 int orientation,\ 2271 int orientation,\
2249 int origin_y,\ 2272 int origin_y,\
2250 int origin_x,\ 2273 int origin_x,\
2251 int random_seed,\ 2274 U32 random_seed,\
2252 val64 total_map_hp,\ 2275 val64 total_map_hp,\
2253 int map_layout_style,\ 2276 int map_layout_style,\
2254 int treasureoptions,\ 2277 int treasureoptions,\
2255 int symmetry_used,\ 2278 int symmetry_used,\
2256 region *region\ 2279 region *region,\
2280 char *custom\
2257) 2281)
2258 CODE: 2282 CODE:
2259{ 2283{
2260 random_map_params rmp; 2284 random_map_params rmp;
2261 2285
… …
2265 assign (rmp.monsterstyle , monsterstyle); 2289 assign (rmp.monsterstyle , monsterstyle);
2266 assign (rmp.treasurestyle , treasurestyle); 2290 assign (rmp.treasurestyle , treasurestyle);
2267 assign (rmp.layoutstyle , layoutstyle); 2291 assign (rmp.layoutstyle , layoutstyle);
2268 assign (rmp.doorstyle , doorstyle); 2292 assign (rmp.doorstyle , doorstyle);
2269 assign (rmp.decorstyle , decorstyle); 2293 assign (rmp.decorstyle , decorstyle);
2270 assign (rmp.origin_map , origin_map);
2271 assign (rmp.final_map , final_map);
2272 assign (rmp.exitstyle , exitstyle); 2294 assign (rmp.exitstyle , exitstyle);
2273 assign (rmp.this_map , this_map);
2274 assign (rmp.exit_on_final_map, exit_on_final_map); 2295 assign (rmp.exit_on_final_map, exit_on_final_map);
2275 2296
2297 rmp.origin_map = origin_map;
2298 rmp.final_map = final_map;
2299 rmp.this_map = this_map;
2276 rmp.Xsize = Xsize; 2300 rmp.xsize = xsize;
2277 rmp.Ysize = Ysize; 2301 rmp.ysize = ysize;
2278 rmp.expand2x = expand2x; 2302 rmp.expand2x = expand2x;
2279 rmp.layoutoptions1 = layoutoptions1; 2303 rmp.layoutoptions1 = layoutoptions1;
2280 rmp.layoutoptions2 = layoutoptions2; 2304 rmp.layoutoptions2 = layoutoptions2;
2281 rmp.layoutoptions3 = layoutoptions3; 2305 rmp.layoutoptions3 = layoutoptions3;
2282 rmp.symmetry = symmetry; 2306 rmp.symmetry = symmetry;
… …
2293 rmp.total_map_hp = total_map_hp; 2317 rmp.total_map_hp = total_map_hp;
2294 rmp.map_layout_style = map_layout_style; 2318 rmp.map_layout_style = map_layout_style;
2295 rmp.treasureoptions = treasureoptions; 2319 rmp.treasureoptions = treasureoptions;
2296 rmp.symmetry_used = symmetry_used; 2320 rmp.symmetry_used = symmetry_used;
2297 rmp.region = region; 2321 rmp.region = region;
2322 rmp.custom = custom;
2298 2323
2299 RETVAL = generate_random_map (path, &rmp); 2324 RETVAL = self->generate_random_map (&rmp);
2300} 2325}
2301 OUTPUT: 2326 OUTPUT:
2302 RETVAL 2327 RETVAL
2303 2328
2304MODULE = cf PACKAGE = cf::arch 2329MODULE = cf PACKAGE = cf::arch
… …
2323 PROTOTYPE: 2348 PROTOTYPE:
2324 CODE: 2349 CODE:
2325 RETVAL = get_firstparty (); 2350 RETVAL = get_firstparty ();
2326 OUTPUT: RETVAL 2351 OUTPUT: RETVAL
2327 2352
2328partylist *next (partylist *party) 2353INCLUDE: $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 2354
2343MODULE = cf PACKAGE = cf::region 2355MODULE = cf PACKAGE = cf::region
2344 2356
2345region *first () 2357region *first ()
2346 PROTOTYPE: 2358 PROTOTYPE:
2347 CODE: 2359 CODE:
2348 RETVAL = first_region; 2360 RETVAL = first_region;
2349 OUTPUT: RETVAL 2361 OUTPUT: RETVAL
2350 2362
2351region *next (region *reg) 2363region *find (char *name)
2364 PROTOTYPE: $
2352 CODE: 2365 CODE:
2353 RETVAL = reg->next; 2366 RETVAL = get_region_by_name (name);
2354 OUTPUT: RETVAL 2367 OUTPUT: RETVAL
2355 2368
2356const char *name (region *reg) 2369INCLUDE: $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 2370
2376MODULE = cf PACKAGE = cf::living 2371MODULE = cf PACKAGE = cf::living
2377 2372
2378INCLUDE: $PERL genacc living ../include/living.h | 2373INCLUDE: $PERL genacc living ../include/living.h |
2379 2374
… …
2410 char *buf = SvPVbyte (packet, len); 2405 char *buf = SvPVbyte (packet, len);
2411 2406
2412 THIS->send_packet (buf, len); 2407 THIS->send_packet (buf, len);
2413} 2408}
2414 2409
2415void
2416client::destroy ()
2417

Diff Legend

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