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.141 by root, Sun Jan 14 02:10:41 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 (New_Face * 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{
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, New_Face * &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_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
1595 case 5: RETVAL = settings.playerdir; break; 1605 case 5: RETVAL = settings.playerdir; break;
1596 case 6: RETVAL = settings.datadir ; break; 1606 case 6: RETVAL = settings.datadir ; break;
1597 } 1607 }
1598 OUTPUT: RETVAL 1608 OUTPUT: RETVAL
1599 1609
1610void abort ()
1611
1612void cleanup (const char *cause, bool make_core = false)
1613
1600void emergency_save () 1614void emergency_save ()
1601 1615
1602void _exit (int status = 0) 1616void _exit (int status = 0)
1617
1618#if _POSIX_MEMLOCK
1619
1620int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1621
1622int munlockall ()
1623
1624#endif
1603 1625
1604int find_animation (char *text) 1626int find_animation (char *text)
1605 PROTOTYPE: $ 1627 PROTOTYPE: $
1606 1628
1607int random_roll (int min, int max, object *op, int goodbad); 1629int random_roll (int min, int max, object *op, int goodbad);
1654 CODE: 1676 CODE:
1655 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1677 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656 OUTPUT: 1678 OUTPUT:
1657 RETVAL 1679 RETVAL
1658 1680
1659#bool 1681INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1660#destroyed (attachable *at)
1661#
1662#void
1663#destroy (attachable *at)
1664 1682
1665MODULE = cf PACKAGE = cf::global 1683MODULE = cf PACKAGE = cf::global
1666 1684
1667int invoke (SV *klass, int event, ...) 1685int invoke (SV *klass, int event, ...)
1668 CODE: 1686 CODE:
1690 PPCODE: 1708 PPCODE:
1691 EXTEND (SP, object::mortals.size ()); 1709 EXTEND (SP, object::mortals.size ());
1692 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1710 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693 PUSHs (to_sv (*i)); 1711 PUSHs (to_sv (*i));
1694 1712
1695object *first () 1713int objects_size ()
1696 CODE: 1714 CODE:
1697 RETVAL = object::first; 1715 RETVAL = objects.size ();
1716 OUTPUT: RETVAL
1717
1718object *objects (U32 index)
1719 CODE:
1720 RETVAL = index < objects.size () ? objects [index] : 0;
1721 OUTPUT: RETVAL
1722
1723int actives_size ()
1724 CODE:
1725 RETVAL = actives.size ();
1726 OUTPUT: RETVAL
1727
1728object *actives (U32 index)
1729 CODE:
1730 RETVAL = index < actives.size () ? actives [index] : 0;
1698 OUTPUT: RETVAL 1731 OUTPUT: RETVAL
1699 1732
1700# missing properties 1733# missing properties
1701 1734
1702object *head (object *op) 1735object *head (object *op)
1703 PROTOTYPE: $ 1736 PROTOTYPE: $
1704 CODE: 1737 CODE:
1705 RETVAL = op->head ? op->head : op; 1738 RETVAL = op->head_ ();
1706 OUTPUT: RETVAL 1739 OUTPUT: RETVAL
1707 1740
1708int is_head (object *op) 1741int is_head (object *op)
1709 PROTOTYPE: $ 1742 PROTOTYPE: $
1710 CODE: 1743 CODE:
1711 RETVAL = !op->head; 1744 RETVAL = op->head_ () == op;
1712 OUTPUT: RETVAL 1745 OUTPUT: RETVAL
1713 1746
1714void 1747void
1715inv (object *obj) 1748inv (object *obj)
1716 PROTOTYPE: $ 1749 PROTOTYPE: $
1913 RETVAL = op->contr; 1946 RETVAL = op->contr;
1914 OUTPUT: RETVAL 1947 OUTPUT: RETVAL
1915 1948
1916void check_score (object *op) 1949void check_score (object *op)
1917 1950
1918void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1951void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1952 CODE:
1953 new_draw_info (flags, 0, op, txt);
1919 1954
1920object *cf_player_send_inventory (object *op) 1955object *cf_player_send_inventory (object *op)
1921 1956
1922char *cf_player_get_ip (object *op) 1957char *cf_player_get_ip (object *op)
1923 ALIAS: ip = 0 1958 ALIAS: ip = 0
1936 1971
1937void esrv_update_item (object *op, int what, object *item) 1972void esrv_update_item (object *op, int what, object *item)
1938 C_ARGS: what, op, item 1973 C_ARGS: what, op, item
1939 1974
1940void clear_los (object *op) 1975void clear_los (object *op)
1941
1942int command_teleport (object *op, char *params)
1943 1976
1944int command_summon (object *op, char *params) 1977int command_summon (object *op, char *params)
1945 1978
1946int command_arrest (object *op, char *params) 1979int command_arrest (object *op, char *params)
1947 1980
1969 CODE: 2002 CODE:
1970 pl->ob->stats.hp = pl->ob->stats.maxhp; 2003 pl->ob->stats.hp = pl->ob->stats.maxhp;
1971 pl->ob->stats.sp = pl->ob->stats.maxsp; 2004 pl->ob->stats.sp = pl->ob->stats.maxsp;
1972 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2005 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973 pl->orig_stats = pl->ob->stats; 2006 pl->orig_stats = pl->ob->stats;
1974
1975player *cf_player_find (char *name)
1976 PROTOTYPE: $
1977 2007
1978void cf_player_move (player *pl, int dir) 2008void cf_player_move (player *pl, int dir)
1979 2009
1980void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2010void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981 2011
2027 if (y) sv_to (y, pl->bed_y); 2057 if (y) sv_to (y, pl->bed_y);
2028 2058
2029void 2059void
2030list () 2060list ()
2031 PPCODE: 2061 PPCODE:
2032 for (player *pl = first_player; pl; pl = pl->next) 2062 for_all_players (pl)
2033 XPUSHs (sv_2mortal (to_sv (pl))); 2063 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 2064
2057 2065
2058MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2066MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059 2067
2060int invoke (maptile *map, int event, ...) 2068int invoke (maptile *map, int event, ...)
2076 PROTOTYPE: 2084 PROTOTYPE:
2077 CODE: 2085 CODE:
2078 RETVAL = new maptile; 2086 RETVAL = new maptile;
2079 OUTPUT: 2087 OUTPUT:
2080 RETVAL 2088 RETVAL
2081
2082void
2083maptile::destroy ()
2084 2089
2085void 2090void
2086maptile::players () 2091maptile::players ()
2087 PPCODE: 2092 PPCODE:
2088 if (GIMME_V == G_SCALAR) 2093 if (GIMME_V == G_SCALAR)
2118 2123
2119object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2124object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2120 C_ARGS: str, map, nx, ny 2125 C_ARGS: str, map, nx, ny
2121 2126
2122void 2127void
2123cf_map_normalise (maptile *map, int x, int y) 2128get_map_flags (maptile *map, int x, int y)
2124 PPCODE: 2129 PPCODE:
2125{ 2130{
2126 maptile *nmap = 0; 2131 maptile *nmap = 0;
2127 I16 nx = 0, ny = 0; 2132 I16 nx = 0, ny = 0;
2128 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2133 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2177 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2182 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; 2183 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; 2184 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; 2185 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181 } 2186 }
2182 OUTPUT: 2187 OUTPUT: RETVAL
2183 RETVAL
2184 2188
2185void fix_walls (maptile *map, int x, int y) 2189void fix_walls (maptile *map, int x, int y)
2186 2190
2187void fix_walls_around (maptile *map, int x, int y) 2191void fix_walls_around (maptile *map, int x, int y)
2188 2192
2193const char *
2194region_name (maptile *m)
2195 CODE:
2196 RETVAL = get_name_of_region_for_map (m);
2197 OUTPUT: RETVAL
2198
2189# worst xs function of my life 2199# worst xs function of my life
2190maptile * 2200bool
2191_create_random_map (\ 2201_create_random_map (\
2192 char *path,\ 2202 maptile *self,\
2193 char *wallstyle,\ 2203 char *wallstyle,\
2194 char *wall_name,\ 2204 char *wall_name,\
2195 char *floorstyle,\ 2205 char *floorstyle,\
2196 char *monsterstyle,\ 2206 char *monsterstyle,\
2197 char *treasurestyle,\ 2207 char *treasurestyle,\
2222 int random_seed,\ 2232 int random_seed,\
2223 val64 total_map_hp,\ 2233 val64 total_map_hp,\
2224 int map_layout_style,\ 2234 int map_layout_style,\
2225 int treasureoptions,\ 2235 int treasureoptions,\
2226 int symmetry_used,\ 2236 int symmetry_used,\
2227 region *region\ 2237 region *region,\
2238 char *custom\
2228) 2239)
2229 CODE: 2240 CODE:
2230{ 2241{
2231 random_map_params rmp; 2242 random_map_params rmp;
2232 2243
2236 assign (rmp.monsterstyle , monsterstyle); 2247 assign (rmp.monsterstyle , monsterstyle);
2237 assign (rmp.treasurestyle , treasurestyle); 2248 assign (rmp.treasurestyle , treasurestyle);
2238 assign (rmp.layoutstyle , layoutstyle); 2249 assign (rmp.layoutstyle , layoutstyle);
2239 assign (rmp.doorstyle , doorstyle); 2250 assign (rmp.doorstyle , doorstyle);
2240 assign (rmp.decorstyle , decorstyle); 2251 assign (rmp.decorstyle , decorstyle);
2241 assign (rmp.origin_map , origin_map);
2242 assign (rmp.final_map , final_map);
2243 assign (rmp.exitstyle , exitstyle); 2252 assign (rmp.exitstyle , exitstyle);
2244 assign (rmp.this_map , this_map);
2245 assign (rmp.exit_on_final_map, exit_on_final_map); 2253 assign (rmp.exit_on_final_map, exit_on_final_map);
2246 2254
2255 rmp.origin_map = origin_map;
2256 rmp.final_map = final_map;
2257 rmp.this_map = this_map;
2247 rmp.Xsize = Xsize; 2258 rmp.Xsize = Xsize;
2248 rmp.Ysize = Ysize; 2259 rmp.Ysize = Ysize;
2249 rmp.expand2x = expand2x; 2260 rmp.expand2x = expand2x;
2250 rmp.layoutoptions1 = layoutoptions1; 2261 rmp.layoutoptions1 = layoutoptions1;
2251 rmp.layoutoptions2 = layoutoptions2; 2262 rmp.layoutoptions2 = layoutoptions2;
2264 rmp.total_map_hp = total_map_hp; 2275 rmp.total_map_hp = total_map_hp;
2265 rmp.map_layout_style = map_layout_style; 2276 rmp.map_layout_style = map_layout_style;
2266 rmp.treasureoptions = treasureoptions; 2277 rmp.treasureoptions = treasureoptions;
2267 rmp.symmetry_used = symmetry_used; 2278 rmp.symmetry_used = symmetry_used;
2268 rmp.region = region; 2279 rmp.region = region;
2280 rmp.custom = custom;
2269 2281
2270 RETVAL = generate_random_map (path, &rmp); 2282 RETVAL = self->generate_random_map (&rmp);
2271} 2283}
2272 OUTPUT: 2284 OUTPUT:
2273 RETVAL 2285 RETVAL
2274 2286
2275MODULE = cf PACKAGE = cf::arch 2287MODULE = cf PACKAGE = cf::arch
2298 2310
2299INCLUDE: $PERL genacc partylist ../include/player.h | 2311INCLUDE: $PERL genacc partylist ../include/player.h |
2300 2312
2301MODULE = cf PACKAGE = cf::region 2313MODULE = cf PACKAGE = cf::region
2302 2314
2303region *first () 2315region *first ()
2304 PROTOTYPE: 2316 PROTOTYPE:
2305 CODE: 2317 CODE:
2306 RETVAL = first_region; 2318 RETVAL = first_region;
2319 OUTPUT: RETVAL
2320
2321region *find (char *name)
2322 PROTOTYPE: $
2323 CODE:
2324 RETVAL = get_region_by_name (name);
2307 OUTPUT: RETVAL 2325 OUTPUT: RETVAL
2308 2326
2309INCLUDE: $PERL genacc region ../include/map.h | 2327INCLUDE: $PERL genacc region ../include/map.h |
2310 2328
2311MODULE = cf PACKAGE = cf::living 2329MODULE = cf PACKAGE = cf::living
2345 char *buf = SvPVbyte (packet, len); 2363 char *buf = SvPVbyte (packet, len);
2346 2364
2347 THIS->send_packet (buf, len); 2365 THIS->send_packet (buf, len);
2348} 2366}
2349 2367
2350void
2351client::destroy ()
2352

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines