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.126 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.160 by elmex, Wed Jan 31 14:11:02 2007 UTC

99 99
100////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 100//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
101 101
102unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
103 103
104#if 0
105attachable *attachable::rc_first;
106
107attachable::attachable ()
108{
109 refcnt = 0;
110 rc_next = rc_first;
111 rc_first = this;
112}
113#endif
114
115attachable::~attachable () 104attachable::~attachable ()
116{ 105{
117 assert (!(flags & F_BORROWED));//D//TODO//remove when stable
118#if 0
119 assert (!rc_next);
120 assert (!refcnt); 106 assert (!self);
121#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 ();
122} 141}
123 142
124// check wether the object really is dead 143// check wether the object really is dead
125void 144void
126attachable::do_check () 145attachable::do_check ()
127{ 146{
128 if (refcnt > 0) 147 if (refcnt_cnt () > 0)
129 return; 148 return;
130 149
131 // try to unborrow the refcnt from perl 150 destroy ();
132 if (flags & F_BORROWED) 151}
152
153void
154attachable::do_destroy ()
155{
156 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
157
158 if (cb)
133 { 159 {
134 assert (self);//D//TODO//remove when stable
135 flags &= ~F_BORROWED;
136 refcnt_inc ();
137 SvREFCNT_dec (self); 160 SvREFCNT_dec (cb);
161 cb = 0;
138 } 162 }
139 163
140 if (refcnt > 0 || self) 164 if (self)
141 return; 165 sever_self ();
142 166
143 destroy ();
144}
145
146void
147attachable::do_destroy ()
148{
149 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
150
151 //TODO: call generic destroy callback
152 mortals.push_back (this); 167 mortals.push_back (this);
153} 168}
154 169
155void 170void
156attachable::destroy () 171attachable::destroy ()
160 175
161 flags |= F_DESTROYED; 176 flags |= F_DESTROYED;
162 do_destroy (); 177 do_destroy ();
163} 178}
164 179
180void
165void attachable::check_mortals () 181attachable::check_mortals ()
166{ 182{
167 for (int i = 0; i < mortals.size (); ) 183 static int i = 0;
184
185 for (;;)
168 { 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
169 attachable *obj = mortals [i]; 197 attachable *obj = mortals [i];
170 198
171 obj->refcnt_chk (); // unborrow from perl, if necessary 199 obj->refcnt_chk (); // unborrow from perl, if necessary
172 200
201 //if (obj->refcnt > 0 || obj->self)
173 if (obj->refcnt || obj->self) 202 if (obj->refcnt || obj->self)
174 { 203 {
175#if 0 204//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
176 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
177 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
178#endif
179
180 ++i; // further delay freeing 205 ++i; // further delay freeing
206
207 if (!(i & 0x3ff))
208 break;
181 }//D 209 }
182 else 210 else
183 { 211 {
184 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
185 mortals.erase (i); 212 mortals.erase (i);
186 delete obj; 213 delete obj;
187 } 214 }
188 } 215 }
189} 216}
214 241
215static int 242static int
216attachable_free (pTHX_ SV *sv, MAGIC *mg) 243attachable_free (pTHX_ SV *sv, MAGIC *mg)
217{ 244{
218 attachable *at = (attachable *)mg->mg_ptr; 245 attachable *at = (attachable *)mg->mg_ptr;
219 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 {
220 at->self = 0; 250 at->self = 0;
251 SvREFCNT_dec (self);
252 }
253
221 // 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
222 //at->refcnt_chk (); 255 //at->refcnt_chk ();
223 return 0; 256 return 0;
224} 257}
225 258
234 if (!obj->self) 267 if (!obj->self)
235 { 268 {
236 obj->self = newHV (); 269 obj->self = newHV ();
237 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);
238 271
239 // borrow the refcnt from the object 272 // now bless the object _once_
240 obj->flags |= attachable::F_BORROWED; 273 return sv_bless (newRV_inc ((SV *)obj->self), stash);
241 obj->refcnt_dec ();
242 } 274 }
275 else
276 {
277 SV *sv = newRV_inc ((SV *)obj->self);
243 278
244 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 }
245} 284}
246 285
247static void 286static void
248clearSVptr (SV *sv) 287clearSVptr (SV *sv)
249{ 288{
302inline 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); }
303 342
304inline SV *to_sv (object & v) { return to_sv (&v); } 343inline SV *to_sv (object & v) { return to_sv (&v); }
305inline SV *to_sv (living & v) { return to_sv (&v); } 344inline SV *to_sv (living & v) { return to_sv (&v); }
306 345
307//TODO:
308inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 346inline SV *to_sv (facetile * v) { return to_sv (v->name); }
309inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
310 348
311inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
312{ 350{
313 char buf[128]; 351 char buf[128];
314 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 352 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
315 return newSVpv (buf, 0); 353 return newSVpv (buf, 0);
316} 354}
317 355
318inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 356inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
319inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 357inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
333inline 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"); }
334inline 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"); }
335inline 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"); }
336inline 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"); }
337inline 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"); }
338inline 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"); }
339inline 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"); }
340inline 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"); }
341 380
342inline 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)]; }
343inline 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)); }
344 383
345template<class T> 384template<class T>
346inline 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; }
347 386
348template<int N> 387template<int N>
483{ 522{
484 if (!ext->cb) 523 if (!ext->cb)
485 ext->cb = newAV (); 524 ext->cb = newAV ();
486 525
487 return newRV_inc ((SV *)ext->cb); 526 return newRV_inc ((SV *)ext->cb);
488}
489
490#if 0
491void attachable::clear ()
492{
493 if (self)
494 {
495 // disconnect Perl from C, to avoid crashes
496 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
497
498 // clear the perl hash, might or might not be a good idea
499 hv_clear ((HV *)SvRV ((SV *)self));
500
501 SvREFCNT_dec (self);
502 self = 0;
503 }
504
505 if (cb)
506 {
507 SvREFCNT_dec (cb);
508 cb = 0;
509 }
510
511 attach = 0;
512}
513#endif
514
515void attachable::optimise ()
516{
517 if (self
518 && SvREFCNT (self) == 1
519 && !HvTOTALKEYS (self))
520 {
521 flags &= ~F_BORROWED;
522 refcnt_inc ();
523 SvREFCNT_dec ((SV *)self);
524 }
525} 527}
526 528
527///////////////////////////////////////////////////////////////////////////// 529/////////////////////////////////////////////////////////////////////////////
528 530
529extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 531extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
825} 827}
826 828
827///////////////////////////////////////////////////////////////////////////// 829/////////////////////////////////////////////////////////////////////////////
828 830
829void 831void
830maptile::emergency_save () 832cfperl_emergency_save ()
831{ 833{
832 CALL_BEGIN (0); 834 CALL_BEGIN (0);
833 CALL_CALL ("cf::map::emergency_save", G_VOID); 835 CALL_CALL ("cf::emergency_save", G_VOID);
834 CALL_END; 836 CALL_END;
835} 837}
836 838
837maptile * 839maptile *
838maptile::find_sync (const char *path, maptile *origin) 840maptile::find_sync (const char *path, maptile *origin)
839{ 841{
840 CALL_BEGIN (2); 842 CALL_BEGIN (2);
841 CALL_ARG (path); 843 CALL_ARG (path);
842 CALL_ARG (origin); 844 CALL_ARG (origin);
843 CALL_CALL ("cf::map::find_sync", G_SCALAR); 845 CALL_CALL ("cf::map::find_sync", G_SCALAR);
846
847 maptile *retval;
848
849 if (count)
850 sv_to (POPs, retval);
851 else
852 retval = 0;
853
854 CALL_END;
855
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);
844 866
845 maptile *retval; 867 maptile *retval;
846 868
847 if (count) 869 if (count)
848 sv_to (POPs, retval); 870 sv_to (POPs, retval);
901void 923void
902iw::alloc () 924iw::alloc ()
903{ 925{
904 pe = GEventAPI->new_idle (0, 0); 926 pe = GEventAPI->new_idle (0, 0);
905 927
928 WaREENTRANT_off (pe);
906 pe->base.callback = (void *)iw_dispatch; 929 pe->base.callback = (void *)iw_dispatch;
907 pe->base.ext_data = (void *)this; 930 pe->base.ext_data = (void *)this;
908} 931}
909 932
910static void iow_dispatch (pe_event *ev) 933static void iow_dispatch (pe_event *ev)
916void 939void
917iow::alloc () 940iow::alloc ()
918{ 941{
919 pe = GEventAPI->new_io (0, 0); 942 pe = GEventAPI->new_io (0, 0);
920 943
944 WaREENTRANT_off (pe);
921 pe->base.callback = (void *)iow_dispatch; 945 pe->base.callback = (void *)iow_dispatch;
922 pe->base.ext_data = (void *)this; 946 pe->base.ext_data = (void *)this;
923 947
924 pe->fd = -1; 948 pe->fd = -1;
925 pe->poll = 0; 949 pe->poll = 0;
1253 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1277 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1254 const_iv (FLAG_IS_WATER) 1278 const_iv (FLAG_IS_WATER)
1255 const_iv (FLAG_CONTENT_ON_GEN) 1279 const_iv (FLAG_CONTENT_ON_GEN)
1256 const_iv (FLAG_IS_A_TEMPLATE) 1280 const_iv (FLAG_IS_A_TEMPLATE)
1257 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)
1258 1284
1259 const_iv (NDI_BLACK) 1285 const_iv (NDI_BLACK)
1260 const_iv (NDI_WHITE) 1286 const_iv (NDI_WHITE)
1261 const_iv (NDI_NAVY) 1287 const_iv (NDI_NAVY)
1262 const_iv (NDI_RED) 1288 const_iv (NDI_RED)
1447 const_iv (ATNR_BLIND) 1473 const_iv (ATNR_BLIND)
1448 const_iv (ATNR_INTERNAL) 1474 const_iv (ATNR_INTERNAL)
1449 const_iv (ATNR_LIFE_STEALING) 1475 const_iv (ATNR_LIFE_STEALING)
1450 const_iv (ATNR_DISEASE) 1476 const_iv (ATNR_DISEASE)
1451 1477
1452 const_iv (MAP_FLUSH)
1453 const_iv (MAP_PLAYER_UNIQUE)
1454 const_iv (MAP_BLOCK)
1455 const_iv (MAP_STYLE)
1456 const_iv (MAP_OVERLAY)
1457
1458 const_iv (MAP_IN_MEMORY) 1478 const_iv (MAP_IN_MEMORY)
1459 const_iv (MAP_SWAPPED) 1479 const_iv (MAP_SWAPPED)
1460 const_iv (MAP_LOADING) 1480 const_iv (MAP_LOADING)
1461 const_iv (MAP_SAVING) 1481 const_iv (MAP_SAVING)
1462 1482
1475 const_iv (ST_SETUP) 1495 const_iv (ST_SETUP)
1476 const_iv (ST_PLAYING) 1496 const_iv (ST_PLAYING)
1477 const_iv (ST_CUSTOM) 1497 const_iv (ST_CUSTOM)
1478 1498
1479 const_iv (ST_CHANGE_CLASS) 1499 const_iv (ST_CHANGE_CLASS)
1480 const_iv (ST_CONFIRM_QUIT)
1481 const_iv (ST_GET_PARTY_PASSWORD)
1482 1500
1483 const_iv (IO_HEADER) 1501 const_iv (IO_HEADER)
1484 const_iv (IO_OBJECTS) 1502 const_iv (IO_OBJECTS)
1485 const_iv (IO_UNIQUES) 1503 const_iv (IO_UNIQUES)
1486 1504
1540 1558
1541void _global_reattach () 1559void _global_reattach ()
1542 CODE: 1560 CODE:
1543{ 1561{
1544 // reattach to all attachable objects in the game. 1562 // reattach to all attachable objects in the game.
1545 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1563 for_all_clients (ns)
1546 (*i)->reattach (); 1564 ns->reattach ();
1547 1565
1548 for_all_players (pl) 1566 for_all_players (pl)
1549 pl->reattach (); 1567 pl->reattach ();
1550 1568
1551 //TODO 1569 //TODO
1552 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1570 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1553 // i->second->reattach (); 1571 // i->second->reattach ();
1554 1572
1555 for (object *op = object::first; op; op = op->next) 1573 for_all_objects (op)
1556 op->reattach (); 1574 op->reattach ();
1557} 1575}
1558 1576
1559NV floor (NV x) 1577NV floor (NV x)
1560 1578
1561NV 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
1562 1592
1563void server_tick () 1593void server_tick ()
1564 CODE: 1594 CODE:
1565 runtime = SvNVx (sv_runtime); 1595 runtime = SvNVx (sv_runtime);
1566 server_tick (); 1596 server_tick ();
1613 } 1643 }
1614 OUTPUT: RETVAL 1644 OUTPUT: RETVAL
1615 1645
1616void abort () 1646void abort ()
1617 1647
1648void fork_abort (char *cause = "cf::fork_abort")
1649
1650void cleanup (const char *cause, bool make_core = false)
1651
1618void emergency_save () 1652void emergency_save ()
1619 1653
1620void _exit (int status = 0) 1654void _exit (int status = EXIT_SUCCESS)
1655
1656UV sv_2watcher (SV *w)
1657 CODE:
1658 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1659 OUTPUT:
1660 RETVAL
1621 1661
1622#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1623 1663
1624int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1625 1665
1680 CODE: 1720 CODE:
1681 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1682 OUTPUT: 1722 OUTPUT:
1683 RETVAL 1723 RETVAL
1684 1724
1685#bool 1725int mortals_size ()
1686#destroyed (attachable *at) 1726 CODE:
1687# 1727 RETVAL = attachable::mortals.size ();
1688#void 1728 OUTPUT: RETVAL
1689#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 |
1690 1736
1691MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1692 1738
1693int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
1694 CODE: 1740 CODE:
1710 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1711 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1712 1758
1713SV *registry (object *op) 1759SV *registry (object *op)
1714 1760
1715void mortals () 1761int objects_size ()
1716 PPCODE: 1762 CODE:
1717 EXTEND (SP, object::mortals.size ());
1718 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1719 PUSHs (to_sv (*i));
1720
1721object *first ()
1722 CODE:
1723 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;
1724 OUTPUT: RETVAL 1779 OUTPUT: RETVAL
1725 1780
1726# missing properties 1781# missing properties
1727 1782
1728object *head (object *op) 1783object *head (object *op)
1729 PROTOTYPE: $ 1784 PROTOTYPE: $
1730 CODE: 1785 CODE:
1731 RETVAL = op->head ? op->head : op; 1786 RETVAL = op->head_ ();
1732 OUTPUT: RETVAL 1787 OUTPUT: RETVAL
1733 1788
1734int is_head (object *op) 1789int is_head (object *op)
1735 PROTOTYPE: $ 1790 PROTOTYPE: $
1736 CODE: 1791 CODE:
1737 RETVAL = !op->head; 1792 RETVAL = op->head_ () == op;
1738 OUTPUT: RETVAL 1793 OUTPUT: RETVAL
1739 1794
1740void 1795void
1741inv (object *obj) 1796inv (object *obj)
1742 PROTOTYPE: $ 1797 PROTOTYPE: $
1749 1804
1750void 1805void
1751set_animation (object *op, int idx) 1806set_animation (object *op, int idx)
1752 CODE: 1807 CODE:
1753 SET_ANIMATION (op, idx); 1808 SET_ANIMATION (op, idx);
1809
1810int
1811num_animations (object *op)
1812 CODE:
1813 RETVAL = NUM_ANIMATIONS (op);
1814 OUTPUT: RETVAL
1754 1815
1755object *find_best_object_match (object *op, const char *match) 1816object *find_best_object_match (object *op, const char *match)
1756 1817
1757object *find_marked_object (object *op) 1818object *find_marked_object (object *op)
1758 1819
1833 1894
1834void drop (object *who, object *op) 1895void drop (object *who, object *op)
1835 1896
1836void pick_up (object *who, object *op) 1897void pick_up (object *who, object *op)
1837 1898
1838object *cf_object_insert_object (object *op, object *container)
1839
1840object *cf_object_insert_in_ob (object *ob, object *where)
1841
1842int cf_object_teleport (object *op, maptile *map, int x, int y) 1899int cf_object_teleport (object *op, maptile *map, int x, int y)
1843 1900
1844void update_object (object *op, int action) 1901void update_object (object *op, int action)
1845 1902
1846object *cf_create_object_by_name (const char *name) 1903object *cf_create_object_by_name (const char *name)
1965void esrv_update_item (object *op, int what, object *item) 2022void esrv_update_item (object *op, int what, object *item)
1966 C_ARGS: what, op, item 2023 C_ARGS: what, op, item
1967 2024
1968void clear_los (object *op) 2025void clear_los (object *op)
1969 2026
1970int command_teleport (object *op, char *params)
1971
1972int command_summon (object *op, char *params) 2027int command_summon (object *op, char *params)
1973 2028
1974int command_arrest (object *op, char *params) 2029int command_arrest (object *op, char *params)
1975 2030
1976int command_kick (object *op, char *params) 2031int command_kick (object *op, char *params)
1997 CODE: 2052 CODE:
1998 pl->ob->stats.hp = pl->ob->stats.maxhp; 2053 pl->ob->stats.hp = pl->ob->stats.maxhp;
1999 pl->ob->stats.sp = pl->ob->stats.maxsp; 2054 pl->ob->stats.sp = pl->ob->stats.maxsp;
2000 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2055 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2001 pl->orig_stats = pl->ob->stats; 2056 pl->orig_stats = pl->ob->stats;
2002
2003player *cf_player_find (char *name)
2004 PROTOTYPE: $
2005 2057
2006void cf_player_move (player *pl, int dir) 2058void cf_player_move (player *pl, int dir)
2007 2059
2008void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2060void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2009 2061
2055 if (y) sv_to (y, pl->bed_y); 2107 if (y) sv_to (y, pl->bed_y);
2056 2108
2057void 2109void
2058list () 2110list ()
2059 PPCODE: 2111 PPCODE:
2060 for (player *pl = first_player; pl; pl = pl->next) 2112 for_all_players (pl)
2061 XPUSHs (sv_2mortal (to_sv (pl))); 2113 XPUSHs (sv_2mortal (to_sv (pl)));
2062
2063bool
2064peaceful (player *pl, bool new_setting = 0)
2065 PROTOTYPE: $;$
2066 CODE:
2067 RETVAL = pl->peaceful;
2068 if (items > 1)
2069 pl->peaceful = new_setting;
2070 OUTPUT:
2071 RETVAL
2072
2073living *
2074orig_stats (player *pl)
2075 CODE:
2076 RETVAL = &pl->orig_stats;
2077 OUTPUT: RETVAL
2078
2079living *
2080last_stats (player *pl)
2081 CODE:
2082 RETVAL = &pl->last_stats;
2083 OUTPUT: RETVAL
2084 2114
2085 2115
2086MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2116MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2087 2117
2088int invoke (maptile *map, int event, ...) 2118int invoke (maptile *map, int event, ...)
2104 PROTOTYPE: 2134 PROTOTYPE:
2105 CODE: 2135 CODE:
2106 RETVAL = new maptile; 2136 RETVAL = new maptile;
2107 OUTPUT: 2137 OUTPUT:
2108 RETVAL 2138 RETVAL
2109
2110void
2111maptile::destroy ()
2112 2139
2113void 2140void
2114maptile::players () 2141maptile::players ()
2115 PPCODE: 2142 PPCODE:
2116 if (GIMME_V == G_SCALAR) 2143 if (GIMME_V == G_SCALAR)
2121 for_all_players (pl) 2148 for_all_players (pl)
2122 if (pl->ob && pl->ob->map == THIS) 2149 if (pl->ob && pl->ob->map == THIS)
2123 PUSHs (sv_2mortal (to_sv (pl->ob))); 2150 PUSHs (sv_2mortal (to_sv (pl->ob)));
2124 } 2151 }
2125 2152
2153void
2154maptile::set_regiondata (SV *data, SV *plt)
2155 CODE:
2156{
2157 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2158 croak ("maptile::set_regiondata needs arrayref as plt arg");
2159
2160 AV *av = (AV *)SvRV (plt);
2161
2162 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2163
2164 for (int i = av_len (av) + 1; i--; )
2165 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2166
2167 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2168 THIS->regionmap = regionmap;
2169}
2170
2126void play_sound_map (maptile *map, int x, int y, int sound_num) 2171void play_sound_map (maptile *map, int x, int y, int sound_num)
2127 2172
2128int out_of_map (maptile *map, int x, int y) 2173int out_of_map (maptile *map, int x, int y)
2129 2174
2130void 2175void
2146 2191
2147object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2192object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2148 C_ARGS: str, map, nx, ny 2193 C_ARGS: str, map, nx, ny
2149 2194
2150void 2195void
2151cf_map_normalise (maptile *map, int x, int y) 2196get_map_flags (maptile *map, int x, int y)
2152 PPCODE: 2197 PPCODE:
2153{ 2198{
2154 maptile *nmap = 0; 2199 maptile *nmap = 0;
2155 I16 nx = 0, ny = 0; 2200 I16 nx = 0, ny = 0;
2156 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2201 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2211 2256
2212void fix_walls (maptile *map, int x, int y) 2257void fix_walls (maptile *map, int x, int y)
2213 2258
2214void fix_walls_around (maptile *map, int x, int y) 2259void fix_walls_around (maptile *map, int x, int y)
2215 2260
2216const char *
2217region_name (maptile *m)
2218 CODE:
2219 RETVAL = get_name_of_region_for_map (m);
2220 OUTPUT: RETVAL
2221
2222# worst xs function of my life 2261# worst xs function of my life
2223maptile * 2262bool
2224_create_random_map (\ 2263_create_random_map (\
2225 char *path,\ 2264 maptile *self,\
2226 char *wallstyle,\ 2265 char *wallstyle,\
2227 char *wall_name,\ 2266 char *wall_name,\
2228 char *floorstyle,\ 2267 char *floorstyle,\
2229 char *monsterstyle,\ 2268 char *monsterstyle,\
2230 char *treasurestyle,\ 2269 char *treasurestyle,\
2234 char *origin_map,\ 2273 char *origin_map,\
2235 char *final_map,\ 2274 char *final_map,\
2236 char *exitstyle,\ 2275 char *exitstyle,\
2237 char *this_map,\ 2276 char *this_map,\
2238 char *exit_on_final_map,\ 2277 char *exit_on_final_map,\
2239 int Xsize,\ 2278 int xsize,\
2240 int Ysize,\ 2279 int ysize,\
2241 int expand2x,\ 2280 int expand2x,\
2242 int layoutoptions1,\ 2281 int layoutoptions1,\
2243 int layoutoptions2,\ 2282 int layoutoptions2,\
2244 int layoutoptions3,\ 2283 int layoutoptions3,\
2245 int symmetry,\ 2284 int symmetry,\
2250 int dungeon_depth,\ 2289 int dungeon_depth,\
2251 int decoroptions,\ 2290 int decoroptions,\
2252 int orientation,\ 2291 int orientation,\
2253 int origin_y,\ 2292 int origin_y,\
2254 int origin_x,\ 2293 int origin_x,\
2255 int random_seed,\ 2294 U32 random_seed,\
2256 val64 total_map_hp,\ 2295 val64 total_map_hp,\
2257 int map_layout_style,\ 2296 int map_layout_style,\
2258 int treasureoptions,\ 2297 int treasureoptions,\
2259 int symmetry_used,\ 2298 int symmetry_used,\
2260 region *region\ 2299 region *region,\
2300 char *custom\
2261) 2301)
2262 CODE: 2302 CODE:
2263{ 2303{
2264 random_map_params rmp; 2304 random_map_params rmp;
2265 2305
2275 assign (rmp.exit_on_final_map, exit_on_final_map); 2315 assign (rmp.exit_on_final_map, exit_on_final_map);
2276 2316
2277 rmp.origin_map = origin_map; 2317 rmp.origin_map = origin_map;
2278 rmp.final_map = final_map; 2318 rmp.final_map = final_map;
2279 rmp.this_map = this_map; 2319 rmp.this_map = this_map;
2280 rmp.Xsize = Xsize; 2320 rmp.xsize = xsize;
2281 rmp.Ysize = Ysize; 2321 rmp.ysize = ysize;
2282 rmp.expand2x = expand2x; 2322 rmp.expand2x = expand2x;
2283 rmp.layoutoptions1 = layoutoptions1; 2323 rmp.layoutoptions1 = layoutoptions1;
2284 rmp.layoutoptions2 = layoutoptions2; 2324 rmp.layoutoptions2 = layoutoptions2;
2285 rmp.layoutoptions3 = layoutoptions3; 2325 rmp.layoutoptions3 = layoutoptions3;
2286 rmp.symmetry = symmetry; 2326 rmp.symmetry = symmetry;
2297 rmp.total_map_hp = total_map_hp; 2337 rmp.total_map_hp = total_map_hp;
2298 rmp.map_layout_style = map_layout_style; 2338 rmp.map_layout_style = map_layout_style;
2299 rmp.treasureoptions = treasureoptions; 2339 rmp.treasureoptions = treasureoptions;
2300 rmp.symmetry_used = symmetry_used; 2340 rmp.symmetry_used = symmetry_used;
2301 rmp.region = region; 2341 rmp.region = region;
2342 rmp.custom = custom;
2302 2343
2303 RETVAL = generate_random_map (path, &rmp); 2344 RETVAL = self->generate_random_map (&rmp);
2304} 2345}
2305 OUTPUT: 2346 OUTPUT:
2306 RETVAL 2347 RETVAL
2307 2348
2308MODULE = cf PACKAGE = cf::arch 2349MODULE = cf PACKAGE = cf::arch
2340 OUTPUT: RETVAL 2381 OUTPUT: RETVAL
2341 2382
2342region *find (char *name) 2383region *find (char *name)
2343 PROTOTYPE: $ 2384 PROTOTYPE: $
2344 CODE: 2385 CODE:
2345 RETVAL = get_region_by_name (name); 2386 RETVAL = region::find (name);
2346 OUTPUT: RETVAL 2387 OUTPUT: RETVAL
2347 2388
2348INCLUDE: $PERL genacc region ../include/map.h | 2389INCLUDE: $PERL genacc region ../include/map.h |
2349 2390
2350MODULE = cf PACKAGE = cf::living 2391MODULE = cf PACKAGE = cf::living
2384 char *buf = SvPVbyte (packet, len); 2425 char *buf = SvPVbyte (packet, len);
2385 2426
2386 THIS->send_packet (buf, len); 2427 THIS->send_packet (buf, len);
2387} 2428}
2388 2429
2389void
2390client::destroy ()
2391

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines