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.147 by root, Sat Jan 20 22:09:54 2007 UTC

32#include <sproto.h> 32#include <sproto.h>
33 33
34#include "cfperl.h" 34#include "cfperl.h"
35#include "shstr.h" 35#include "shstr.h"
36 36
37#include <unistd.h>
38#if _POSIX_MEMLOCK
39# include <sys/mman.h>
40#endif
41
37#include <EXTERN.h> 42#include <EXTERN.h>
38#include <perl.h> 43#include <perl.h>
39#include <XSUB.h> 44#include <XSUB.h>
40 45
41#include "CoroAPI.h" 46#include "CoroAPI.h"
94 99
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 100//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96 101
97unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
98 103
99#if 0
100attachable *attachable::rc_first;
101
102attachable::attachable ()
103{
104 refcnt = 0;
105 rc_next = rc_first;
106 rc_first = this;
107}
108#endif
109
110attachable::~attachable () 104attachable::~attachable ()
111{ 105{
112 assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113#if 0
114 assert (!rc_next);
115 assert (!refcnt); 106 assert (!self);
116#endif 107}
108
109int
110attachable::refcnt_cnt () const
111{
112 return refcnt + (self ? SvREFCNT (self) : 0);
113}
114
115void
116attachable::optimise ()
117{
118 if (self
119 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self))
121 {
122 refcnt_inc ();
123 SvREFCNT_dec ((SV *)self);
124 }
117} 125}
118 126
119// check wether the object really is dead 127// check wether the object really is dead
120void 128void
121attachable::do_check () 129attachable::do_check ()
122{ 130{
123 if (refcnt > 0) 131 if (refcnt > 0 || refcnt_cnt () > 0)
124 return; 132 return;
125 133
126 // try to unborrow the refcnt from perl 134 destroy ();
127 if (flags & F_BORROWED) 135
136 if (self)
128 { 137 {
129 assert (self);//D//TODO//remove when stable 138 hv_clear (self);
130 flags &= ~F_BORROWED; 139 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
131 refcnt_inc ();
132 SvREFCNT_dec (self); 140 SvREFCNT_dec (self);
141 self = 0;
133 } 142 }
134
135 if (refcnt > 0 || self)
136 return;
137
138 destroy ();
139} 143}
140 144
141void 145void
142attachable::do_destroy () 146attachable::do_destroy ()
143{ 147{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END); 148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145 149
146 //TODO: call generic destroy callback 150 if (self)
151 hv_clear (self);
152
147 mortals.push_back (this); 153 mortals.push_back (this);
148} 154}
149 155
150void 156void
151attachable::destroy () 157attachable::destroy ()
155 161
156 flags |= F_DESTROYED; 162 flags |= F_DESTROYED;
157 do_destroy (); 163 do_destroy ();
158} 164}
159 165
166void
160void attachable::check_mortals () 167attachable::check_mortals ()
161{ 168{
162 for (int i = 0; i < mortals.size (); ) 169 for (int i = 0; i < mortals.size (); )
163 { 170 {
164 attachable *obj = mortals [i]; 171 attachable *obj = mortals [i];
165 172
209 216
210static int 217static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 218attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 219{
213 attachable *at = (attachable *)mg->mg_ptr; 220 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable
215 at->self = 0; 221 at->self = 0;
216 // next line makes sense, but most objects still have refcnt 0 by default 222 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 223 //at->refcnt_chk ();
218 return 0; 224 return 0;
219} 225}
230 { 236 {
231 obj->self = newHV (); 237 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 238 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 239
234 // borrow the refcnt from the object 240 // borrow the refcnt from the object
235 obj->flags |= attachable::F_BORROWED; 241 // it is important thta no refcnt_chk is being executed here
236 obj->refcnt_dec (); 242 obj->refcnt_dec ();
243
244 // now bless the object _once_
245 return sv_bless (newRV_inc ((SV *)obj->self), stash);
237 } 246 }
247 else
248 {
249 SV *sv = newRV_inc ((SV *)obj->self);
238 250
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 251 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
252 SvAMAGIC_on (sv);
253
254 return sv;
255 }
240} 256}
241 257
242static void 258static void
243clearSVptr (SV *sv) 259clearSVptr (SV *sv)
244{ 260{
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 313inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 314
299inline SV *to_sv (object & v) { return to_sv (&v); } 315inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 316inline SV *to_sv (living & v) { return to_sv (&v); }
301 317
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 318inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 319inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 320
306inline SV *to_sv (UUID v) 321inline SV *to_sv (UUID v)
307{ 322{
308 char buf[128]; 323 char buf[128];
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 343inline 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"); } 344inline 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"); } 345inline 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"); } 346inline 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"); } 347inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
348inline 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"); } 349inline 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"); } 350inline 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"); } 351inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 352
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 353inline 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 354inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 355
340template<class T> 356template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 357inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 358
343template<int N> 359template<int N>
478{ 494{
479 if (!ext->cb) 495 if (!ext->cb)
480 ext->cb = newAV (); 496 ext->cb = newAV ();
481 497
482 return newRV_inc ((SV *)ext->cb); 498 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} 499}
521 500
522///////////////////////////////////////////////////////////////////////////// 501/////////////////////////////////////////////////////////////////////////////
523 502
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 503extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
820} 799}
821 800
822///////////////////////////////////////////////////////////////////////////// 801/////////////////////////////////////////////////////////////////////////////
823 802
824void 803void
825maptile::emergency_save () 804cfperl_emergency_save ()
826{ 805{
827 CALL_BEGIN (0); 806 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 807 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 808 CALL_END;
830} 809}
831 810
832maptile * 811maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 812maptile::find_sync (const char *path, maptile *origin)
834{ 813{
835 CALL_BEGIN (2); 814 CALL_BEGIN (2);
836 CALL_ARG (path); 815 CALL_ARG (path);
837 CALL_ARG (origin); 816 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 817 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 818
840 maptile *retval; 819 maptile *retval;
841 820
842 if (count) 821 if (count)
843 sv_to (POPs, retval); 822 sv_to (POPs, retval);
845 retval = 0; 824 retval = 0;
846 825
847 CALL_END; 826 CALL_END;
848 827
849 return retval; 828 return retval;
829}
830
831maptile *
832maptile::find_async (const char *path, maptile *origin)
833{
834 CALL_BEGIN (2);
835 CALL_ARG (path);
836 CALL_ARG (origin);
837 CALL_CALL ("cf::map::find_async", G_SCALAR);
838
839 maptile *retval;
840
841 if (count)
842 sv_to (POPs, retval);
843 else
844 retval = 0;
845
846 CALL_END;
847
848 return retval;
849}
850
851void
852maptile::do_load_sync ()
853{
854 CALL_BEGIN (1);
855 CALL_ARG (this);
856 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
857 CALL_END;
850} 858}
851 859
852void 860void
853maptile::change_all_map_light (int change) 861maptile::change_all_map_light (int change)
854{ 862{
873 881
874///////////////////////////////////////////////////////////////////////////// 882/////////////////////////////////////////////////////////////////////////////
875 883
876struct EventAPI *watcher_base::GEventAPI; 884struct EventAPI *watcher_base::GEventAPI;
877struct CoroAPI *coroapi::GCoroAPI; 885struct CoroAPI *coroapi::GCoroAPI;
886
887int coroapi::cede_counter;
878 888
879static void iw_dispatch (pe_event *ev) 889static void iw_dispatch (pe_event *ev)
880{ 890{
881 iw *w = (iw *)ev->ext_data; 891 iw *w = (iw *)ev->ext_data;
882 w->call (*w); 892 w->call (*w);
1237 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1247 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238 const_iv (FLAG_IS_WATER) 1248 const_iv (FLAG_IS_WATER)
1239 const_iv (FLAG_CONTENT_ON_GEN) 1249 const_iv (FLAG_CONTENT_ON_GEN)
1240 const_iv (FLAG_IS_A_TEMPLATE) 1250 const_iv (FLAG_IS_A_TEMPLATE)
1241 const_iv (FLAG_IS_BUILDABLE) 1251 const_iv (FLAG_IS_BUILDABLE)
1252 const_iv (FLAG_DESTROY_ON_DEATH)
1253 const_iv (FLAG_NO_MAP_SAVE)
1242 1254
1243 const_iv (NDI_BLACK) 1255 const_iv (NDI_BLACK)
1244 const_iv (NDI_WHITE) 1256 const_iv (NDI_WHITE)
1245 const_iv (NDI_NAVY) 1257 const_iv (NDI_NAVY)
1246 const_iv (NDI_RED) 1258 const_iv (NDI_RED)
1288 const_iv (P_BLOCKSVIEW) 1300 const_iv (P_BLOCKSVIEW)
1289 const_iv (P_PLAYER) 1301 const_iv (P_PLAYER)
1290 const_iv (P_NO_MAGIC) 1302 const_iv (P_NO_MAGIC)
1291 const_iv (P_IS_ALIVE) 1303 const_iv (P_IS_ALIVE)
1292 const_iv (P_NO_CLERIC) 1304 const_iv (P_NO_CLERIC)
1293 const_iv (P_NEED_UPDATE)
1294 const_iv (P_OUT_OF_MAP) 1305 const_iv (P_OUT_OF_MAP)
1295 const_iv (P_NEW_MAP) 1306 const_iv (P_NEW_MAP)
1307 const_iv (P_UPTODATE)
1296 1308
1297 const_iv (UP_OBJ_INSERT) 1309 const_iv (UP_OBJ_INSERT)
1298 const_iv (UP_OBJ_REMOVE) 1310 const_iv (UP_OBJ_REMOVE)
1299 const_iv (UP_OBJ_CHANGE) 1311 const_iv (UP_OBJ_CHANGE)
1300 const_iv (UP_OBJ_FACE) 1312 const_iv (UP_OBJ_FACE)
1459 const_iv (ST_SETUP) 1471 const_iv (ST_SETUP)
1460 const_iv (ST_PLAYING) 1472 const_iv (ST_PLAYING)
1461 const_iv (ST_CUSTOM) 1473 const_iv (ST_CUSTOM)
1462 1474
1463 const_iv (ST_CHANGE_CLASS) 1475 const_iv (ST_CHANGE_CLASS)
1464 const_iv (ST_CONFIRM_QUIT)
1465 const_iv (ST_GET_PARTY_PASSWORD)
1466 1476
1467 const_iv (IO_HEADER) 1477 const_iv (IO_HEADER)
1468 const_iv (IO_OBJECTS) 1478 const_iv (IO_OBJECTS)
1469 const_iv (IO_UNIQUES) 1479 const_iv (IO_UNIQUES)
1470 1480
1524 1534
1525void _global_reattach () 1535void _global_reattach ()
1526 CODE: 1536 CODE:
1527{ 1537{
1528 // reattach to all attachable objects in the game. 1538 // reattach to all attachable objects in the game.
1529 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1539 for_all_clients (ns)
1530 (*i)->reattach (); 1540 ns->reattach ();
1531 1541
1532 for_all_players (pl) 1542 for_all_players (pl)
1533 pl->reattach (); 1543 pl->reattach ();
1534 1544
1535 //TODO 1545 //TODO
1536 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1546 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537 // i->second->reattach (); 1547 // i->second->reattach ();
1538 1548
1539 for (object *op = object::first; op; op = op->next) 1549 for_all_objects (op)
1540 op->reattach (); 1550 op->reattach ();
1541} 1551}
1542 1552
1543NV floor (NV x) 1553NV floor (NV x)
1544 1554
1545NV ceil (NV x) 1555NV ceil (NV x)
1556
1557NV rndm (...)
1558 CODE:
1559 switch (items)
1560 {
1561 case 0: RETVAL = rndm (); break;
1562 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1563 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1564 default: croak ("cf::rndm requires none, one or two parameters."); break;
1565 }
1566 OUTPUT:
1567 RETVAL
1546 1568
1547void server_tick () 1569void server_tick ()
1548 CODE: 1570 CODE:
1549 runtime = SvNVx (sv_runtime); 1571 runtime = SvNVx (sv_runtime);
1550 server_tick (); 1572 server_tick ();
1595 case 5: RETVAL = settings.playerdir; break; 1617 case 5: RETVAL = settings.playerdir; break;
1596 case 6: RETVAL = settings.datadir ; break; 1618 case 6: RETVAL = settings.datadir ; break;
1597 } 1619 }
1598 OUTPUT: RETVAL 1620 OUTPUT: RETVAL
1599 1621
1622void abort ()
1623
1624void fork_abort (char *cause = "cf::fork_abort")
1625
1626void cleanup (const char *cause, bool make_core = false)
1627
1600void emergency_save () 1628void emergency_save ()
1601 1629
1602void _exit (int status = 0) 1630void _exit (int status = 0)
1631
1632#if _POSIX_MEMLOCK
1633
1634int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1635
1636int munlockall ()
1637
1638#endif
1603 1639
1604int find_animation (char *text) 1640int find_animation (char *text)
1605 PROTOTYPE: $ 1641 PROTOTYPE: $
1606 1642
1607int random_roll (int min, int max, object *op, int goodbad); 1643int random_roll (int min, int max, object *op, int goodbad);
1654 CODE: 1690 CODE:
1655 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1691 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656 OUTPUT: 1692 OUTPUT:
1657 RETVAL 1693 RETVAL
1658 1694
1659#bool 1695INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1660#destroyed (attachable *at)
1661#
1662#void
1663#destroy (attachable *at)
1664 1696
1665MODULE = cf PACKAGE = cf::global 1697MODULE = cf PACKAGE = cf::global
1666 1698
1667int invoke (SV *klass, int event, ...) 1699int invoke (SV *klass, int event, ...)
1668 CODE: 1700 CODE:
1690 PPCODE: 1722 PPCODE:
1691 EXTEND (SP, object::mortals.size ()); 1723 EXTEND (SP, object::mortals.size ());
1692 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1724 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693 PUSHs (to_sv (*i)); 1725 PUSHs (to_sv (*i));
1694 1726
1695object *first () 1727int objects_size ()
1696 CODE: 1728 CODE:
1697 RETVAL = object::first; 1729 RETVAL = objects.size ();
1730 OUTPUT: RETVAL
1731
1732object *objects (U32 index)
1733 CODE:
1734 RETVAL = index < objects.size () ? objects [index] : 0;
1735 OUTPUT: RETVAL
1736
1737int actives_size ()
1738 CODE:
1739 RETVAL = actives.size ();
1740 OUTPUT: RETVAL
1741
1742object *actives (U32 index)
1743 CODE:
1744 RETVAL = index < actives.size () ? actives [index] : 0;
1698 OUTPUT: RETVAL 1745 OUTPUT: RETVAL
1699 1746
1700# missing properties 1747# missing properties
1701 1748
1702object *head (object *op) 1749object *head (object *op)
1703 PROTOTYPE: $ 1750 PROTOTYPE: $
1704 CODE: 1751 CODE:
1705 RETVAL = op->head ? op->head : op; 1752 RETVAL = op->head_ ();
1706 OUTPUT: RETVAL 1753 OUTPUT: RETVAL
1707 1754
1708int is_head (object *op) 1755int is_head (object *op)
1709 PROTOTYPE: $ 1756 PROTOTYPE: $
1710 CODE: 1757 CODE:
1711 RETVAL = !op->head; 1758 RETVAL = op->head_ () == op;
1712 OUTPUT: RETVAL 1759 OUTPUT: RETVAL
1713 1760
1714void 1761void
1715inv (object *obj) 1762inv (object *obj)
1716 PROTOTYPE: $ 1763 PROTOTYPE: $
1807 1854
1808void drop (object *who, object *op) 1855void drop (object *who, object *op)
1809 1856
1810void pick_up (object *who, object *op) 1857void pick_up (object *who, object *op)
1811 1858
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) 1859int cf_object_teleport (object *op, maptile *map, int x, int y)
1817 1860
1818void update_object (object *op, int action) 1861void update_object (object *op, int action)
1819 1862
1820object *cf_create_object_by_name (const char *name) 1863object *cf_create_object_by_name (const char *name)
1913 RETVAL = op->contr; 1956 RETVAL = op->contr;
1914 OUTPUT: RETVAL 1957 OUTPUT: RETVAL
1915 1958
1916void check_score (object *op) 1959void check_score (object *op)
1917 1960
1918void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1961void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1962 CODE:
1963 new_draw_info (flags, 0, op, txt);
1919 1964
1920object *cf_player_send_inventory (object *op) 1965object *cf_player_send_inventory (object *op)
1921 1966
1922char *cf_player_get_ip (object *op) 1967char *cf_player_get_ip (object *op)
1923 ALIAS: ip = 0 1968 ALIAS: ip = 0
1936 1981
1937void esrv_update_item (object *op, int what, object *item) 1982void esrv_update_item (object *op, int what, object *item)
1938 C_ARGS: what, op, item 1983 C_ARGS: what, op, item
1939 1984
1940void clear_los (object *op) 1985void clear_los (object *op)
1941
1942int command_teleport (object *op, char *params)
1943 1986
1944int command_summon (object *op, char *params) 1987int command_summon (object *op, char *params)
1945 1988
1946int command_arrest (object *op, char *params) 1989int command_arrest (object *op, char *params)
1947 1990
1969 CODE: 2012 CODE:
1970 pl->ob->stats.hp = pl->ob->stats.maxhp; 2013 pl->ob->stats.hp = pl->ob->stats.maxhp;
1971 pl->ob->stats.sp = pl->ob->stats.maxsp; 2014 pl->ob->stats.sp = pl->ob->stats.maxsp;
1972 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2015 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973 pl->orig_stats = pl->ob->stats; 2016 pl->orig_stats = pl->ob->stats;
1974
1975player *cf_player_find (char *name)
1976 PROTOTYPE: $
1977 2017
1978void cf_player_move (player *pl, int dir) 2018void cf_player_move (player *pl, int dir)
1979 2019
1980void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2020void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981 2021
2027 if (y) sv_to (y, pl->bed_y); 2067 if (y) sv_to (y, pl->bed_y);
2028 2068
2029void 2069void
2030list () 2070list ()
2031 PPCODE: 2071 PPCODE:
2032 for (player *pl = first_player; pl; pl = pl->next) 2072 for_all_players (pl)
2033 XPUSHs (sv_2mortal (to_sv (pl))); 2073 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 2074
2057 2075
2058MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2076MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059 2077
2060int invoke (maptile *map, int event, ...) 2078int invoke (maptile *map, int event, ...)
2076 PROTOTYPE: 2094 PROTOTYPE:
2077 CODE: 2095 CODE:
2078 RETVAL = new maptile; 2096 RETVAL = new maptile;
2079 OUTPUT: 2097 OUTPUT:
2080 RETVAL 2098 RETVAL
2081
2082void
2083maptile::destroy ()
2084 2099
2085void 2100void
2086maptile::players () 2101maptile::players ()
2087 PPCODE: 2102 PPCODE:
2088 if (GIMME_V == G_SCALAR) 2103 if (GIMME_V == G_SCALAR)
2118 2133
2119object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2134object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2120 C_ARGS: str, map, nx, ny 2135 C_ARGS: str, map, nx, ny
2121 2136
2122void 2137void
2123cf_map_normalise (maptile *map, int x, int y) 2138get_map_flags (maptile *map, int x, int y)
2124 PPCODE: 2139 PPCODE:
2125{ 2140{
2126 maptile *nmap = 0; 2141 maptile *nmap = 0;
2127 I16 nx = 0, ny = 0; 2142 I16 nx = 0, ny = 0;
2128 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2143 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2177 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2192 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; 2193 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; 2194 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; 2195 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181 } 2196 }
2182 OUTPUT: 2197 OUTPUT: RETVAL
2183 RETVAL
2184 2198
2185void fix_walls (maptile *map, int x, int y) 2199void fix_walls (maptile *map, int x, int y)
2186 2200
2187void fix_walls_around (maptile *map, int x, int y) 2201void fix_walls_around (maptile *map, int x, int y)
2188 2202
2203const char *
2204region_name (maptile *m)
2205 CODE:
2206 RETVAL = get_name_of_region_for_map (m);
2207 OUTPUT: RETVAL
2208
2189# worst xs function of my life 2209# worst xs function of my life
2190maptile * 2210bool
2191_create_random_map (\ 2211_create_random_map (\
2192 char *path,\ 2212 maptile *self,\
2193 char *wallstyle,\ 2213 char *wallstyle,\
2194 char *wall_name,\ 2214 char *wall_name,\
2195 char *floorstyle,\ 2215 char *floorstyle,\
2196 char *monsterstyle,\ 2216 char *monsterstyle,\
2197 char *treasurestyle,\ 2217 char *treasurestyle,\
2201 char *origin_map,\ 2221 char *origin_map,\
2202 char *final_map,\ 2222 char *final_map,\
2203 char *exitstyle,\ 2223 char *exitstyle,\
2204 char *this_map,\ 2224 char *this_map,\
2205 char *exit_on_final_map,\ 2225 char *exit_on_final_map,\
2206 int Xsize,\ 2226 int xsize,\
2207 int Ysize,\ 2227 int ysize,\
2208 int expand2x,\ 2228 int expand2x,\
2209 int layoutoptions1,\ 2229 int layoutoptions1,\
2210 int layoutoptions2,\ 2230 int layoutoptions2,\
2211 int layoutoptions3,\ 2231 int layoutoptions3,\
2212 int symmetry,\ 2232 int symmetry,\
2217 int dungeon_depth,\ 2237 int dungeon_depth,\
2218 int decoroptions,\ 2238 int decoroptions,\
2219 int orientation,\ 2239 int orientation,\
2220 int origin_y,\ 2240 int origin_y,\
2221 int origin_x,\ 2241 int origin_x,\
2222 int random_seed,\ 2242 U32 random_seed,\
2223 val64 total_map_hp,\ 2243 val64 total_map_hp,\
2224 int map_layout_style,\ 2244 int map_layout_style,\
2225 int treasureoptions,\ 2245 int treasureoptions,\
2226 int symmetry_used,\ 2246 int symmetry_used,\
2227 region *region\ 2247 region *region,\
2248 char *custom\
2228) 2249)
2229 CODE: 2250 CODE:
2230{ 2251{
2231 random_map_params rmp; 2252 random_map_params rmp;
2232 2253
2236 assign (rmp.monsterstyle , monsterstyle); 2257 assign (rmp.monsterstyle , monsterstyle);
2237 assign (rmp.treasurestyle , treasurestyle); 2258 assign (rmp.treasurestyle , treasurestyle);
2238 assign (rmp.layoutstyle , layoutstyle); 2259 assign (rmp.layoutstyle , layoutstyle);
2239 assign (rmp.doorstyle , doorstyle); 2260 assign (rmp.doorstyle , doorstyle);
2240 assign (rmp.decorstyle , decorstyle); 2261 assign (rmp.decorstyle , decorstyle);
2241 assign (rmp.origin_map , origin_map);
2242 assign (rmp.final_map , final_map);
2243 assign (rmp.exitstyle , exitstyle); 2262 assign (rmp.exitstyle , exitstyle);
2244 assign (rmp.this_map , this_map);
2245 assign (rmp.exit_on_final_map, exit_on_final_map); 2263 assign (rmp.exit_on_final_map, exit_on_final_map);
2246 2264
2265 rmp.origin_map = origin_map;
2266 rmp.final_map = final_map;
2267 rmp.this_map = this_map;
2247 rmp.Xsize = Xsize; 2268 rmp.xsize = xsize;
2248 rmp.Ysize = Ysize; 2269 rmp.ysize = ysize;
2249 rmp.expand2x = expand2x; 2270 rmp.expand2x = expand2x;
2250 rmp.layoutoptions1 = layoutoptions1; 2271 rmp.layoutoptions1 = layoutoptions1;
2251 rmp.layoutoptions2 = layoutoptions2; 2272 rmp.layoutoptions2 = layoutoptions2;
2252 rmp.layoutoptions3 = layoutoptions3; 2273 rmp.layoutoptions3 = layoutoptions3;
2253 rmp.symmetry = symmetry; 2274 rmp.symmetry = symmetry;
2264 rmp.total_map_hp = total_map_hp; 2285 rmp.total_map_hp = total_map_hp;
2265 rmp.map_layout_style = map_layout_style; 2286 rmp.map_layout_style = map_layout_style;
2266 rmp.treasureoptions = treasureoptions; 2287 rmp.treasureoptions = treasureoptions;
2267 rmp.symmetry_used = symmetry_used; 2288 rmp.symmetry_used = symmetry_used;
2268 rmp.region = region; 2289 rmp.region = region;
2290 rmp.custom = custom;
2269 2291
2270 RETVAL = generate_random_map (path, &rmp); 2292 RETVAL = self->generate_random_map (&rmp);
2271} 2293}
2272 OUTPUT: 2294 OUTPUT:
2273 RETVAL 2295 RETVAL
2274 2296
2275MODULE = cf PACKAGE = cf::arch 2297MODULE = cf PACKAGE = cf::arch
2298 2320
2299INCLUDE: $PERL genacc partylist ../include/player.h | 2321INCLUDE: $PERL genacc partylist ../include/player.h |
2300 2322
2301MODULE = cf PACKAGE = cf::region 2323MODULE = cf PACKAGE = cf::region
2302 2324
2303region *first () 2325region *first ()
2304 PROTOTYPE: 2326 PROTOTYPE:
2305 CODE: 2327 CODE:
2306 RETVAL = first_region; 2328 RETVAL = first_region;
2329 OUTPUT: RETVAL
2330
2331region *find (char *name)
2332 PROTOTYPE: $
2333 CODE:
2334 RETVAL = get_region_by_name (name);
2307 OUTPUT: RETVAL 2335 OUTPUT: RETVAL
2308 2336
2309INCLUDE: $PERL genacc region ../include/map.h | 2337INCLUDE: $PERL genacc region ../include/map.h |
2310 2338
2311MODULE = cf PACKAGE = cf::living 2339MODULE = cf PACKAGE = cf::living
2345 char *buf = SvPVbyte (packet, len); 2373 char *buf = SvPVbyte (packet, len);
2346 2374
2347 THIS->send_packet (buf, len); 2375 THIS->send_packet (buf, len);
2348} 2376}
2349 2377
2350void
2351client::destroy ()
2352

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines