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.163 by root, Thu Feb 8 13:11:18 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 (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 (!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 &= ~0xc0;//D
276 obj->flags |= 0x10;//D
233 277
234 // borrow the refcnt from the object 278 // now bless the object _once_
235 obj->flags |= attachable::F_BORROWED; 279 return sv_bless (newRV_inc ((SV *)obj->self), stash);
236 obj->refcnt_dec ();
237 } 280 }
281 else
282 {
283 SV *sv = newRV_inc ((SV *)obj->self);
238 284
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 285 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
286 SvAMAGIC_on (sv);
287
288 return sv;
289 }
240} 290}
241 291
242static void 292static void
243clearSVptr (SV *sv) 293clearSVptr (SV *sv)
244{ 294{
297inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 347inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
298 348
299inline SV *to_sv (object & v) { return to_sv (&v); } 349inline SV *to_sv (object & v) { return to_sv (&v); }
300inline SV *to_sv (living & v) { return to_sv (&v); } 350inline SV *to_sv (living & v) { return to_sv (&v); }
301 351
302//TODO:
303inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 352inline SV *to_sv (facetile * v) { return to_sv (v->name); }
304inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 353inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
305 354
306inline SV *to_sv (UUID v) 355inline SV *to_sv (UUID v)
307{ 356{
308 char buf[128]; 357 char buf[128];
309 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 358 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
310 return newSVpv (buf, 0); 359 return newSVpv (buf, 0);
311} 360}
312 361
313inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 362inline 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; } 363inline 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"); } 377inline 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"); } 378inline 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"); } 379inline 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"); } 380inline 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"); } 381inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
382inline 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"); } 383inline 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"); } 384inline 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"); } 385inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 386
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 387inline 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 388inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
339 389
340template<class T> 390template<class T>
341inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 391inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
342 392
343template<int N> 393template<int N>
478{ 528{
479 if (!ext->cb) 529 if (!ext->cb)
480 ext->cb = newAV (); 530 ext->cb = newAV ();
481 531
482 return newRV_inc ((SV *)ext->cb); 532 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} 533}
521 534
522///////////////////////////////////////////////////////////////////////////// 535/////////////////////////////////////////////////////////////////////////////
523 536
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 537extern "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)) 610 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
598 { 611 {
599 printf ("unable to initialize perl-interpreter, aborting.\n"); 612 printf ("unable to initialize perl-interpreter, aborting.\n");
600 exit (EXIT_FAILURE); 613 exit (EXIT_FAILURE);
601 } 614 }
615
616 {
617 dSP;
618
619 PUSHMARK (SP);
620 PUTBACK;
621 call_pv ("cf::init", G_DISCARD | G_VOID);
622 }
602} 623}
603 624
604void cfperl_main () 625void cfperl_main ()
605{ 626{
606 dSP; 627 dSP;
820} 841}
821 842
822///////////////////////////////////////////////////////////////////////////// 843/////////////////////////////////////////////////////////////////////////////
823 844
824void 845void
825maptile::emergency_save () 846cfperl_emergency_save ()
826{ 847{
827 CALL_BEGIN (0); 848 CALL_BEGIN (0);
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 849 CALL_CALL ("cf::emergency_save", G_VOID);
829 CALL_END; 850 CALL_END;
830} 851}
831 852
832maptile * 853maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 854maptile::find_sync (const char *path, maptile *origin)
834{ 855{
835 CALL_BEGIN (2); 856 CALL_BEGIN (2);
836 CALL_ARG (path); 857 CALL_ARG (path);
837 CALL_ARG (origin); 858 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 859 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 860
840 maptile *retval; 861 maptile *retval;
841 862
842 if (count) 863 if (count)
843 sv_to (POPs, retval); 864 sv_to (POPs, retval);
845 retval = 0; 866 retval = 0;
846 867
847 CALL_END; 868 CALL_END;
848 869
849 return retval; 870 return retval;
871}
872
873maptile *
874maptile::find_async (const char *path, maptile *origin)
875{
876 CALL_BEGIN (2);
877 CALL_ARG (path);
878 CALL_ARG (origin);
879 CALL_CALL ("cf::map::find_async", G_SCALAR);
880
881 maptile *retval;
882
883 if (count)
884 sv_to (POPs, retval);
885 else
886 retval = 0;
887
888 CALL_END;
889
890 return retval;
891}
892
893void
894maptile::do_load_sync ()
895{
896 CALL_BEGIN (1);
897 CALL_ARG (this);
898 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
899 CALL_END;
850} 900}
851 901
852void 902void
853maptile::change_all_map_light (int change) 903maptile::change_all_map_light (int change)
854{ 904{
874///////////////////////////////////////////////////////////////////////////// 924/////////////////////////////////////////////////////////////////////////////
875 925
876struct EventAPI *watcher_base::GEventAPI; 926struct EventAPI *watcher_base::GEventAPI;
877struct CoroAPI *coroapi::GCoroAPI; 927struct CoroAPI *coroapi::GCoroAPI;
878 928
929int coroapi::cede_counter;
930
879static void iw_dispatch (pe_event *ev) 931static void iw_dispatch (pe_event *ev)
880{ 932{
881 iw *w = (iw *)ev->ext_data; 933 iw *w = (iw *)ev->ext_data;
882 w->call (*w); 934 w->call (*w);
883} 935}
885void 937void
886iw::alloc () 938iw::alloc ()
887{ 939{
888 pe = GEventAPI->new_idle (0, 0); 940 pe = GEventAPI->new_idle (0, 0);
889 941
942 WaREENTRANT_off (pe);
890 pe->base.callback = (void *)iw_dispatch; 943 pe->base.callback = (void *)iw_dispatch;
891 pe->base.ext_data = (void *)this; 944 pe->base.ext_data = (void *)this;
892} 945}
893 946
894static void iow_dispatch (pe_event *ev) 947static void iow_dispatch (pe_event *ev)
900void 953void
901iow::alloc () 954iow::alloc ()
902{ 955{
903 pe = GEventAPI->new_io (0, 0); 956 pe = GEventAPI->new_io (0, 0);
904 957
958 WaREENTRANT_off (pe);
905 pe->base.callback = (void *)iow_dispatch; 959 pe->base.callback = (void *)iow_dispatch;
906 pe->base.ext_data = (void *)this; 960 pe->base.ext_data = (void *)this;
907 961
908 pe->fd = -1; 962 pe->fd = -1;
909 pe->poll = 0; 963 pe->poll = 0;
1237 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1291 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1238 const_iv (FLAG_IS_WATER) 1292 const_iv (FLAG_IS_WATER)
1239 const_iv (FLAG_CONTENT_ON_GEN) 1293 const_iv (FLAG_CONTENT_ON_GEN)
1240 const_iv (FLAG_IS_A_TEMPLATE) 1294 const_iv (FLAG_IS_A_TEMPLATE)
1241 const_iv (FLAG_IS_BUILDABLE) 1295 const_iv (FLAG_IS_BUILDABLE)
1296 const_iv (FLAG_DESTROY_ON_DEATH)
1297 const_iv (FLAG_NO_MAP_SAVE)
1242 1298
1243 const_iv (NDI_BLACK) 1299 const_iv (NDI_BLACK)
1244 const_iv (NDI_WHITE) 1300 const_iv (NDI_WHITE)
1245 const_iv (NDI_NAVY) 1301 const_iv (NDI_NAVY)
1246 const_iv (NDI_RED) 1302 const_iv (NDI_RED)
1288 const_iv (P_BLOCKSVIEW) 1344 const_iv (P_BLOCKSVIEW)
1289 const_iv (P_PLAYER) 1345 const_iv (P_PLAYER)
1290 const_iv (P_NO_MAGIC) 1346 const_iv (P_NO_MAGIC)
1291 const_iv (P_IS_ALIVE) 1347 const_iv (P_IS_ALIVE)
1292 const_iv (P_NO_CLERIC) 1348 const_iv (P_NO_CLERIC)
1293 const_iv (P_NEED_UPDATE)
1294 const_iv (P_OUT_OF_MAP) 1349 const_iv (P_OUT_OF_MAP)
1295 const_iv (P_NEW_MAP) 1350 const_iv (P_NEW_MAP)
1351 const_iv (P_UPTODATE)
1296 1352
1297 const_iv (UP_OBJ_INSERT) 1353 const_iv (UP_OBJ_INSERT)
1298 const_iv (UP_OBJ_REMOVE) 1354 const_iv (UP_OBJ_REMOVE)
1299 const_iv (UP_OBJ_CHANGE) 1355 const_iv (UP_OBJ_CHANGE)
1300 const_iv (UP_OBJ_FACE) 1356 const_iv (UP_OBJ_FACE)
1431 const_iv (ATNR_BLIND) 1487 const_iv (ATNR_BLIND)
1432 const_iv (ATNR_INTERNAL) 1488 const_iv (ATNR_INTERNAL)
1433 const_iv (ATNR_LIFE_STEALING) 1489 const_iv (ATNR_LIFE_STEALING)
1434 const_iv (ATNR_DISEASE) 1490 const_iv (ATNR_DISEASE)
1435 1491
1436 const_iv (MAP_FLUSH)
1437 const_iv (MAP_PLAYER_UNIQUE)
1438 const_iv (MAP_BLOCK)
1439 const_iv (MAP_STYLE)
1440 const_iv (MAP_OVERLAY)
1441
1442 const_iv (MAP_IN_MEMORY) 1492 const_iv (MAP_IN_MEMORY)
1443 const_iv (MAP_SWAPPED) 1493 const_iv (MAP_SWAPPED)
1444 const_iv (MAP_LOADING) 1494 const_iv (MAP_LOADING)
1445 const_iv (MAP_SAVING) 1495 const_iv (MAP_SAVING)
1446 1496
1459 const_iv (ST_SETUP) 1509 const_iv (ST_SETUP)
1460 const_iv (ST_PLAYING) 1510 const_iv (ST_PLAYING)
1461 const_iv (ST_CUSTOM) 1511 const_iv (ST_CUSTOM)
1462 1512
1463 const_iv (ST_CHANGE_CLASS) 1513 const_iv (ST_CHANGE_CLASS)
1464 const_iv (ST_CONFIRM_QUIT)
1465 const_iv (ST_GET_PARTY_PASSWORD)
1466 1514
1467 const_iv (IO_HEADER) 1515 const_iv (IO_HEADER)
1468 const_iv (IO_OBJECTS) 1516 const_iv (IO_OBJECTS)
1469 const_iv (IO_UNIQUES) 1517 const_iv (IO_UNIQUES)
1470 1518
1524 1572
1525void _global_reattach () 1573void _global_reattach ()
1526 CODE: 1574 CODE:
1527{ 1575{
1528 // reattach to all attachable objects in the game. 1576 // reattach to all attachable objects in the game.
1529 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1577 for_all_clients (ns)
1530 (*i)->reattach (); 1578 ns->reattach ();
1531 1579
1532 for_all_players (pl) 1580 for_all_players (pl)
1533 pl->reattach (); 1581 pl->reattach ();
1534 1582
1535 //TODO 1583 //TODO
1536 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1584 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1537 // i->second->reattach (); 1585 // i->second->reattach ();
1538 1586
1539 for (object *op = object::first; op; op = op->next) 1587 for_all_objects (op)
1540 op->reattach (); 1588 op->reattach ();
1541} 1589}
1542 1590
1543NV floor (NV x) 1591NV floor (NV x)
1544 1592
1545NV ceil (NV x) 1593NV ceil (NV x)
1594
1595NV rndm (...)
1596 CODE:
1597 switch (items)
1598 {
1599 case 0: RETVAL = rndm (); break;
1600 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1601 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1602 default: croak ("cf::rndm requires none, one or two parameters."); break;
1603 }
1604 OUTPUT:
1605 RETVAL
1546 1606
1547void server_tick () 1607void server_tick ()
1548 CODE: 1608 CODE:
1549 runtime = SvNVx (sv_runtime); 1609 runtime = SvNVx (sv_runtime);
1550 server_tick (); 1610 server_tick ();
1595 case 5: RETVAL = settings.playerdir; break; 1655 case 5: RETVAL = settings.playerdir; break;
1596 case 6: RETVAL = settings.datadir ; break; 1656 case 6: RETVAL = settings.datadir ; break;
1597 } 1657 }
1598 OUTPUT: RETVAL 1658 OUTPUT: RETVAL
1599 1659
1660void abort ()
1661
1662void fork_abort (char *cause = "cf::fork_abort")
1663
1664void cleanup (const char *cause, bool make_core = false)
1665
1600void emergency_save () 1666void emergency_save ()
1601 1667
1602void _exit (int status = 0) 1668void _exit (int status = EXIT_SUCCESS)
1669
1670UV sv_2watcher (SV *w)
1671 CODE:
1672 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1673 OUTPUT:
1674 RETVAL
1675
1676#if _POSIX_MEMLOCK
1677
1678int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1679
1680int munlockall ()
1681
1682#endif
1603 1683
1604int find_animation (char *text) 1684int find_animation (char *text)
1605 PROTOTYPE: $ 1685 PROTOTYPE: $
1606 1686
1607int random_roll (int min, int max, object *op, int goodbad); 1687int random_roll (int min, int max, object *op, int goodbad);
1645 RETVAL = newSVpv (resist_plus[atnr], 0); 1725 RETVAL = newSVpv (resist_plus[atnr], 0);
1646 else 1726 else
1647 XSRETURN_UNDEF; 1727 XSRETURN_UNDEF;
1648 OUTPUT: RETVAL 1728 OUTPUT: RETVAL
1649 1729
1730bool
1731load_regions (const char *filename)
1732 CODE:
1733 RETVAL = loader_region ().load (filename);
1734 OUTPUT: RETVAL
1735
1650MODULE = cf PACKAGE = cf::attachable 1736MODULE = cf PACKAGE = cf::attachable
1651 1737
1652int 1738int
1653valid (SV *obj) 1739valid (SV *obj)
1654 CODE: 1740 CODE:
1655 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1741 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1656 OUTPUT: 1742 OUTPUT:
1657 RETVAL 1743 RETVAL
1658 1744
1659#bool 1745int mortals_size ()
1660#destroyed (attachable *at) 1746 CODE:
1661# 1747 RETVAL = attachable::mortals.size ();
1662#void 1748 OUTPUT: RETVAL
1663#destroy (attachable *at) 1749
1750#object *mortals (U32 index)
1751# CODE:
1752# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1753# OUTPUT: RETVAL
1754
1755INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1664 1756
1665MODULE = cf PACKAGE = cf::global 1757MODULE = cf PACKAGE = cf::global
1666 1758
1667int invoke (SV *klass, int event, ...) 1759int invoke (SV *klass, int event, ...)
1668 CODE: 1760 CODE:
1684 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1776 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1685 OUTPUT: RETVAL 1777 OUTPUT: RETVAL
1686 1778
1687SV *registry (object *op) 1779SV *registry (object *op)
1688 1780
1689void mortals () 1781int objects_size ()
1690 PPCODE: 1782 CODE:
1691 EXTEND (SP, object::mortals.size ());
1692 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1693 PUSHs (to_sv (*i));
1694
1695object *first ()
1696 CODE:
1697 RETVAL = object::first; 1783 RETVAL = objects.size ();
1784 OUTPUT: RETVAL
1785
1786object *objects (U32 index)
1787 CODE:
1788 RETVAL = index < objects.size () ? objects [index] : 0;
1789 OUTPUT: RETVAL
1790
1791int actives_size ()
1792 CODE:
1793 RETVAL = actives.size ();
1794 OUTPUT: RETVAL
1795
1796object *actives (U32 index)
1797 CODE:
1798 RETVAL = index < actives.size () ? actives [index] : 0;
1698 OUTPUT: RETVAL 1799 OUTPUT: RETVAL
1699 1800
1700# missing properties 1801# missing properties
1701 1802
1702object *head (object *op) 1803object *head (object *op)
1703 PROTOTYPE: $ 1804 PROTOTYPE: $
1704 CODE: 1805 CODE:
1705 RETVAL = op->head ? op->head : op; 1806 RETVAL = op->head_ ();
1706 OUTPUT: RETVAL 1807 OUTPUT: RETVAL
1707 1808
1708int is_head (object *op) 1809int is_head (object *op)
1709 PROTOTYPE: $ 1810 PROTOTYPE: $
1710 CODE: 1811 CODE:
1711 RETVAL = !op->head; 1812 RETVAL = op->head_ () == op;
1712 OUTPUT: RETVAL 1813 OUTPUT: RETVAL
1713 1814
1714void 1815void
1715inv (object *obj) 1816inv (object *obj)
1716 PROTOTYPE: $ 1817 PROTOTYPE: $
1723 1824
1724void 1825void
1725set_animation (object *op, int idx) 1826set_animation (object *op, int idx)
1726 CODE: 1827 CODE:
1727 SET_ANIMATION (op, idx); 1828 SET_ANIMATION (op, idx);
1829
1830int
1831num_animations (object *op)
1832 CODE:
1833 RETVAL = NUM_ANIMATIONS (op);
1834 OUTPUT: RETVAL
1728 1835
1729object *find_best_object_match (object *op, const char *match) 1836object *find_best_object_match (object *op, const char *match)
1730 1837
1731object *find_marked_object (object *op) 1838object *find_marked_object (object *op)
1732 1839
1807 1914
1808void drop (object *who, object *op) 1915void drop (object *who, object *op)
1809 1916
1810void pick_up (object *who, object *op) 1917void pick_up (object *who, object *op)
1811 1918
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) 1919int cf_object_teleport (object *op, maptile *map, int x, int y)
1817 1920
1818void update_object (object *op, int action) 1921void update_object (object *op, int action)
1819 1922
1820object *cf_create_object_by_name (const char *name) 1923object *cf_create_object_by_name (const char *name)
1913 RETVAL = op->contr; 2016 RETVAL = op->contr;
1914 OUTPUT: RETVAL 2017 OUTPUT: RETVAL
1915 2018
1916void check_score (object *op) 2019void check_score (object *op)
1917 2020
1918void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2021void message (object *op, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2022 CODE:
2023 new_draw_info (flags, 0, op, txt);
1919 2024
1920object *cf_player_send_inventory (object *op) 2025object *cf_player_send_inventory (object *op)
1921 2026
1922char *cf_player_get_ip (object *op) 2027char *cf_player_get_ip (object *op)
1923 ALIAS: ip = 0 2028 ALIAS: ip = 0
1936 2041
1937void esrv_update_item (object *op, int what, object *item) 2042void esrv_update_item (object *op, int what, object *item)
1938 C_ARGS: what, op, item 2043 C_ARGS: what, op, item
1939 2044
1940void clear_los (object *op) 2045void clear_los (object *op)
1941
1942int command_teleport (object *op, char *params)
1943 2046
1944int command_summon (object *op, char *params) 2047int command_summon (object *op, char *params)
1945 2048
1946int command_arrest (object *op, char *params) 2049int command_arrest (object *op, char *params)
1947 2050
1970 pl->ob->stats.hp = pl->ob->stats.maxhp; 2073 pl->ob->stats.hp = pl->ob->stats.maxhp;
1971 pl->ob->stats.sp = pl->ob->stats.maxsp; 2074 pl->ob->stats.sp = pl->ob->stats.maxsp;
1972 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2075 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1973 pl->orig_stats = pl->ob->stats; 2076 pl->orig_stats = pl->ob->stats;
1974 2077
1975player *cf_player_find (char *name)
1976 PROTOTYPE: $
1977
1978void cf_player_move (player *pl, int dir) 2078void cf_player_move (player *pl, int dir)
1979 2079
1980void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2080void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1981
1982player *first ()
1983 CODE:
1984 RETVAL = first_player;
1985 OUTPUT: RETVAL
1986 2081
1987bool 2082bool
1988cell_visible (player *pl, int dx, int dy) 2083cell_visible (player *pl, int dx, int dy)
1989 CODE: 2084 CODE:
1990 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2085 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2027 if (y) sv_to (y, pl->bed_y); 2122 if (y) sv_to (y, pl->bed_y);
2028 2123
2029void 2124void
2030list () 2125list ()
2031 PPCODE: 2126 PPCODE:
2032 for (player *pl = first_player; pl; pl = pl->next) 2127 for_all_players (pl)
2033 XPUSHs (sv_2mortal (to_sv (pl))); 2128 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 2129
2057 2130
2058MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2131MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2059 2132
2060int invoke (maptile *map, int event, ...) 2133int invoke (maptile *map, int event, ...)
2076 PROTOTYPE: 2149 PROTOTYPE:
2077 CODE: 2150 CODE:
2078 RETVAL = new maptile; 2151 RETVAL = new maptile;
2079 OUTPUT: 2152 OUTPUT:
2080 RETVAL 2153 RETVAL
2081
2082void
2083maptile::destroy ()
2084 2154
2085void 2155void
2086maptile::players () 2156maptile::players ()
2087 PPCODE: 2157 PPCODE:
2088 if (GIMME_V == G_SCALAR) 2158 if (GIMME_V == G_SCALAR)
2093 for_all_players (pl) 2163 for_all_players (pl)
2094 if (pl->ob && pl->ob->map == THIS) 2164 if (pl->ob && pl->ob->map == THIS)
2095 PUSHs (sv_2mortal (to_sv (pl->ob))); 2165 PUSHs (sv_2mortal (to_sv (pl->ob)));
2096 } 2166 }
2097 2167
2168void
2169maptile::set_regiondata (SV *data, SV *plt)
2170 CODE:
2171{
2172 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2173 croak ("maptile::set_regiondata needs arrayref as plt arg");
2174
2175 AV *av = (AV *)SvRV (plt);
2176
2177 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2178
2179 for (int i = av_len (av) + 1; i--; )
2180 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2181
2182 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2183 THIS->regionmap = regionmap;
2184}
2185
2098void play_sound_map (maptile *map, int x, int y, int sound_num) 2186void play_sound_map (maptile *map, int x, int y, int sound_num)
2099 2187
2100int out_of_map (maptile *map, int x, int y) 2188int out_of_map (maptile *map, int x, int y)
2101 2189
2102void 2190void
2118 2206
2119object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2207object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2120 C_ARGS: str, map, nx, ny 2208 C_ARGS: str, map, nx, ny
2121 2209
2122void 2210void
2123cf_map_normalise (maptile *map, int x, int y) 2211get_map_flags (maptile *map, int x, int y)
2124 PPCODE: 2212 PPCODE:
2125{ 2213{
2126 maptile *nmap = 0; 2214 maptile *nmap = 0;
2127 I16 nx = 0, ny = 0; 2215 I16 nx = 0, ny = 0;
2128 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2216 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2177 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2265 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; 2266 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; 2267 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; 2268 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
2181 } 2269 }
2182 OUTPUT: 2270 OUTPUT: RETVAL
2183 RETVAL
2184 2271
2185void fix_walls (maptile *map, int x, int y) 2272void fix_walls (maptile *map, int x, int y)
2186 2273
2187void fix_walls_around (maptile *map, int x, int y) 2274void fix_walls_around (maptile *map, int x, int y)
2188 2275
2189# worst xs function of my life 2276# worst xs function of my life
2190maptile * 2277bool
2191_create_random_map (\ 2278_create_random_map (\
2192 char *path,\ 2279 maptile *self,\
2193 char *wallstyle,\ 2280 char *wallstyle,\
2194 char *wall_name,\ 2281 char *wall_name,\
2195 char *floorstyle,\ 2282 char *floorstyle,\
2196 char *monsterstyle,\ 2283 char *monsterstyle,\
2197 char *treasurestyle,\ 2284 char *treasurestyle,\
2201 char *origin_map,\ 2288 char *origin_map,\
2202 char *final_map,\ 2289 char *final_map,\
2203 char *exitstyle,\ 2290 char *exitstyle,\
2204 char *this_map,\ 2291 char *this_map,\
2205 char *exit_on_final_map,\ 2292 char *exit_on_final_map,\
2206 int Xsize,\ 2293 int xsize,\
2207 int Ysize,\ 2294 int ysize,\
2208 int expand2x,\ 2295 int expand2x,\
2209 int layoutoptions1,\ 2296 int layoutoptions1,\
2210 int layoutoptions2,\ 2297 int layoutoptions2,\
2211 int layoutoptions3,\ 2298 int layoutoptions3,\
2212 int symmetry,\ 2299 int symmetry,\
2217 int dungeon_depth,\ 2304 int dungeon_depth,\
2218 int decoroptions,\ 2305 int decoroptions,\
2219 int orientation,\ 2306 int orientation,\
2220 int origin_y,\ 2307 int origin_y,\
2221 int origin_x,\ 2308 int origin_x,\
2222 int random_seed,\ 2309 U32 random_seed,\
2223 val64 total_map_hp,\ 2310 val64 total_map_hp,\
2224 int map_layout_style,\ 2311 int map_layout_style,\
2225 int treasureoptions,\ 2312 int treasureoptions,\
2226 int symmetry_used,\ 2313 int symmetry_used,\
2227 region *region\ 2314 region *region,\
2315 char *custom\
2228) 2316)
2229 CODE: 2317 CODE:
2230{ 2318{
2231 random_map_params rmp; 2319 random_map_params rmp;
2232 2320
2236 assign (rmp.monsterstyle , monsterstyle); 2324 assign (rmp.monsterstyle , monsterstyle);
2237 assign (rmp.treasurestyle , treasurestyle); 2325 assign (rmp.treasurestyle , treasurestyle);
2238 assign (rmp.layoutstyle , layoutstyle); 2326 assign (rmp.layoutstyle , layoutstyle);
2239 assign (rmp.doorstyle , doorstyle); 2327 assign (rmp.doorstyle , doorstyle);
2240 assign (rmp.decorstyle , decorstyle); 2328 assign (rmp.decorstyle , decorstyle);
2241 assign (rmp.origin_map , origin_map);
2242 assign (rmp.final_map , final_map);
2243 assign (rmp.exitstyle , exitstyle); 2329 assign (rmp.exitstyle , exitstyle);
2244 assign (rmp.this_map , this_map);
2245 assign (rmp.exit_on_final_map, exit_on_final_map); 2330 assign (rmp.exit_on_final_map, exit_on_final_map);
2246 2331
2332 rmp.origin_map = origin_map;
2333 rmp.final_map = final_map;
2334 rmp.this_map = this_map;
2247 rmp.Xsize = Xsize; 2335 rmp.xsize = xsize;
2248 rmp.Ysize = Ysize; 2336 rmp.ysize = ysize;
2249 rmp.expand2x = expand2x; 2337 rmp.expand2x = expand2x;
2250 rmp.layoutoptions1 = layoutoptions1; 2338 rmp.layoutoptions1 = layoutoptions1;
2251 rmp.layoutoptions2 = layoutoptions2; 2339 rmp.layoutoptions2 = layoutoptions2;
2252 rmp.layoutoptions3 = layoutoptions3; 2340 rmp.layoutoptions3 = layoutoptions3;
2253 rmp.symmetry = symmetry; 2341 rmp.symmetry = symmetry;
2264 rmp.total_map_hp = total_map_hp; 2352 rmp.total_map_hp = total_map_hp;
2265 rmp.map_layout_style = map_layout_style; 2353 rmp.map_layout_style = map_layout_style;
2266 rmp.treasureoptions = treasureoptions; 2354 rmp.treasureoptions = treasureoptions;
2267 rmp.symmetry_used = symmetry_used; 2355 rmp.symmetry_used = symmetry_used;
2268 rmp.region = region; 2356 rmp.region = region;
2357 rmp.custom = custom;
2269 2358
2270 RETVAL = generate_random_map (path, &rmp); 2359 RETVAL = self->generate_random_map (&rmp);
2271} 2360}
2272 OUTPUT: 2361 OUTPUT:
2273 RETVAL 2362 RETVAL
2274 2363
2275MODULE = cf PACKAGE = cf::arch 2364MODULE = cf PACKAGE = cf::arch
2298 2387
2299INCLUDE: $PERL genacc partylist ../include/player.h | 2388INCLUDE: $PERL genacc partylist ../include/player.h |
2300 2389
2301MODULE = cf PACKAGE = cf::region 2390MODULE = cf PACKAGE = cf::region
2302 2391
2303region *first () 2392void
2393list ()
2394 PPCODE:
2395 for_all_regions (rgn)
2396 XPUSHs (sv_2mortal (to_sv (rgn)));
2397
2398region *find (char *name)
2304 PROTOTYPE: 2399 PROTOTYPE: $
2305 CODE: 2400 CODE:
2306 RETVAL = first_region; 2401 RETVAL = region::find (name);
2402 OUTPUT: RETVAL
2403
2404region *find_fuzzy (char *name)
2405 PROTOTYPE: $
2406 CODE:
2407 RETVAL = region::find_fuzzy (name);
2307 OUTPUT: RETVAL 2408 OUTPUT: RETVAL
2308 2409
2309INCLUDE: $PERL genacc region ../include/map.h | 2410INCLUDE: $PERL genacc region ../include/map.h |
2310 2411
2311MODULE = cf PACKAGE = cf::living 2412MODULE = cf PACKAGE = cf::living
2345 char *buf = SvPVbyte (packet, len); 2446 char *buf = SvPVbyte (packet, len);
2346 2447
2347 THIS->send_packet (buf, len); 2448 THIS->send_packet (buf, len);
2348} 2449}
2349 2450
2350void
2351client::destroy ()
2352

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines