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.289 by root, Thu May 8 20:03:50 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 2008 UTC

… …
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
25 25
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#if HAVE_EXECINFO_H 26#if HAVE_EXECINFO_H
30# include <execinfo.h> 27# include <execinfo.h>
31#endif 28#endif
32 29
33#include <cstdarg> 30#include <cstdarg>
31#include <typeinfo>
34 32
35#include "global.h" 33#include "global.h"
36#include "loader.h" 34#include "loader.h"
37#include "../random_maps/random_map.h" 35#include "../random_maps/random_map.h"
38#include "evthread.h" 36#include "evthread.h"
… …
83 *stash_cf, 81 *stash_cf,
84 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
85 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
86 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
87 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
93 92
93#ifndef newSVpv_utf8
94static inline SV * 94static inline SV *
95newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
96{ 96{
97 if (!s) 97 if (!s)
98 return newSV (0); 98 return newSV (0);
99 99
100 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
101 SvUTF8_on (sv); 101 SvUTF8_on (sv);
102 return sv; 102 return sv;
103} 103}
104#endif
104 105
106#ifndef newSVpvn_utf8
105static inline SV * 107static inline SV *
106newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
107{ 109{
108 if (!s) 110 if (!s)
109 return newSV (0); 111 return newSV (0);
110 112
111 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
112 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
113 return sv; 118 return sv;
114} 119}
120#endif
115 121
116// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
117template<class super> 123template<class super>
118static super * 124static super *
119is_a (attachable *at) 125is_a (attachable *at)
… …
408 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
409 else 415 else
410 return 0; 416 return 0;
411} 417}
412 418
413inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
414inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 420inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
415inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
416inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
417inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
418inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
431inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 437inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
432inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 438inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
433inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 439inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
434inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 440inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
435inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 441inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
442inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 443
437inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&v); }
439 446
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 449
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451
452inline SV *to_sv (dynbuf * v)
453{
454 SV *sv = newSV (0);
455
456 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1);
458 SvPOK_only (sv);
459 v->linearise (SvPVX (sv));
460 SvCUR_set (sv, v->size ());
461 *SvEND (sv) = 0;
462
463 return sv;
464}
465
466inline SV *to_sv (dynbuf_text * v)
467{
468 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv);
470 return sv;
471}
444 472
445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
446inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
464inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 492inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
465inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
466inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 494inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
467inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 495inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
468inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 496inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
497inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
469inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
470inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 499inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
471 500
472//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
473inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 502inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
… …
604 633
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 635
607 const char *argv[] = { 636 const char *argv[] = {
608 settings.argv [0], 637 settings.argv [0],
609 "-e" 638 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 639 };
615 640
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 642 || perl_run (perl))
618 { 643 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
621 } 646 }
622 647
648 eval_pv (
649 "#line 1 'cfperl init'\n"
650 "use EV ();\n"
651 "use Coro ();\n"
652 "cf->bootstrap;\n"
653 "unshift @INC, cf::datadir ();\n"
654 "require cf;\n",
655 0
656 );
657
658 if (SvTRUE (ERRSV))
623 { 659 {
624 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 661 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 662 }
630} 663}
631 664
632void cfperl_main () 665void cfperl_main ()
633{ 666{
634 dSP; 667 dSP;
… …
944 CALL_CALL ("ext::books::make_book", G_VOID); 977 CALL_CALL ("ext::books::make_book", G_VOID);
945 CALL_END; 978 CALL_END;
946} 979}
947 980
948void 981void
949cfperl_expand_cfpod (player *pl, std::string &msg)
950{
951 CALL_BEGIN (2);
952 CALL_ARG (pl);
953 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
954 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
955
956 if (count)
957 {
958 STRLEN len;
959 char *data = SvPVutf8 (TOPs, len);
960 msg.assign (data, len);
961 }
962
963 CALL_END;
964}
965
966void
967cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 982cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
968{ 983{
969 CALL_BEGIN (4); 984 CALL_BEGIN (4);
970 CALL_ARG (ns); 985 CALL_ARG (ns);
971 CALL_ARG (type); 986 CALL_ARG (type);
… …
1063 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1064 CALL_END; 1079 CALL_END;
1065} 1080}
1066 1081
1067void 1082void
1068maptile::change_all_map_light (int change)
1069{
1070 CALL_BEGIN (1);
1071 CALL_ARG (change);
1072 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1073 CALL_END;
1074}
1075
1076void
1077object::enter_exit (object *exit) 1083object::enter_exit (object *exit)
1078{ 1084{
1079 if (type != PLAYER) 1085 if (type != PLAYER)
1080 return; 1086 return;
1081 1087
… …
1192 1198
1193 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1199 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1194 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1200 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1195 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1201 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1196 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1202 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1203 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1197 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1204 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1198 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1205 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1199 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1206 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1200 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1207 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1201 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1208 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1321 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1328 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1322 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1329 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1323 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1330 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1324 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1331 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1325 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1332 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1326 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1333 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1327 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1334 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1328 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1335 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1329 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1336 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1330 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1337 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1331 1338
1332 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1339 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1333 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1340 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1334 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1341 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1335 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1342 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1336 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1343 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1337 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1344 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1338 1345
1339 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1346 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1340 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1347 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1341 1348
1342 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1349 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1394 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1401 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1395 const_iv (F_LOCKED) 1402 const_iv (F_LOCKED)
1396 1403
1397 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1404 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1398 1405
1399 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1406 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1400 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1407 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1401 1408
1402 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1409 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1403 1410
1404 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1411 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
… …
1502 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1509 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1503 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1510 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1504 } 1511 }
1505} 1512}
1506 1513
1514void _gv_clear (SV *gv)
1515 CODE:
1516 assert (SvTYPE (gv) == SVt_PVGV);
1517# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1518 f (GvGP (gv)->gp_form);
1519 f (GvGP (gv)->gp_io);
1520 f (GvGP (gv)->gp_sv);
1521 f (GvGP (gv)->gp_av);
1522 f (GvGP (gv)->gp_hv);
1523 f (GvGP (gv)->gp_cv);
1524 GvCVGEN (gv) = 0;
1525 GvMULTI_off (gv);
1526# undef f
1527
1507void _connect_to_perl () 1528void _connect_to_perl ()
1508 1529
1509void _recalc_want () 1530void _recalc_want ()
1510 1531
1532# not used by default anymore
1511void _global_reattach () 1533void _global_reattach ()
1512 CODE: 1534 CODE:
1513{ 1535{
1514 // reattach to all attachable objects in the game. 1536 // reattach to all attachable objects in the game.
1515 for_all_clients (ns) 1537 for_all_clients (ns)
… …
1558 len -= 3; 1580 len -= 3;
1559 } 1581 }
1560 1582
1561 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1583 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1562} 1584}
1585
1586void init_anim ()
1587
1588void init_globals ()
1589
1590void init_experience ()
1591
1592void init_attackmess ()
1593
1594void init_dynamic ()
1595
1596void load_settings ()
1597
1598void load_materials ()
1599
1600void init_uuid ()
1601 CODE:
1602 UUID::init ();
1603
1604void init_signals ()
1605
1606void init_commands ()
1607
1608void init_skills ()
1609
1610void init_beforeplay ()
1563 1611
1564void evthread_start (int aiofd) 1612void evthread_start (int aiofd)
1565 1613
1566void cede_to_tick () 1614void cede_to_tick ()
1567 CODE: 1615 CODE:
… …
1705#if _POSIX_MEMLOCK 1753#if _POSIX_MEMLOCK
1706 1754
1707int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1755int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1708 INIT: 1756 INIT:
1709#if __GLIBC__ 1757#if __GLIBC__
1758 mallopt (M_TOP_PAD, 1024 * 1024);
1759 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1760 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1710 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1761 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1711#endif 1762#endif
1712 1763
1713int munlockall () 1764int munlockall ()
1714 1765
… …
1733 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1784 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1734 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1785 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1735 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1786 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1736 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1787 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1737#endif 1788#endif
1738 EXTEND (SP, 2*2); 1789 EXTEND (SP, 5*2);
1739 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1790 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1740 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1791 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1741 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1792 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1793 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1794 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1742} 1795}
1743 1796
1744int find_animation (utf8_string text) 1797int find_animation (utf8_string text)
1745 PROTOTYPE: $ 1798 PROTOTYPE: $
1746 1799
… …
2103void rangevector (object *ob, object *other, int flags = 0) 2156void rangevector (object *ob, object *other, int flags = 0)
2104 PROTOTYPE: $$;$ 2157 PROTOTYPE: $$;$
2105 PPCODE: 2158 PPCODE:
2106{ 2159{
2107 rv_vector rv; 2160 rv_vector rv;
2161
2162 PUTBACK;
2108 get_rangevector (ob, other, &rv, flags); 2163 get_rangevector (ob, other, &rv, flags);
2164 SPAGAIN;
2165
2109 EXTEND (SP, 5); 2166 EXTEND (SP, 5);
2110 PUSHs (newSVuv (rv.distance)); 2167 PUSHs (newSVuv (rv.distance));
2111 PUSHs (newSViv (rv.distance_x)); 2168 PUSHs (newSViv (rv.distance_x));
2112 PUSHs (newSViv (rv.distance_y)); 2169 PUSHs (newSViv (rv.distance_y));
2113 PUSHs (newSViv (rv.direction)); 2170 PUSHs (newSViv (rv.direction));
… …
2182 pl->ob->stats.hp = pl->ob->stats.maxhp; 2239 pl->ob->stats.hp = pl->ob->stats.maxhp;
2183 pl->ob->stats.sp = pl->ob->stats.maxsp; 2240 pl->ob->stats.sp = pl->ob->stats.maxsp;
2184 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2241 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2185 pl->orig_stats = pl->ob->stats; 2242 pl->orig_stats = pl->ob->stats;
2186 2243
2187void clear_los (player *pl) 2244# should only be temporary
2245void esrv_new_player (player *pl)
2188 2246
2247#d# TODO: replace by blocked_los accessor, fix code using this
2189bool 2248bool
2190cell_visible (player *pl, int dx, int dy) 2249cell_visible (player *pl, int dx, int dy)
2191 CODE: 2250 CODE:
2192 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2251 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2193 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2194 OUTPUT: 2252 OUTPUT:
2195 RETVAL 2253 RETVAL
2196 2254
2197void 2255void
2198send (player *pl, SV *packet) 2256send (player *pl, SV *packet)
… …
2204 if (len > MAXSOCKBUF) 2262 if (len > MAXSOCKBUF)
2205 pl->failmsg ("[packet too long for client]"); 2263 pl->failmsg ("[packet too long for client]");
2206 else if (pl->ns) 2264 else if (pl->ns)
2207 pl->ns->send_packet (buf, len); 2265 pl->ns->send_packet (buf, len);
2208} 2266}
2209
2210int
2211listening (player *pl, int new_value = -1)
2212 CODE:
2213 RETVAL = pl->listening;
2214 if (new_value >= 0)
2215 pl->listening = new_value;
2216 OUTPUT:
2217 RETVAL
2218 2267
2219void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2268void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2220 PROTOTYPE: $;$$$ 2269 PROTOTYPE: $;$$$
2221 PPCODE: 2270 PPCODE:
2222 if (GIMME_V != G_VOID) 2271 if (GIMME_V != G_VOID)
… …
2275} 2324}
2276 2325
2277INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2278 2327
2279void 2328void
2329adjust_daylight ()
2330 CODE:
2331 maptile::adjust_daylight ();
2332
2333void
2280maptile::instantiate () 2334maptile::instantiate ()
2281 2335
2282maptile *new () 2336maptile *new ()
2283 PROTOTYPE: 2337 PROTOTYPE:
2284 CODE: 2338 CODE:
… …
2377} 2431}
2378 2432
2379void 2433void
2380maptile::create_region_treasure () 2434maptile::create_region_treasure ()
2381 CODE: 2435 CODE:
2382{
2383 object *op = object::create ();
2384 op->type = FLOOR;
2385 op->map = THIS;
2386
2387 for (int x = 0; x < THIS->width; ++x) 2436 for (int x = 0; x < THIS->width; ++x)
2388 for (int y = 0; y < THIS->height; ++y) 2437 for (int y = 0; y < THIS->height; ++y)
2389 { 2438 {
2390 region *rgn = THIS->region (x, y); 2439 region *rgn = THIS->region (x, y);
2391 2440
2392 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2441 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2442 if (object *op = THIS->at (x, y).top)
2393 if (rgn->treasure && rndm () < rgn->treasure_density) 2443 if (rgn->treasure && rndm () < rgn->treasure_density)
2394 {
2395 op->x = x;
2396 op->y = y;
2397 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2444 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2398 }
2399 } 2445 }
2400
2401 op->destroy ();
2402}
2403 2446
2404int out_of_map (maptile *map, int x, int y) 2447int out_of_map (maptile *map, int x, int y)
2405 2448
2406void 2449void
2407trigger (maptile *map, long connection, bool state = true) 2450trigger (maptile *map, long connection, bool state = true)
… …
2420get_map_flags (maptile *map, int x, int y) 2463get_map_flags (maptile *map, int x, int y)
2421 PPCODE: 2464 PPCODE:
2422{ 2465{
2423 maptile *nmap = 0; 2466 maptile *nmap = 0;
2424 I16 nx = 0, ny = 0; 2467 I16 nx = 0, ny = 0;
2468
2469 PUTBACK;
2425 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2470 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2471 SPAGAIN;
2426 2472
2427 EXTEND (SP, 4); 2473 EXTEND (SP, 4);
2428 PUSHs (sv_2mortal (newSViv (flags))); 2474 PUSHs (sv_2mortal (newSViv (flags)));
2429 2475
2430 if (GIMME_V == G_ARRAY) 2476 if (GIMME_V == G_ARRAY)
… …
2433 PUSHs (sv_2mortal (newSViv (nx))); 2479 PUSHs (sv_2mortal (newSViv (nx)));
2434 PUSHs (sv_2mortal (newSViv (ny))); 2480 PUSHs (sv_2mortal (newSViv (ny)));
2435 } 2481 }
2436} 2482}
2437 2483
2484mapspace *
2485ms (maptile *map, unsigned int x, unsigned int y)
2486 PROTOTYPE: $$$
2487 CODE:
2488{
2489 maptile *nmap = 0;
2490 I16 nx, ny;
2491
2492 PUTBACK;
2493 get_map_flags (map, &nmap, x, y, &nx, &ny);
2494 SPAGAIN;
2495
2496 if (!nmap)
2497 XSRETURN_UNDEF;
2498
2499 RETVAL = &nmap->at (nx, ny);
2500}
2501 OUTPUT:
2502 RETVAL
2503
2438void 2504void
2439at (maptile *map, unsigned int x, unsigned int y) 2505at (maptile *map, unsigned int x, unsigned int y)
2440 PROTOTYPE: $$$ 2506 PROTOTYPE: $$$
2441 PPCODE: 2507 PPCODE:
2442{ 2508{
2443 object *o;
2444 maptile *nmap = 0; 2509 maptile *nmap = 0;
2445 I16 nx, ny; 2510 I16 nx, ny;
2446 2511
2512 PUTBACK;
2447 get_map_flags (map, &nmap, x, y, &nx, &ny); 2513 get_map_flags (map, &nmap, x, y, &nx, &ny);
2514 SPAGAIN;
2448 2515
2449 if (nmap) 2516 if (nmap)
2450 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2517 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2451 XPUSHs (sv_2mortal (to_sv (o))); 2518 XPUSHs (sv_2mortal (to_sv (o)));
2452} 2519}
2453 2520
2454SV * 2521SV *
2455bot_at (maptile *obj, unsigned int x, unsigned int y) 2522bot_at (maptile *map, unsigned int x, unsigned int y)
2456 PROTOTYPE: $$$ 2523 PROTOTYPE: $$$
2457 ALIAS: 2524 ALIAS:
2458 top_at = 1 2525 top_at = 1
2459 flags_at = 2 2526 flags_at = 2
2460 light_at = 3 2527 light_at = 3
2461 move_block_at = 4 2528 move_block_at = 4
2462 move_slow_at = 5 2529 move_slow_at = 5
2463 move_on_at = 6 2530 move_on_at = 6
2464 move_off_at = 7 2531 move_off_at = 7
2465 INIT:
2466 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2467 CODE: 2532 CODE:
2533{
2534 sint16 nx = x;
2535 sint16 ny = y;
2536
2537 if (!xy_normalise (map, nx, ny))
2538 XSRETURN_UNDEF;
2539
2540 mapspace &ms = map->at (nx, ny);
2541
2542 ms.update ();
2543
2468 switch (ix) 2544 switch (ix)
2469 { 2545 {
2470 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2546 case 0: RETVAL = to_sv (ms.bot ); break;
2471 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2547 case 1: RETVAL = to_sv (ms.top ); break;
2472 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2548 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2473 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2549 case 3: RETVAL = newSViv (ms.light ); break;
2474 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2550 case 4: RETVAL = newSVuv (ms.move_block); break;
2475 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2551 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2476 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2552 case 6: RETVAL = newSVuv (ms.move_on ); break;
2477 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2553 case 7: RETVAL = newSVuv (ms.move_off ); break;
2478 } 2554 }
2555}
2479 OUTPUT: RETVAL 2556 OUTPUT: RETVAL
2480 2557
2481void fix_walls (maptile *map, int x, int y) 2558void fix_walls (maptile *map, int x, int y)
2482 2559
2483void fix_walls_around (maptile *map, int x, int y) 2560void fix_walls_around (maptile *map, int x, int y)
… …
2568 RETVAL = self->generate_random_map (&rmp); 2645 RETVAL = self->generate_random_map (&rmp);
2569} 2646}
2570 OUTPUT: 2647 OUTPUT:
2571 RETVAL 2648 RETVAL
2572 2649
2650MODULE = cf PACKAGE = cf::mapspace
2651
2652INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2653
2573MODULE = cf PACKAGE = cf::arch 2654MODULE = cf PACKAGE = cf::arch
2574 2655
2575int archetypes_size () 2656int archetypes_size ()
2576 CODE: 2657 CODE:
2577 RETVAL = archetypes.size (); 2658 RETVAL = archetypes.size ();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines