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.166 by root, Tue Feb 13 19:25:45 2007 UTC

29#include <plugin_common.h> 29#include <plugin_common.h>
30#include <sounds.h> 30#include <sounds.h>
31#include <cstdarg> 31#include <cstdarg>
32#include <sproto.h> 32#include <sproto.h>
33 33
34#include "loader.h"
34#include "cfperl.h" 35#include "cfperl.h"
35#include "shstr.h" 36#include "shstr.h"
37
38#include <unistd.h>
39#if _POSIX_MEMLOCK
40# include <sys/mman.h>
41#endif
36 42
37#include <EXTERN.h> 43#include <EXTERN.h>
38#include <perl.h> 44#include <perl.h>
39#include <XSUB.h> 45#include <XSUB.h>
40 46
94 100
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 101//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96 102
97unordered_vector<attachable *> attachable::mortals; 103unordered_vector<attachable *> attachable::mortals;
98 104
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 () 105attachable::~attachable ()
111{ 106{
112 assert (!(flags & F_BORROWED));//D//TODO//remove when stable
113#if 0
114 assert (!rc_next);
115 assert (!refcnt); 107 assert (!self);
116#endif 108 assert (!cb);
109}
110
111int
112attachable::refcnt_cnt () const
113{
114 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
115}
116
117void
118attachable::sever_self ()
119{
120 if (HV *self = this->self)
121 {
122 // keep a refcount because sv_unmagic might call attachable_free,
123 // which might clear self, causing sv_unmagic to crash on a now
124 // invalid object.
125 SvREFCNT_inc (self);
126 hv_clear (self);
127 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
128 SvREFCNT_dec (self);
129
130 // self *must* be null now because thats sv_unmagic's job.
131 assert (!this->self);
132 flags |= 0x80; // severed //D
133 }
134}
135
136void
137attachable::optimise ()
138{
139 if (self
140 && SvREFCNT (self) == 1
141 && !HvTOTALKEYS (self))
142 flags |= 0x40,//D
143 sever_self ();
117} 144}
118 145
119// check wether the object really is dead 146// check wether the object really is dead
120void 147void
121attachable::do_check () 148attachable::do_check ()
122{ 149{
123 if (refcnt > 0) 150 if (refcnt_cnt () > 0)
124 return; 151 return;
125 152
126 // try to unborrow the refcnt from perl 153 destroy ();
127 if (flags & F_BORROWED) 154}
155
156void
157attachable::do_destroy ()
158{
159 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
160
161 if (cb)
128 { 162 {
129 assert (self);//D//TODO//remove when stable
130 flags &= ~F_BORROWED;
131 refcnt_inc ();
132 SvREFCNT_dec (self); 163 SvREFCNT_dec (cb);
164 cb = 0;
133 } 165 }
134 166
135 if (refcnt > 0 || self) 167 if (self)
136 return; 168 sever_self ();
137 169
138 destroy (); 170 flags |= 0x20; //D
139}
140
141void
142attachable::do_destroy ()
143{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145
146 //TODO: call generic destroy callback
147 mortals.push_back (this); 171 mortals.push_back (this);
148} 172}
149 173
150void 174void
151attachable::destroy () 175attachable::destroy ()
155 179
156 flags |= F_DESTROYED; 180 flags |= F_DESTROYED;
157 do_destroy (); 181 do_destroy ();
158} 182}
159 183
184void
160void attachable::check_mortals () 185attachable::check_mortals ()
161{ 186{
162 for (int i = 0; i < mortals.size (); ) 187 static int i = 0;
188
189 for (;;)
163 { 190 {
191 if (i >= mortals.size ())
192 {
193 i = 0;
194
195 if (mortals.size () > 1000)
196 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
197
198 break;
199 }
200
164 attachable *obj = mortals [i]; 201 attachable *obj = mortals [i];
165 202
166 obj->refcnt_chk (); // unborrow from perl, if necessary 203 obj->refcnt_chk (); // unborrow from perl, if necessary
167 204
205 //if (obj->refcnt > 0 || obj->self)
168 if (obj->refcnt || obj->self) 206 if (obj->refcnt || obj->self)
169 { 207 {
170#if 0 208//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
171 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
172 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
173#endif
174
175 ++i; // further delay freeing 209 ++i; // further delay freeing
210
211 if (!(i & 0x3ff))
212 break;
176 }//D 213 }
177 else 214 else
178 { 215 {
179 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
180 mortals.erase (i); 216 mortals.erase (i);
181 delete obj; 217 delete obj;
182 } 218 }
183 } 219 }
184} 220}
209 245
210static int 246static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 247attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 248{
213 attachable *at = (attachable *)mg->mg_ptr; 249 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable 250
251 //TODO: check if transaction behaviour is really required here
252 if (SV *self = (SV *)at->self)
253 {
215 at->self = 0; 254 at->self = 0;
255 SvREFCNT_dec (self);
256 }
257
216 // next line makes sense, but most objects still have refcnt 0 by default 258 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 259 //at->refcnt_chk ();
218 return 0; 260 return 0;
219} 261}
220 262
228 270
229 if (!obj->self) 271 if (!obj->self)
230 { 272 {
231 obj->self = newHV (); 273 obj->self = newHV ();
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 274 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
275 obj->flags |= (obj->flags & 0xc0) << 8;
276 obj->flags &= ~0xc0;//D
277 obj->flags |= 0x10;//D
233 278
234 // borrow the refcnt from the object 279 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 280 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 281 }
282 else
283 {
284 SV *sv = newRV_inc ((SV *)obj->self);
238 285
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 286 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
287 SvAMAGIC_on (sv);
288
289 return sv;
290 }
240} 291}
241 292
242static void 293static void
243clearSVptr (SV *sv) 294clearSVptr (SV *sv)
244{ 295{
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 348inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 349
299inline SV *to_sv (object & v) { return to_sv (&v); } 350inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 351inline SV *to_sv (living & v) { return to_sv (&v); }
301 352
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 353inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 354inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 355
306inline SV *to_sv (UUID v) 356inline SV *to_sv (UUID v)
307{ 357{
308 char buf[128]; 358 char buf[128];
309 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 359 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
310 return newSVpv (buf, 0); 360 return newSVpv (buf, 0);
311} 361}
312 362
313inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 363inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
314inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 364inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 378inline 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"); } 379inline 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"); } 380inline 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"); } 381inline 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"); } 382inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
383inline 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"); } 384inline 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"); } 385inline 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"); } 386inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 387
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 388inline 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 389inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 390
340template<class T> 391template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 392inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 393
343template<int N> 394template<int N>
478{ 529{
479 if (!ext->cb) 530 if (!ext->cb)
480 ext->cb = newAV (); 531 ext->cb = newAV ();
481 532
482 return newRV_inc ((SV *)ext->cb); 533 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} 534}
521 535
522///////////////////////////////////////////////////////////////////////////// 536/////////////////////////////////////////////////////////////////////////////
523 537
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 538extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
597 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 611 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
598 { 612 {
599 printf ("unable to initialize perl-interpreter, aborting.\n"); 613 printf ("unable to initialize perl-interpreter, aborting.\n");
600 exit (EXIT_FAILURE); 614 exit (EXIT_FAILURE);
601 } 615 }
616
617 {
618 dSP;
619
620 PUSHMARK (SP);
621 PUTBACK;
622 call_pv ("cf::init", G_DISCARD | G_VOID);
623 }
602} 624}
603 625
604void cfperl_main () 626void cfperl_main ()
605{ 627{
606 dSP; 628 dSP;
820} 842}
821 843
822///////////////////////////////////////////////////////////////////////////// 844/////////////////////////////////////////////////////////////////////////////
823 845
824void 846void
825maptile::emergency_save () 847cfperl_emergency_save ()
826{ 848{
827 CALL_BEGIN (0); 849 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 850 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 851 CALL_END;
830} 852}
831 853
854void
855cfperl_cleanup (int make_core)
856{
857 CALL_BEGIN (1);
858 CALL_ARG (make_core);
859 CALL_CALL ("cf::post_cleanup", G_VOID);
860 CALL_END;
861}
862
832maptile * 863maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 864maptile::find_sync (const char *path, maptile *origin)
834{ 865{
835 CALL_BEGIN (2); 866 CALL_BEGIN (2);
836 CALL_ARG (path); 867 CALL_ARG (path);
837 CALL_ARG (origin); 868 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 869 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 870
840 maptile *retval; 871 maptile *retval;
841 872
842 if (count) 873 if (count)
843 sv_to (POPs, retval); 874 sv_to (POPs, retval);
845 retval = 0; 876 retval = 0;
846 877
847 CALL_END; 878 CALL_END;
848 879
849 return retval; 880 return retval;
881}
882
883maptile *
884maptile::find_async (const char *path, maptile *origin)
885{
886 CALL_BEGIN (2);
887 CALL_ARG (path);
888 CALL_ARG (origin);
889 CALL_CALL ("cf::map::find_async", G_SCALAR);
890
891 maptile *retval;
892
893 if (count)
894 sv_to (POPs, retval);
895 else
896 retval = 0;
897
898 CALL_END;
899
900 return retval;
901}
902
903void
904maptile::do_load_sync ()
905{
906 CALL_BEGIN (1);
907 CALL_ARG (this);
908 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
909 CALL_END;
850} 910}
851 911
852void 912void
853maptile::change_all_map_light (int change) 913maptile::change_all_map_light (int change)
854{ 914{
887void 947void
888iw::alloc () 948iw::alloc ()
889{ 949{
890 pe = GEventAPI->new_idle (0, 0); 950 pe = GEventAPI->new_idle (0, 0);
891 951
952 WaREENTRANT_off (pe);
892 pe->base.callback = (void *)iw_dispatch; 953 pe->base.callback = (void *)iw_dispatch;
893 pe->base.ext_data = (void *)this; 954 pe->base.ext_data = (void *)this;
894} 955}
895 956
896static void iow_dispatch (pe_event *ev) 957static void iow_dispatch (pe_event *ev)
902void 963void
903iow::alloc () 964iow::alloc ()
904{ 965{
905 pe = GEventAPI->new_io (0, 0); 966 pe = GEventAPI->new_io (0, 0);
906 967
968 WaREENTRANT_off (pe);
907 pe->base.callback = (void *)iow_dispatch; 969 pe->base.callback = (void *)iow_dispatch;
908 pe->base.ext_data = (void *)this; 970 pe->base.ext_data = (void *)this;
909 971
910 pe->fd = -1; 972 pe->fd = -1;
911 pe->poll = 0; 973 pe->poll = 0;
1239 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1301 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1240 const_iv (FLAG_IS_WATER) 1302 const_iv (FLAG_IS_WATER)
1241 const_iv (FLAG_CONTENT_ON_GEN) 1303 const_iv (FLAG_CONTENT_ON_GEN)
1242 const_iv (FLAG_IS_A_TEMPLATE) 1304 const_iv (FLAG_IS_A_TEMPLATE)
1243 const_iv (FLAG_IS_BUILDABLE) 1305 const_iv (FLAG_IS_BUILDABLE)
1306 const_iv (FLAG_DESTROY_ON_DEATH)
1307 const_iv (FLAG_NO_MAP_SAVE)
1244 1308
1245 const_iv (NDI_BLACK) 1309 const_iv (NDI_BLACK)
1246 const_iv (NDI_WHITE) 1310 const_iv (NDI_WHITE)
1247 const_iv (NDI_NAVY) 1311 const_iv (NDI_NAVY)
1248 const_iv (NDI_RED) 1312 const_iv (NDI_RED)
1433 const_iv (ATNR_BLIND) 1497 const_iv (ATNR_BLIND)
1434 const_iv (ATNR_INTERNAL) 1498 const_iv (ATNR_INTERNAL)
1435 const_iv (ATNR_LIFE_STEALING) 1499 const_iv (ATNR_LIFE_STEALING)
1436 const_iv (ATNR_DISEASE) 1500 const_iv (ATNR_DISEASE)
1437 1501
1438 const_iv (MAP_FLUSH)
1439 const_iv (MAP_PLAYER_UNIQUE)
1440 const_iv (MAP_BLOCK)
1441 const_iv (MAP_STYLE)
1442 const_iv (MAP_OVERLAY)
1443
1444 const_iv (MAP_IN_MEMORY) 1502 const_iv (MAP_IN_MEMORY)
1445 const_iv (MAP_SWAPPED) 1503 const_iv (MAP_SWAPPED)
1446 const_iv (MAP_LOADING) 1504 const_iv (MAP_LOADING)
1447 const_iv (MAP_SAVING) 1505 const_iv (MAP_SAVING)
1448 1506
1461 const_iv (ST_SETUP) 1519 const_iv (ST_SETUP)
1462 const_iv (ST_PLAYING) 1520 const_iv (ST_PLAYING)
1463 const_iv (ST_CUSTOM) 1521 const_iv (ST_CUSTOM)
1464 1522
1465 const_iv (ST_CHANGE_CLASS) 1523 const_iv (ST_CHANGE_CLASS)
1466 const_iv (ST_CONFIRM_QUIT)
1467 const_iv (ST_GET_PARTY_PASSWORD)
1468 1524
1469 const_iv (IO_HEADER) 1525 const_iv (IO_HEADER)
1470 const_iv (IO_OBJECTS) 1526 const_iv (IO_OBJECTS)
1471 const_iv (IO_UNIQUES) 1527 const_iv (IO_UNIQUES)
1472 1528
1526 1582
1527void _global_reattach () 1583void _global_reattach ()
1528 CODE: 1584 CODE:
1529{ 1585{
1530 // reattach to all attachable objects in the game. 1586 // reattach to all attachable objects in the game.
1531 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1587 for_all_clients (ns)
1532 (*i)->reattach (); 1588 ns->reattach ();
1533 1589
1534 for_all_players (pl) 1590 for_all_players (pl)
1535 pl->reattach (); 1591 pl->reattach ();
1536 1592
1537 //TODO 1593 //TODO
1538 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1594 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539 // i->second->reattach (); 1595 // i->second->reattach ();
1540 1596
1541 for (object *op = object::first; op; op = op->next) 1597 for_all_objects (op)
1542 op->reattach (); 1598 op->reattach ();
1543} 1599}
1544 1600
1545NV floor (NV x) 1601NV floor (NV x)
1546 1602
1547NV ceil (NV x) 1603NV ceil (NV x)
1604
1605NV rndm (...)
1606 CODE:
1607 switch (items)
1608 {
1609 case 0: RETVAL = rndm (); break;
1610 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1611 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1612 default: croak ("cf::rndm requires none, one or two parameters."); break;
1613 }
1614 OUTPUT:
1615 RETVAL
1548 1616
1549void server_tick () 1617void server_tick ()
1550 CODE: 1618 CODE:
1551 runtime = SvNVx (sv_runtime); 1619 runtime = SvNVx (sv_runtime);
1552 server_tick (); 1620 server_tick ();
1599 } 1667 }
1600 OUTPUT: RETVAL 1668 OUTPUT: RETVAL
1601 1669
1602void abort () 1670void abort ()
1603 1671
1672void fork_abort (char *cause = "cf::fork_abort")
1673
1674void cleanup (const char *cause, bool make_core = false)
1675
1604void emergency_save () 1676void emergency_save ()
1605 1677
1606void _exit (int status = 0) 1678void _exit (int status = EXIT_SUCCESS)
1679
1680UV sv_2watcher (SV *w)
1681 CODE:
1682 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1683 OUTPUT:
1684 RETVAL
1685
1686#if _POSIX_MEMLOCK
1687
1688int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1689
1690int munlockall ()
1691
1692#endif
1607 1693
1608int find_animation (char *text) 1694int find_animation (char *text)
1609 PROTOTYPE: $ 1695 PROTOTYPE: $
1610 1696
1611int random_roll (int min, int max, object *op, int goodbad); 1697int random_roll (int min, int max, object *op, int goodbad);
1649 RETVAL = newSVpv (resist_plus[atnr], 0); 1735 RETVAL = newSVpv (resist_plus[atnr], 0);
1650 else 1736 else
1651 XSRETURN_UNDEF; 1737 XSRETURN_UNDEF;
1652 OUTPUT: RETVAL 1738 OUTPUT: RETVAL
1653 1739
1740bool
1741load_regions (const char *filename)
1742 CODE:
1743 RETVAL = loader_region ().load (filename);
1744 OUTPUT: RETVAL
1745
1654MODULE = cf PACKAGE = cf::attachable 1746MODULE = cf PACKAGE = cf::attachable
1655 1747
1656int 1748int
1657valid (SV *obj) 1749valid (SV *obj)
1658 CODE: 1750 CODE:
1659 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1751 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660 OUTPUT: 1752 OUTPUT:
1661 RETVAL 1753 RETVAL
1662 1754
1663#bool
1664#destroyed (attachable *at)
1665#
1666#void 1755void
1667#destroy (attachable *at) 1756debug_trace (attachable *obj, bool on = true)
1757 CODE:
1758 obj->flags &= ~attachable::F_DEBUG_TRACE;
1759 if (on)
1760 obj->flags |= attachable::F_DEBUG_TRACE;
1761
1762int mortals_size ()
1763 CODE:
1764 RETVAL = attachable::mortals.size ();
1765 OUTPUT: RETVAL
1766
1767#object *mortals (U32 index)
1768# CODE:
1769# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1770# OUTPUT: RETVAL
1771
1772INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1668 1773
1669MODULE = cf PACKAGE = cf::global 1774MODULE = cf PACKAGE = cf::global
1670 1775
1671int invoke (SV *klass, int event, ...) 1776int invoke (SV *klass, int event, ...)
1672 CODE: 1777 CODE:
1688 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1793 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1689 OUTPUT: RETVAL 1794 OUTPUT: RETVAL
1690 1795
1691SV *registry (object *op) 1796SV *registry (object *op)
1692 1797
1693void mortals () 1798int objects_size ()
1694 PPCODE: 1799 CODE:
1695 EXTEND (SP, object::mortals.size ());
1696 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1697 PUSHs (to_sv (*i));
1698
1699object *first ()
1700 CODE:
1701 RETVAL = object::first; 1800 RETVAL = objects.size ();
1801 OUTPUT: RETVAL
1802
1803object *objects (U32 index)
1804 CODE:
1805 RETVAL = index < objects.size () ? objects [index] : 0;
1806 OUTPUT: RETVAL
1807
1808int actives_size ()
1809 CODE:
1810 RETVAL = actives.size ();
1811 OUTPUT: RETVAL
1812
1813object *actives (U32 index)
1814 CODE:
1815 RETVAL = index < actives.size () ? actives [index] : 0;
1702 OUTPUT: RETVAL 1816 OUTPUT: RETVAL
1703 1817
1704# missing properties 1818# missing properties
1705 1819
1706object *head (object *op) 1820object *head (object *op)
1707 PROTOTYPE: $ 1821 PROTOTYPE: $
1708 CODE: 1822 CODE:
1709 RETVAL = op->head ? op->head : op; 1823 RETVAL = op->head_ ();
1710 OUTPUT: RETVAL 1824 OUTPUT: RETVAL
1711 1825
1712int is_head (object *op) 1826int is_head (object *op)
1713 PROTOTYPE: $ 1827 PROTOTYPE: $
1714 CODE: 1828 CODE:
1715 RETVAL = !op->head; 1829 RETVAL = op->head_ () == op;
1716 OUTPUT: RETVAL 1830 OUTPUT: RETVAL
1717 1831
1718void 1832void
1719inv (object *obj) 1833inv (object *obj)
1720 PROTOTYPE: $ 1834 PROTOTYPE: $
1727 1841
1728void 1842void
1729set_animation (object *op, int idx) 1843set_animation (object *op, int idx)
1730 CODE: 1844 CODE:
1731 SET_ANIMATION (op, idx); 1845 SET_ANIMATION (op, idx);
1846
1847int
1848num_animations (object *op)
1849 CODE:
1850 RETVAL = NUM_ANIMATIONS (op);
1851 OUTPUT: RETVAL
1732 1852
1733object *find_best_object_match (object *op, const char *match) 1853object *find_best_object_match (object *op, const char *match)
1734 1854
1735object *find_marked_object (object *op) 1855object *find_marked_object (object *op)
1736 1856
1811 1931
1812void drop (object *who, object *op) 1932void drop (object *who, object *op)
1813 1933
1814void pick_up (object *who, object *op) 1934void pick_up (object *who, object *op)
1815 1935
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) 1936int cf_object_teleport (object *op, maptile *map, int x, int y)
1821 1937
1822void update_object (object *op, int action) 1938void update_object (object *op, int action)
1823 1939
1824object *cf_create_object_by_name (const char *name) 1940object *cf_create_object_by_name (const char *name)
1943void esrv_update_item (object *op, int what, object *item) 2059void esrv_update_item (object *op, int what, object *item)
1944 C_ARGS: what, op, item 2060 C_ARGS: what, op, item
1945 2061
1946void clear_los (object *op) 2062void clear_los (object *op)
1947 2063
1948int command_teleport (object *op, char *params)
1949
1950int command_summon (object *op, char *params) 2064int command_summon (object *op, char *params)
1951 2065
1952int command_arrest (object *op, char *params) 2066int command_arrest (object *op, char *params)
1953 2067
1954int command_kick (object *op, char *params) 2068int command_kick (object *op, char *params)
1976 pl->ob->stats.hp = pl->ob->stats.maxhp; 2090 pl->ob->stats.hp = pl->ob->stats.maxhp;
1977 pl->ob->stats.sp = pl->ob->stats.maxsp; 2091 pl->ob->stats.sp = pl->ob->stats.maxsp;
1978 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2092 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979 pl->orig_stats = pl->ob->stats; 2093 pl->orig_stats = pl->ob->stats;
1980 2094
1981player *cf_player_find (char *name)
1982 PROTOTYPE: $
1983
1984void cf_player_move (player *pl, int dir) 2095void cf_player_move (player *pl, int dir)
1985 2096
1986void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2097void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987
1988player *first ()
1989 CODE:
1990 RETVAL = first_player;
1991 OUTPUT: RETVAL
1992 2098
1993bool 2099bool
1994cell_visible (player *pl, int dx, int dy) 2100cell_visible (player *pl, int dx, int dy)
1995 CODE: 2101 CODE:
1996 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2102 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2033 if (y) sv_to (y, pl->bed_y); 2139 if (y) sv_to (y, pl->bed_y);
2034 2140
2035void 2141void
2036list () 2142list ()
2037 PPCODE: 2143 PPCODE:
2038 for (player *pl = first_player; pl; pl = pl->next) 2144 for_all_players (pl)
2039 XPUSHs (sv_2mortal (to_sv (pl))); 2145 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 2146
2063 2147
2064MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2148MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2065 2149
2066int invoke (maptile *map, int event, ...) 2150int invoke (maptile *map, int event, ...)
2082 PROTOTYPE: 2166 PROTOTYPE:
2083 CODE: 2167 CODE:
2084 RETVAL = new maptile; 2168 RETVAL = new maptile;
2085 OUTPUT: 2169 OUTPUT:
2086 RETVAL 2170 RETVAL
2087
2088void
2089maptile::destroy ()
2090 2171
2091void 2172void
2092maptile::players () 2173maptile::players ()
2093 PPCODE: 2174 PPCODE:
2094 if (GIMME_V == G_SCALAR) 2175 if (GIMME_V == G_SCALAR)
2099 for_all_players (pl) 2180 for_all_players (pl)
2100 if (pl->ob && pl->ob->map == THIS) 2181 if (pl->ob && pl->ob->map == THIS)
2101 PUSHs (sv_2mortal (to_sv (pl->ob))); 2182 PUSHs (sv_2mortal (to_sv (pl->ob)));
2102 } 2183 }
2103 2184
2185void
2186maptile::set_regiondata (SV *data, SV *plt)
2187 CODE:
2188{
2189 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2190 croak ("maptile::set_regiondata needs arrayref as plt arg");
2191
2192 AV *av = (AV *)SvRV (plt);
2193
2194 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2195
2196 for (int i = av_len (av) + 1; i--; )
2197 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2198
2199 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2200 THIS->regionmap = regionmap;
2201}
2202
2104void play_sound_map (maptile *map, int x, int y, int sound_num) 2203void play_sound_map (maptile *map, int x, int y, int sound_num)
2105 2204
2106int out_of_map (maptile *map, int x, int y) 2205int out_of_map (maptile *map, int x, int y)
2107 2206
2108void 2207void
2124 2223
2125object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2224object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2126 C_ARGS: str, map, nx, ny 2225 C_ARGS: str, map, nx, ny
2127 2226
2128void 2227void
2129cf_map_normalise (maptile *map, int x, int y) 2228get_map_flags (maptile *map, int x, int y)
2130 PPCODE: 2229 PPCODE:
2131{ 2230{
2132 maptile *nmap = 0; 2231 maptile *nmap = 0;
2133 I16 nx = 0, ny = 0; 2232 I16 nx = 0, ny = 0;
2134 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2233 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2189 2288
2190void fix_walls (maptile *map, int x, int y) 2289void fix_walls (maptile *map, int x, int y)
2191 2290
2192void fix_walls_around (maptile *map, int x, int y) 2291void fix_walls_around (maptile *map, int x, int y)
2193 2292
2194const char *
2195region_name (maptile *m)
2196 CODE:
2197 RETVAL = get_name_of_region_for_map (m);
2198 OUTPUT: RETVAL
2199
2200# worst xs function of my life 2293# worst xs function of my life
2201maptile * 2294bool
2202_create_random_map (\ 2295_create_random_map (\
2203 char *path,\ 2296 maptile *self,\
2204 char *wallstyle,\ 2297 char *wallstyle,\
2205 char *wall_name,\ 2298 char *wall_name,\
2206 char *floorstyle,\ 2299 char *floorstyle,\
2207 char *monsterstyle,\ 2300 char *monsterstyle,\
2208 char *treasurestyle,\ 2301 char *treasurestyle,\
2212 char *origin_map,\ 2305 char *origin_map,\
2213 char *final_map,\ 2306 char *final_map,\
2214 char *exitstyle,\ 2307 char *exitstyle,\
2215 char *this_map,\ 2308 char *this_map,\
2216 char *exit_on_final_map,\ 2309 char *exit_on_final_map,\
2217 int Xsize,\ 2310 int xsize,\
2218 int Ysize,\ 2311 int ysize,\
2219 int expand2x,\ 2312 int expand2x,\
2220 int layoutoptions1,\ 2313 int layoutoptions1,\
2221 int layoutoptions2,\ 2314 int layoutoptions2,\
2222 int layoutoptions3,\ 2315 int layoutoptions3,\
2223 int symmetry,\ 2316 int symmetry,\
2228 int dungeon_depth,\ 2321 int dungeon_depth,\
2229 int decoroptions,\ 2322 int decoroptions,\
2230 int orientation,\ 2323 int orientation,\
2231 int origin_y,\ 2324 int origin_y,\
2232 int origin_x,\ 2325 int origin_x,\
2233 int random_seed,\ 2326 U32 random_seed,\
2234 val64 total_map_hp,\ 2327 val64 total_map_hp,\
2235 int map_layout_style,\ 2328 int map_layout_style,\
2236 int treasureoptions,\ 2329 int treasureoptions,\
2237 int symmetry_used,\ 2330 int symmetry_used,\
2238 region *region\ 2331 region *region,\
2332 char *custom\
2239) 2333)
2240 CODE: 2334 CODE:
2241{ 2335{
2242 random_map_params rmp; 2336 random_map_params rmp;
2243 2337
2253 assign (rmp.exit_on_final_map, exit_on_final_map); 2347 assign (rmp.exit_on_final_map, exit_on_final_map);
2254 2348
2255 rmp.origin_map = origin_map; 2349 rmp.origin_map = origin_map;
2256 rmp.final_map = final_map; 2350 rmp.final_map = final_map;
2257 rmp.this_map = this_map; 2351 rmp.this_map = this_map;
2258 rmp.Xsize = Xsize; 2352 rmp.xsize = xsize;
2259 rmp.Ysize = Ysize; 2353 rmp.ysize = ysize;
2260 rmp.expand2x = expand2x; 2354 rmp.expand2x = expand2x;
2261 rmp.layoutoptions1 = layoutoptions1; 2355 rmp.layoutoptions1 = layoutoptions1;
2262 rmp.layoutoptions2 = layoutoptions2; 2356 rmp.layoutoptions2 = layoutoptions2;
2263 rmp.layoutoptions3 = layoutoptions3; 2357 rmp.layoutoptions3 = layoutoptions3;
2264 rmp.symmetry = symmetry; 2358 rmp.symmetry = symmetry;
2275 rmp.total_map_hp = total_map_hp; 2369 rmp.total_map_hp = total_map_hp;
2276 rmp.map_layout_style = map_layout_style; 2370 rmp.map_layout_style = map_layout_style;
2277 rmp.treasureoptions = treasureoptions; 2371 rmp.treasureoptions = treasureoptions;
2278 rmp.symmetry_used = symmetry_used; 2372 rmp.symmetry_used = symmetry_used;
2279 rmp.region = region; 2373 rmp.region = region;
2374 rmp.custom = custom;
2280 2375
2281 RETVAL = generate_random_map (path, &rmp); 2376 RETVAL = self->generate_random_map (&rmp);
2282} 2377}
2283 OUTPUT: 2378 OUTPUT:
2284 RETVAL 2379 RETVAL
2285 2380
2286MODULE = cf PACKAGE = cf::arch 2381MODULE = cf PACKAGE = cf::arch
2309 2404
2310INCLUDE: $PERL genacc partylist ../include/player.h | 2405INCLUDE: $PERL genacc partylist ../include/player.h |
2311 2406
2312MODULE = cf PACKAGE = cf::region 2407MODULE = cf PACKAGE = cf::region
2313 2408
2314region *first () 2409void
2315 PROTOTYPE: 2410list ()
2316 CODE: 2411 PPCODE:
2317 RETVAL = first_region; 2412 for_all_regions (rgn)
2318 OUTPUT: RETVAL 2413 XPUSHs (sv_2mortal (to_sv (rgn)));
2319 2414
2320region *find (char *name) 2415region *find (char *name)
2321 PROTOTYPE: $ 2416 PROTOTYPE: $
2322 CODE: 2417 CODE:
2323 RETVAL = get_region_by_name (name); 2418 RETVAL = region::find (name);
2419 OUTPUT: RETVAL
2420
2421region *find_fuzzy (char *name)
2422 PROTOTYPE: $
2423 CODE:
2424 RETVAL = region::find_fuzzy (name);
2324 OUTPUT: RETVAL 2425 OUTPUT: RETVAL
2325 2426
2326INCLUDE: $PERL genacc region ../include/map.h | 2427INCLUDE: $PERL genacc region ../include/map.h |
2327 2428
2328MODULE = cf PACKAGE = cf::living 2429MODULE = cf PACKAGE = cf::living
2362 char *buf = SvPVbyte (packet, len); 2463 char *buf = SvPVbyte (packet, len);
2363 2464
2364 THIS->send_packet (buf, len); 2465 THIS->send_packet (buf, len);
2365} 2466}
2366 2467
2367void
2368client::destroy ()
2369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines