ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.119 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.155 by root, Fri Jan 26 22:06:30 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::sever_self ()
118{
119 if (HV *self = this->self)
120 {
121 // keep a refcount because sv_unmagic might call attachable_free,
122 // which might clear self, causing sv_unmagic to crash on a now
123 // invalid object.
124 SvREFCNT_inc (self);
125 hv_clear (self);
126 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
127 SvREFCNT_dec (self);
128
129 // self *must* be null now because thats sv_unmagic's job.
130 assert (!this->self);
131 }
132}
133
134void
135attachable::optimise ()
136{
137 if (self
138 && SvREFCNT (self) == 1
139 && !HvTOTALKEYS (self))
140 sever_self ();
117} 141}
118 142
119// check wether the object really is dead 143// check wether the object really is dead
120void 144void
121attachable::do_check () 145attachable::do_check ()
122{ 146{
123 if (refcnt > 0) 147 if (refcnt_cnt () > 0)
124 return; 148 return;
125 149
126 // try to unborrow the refcnt from perl 150 destroy ();
127 if (flags & F_BORROWED) 151}
152
153void
154attachable::do_destroy ()
155{
156 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
157
158 if (cb)
128 { 159 {
129 assert (self);//D//TODO//remove when stable
130 flags &= ~F_BORROWED;
131 refcnt_inc ();
132 SvREFCNT_dec (self); 160 SvREFCNT_dec (cb);
161 cb = 0;
133 } 162 }
134 163
135 if (refcnt > 0 || self) 164 if (self)
136 return; 165 sever_self ();
137 166
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); 167 mortals.push_back (this);
148} 168}
149 169
150void 170void
151attachable::destroy () 171attachable::destroy ()
155 175
156 flags |= F_DESTROYED; 176 flags |= F_DESTROYED;
157 do_destroy (); 177 do_destroy ();
158} 178}
159 179
180void
160void attachable::check_mortals () 181attachable::check_mortals ()
161{ 182{
162 for (int i = 0; i < mortals.size (); ) 183 static int i = 0;
184
185 for (;;)
163 { 186 {
187 if (i >= mortals.size ())
188 {
189 i = 0;
190
191 if (mortals.size () > 1000)
192 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
193
194 break;
195 }
196
164 attachable *obj = mortals [i]; 197 attachable *obj = mortals [i];
165 198
166 obj->refcnt_chk (); // unborrow from perl, if necessary 199 obj->refcnt_chk (); // unborrow from perl, if necessary
167 200
201 //if (obj->refcnt > 0 || obj->self)
168 if (obj->refcnt || obj->self) 202 if (obj->refcnt || obj->self)
169 { 203 {
170#if 0 204//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 205 ++i; // further delay freeing
206
207 if (!(i & 0x3ff))
208 break;
176 }//D 209 }
177 else 210 else
178 { 211 {
179 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180 mortals.erase (i); 212 mortals.erase (i);
181 delete obj; 213 delete obj;
182 } 214 }
183 } 215 }
184} 216}
209 241
210static int 242static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 243attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 244{
213 attachable *at = (attachable *)mg->mg_ptr; 245 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable 246
247 //TODO: check if transaction behaviour is really required here
248 if (SV *self = (SV *)at->self)
249 {
215 at->self = 0; 250 at->self = 0;
251 SvREFCNT_dec (self);
252 }
253
216 // next line makes sense, but most objects still have refcnt 0 by default 254 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 255 //at->refcnt_chk ();
218 return 0; 256 return 0;
219} 257}
220 258
229 if (!obj->self) 267 if (!obj->self)
230 { 268 {
231 obj->self = newHV (); 269 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 270 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 271
234 // borrow the refcnt from the object 272 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 273 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 274 }
275 else
276 {
277 SV *sv = newRV_inc ((SV *)obj->self);
238 278
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 279 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
280 SvAMAGIC_on (sv);
281
282 return sv;
283 }
240} 284}
241 285
242static void 286static void
243clearSVptr (SV *sv) 287clearSVptr (SV *sv)
244{ 288{
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 341inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 342
299inline SV *to_sv (object & v) { return to_sv (&v); } 343inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 344inline SV *to_sv (living & v) { return to_sv (&v); }
301 345
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 346inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 348
306inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
307{ 350{
308 char buf[128]; 351 char buf[128];
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 371inline 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"); } 372inline 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"); } 373inline 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"); } 374inline 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"); } 375inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
376inline 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"); } 377inline 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"); } 378inline 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"); } 379inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 380
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 381inline 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 382inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 383
340template<class T> 384template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 385inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 386
343template<int N> 387template<int N>
478{ 522{
479 if (!ext->cb) 523 if (!ext->cb)
480 ext->cb = newAV (); 524 ext->cb = newAV ();
481 525
482 return newRV_inc ((SV *)ext->cb); 526 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} 527}
521 528
522///////////////////////////////////////////////////////////////////////////// 529/////////////////////////////////////////////////////////////////////////////
523 530
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 531extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
820} 827}
821 828
822///////////////////////////////////////////////////////////////////////////// 829/////////////////////////////////////////////////////////////////////////////
823 830
824void 831void
825maptile::emergency_save () 832cfperl_emergency_save ()
826{ 833{
827 CALL_BEGIN (0); 834 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 835 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 836 CALL_END;
830} 837}
831 838
832maptile * 839maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 840maptile::find_sync (const char *path, maptile *origin)
834{ 841{
835 CALL_BEGIN (2); 842 CALL_BEGIN (2);
836 CALL_ARG (path); 843 CALL_ARG (path);
837 CALL_ARG (origin); 844 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 845 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 846
840 maptile *retval; 847 maptile *retval;
841 848
842 if (count) 849 if (count)
843 sv_to (POPs, retval); 850 sv_to (POPs, retval);
845 retval = 0; 852 retval = 0;
846 853
847 CALL_END; 854 CALL_END;
848 855
849 return retval; 856 return retval;
857}
858
859maptile *
860maptile::find_async (const char *path, maptile *origin)
861{
862 CALL_BEGIN (2);
863 CALL_ARG (path);
864 CALL_ARG (origin);
865 CALL_CALL ("cf::map::find_async", G_SCALAR);
866
867 maptile *retval;
868
869 if (count)
870 sv_to (POPs, retval);
871 else
872 retval = 0;
873
874 CALL_END;
875
876 return retval;
877}
878
879void
880maptile::do_load_sync ()
881{
882 CALL_BEGIN (1);
883 CALL_ARG (this);
884 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
885 CALL_END;
850} 886}
851 887
852void 888void
853maptile::change_all_map_light (int change) 889maptile::change_all_map_light (int change)
854{ 890{
874///////////////////////////////////////////////////////////////////////////// 910/////////////////////////////////////////////////////////////////////////////
875 911
876struct EventAPI *watcher_base::GEventAPI; 912struct EventAPI *watcher_base::GEventAPI;
877struct CoroAPI *coroapi::GCoroAPI; 913struct CoroAPI *coroapi::GCoroAPI;
878 914
915int coroapi::cede_counter;
916
879static void iw_dispatch (pe_event *ev) 917static void iw_dispatch (pe_event *ev)
880{ 918{
881 iw *w = (iw *)ev->ext_data; 919 iw *w = (iw *)ev->ext_data;
882 w->call (*w); 920 w->call (*w);
883} 921}
885void 923void
886iw::alloc () 924iw::alloc ()
887{ 925{
888 pe = GEventAPI->new_idle (0, 0); 926 pe = GEventAPI->new_idle (0, 0);
889 927
928 WaREENTRANT_off (pe);
890 pe->base.callback = (void *)iw_dispatch; 929 pe->base.callback = (void *)iw_dispatch;
891 pe->base.ext_data = (void *)this; 930 pe->base.ext_data = (void *)this;
892} 931}
893 932
894static void iow_dispatch (pe_event *ev) 933static void iow_dispatch (pe_event *ev)
900void 939void
901iow::alloc () 940iow::alloc ()
902{ 941{
903 pe = GEventAPI->new_io (0, 0); 942 pe = GEventAPI->new_io (0, 0);
904 943
944 WaREENTRANT_off (pe);
905 pe->base.callback = (void *)iow_dispatch; 945 pe->base.callback = (void *)iow_dispatch;
906 pe->base.ext_data = (void *)this; 946 pe->base.ext_data = (void *)this;
907 947
908 pe->fd = -1; 948 pe->fd = -1;
909 pe->poll = 0; 949 pe->poll = 0;
1237 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1277 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238 const_iv (FLAG_IS_WATER) 1278 const_iv (FLAG_IS_WATER)
1239 const_iv (FLAG_CONTENT_ON_GEN) 1279 const_iv (FLAG_CONTENT_ON_GEN)
1240 const_iv (FLAG_IS_A_TEMPLATE) 1280 const_iv (FLAG_IS_A_TEMPLATE)
1241 const_iv (FLAG_IS_BUILDABLE) 1281 const_iv (FLAG_IS_BUILDABLE)
1282 const_iv (FLAG_DESTROY_ON_DEATH)
1283 const_iv (FLAG_NO_MAP_SAVE)
1242 1284
1243 const_iv (NDI_BLACK) 1285 const_iv (NDI_BLACK)
1244 const_iv (NDI_WHITE) 1286 const_iv (NDI_WHITE)
1245 const_iv (NDI_NAVY) 1287 const_iv (NDI_NAVY)
1246 const_iv (NDI_RED) 1288 const_iv (NDI_RED)
1288 const_iv (P_BLOCKSVIEW) 1330 const_iv (P_BLOCKSVIEW)
1289 const_iv (P_PLAYER) 1331 const_iv (P_PLAYER)
1290 const_iv (P_NO_MAGIC) 1332 const_iv (P_NO_MAGIC)
1291 const_iv (P_IS_ALIVE) 1333 const_iv (P_IS_ALIVE)
1292 const_iv (P_NO_CLERIC) 1334 const_iv (P_NO_CLERIC)
1293 const_iv (P_NEED_UPDATE)
1294 const_iv (P_OUT_OF_MAP) 1335 const_iv (P_OUT_OF_MAP)
1295 const_iv (P_NEW_MAP) 1336 const_iv (P_NEW_MAP)
1337 const_iv (P_UPTODATE)
1296 1338
1297 const_iv (UP_OBJ_INSERT) 1339 const_iv (UP_OBJ_INSERT)
1298 const_iv (UP_OBJ_REMOVE) 1340 const_iv (UP_OBJ_REMOVE)
1299 const_iv (UP_OBJ_CHANGE) 1341 const_iv (UP_OBJ_CHANGE)
1300 const_iv (UP_OBJ_FACE) 1342 const_iv (UP_OBJ_FACE)
1431 const_iv (ATNR_BLIND) 1473 const_iv (ATNR_BLIND)
1432 const_iv (ATNR_INTERNAL) 1474 const_iv (ATNR_INTERNAL)
1433 const_iv (ATNR_LIFE_STEALING) 1475 const_iv (ATNR_LIFE_STEALING)
1434 const_iv (ATNR_DISEASE) 1476 const_iv (ATNR_DISEASE)
1435 1477
1436 const_iv (MAP_FLUSH)
1437 const_iv (MAP_PLAYER_UNIQUE)
1438 const_iv (MAP_BLOCK)
1439 const_iv (MAP_STYLE)
1440 const_iv (MAP_OVERLAY)
1441
1442 const_iv (MAP_IN_MEMORY) 1478 const_iv (MAP_IN_MEMORY)
1443 const_iv (MAP_SWAPPED) 1479 const_iv (MAP_SWAPPED)
1444 const_iv (MAP_LOADING) 1480 const_iv (MAP_LOADING)
1445 const_iv (MAP_SAVING) 1481 const_iv (MAP_SAVING)
1446 1482
1459 const_iv (ST_SETUP) 1495 const_iv (ST_SETUP)
1460 const_iv (ST_PLAYING) 1496 const_iv (ST_PLAYING)
1461 const_iv (ST_CUSTOM) 1497 const_iv (ST_CUSTOM)
1462 1498
1463 const_iv (ST_CHANGE_CLASS) 1499 const_iv (ST_CHANGE_CLASS)
1464 const_iv (ST_CONFIRM_QUIT)
1465 const_iv (ST_GET_PARTY_PASSWORD)
1466 1500
1467 const_iv (IO_HEADER) 1501 const_iv (IO_HEADER)
1468 const_iv (IO_OBJECTS) 1502 const_iv (IO_OBJECTS)
1469 const_iv (IO_UNIQUES) 1503 const_iv (IO_UNIQUES)
1470 1504
1524 1558
1525void _global_reattach () 1559void _global_reattach ()
1526 CODE: 1560 CODE:
1527{ 1561{
1528 // reattach to all attachable objects in the game. 1562 // reattach to all attachable objects in the game.
1529 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1563 for_all_clients (ns)
1530 (*i)->reattach (); 1564 ns->reattach ();
1531 1565
1532 for_all_players (pl) 1566 for_all_players (pl)
1533 pl->reattach (); 1567 pl->reattach ();
1534 1568
1535 //TODO 1569 //TODO
1536 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1570 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537 // i->second->reattach (); 1571 // i->second->reattach ();
1538 1572
1539 for (object *op = object::first; op; op = op->next) 1573 for_all_objects (op)
1540 op->reattach (); 1574 op->reattach ();
1541} 1575}
1542 1576
1543NV floor (NV x) 1577NV floor (NV x)
1544 1578
1545NV ceil (NV x) 1579NV ceil (NV x)
1580
1581NV rndm (...)
1582 CODE:
1583 switch (items)
1584 {
1585 case 0: RETVAL = rndm (); break;
1586 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1587 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1588 default: croak ("cf::rndm requires none, one or two parameters."); break;
1589 }
1590 OUTPUT:
1591 RETVAL
1546 1592
1547void server_tick () 1593void server_tick ()
1548 CODE: 1594 CODE:
1549 runtime = SvNVx (sv_runtime); 1595 runtime = SvNVx (sv_runtime);
1550 server_tick (); 1596 server_tick ();
1595 case 5: RETVAL = settings.playerdir; break; 1641 case 5: RETVAL = settings.playerdir; break;
1596 case 6: RETVAL = settings.datadir ; break; 1642 case 6: RETVAL = settings.datadir ; break;
1597 } 1643 }
1598 OUTPUT: RETVAL 1644 OUTPUT: RETVAL
1599 1645
1646void abort ()
1647
1648void fork_abort (char *cause = "cf::fork_abort")
1649
1650void cleanup (const char *cause, bool make_core = false)
1651
1600void emergency_save () 1652void emergency_save ()
1601 1653
1654UV sv_2watcher (SV *w)
1655 CODE:
1656 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1657 OUTPUT:
1658 RETVAL
1659
1602void _exit (int status = 0) 1660void _exit (int status = 0)
1661
1662#if _POSIX_MEMLOCK
1663
1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1665
1666int munlockall ()
1667
1668#endif
1603 1669
1604int find_animation (char *text) 1670int find_animation (char *text)
1605 PROTOTYPE: $ 1671 PROTOTYPE: $
1606 1672
1607int random_roll (int min, int max, object *op, int goodbad); 1673int random_roll (int min, int max, object *op, int goodbad);
1654 CODE: 1720 CODE:
1655 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656 OUTPUT: 1722 OUTPUT:
1657 RETVAL 1723 RETVAL
1658 1724
1659#bool 1725int mortals_size ()
1660#destroyed (attachable *at) 1726 CODE:
1661# 1727 RETVAL = attachable::mortals.size ();
1662#void 1728 OUTPUT: RETVAL
1663#destroy (attachable *at) 1729
1730#object *mortals (U32 index)
1731# CODE:
1732# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1733# OUTPUT: RETVAL
1734
1735INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1664 1736
1665MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1666 1738
1667int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
1668 CODE: 1740 CODE:
1684 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1685 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1686 1758
1687SV *registry (object *op) 1759SV *registry (object *op)
1688 1760
1689void mortals () 1761int objects_size ()
1690 PPCODE: 1762 CODE:
1691 EXTEND (SP, object::mortals.size ());
1692 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693 PUSHs (to_sv (*i));
1694
1695object *first ()
1696 CODE:
1697 RETVAL = object::first; 1763 RETVAL = objects.size ();
1764 OUTPUT: RETVAL
1765
1766object *objects (U32 index)
1767 CODE:
1768 RETVAL = index < objects.size () ? objects [index] : 0;
1769 OUTPUT: RETVAL
1770
1771int actives_size ()
1772 CODE:
1773 RETVAL = actives.size ();
1774 OUTPUT: RETVAL
1775
1776object *actives (U32 index)
1777 CODE:
1778 RETVAL = index < actives.size () ? actives [index] : 0;
1698 OUTPUT: RETVAL 1779 OUTPUT: RETVAL
1699 1780
1700# missing properties 1781# missing properties
1701 1782
1702object *head (object *op) 1783object *head (object *op)
1703 PROTOTYPE: $ 1784 PROTOTYPE: $
1704 CODE: 1785 CODE:
1705 RETVAL = op->head ? op->head : op; 1786 RETVAL = op->head_ ();
1706 OUTPUT: RETVAL 1787 OUTPUT: RETVAL
1707 1788
1708int is_head (object *op) 1789int is_head (object *op)
1709 PROTOTYPE: $ 1790 PROTOTYPE: $
1710 CODE: 1791 CODE:
1711 RETVAL = !op->head; 1792 RETVAL = op->head_ () == op;
1712 OUTPUT: RETVAL 1793 OUTPUT: RETVAL
1713 1794
1714void 1795void
1715inv (object *obj) 1796inv (object *obj)
1716 PROTOTYPE: $ 1797 PROTOTYPE: $
1807 1888
1808void drop (object *who, object *op) 1889void drop (object *who, object *op)
1809 1890
1810void pick_up (object *who, object *op) 1891void pick_up (object *who, object *op)
1811 1892
1812object *cf_object_insert_object (object *op, object *container)
1813
1814object *cf_object_insert_in_ob (object *ob, object *where)
1815
1816int cf_object_teleport (object *op, maptile *map, int x, int y) 1893int cf_object_teleport (object *op, maptile *map, int x, int y)
1817 1894
1818void update_object (object *op, int action) 1895void update_object (object *op, int action)
1819 1896
1820object *cf_create_object_by_name (const char *name) 1897object *cf_create_object_by_name (const char *name)
1913 RETVAL = op->contr; 1990 RETVAL = op->contr;
1914 OUTPUT: RETVAL 1991 OUTPUT: RETVAL
1915 1992
1916void check_score (object *op) 1993void check_score (object *op)
1917 1994
1918void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1995void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1996 CODE:
1997 new_draw_info (flags, 0, op, txt);
1919 1998
1920object *cf_player_send_inventory (object *op) 1999object *cf_player_send_inventory (object *op)
1921 2000
1922char *cf_player_get_ip (object *op) 2001char *cf_player_get_ip (object *op)
1923 ALIAS: ip = 0 2002 ALIAS: ip = 0
1936 2015
1937void esrv_update_item (object *op, int what, object *item) 2016void esrv_update_item (object *op, int what, object *item)
1938 C_ARGS: what, op, item 2017 C_ARGS: what, op, item
1939 2018
1940void clear_los (object *op) 2019void clear_los (object *op)
1941
1942int command_teleport (object *op, char *params)
1943 2020
1944int command_summon (object *op, char *params) 2021int command_summon (object *op, char *params)
1945 2022
1946int command_arrest (object *op, char *params) 2023int command_arrest (object *op, char *params)
1947 2024
1969 CODE: 2046 CODE:
1970 pl->ob->stats.hp = pl->ob->stats.maxhp; 2047 pl->ob->stats.hp = pl->ob->stats.maxhp;
1971 pl->ob->stats.sp = pl->ob->stats.maxsp; 2048 pl->ob->stats.sp = pl->ob->stats.maxsp;
1972 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2049 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973 pl->orig_stats = pl->ob->stats; 2050 pl->orig_stats = pl->ob->stats;
1974
1975player *cf_player_find (char *name)
1976 PROTOTYPE: $
1977 2051
1978void cf_player_move (player *pl, int dir) 2052void cf_player_move (player *pl, int dir)
1979 2053
1980void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2054void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981 2055
2027 if (y) sv_to (y, pl->bed_y); 2101 if (y) sv_to (y, pl->bed_y);
2028 2102
2029void 2103void
2030list () 2104list ()
2031 PPCODE: 2105 PPCODE:
2032 for (player *pl = first_player; pl; pl = pl->next) 2106 for_all_players (pl)
2033 XPUSHs (sv_2mortal (to_sv (pl))); 2107 XPUSHs (sv_2mortal (to_sv (pl)));
2034
2035bool
2036peaceful (player *pl, bool new_setting = 0)
2037 PROTOTYPE: $;$
2038 CODE:
2039 RETVAL = pl->peaceful;
2040 if (items > 1)
2041 pl->peaceful = new_setting;
2042 OUTPUT:
2043 RETVAL
2044
2045living *
2046orig_stats (player *pl)
2047 CODE:
2048 RETVAL = &pl->orig_stats;
2049 OUTPUT: RETVAL
2050
2051living *
2052last_stats (player *pl)
2053 CODE:
2054 RETVAL = &pl->last_stats;
2055 OUTPUT: RETVAL
2056 2108
2057 2109
2058MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2110MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059 2111
2060int invoke (maptile *map, int event, ...) 2112int invoke (maptile *map, int event, ...)
2076 PROTOTYPE: 2128 PROTOTYPE:
2077 CODE: 2129 CODE:
2078 RETVAL = new maptile; 2130 RETVAL = new maptile;
2079 OUTPUT: 2131 OUTPUT:
2080 RETVAL 2132 RETVAL
2081
2082void
2083maptile::destroy ()
2084 2133
2085void 2134void
2086maptile::players () 2135maptile::players ()
2087 PPCODE: 2136 PPCODE:
2088 if (GIMME_V == G_SCALAR) 2137 if (GIMME_V == G_SCALAR)
2118 2167
2119object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2168object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2120 C_ARGS: str, map, nx, ny 2169 C_ARGS: str, map, nx, ny
2121 2170
2122void 2171void
2123cf_map_normalise (maptile *map, int x, int y) 2172get_map_flags (maptile *map, int x, int y)
2124 PPCODE: 2173 PPCODE:
2125{ 2174{
2126 maptile *nmap = 0; 2175 maptile *nmap = 0;
2127 I16 nx = 0, ny = 0; 2176 I16 nx = 0, ny = 0;
2128 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2177 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2177 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2226 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2178 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2227 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break;
2179 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2228 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break;
2180 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2229 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181 } 2230 }
2182 OUTPUT: 2231 OUTPUT: RETVAL
2183 RETVAL
2184 2232
2185void fix_walls (maptile *map, int x, int y) 2233void fix_walls (maptile *map, int x, int y)
2186 2234
2187void fix_walls_around (maptile *map, int x, int y) 2235void fix_walls_around (maptile *map, int x, int y)
2188 2236
2237const char *
2238region_name (maptile *m)
2239 CODE:
2240 RETVAL = get_name_of_region_for_map (m);
2241 OUTPUT: RETVAL
2242
2189# worst xs function of my life 2243# worst xs function of my life
2190maptile * 2244bool
2191_create_random_map (\ 2245_create_random_map (\
2192 char *path,\ 2246 maptile *self,\
2193 char *wallstyle,\ 2247 char *wallstyle,\
2194 char *wall_name,\ 2248 char *wall_name,\
2195 char *floorstyle,\ 2249 char *floorstyle,\
2196 char *monsterstyle,\ 2250 char *monsterstyle,\
2197 char *treasurestyle,\ 2251 char *treasurestyle,\
2201 char *origin_map,\ 2255 char *origin_map,\
2202 char *final_map,\ 2256 char *final_map,\
2203 char *exitstyle,\ 2257 char *exitstyle,\
2204 char *this_map,\ 2258 char *this_map,\
2205 char *exit_on_final_map,\ 2259 char *exit_on_final_map,\
2206 int Xsize,\ 2260 int xsize,\
2207 int Ysize,\ 2261 int ysize,\
2208 int expand2x,\ 2262 int expand2x,\
2209 int layoutoptions1,\ 2263 int layoutoptions1,\
2210 int layoutoptions2,\ 2264 int layoutoptions2,\
2211 int layoutoptions3,\ 2265 int layoutoptions3,\
2212 int symmetry,\ 2266 int symmetry,\
2217 int dungeon_depth,\ 2271 int dungeon_depth,\
2218 int decoroptions,\ 2272 int decoroptions,\
2219 int orientation,\ 2273 int orientation,\
2220 int origin_y,\ 2274 int origin_y,\
2221 int origin_x,\ 2275 int origin_x,\
2222 int random_seed,\ 2276 U32 random_seed,\
2223 val64 total_map_hp,\ 2277 val64 total_map_hp,\
2224 int map_layout_style,\ 2278 int map_layout_style,\
2225 int treasureoptions,\ 2279 int treasureoptions,\
2226 int symmetry_used,\ 2280 int symmetry_used,\
2227 region *region\ 2281 region *region,\
2282 char *custom\
2228) 2283)
2229 CODE: 2284 CODE:
2230{ 2285{
2231 random_map_params rmp; 2286 random_map_params rmp;
2232 2287
2236 assign (rmp.monsterstyle , monsterstyle); 2291 assign (rmp.monsterstyle , monsterstyle);
2237 assign (rmp.treasurestyle , treasurestyle); 2292 assign (rmp.treasurestyle , treasurestyle);
2238 assign (rmp.layoutstyle , layoutstyle); 2293 assign (rmp.layoutstyle , layoutstyle);
2239 assign (rmp.doorstyle , doorstyle); 2294 assign (rmp.doorstyle , doorstyle);
2240 assign (rmp.decorstyle , decorstyle); 2295 assign (rmp.decorstyle , decorstyle);
2241 assign (rmp.origin_map , origin_map);
2242 assign (rmp.final_map , final_map);
2243 assign (rmp.exitstyle , exitstyle); 2296 assign (rmp.exitstyle , exitstyle);
2244 assign (rmp.this_map , this_map);
2245 assign (rmp.exit_on_final_map, exit_on_final_map); 2297 assign (rmp.exit_on_final_map, exit_on_final_map);
2246 2298
2299 rmp.origin_map = origin_map;
2300 rmp.final_map = final_map;
2301 rmp.this_map = this_map;
2247 rmp.Xsize = Xsize; 2302 rmp.xsize = xsize;
2248 rmp.Ysize = Ysize; 2303 rmp.ysize = ysize;
2249 rmp.expand2x = expand2x; 2304 rmp.expand2x = expand2x;
2250 rmp.layoutoptions1 = layoutoptions1; 2305 rmp.layoutoptions1 = layoutoptions1;
2251 rmp.layoutoptions2 = layoutoptions2; 2306 rmp.layoutoptions2 = layoutoptions2;
2252 rmp.layoutoptions3 = layoutoptions3; 2307 rmp.layoutoptions3 = layoutoptions3;
2253 rmp.symmetry = symmetry; 2308 rmp.symmetry = symmetry;
2264 rmp.total_map_hp = total_map_hp; 2319 rmp.total_map_hp = total_map_hp;
2265 rmp.map_layout_style = map_layout_style; 2320 rmp.map_layout_style = map_layout_style;
2266 rmp.treasureoptions = treasureoptions; 2321 rmp.treasureoptions = treasureoptions;
2267 rmp.symmetry_used = symmetry_used; 2322 rmp.symmetry_used = symmetry_used;
2268 rmp.region = region; 2323 rmp.region = region;
2324 rmp.custom = custom;
2269 2325
2270 RETVAL = generate_random_map (path, &rmp); 2326 RETVAL = self->generate_random_map (&rmp);
2271} 2327}
2272 OUTPUT: 2328 OUTPUT:
2273 RETVAL 2329 RETVAL
2274 2330
2275MODULE = cf PACKAGE = cf::arch 2331MODULE = cf PACKAGE = cf::arch
2298 2354
2299INCLUDE: $PERL genacc partylist ../include/player.h | 2355INCLUDE: $PERL genacc partylist ../include/player.h |
2300 2356
2301MODULE = cf PACKAGE = cf::region 2357MODULE = cf PACKAGE = cf::region
2302 2358
2303region *first () 2359region *first ()
2304 PROTOTYPE: 2360 PROTOTYPE:
2305 CODE: 2361 CODE:
2306 RETVAL = first_region; 2362 RETVAL = first_region;
2363 OUTPUT: RETVAL
2364
2365region *find (char *name)
2366 PROTOTYPE: $
2367 CODE:
2368 RETVAL = get_region_by_name (name);
2307 OUTPUT: RETVAL 2369 OUTPUT: RETVAL
2308 2370
2309INCLUDE: $PERL genacc region ../include/map.h | 2371INCLUDE: $PERL genacc region ../include/map.h |
2310 2372
2311MODULE = cf PACKAGE = cf::living 2373MODULE = cf PACKAGE = cf::living
2345 char *buf = SvPVbyte (packet, len); 2407 char *buf = SvPVbyte (packet, len);
2346 2408
2347 THIS->send_packet (buf, len); 2409 THIS->send_packet (buf, len);
2348} 2410}
2349 2411
2350void
2351client::destroy ()
2352

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines