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.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.145 by root, Fri Jan 19 18:06:51 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{
1239 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1247 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240 const_iv (FLAG_IS_WATER) 1248 const_iv (FLAG_IS_WATER)
1241 const_iv (FLAG_CONTENT_ON_GEN) 1249 const_iv (FLAG_CONTENT_ON_GEN)
1242 const_iv (FLAG_IS_A_TEMPLATE) 1250 const_iv (FLAG_IS_A_TEMPLATE)
1243 const_iv (FLAG_IS_BUILDABLE) 1251 const_iv (FLAG_IS_BUILDABLE)
1252 const_iv (FLAG_DESTROY_ON_DEATH)
1253 const_iv (FLAG_NO_SAVE)
1244 1254
1245 const_iv (NDI_BLACK) 1255 const_iv (NDI_BLACK)
1246 const_iv (NDI_WHITE) 1256 const_iv (NDI_WHITE)
1247 const_iv (NDI_NAVY) 1257 const_iv (NDI_NAVY)
1248 const_iv (NDI_RED) 1258 const_iv (NDI_RED)
1461 const_iv (ST_SETUP) 1471 const_iv (ST_SETUP)
1462 const_iv (ST_PLAYING) 1472 const_iv (ST_PLAYING)
1463 const_iv (ST_CUSTOM) 1473 const_iv (ST_CUSTOM)
1464 1474
1465 const_iv (ST_CHANGE_CLASS) 1475 const_iv (ST_CHANGE_CLASS)
1466 const_iv (ST_CONFIRM_QUIT)
1467 const_iv (ST_GET_PARTY_PASSWORD)
1468 1476
1469 const_iv (IO_HEADER) 1477 const_iv (IO_HEADER)
1470 const_iv (IO_OBJECTS) 1478 const_iv (IO_OBJECTS)
1471 const_iv (IO_UNIQUES) 1479 const_iv (IO_UNIQUES)
1472 1480
1526 1534
1527void _global_reattach () 1535void _global_reattach ()
1528 CODE: 1536 CODE:
1529{ 1537{
1530 // reattach to all attachable objects in the game. 1538 // reattach to all attachable objects in the game.
1531 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1539 for_all_clients (ns)
1532 (*i)->reattach (); 1540 ns->reattach ();
1533 1541
1534 for_all_players (pl) 1542 for_all_players (pl)
1535 pl->reattach (); 1543 pl->reattach ();
1536 1544
1537 //TODO 1545 //TODO
1538 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1546 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539 // i->second->reattach (); 1547 // i->second->reattach ();
1540 1548
1541 for (object *op = object::first; op; op = op->next) 1549 for_all_objects (op)
1542 op->reattach (); 1550 op->reattach ();
1543} 1551}
1544 1552
1545NV floor (NV x) 1553NV floor (NV x)
1546 1554
1547NV 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
1548 1568
1549void server_tick () 1569void server_tick ()
1550 CODE: 1570 CODE:
1551 runtime = SvNVx (sv_runtime); 1571 runtime = SvNVx (sv_runtime);
1552 server_tick (); 1572 server_tick ();
1599 } 1619 }
1600 OUTPUT: RETVAL 1620 OUTPUT: RETVAL
1601 1621
1602void abort () 1622void abort ()
1603 1623
1624void fork_abort (char *cause = "cf::fork_abort")
1625
1626void cleanup (const char *cause, bool make_core = false)
1627
1604void emergency_save () 1628void emergency_save ()
1605 1629
1606void _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
1607 1639
1608int find_animation (char *text) 1640int find_animation (char *text)
1609 PROTOTYPE: $ 1641 PROTOTYPE: $
1610 1642
1611int random_roll (int min, int max, object *op, int goodbad); 1643int random_roll (int min, int max, object *op, int goodbad);
1658 CODE: 1690 CODE:
1659 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1691 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660 OUTPUT: 1692 OUTPUT:
1661 RETVAL 1693 RETVAL
1662 1694
1663#bool 1695INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1664#destroyed (attachable *at)
1665#
1666#void
1667#destroy (attachable *at)
1668 1696
1669MODULE = cf PACKAGE = cf::global 1697MODULE = cf PACKAGE = cf::global
1670 1698
1671int invoke (SV *klass, int event, ...) 1699int invoke (SV *klass, int event, ...)
1672 CODE: 1700 CODE:
1694 PPCODE: 1722 PPCODE:
1695 EXTEND (SP, object::mortals.size ()); 1723 EXTEND (SP, object::mortals.size ());
1696 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1724 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697 PUSHs (to_sv (*i)); 1725 PUSHs (to_sv (*i));
1698 1726
1699object *first () 1727int objects_size ()
1700 CODE: 1728 CODE:
1701 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;
1702 OUTPUT: RETVAL 1745 OUTPUT: RETVAL
1703 1746
1704# missing properties 1747# missing properties
1705 1748
1706object *head (object *op) 1749object *head (object *op)
1707 PROTOTYPE: $ 1750 PROTOTYPE: $
1708 CODE: 1751 CODE:
1709 RETVAL = op->head ? op->head : op; 1752 RETVAL = op->head_ ();
1710 OUTPUT: RETVAL 1753 OUTPUT: RETVAL
1711 1754
1712int is_head (object *op) 1755int is_head (object *op)
1713 PROTOTYPE: $ 1756 PROTOTYPE: $
1714 CODE: 1757 CODE:
1715 RETVAL = !op->head; 1758 RETVAL = op->head_ () == op;
1716 OUTPUT: RETVAL 1759 OUTPUT: RETVAL
1717 1760
1718void 1761void
1719inv (object *obj) 1762inv (object *obj)
1720 PROTOTYPE: $ 1763 PROTOTYPE: $
1811 1854
1812void drop (object *who, object *op) 1855void drop (object *who, object *op)
1813 1856
1814void pick_up (object *who, object *op) 1857void pick_up (object *who, object *op)
1815 1858
1816object *cf_object_insert_object (object *op, object *container)
1817
1818object *cf_object_insert_in_ob (object *ob, object *where)
1819
1820int cf_object_teleport (object *op, maptile *map, int x, int y) 1859int cf_object_teleport (object *op, maptile *map, int x, int y)
1821 1860
1822void update_object (object *op, int action) 1861void update_object (object *op, int action)
1823 1862
1824object *cf_create_object_by_name (const char *name) 1863object *cf_create_object_by_name (const char *name)
1943void esrv_update_item (object *op, int what, object *item) 1982void esrv_update_item (object *op, int what, object *item)
1944 C_ARGS: what, op, item 1983 C_ARGS: what, op, item
1945 1984
1946void clear_los (object *op) 1985void clear_los (object *op)
1947 1986
1948int command_teleport (object *op, char *params)
1949
1950int command_summon (object *op, char *params) 1987int command_summon (object *op, char *params)
1951 1988
1952int command_arrest (object *op, char *params) 1989int command_arrest (object *op, char *params)
1953 1990
1954int command_kick (object *op, char *params) 1991int command_kick (object *op, char *params)
1975 CODE: 2012 CODE:
1976 pl->ob->stats.hp = pl->ob->stats.maxhp; 2013 pl->ob->stats.hp = pl->ob->stats.maxhp;
1977 pl->ob->stats.sp = pl->ob->stats.maxsp; 2014 pl->ob->stats.sp = pl->ob->stats.maxsp;
1978 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2015 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979 pl->orig_stats = pl->ob->stats; 2016 pl->orig_stats = pl->ob->stats;
1980
1981player *cf_player_find (char *name)
1982 PROTOTYPE: $
1983 2017
1984void cf_player_move (player *pl, int dir) 2018void cf_player_move (player *pl, int dir)
1985 2019
1986void 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);
1987 2021
2033 if (y) sv_to (y, pl->bed_y); 2067 if (y) sv_to (y, pl->bed_y);
2034 2068
2035void 2069void
2036list () 2070list ()
2037 PPCODE: 2071 PPCODE:
2038 for (player *pl = first_player; pl; pl = pl->next) 2072 for_all_players (pl)
2039 XPUSHs (sv_2mortal (to_sv (pl))); 2073 XPUSHs (sv_2mortal (to_sv (pl)));
2040
2041bool
2042peaceful (player *pl, bool new_setting = 0)
2043 PROTOTYPE: $;$
2044 CODE:
2045 RETVAL = pl->peaceful;
2046 if (items > 1)
2047 pl->peaceful = new_setting;
2048 OUTPUT:
2049 RETVAL
2050
2051living *
2052orig_stats (player *pl)
2053 CODE:
2054 RETVAL = &pl->orig_stats;
2055 OUTPUT: RETVAL
2056
2057living *
2058last_stats (player *pl)
2059 CODE:
2060 RETVAL = &pl->last_stats;
2061 OUTPUT: RETVAL
2062 2074
2063 2075
2064MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2076MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065 2077
2066int invoke (maptile *map, int event, ...) 2078int invoke (maptile *map, int event, ...)
2082 PROTOTYPE: 2094 PROTOTYPE:
2083 CODE: 2095 CODE:
2084 RETVAL = new maptile; 2096 RETVAL = new maptile;
2085 OUTPUT: 2097 OUTPUT:
2086 RETVAL 2098 RETVAL
2087
2088void
2089maptile::destroy ()
2090 2099
2091void 2100void
2092maptile::players () 2101maptile::players ()
2093 PPCODE: 2102 PPCODE:
2094 if (GIMME_V == G_SCALAR) 2103 if (GIMME_V == G_SCALAR)
2124 2133
2125object* 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)
2126 C_ARGS: str, map, nx, ny 2135 C_ARGS: str, map, nx, ny
2127 2136
2128void 2137void
2129cf_map_normalise (maptile *map, int x, int y) 2138get_map_flags (maptile *map, int x, int y)
2130 PPCODE: 2139 PPCODE:
2131{ 2140{
2132 maptile *nmap = 0; 2141 maptile *nmap = 0;
2133 I16 nx = 0, ny = 0; 2142 I16 nx = 0, ny = 0;
2134 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2143 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2196 CODE: 2205 CODE:
2197 RETVAL = get_name_of_region_for_map (m); 2206 RETVAL = get_name_of_region_for_map (m);
2198 OUTPUT: RETVAL 2207 OUTPUT: RETVAL
2199 2208
2200# worst xs function of my life 2209# worst xs function of my life
2201maptile * 2210bool
2202_create_random_map (\ 2211_create_random_map (\
2203 char *path,\ 2212 maptile *self,\
2204 char *wallstyle,\ 2213 char *wallstyle,\
2205 char *wall_name,\ 2214 char *wall_name,\
2206 char *floorstyle,\ 2215 char *floorstyle,\
2207 char *monsterstyle,\ 2216 char *monsterstyle,\
2208 char *treasurestyle,\ 2217 char *treasurestyle,\
2233 int random_seed,\ 2242 int random_seed,\
2234 val64 total_map_hp,\ 2243 val64 total_map_hp,\
2235 int map_layout_style,\ 2244 int map_layout_style,\
2236 int treasureoptions,\ 2245 int treasureoptions,\
2237 int symmetry_used,\ 2246 int symmetry_used,\
2238 region *region\ 2247 region *region,\
2248 char *custom\
2239) 2249)
2240 CODE: 2250 CODE:
2241{ 2251{
2242 random_map_params rmp; 2252 random_map_params rmp;
2243 2253
2275 rmp.total_map_hp = total_map_hp; 2285 rmp.total_map_hp = total_map_hp;
2276 rmp.map_layout_style = map_layout_style; 2286 rmp.map_layout_style = map_layout_style;
2277 rmp.treasureoptions = treasureoptions; 2287 rmp.treasureoptions = treasureoptions;
2278 rmp.symmetry_used = symmetry_used; 2288 rmp.symmetry_used = symmetry_used;
2279 rmp.region = region; 2289 rmp.region = region;
2290 rmp.custom = custom;
2280 2291
2281 RETVAL = generate_random_map (path, &rmp); 2292 RETVAL = self->generate_random_map (&rmp);
2282} 2293}
2283 OUTPUT: 2294 OUTPUT:
2284 RETVAL 2295 RETVAL
2285 2296
2286MODULE = cf PACKAGE = cf::arch 2297MODULE = cf PACKAGE = cf::arch
2362 char *buf = SvPVbyte (packet, len); 2373 char *buf = SvPVbyte (packet, len);
2363 2374
2364 THIS->send_packet (buf, len); 2375 THIS->send_packet (buf, len);
2365} 2376}
2366 2377
2367void
2368client::destroy ()
2369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines