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.272 by root, Wed Apr 2 11:13:56 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"
45 43
46#if HAVE_MALLOC_H 44#if HAVE_MALLOC_H
47# include <malloc.h> 45# include <malloc.h>
48#endif 46#endif
49 47
48#if !__GLIBC__
49# define malloc_trim(pad) -1
50#endif
51
50#include <EXTERN.h> 52#include <EXTERN.h>
51#include <perl.h> 53#include <perl.h>
52#include <XSUB.h> 54#include <XSUB.h>
53 55
54#include "CoroAPI.h" 56#include "CoroAPI.h"
58 60
59typedef object_thawer &object_thawer_ref; 61typedef object_thawer &object_thawer_ref;
60typedef object_freezer &object_freezer_ref; 62typedef object_freezer &object_freezer_ref;
61 63
62typedef std::string std__string; 64typedef std::string std__string;
63
64#if IVSIZE >= 8
65 typedef IV val64;
66# define newSVval64 newSViv
67# define SvVAL64 SvIV
68#else
69 typedef double val64;
70# define newSVval64 newSVnv
71# define SvVAL64 SvNV
72#endif
73 65
74static PerlInterpreter *perl; 66static PerlInterpreter *perl;
75 67
76tstamp NOW, runtime; 68tstamp NOW, runtime;
77 69
89 *stash_cf, 81 *stash_cf,
90 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
91 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
92 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
93 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
94 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
95 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
96 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
97 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
98 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
99 92
93#ifndef newSVpv_utf8
100static inline SV * 94static inline SV *
101newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
102{ 96{
103 if (!s) 97 if (!s)
104 return newSV (0); 98 return newSV (0);
105 99
106 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
107 SvUTF8_on (sv); 101 SvUTF8_on (sv);
108 return sv; 102 return sv;
109} 103}
104#endif
110 105
106#ifndef newSVpvn_utf8
111static inline SV * 107static inline SV *
112newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
113{ 109{
114 if (!s) 110 if (!s)
115 return newSV (0); 111 return newSV (0);
116 112
117 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
118 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
119 return sv; 118 return sv;
120} 119}
120#endif
121 121
122// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
123template<class super> 123template<class super>
124static super * 124static super *
125is_a (attachable *at) 125is_a (attachable *at)
414 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
415 else 415 else
416 return 0; 416 return 0;
417} 417}
418 418
419inline 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); }
420inline 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); }
421inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
422inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
423inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
424inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
437inline 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); }
438inline 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); }
439inline 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); }
440inline 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); }
441inline 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); }
442 443
443inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
444inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&v); }
445 446
446inline 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 ()); }
447inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
448 449
450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451
449inline SV *to_sv (UUID v) 452inline SV *to_sv (dynbuf * v)
450{ 453{
451 char buf[128]; 454 SV *sv = newSV (0);
452 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq); 455
453 return newSVpv (buf, 0); 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;
454} 471}
455 472
456inline 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; }
457inline 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; }
458inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
475inline 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"); }
476inline 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"); }
477inline 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"); }
478inline 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"); }
479inline 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"); }
480inline 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"); }
481inline 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" ); }
482 500
483//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)]; }
484inline 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)); }
501 v.assign (data, len); 519 v.assign (data, len);
502} 520}
503 521
504inline void sv_to (SV *sv, UUID &v) 522inline void sv_to (SV *sv, UUID &v)
505{ 523{
506 unsigned int version; 524 if (!v.parse (SvPV_nolen (sv)))
507
508 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
509 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 525 croak ("unparsable uuid: %s", SvPV_nolen (sv));
510} 526}
511 527
512inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 528inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
513 529
617 633
618 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
619 635
620 const char *argv[] = { 636 const char *argv[] = {
621 settings.argv [0], 637 settings.argv [0],
622 "-e" 638 "-e0"
623 "use EV; use Coro;" // required for bootstrap
624 "cf->bootstrap;" // required for datadir :*>
625 "unshift @INC, cf::datadir ();"
626 "require cf;"
627 }; 639 };
628 640
629 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
630 || perl_run (perl)) 642 || perl_run (perl))
631 { 643 {
632 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
633 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
634 } 646 }
635 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))
636 { 659 {
637 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
638 661 exit (EXIT_FAILURE);
639 PUSHMARK (SP);
640 PUTBACK;
641 call_pv ("cf::init", G_DISCARD | G_VOID);
642 } 662 }
643} 663}
644 664
645void cfperl_main () 665void cfperl_main ()
646{ 666{
647 dSP; 667 dSP;
990{ 1010{
991 CALL_BEGIN (1); 1011 CALL_BEGIN (1);
992 CALL_ARG (name); 1012 CALL_ARG (name);
993 CALL_CALL ("cf::player::find", G_SCALAR); 1013 CALL_CALL ("cf::player::find", G_SCALAR);
994 1014
995 player *retval; 1015 player *retval = 0;
996
997 if (count)
998 sv_to (POPs, retval); 1016 if (count) sv_to (POPs, retval);
999 else 1017
1000 retval = 0; 1018 CALL_END;
1019
1020 return retval;
1021}
1022
1023maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty)
1025{
1026 CALL_BEGIN (3);
1027 CALL_ARG (dirname);
1028 CALL_ARG (stylename);
1029 CALL_ARG (difficulty);
1030 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1031
1032 maptile *retval = 0;
1033 if (count) sv_to (POPs, retval);
1001 1034
1002 CALL_END; 1035 CALL_END;
1003 1036
1004 return retval; 1037 return retval;
1005} 1038}
1010 CALL_BEGIN (2); 1043 CALL_BEGIN (2);
1011 CALL_ARG (path); 1044 CALL_ARG (path);
1012 CALL_ARG (origin); 1045 CALL_ARG (origin);
1013 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1046 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1014 1047
1015 maptile *retval; 1048 maptile *retval = 0;
1016
1017 if (count)
1018 sv_to (POPs, retval); 1049 if (count) sv_to (POPs, retval);
1019 else
1020 retval = 0;
1021 1050
1022 CALL_END; 1051 CALL_END;
1023 1052
1024 return retval; 1053 return retval;
1025} 1054}
1031 CALL_ARG (path); 1060 CALL_ARG (path);
1032 CALL_ARG (origin); 1061 CALL_ARG (origin);
1033 CALL_ARG (load); 1062 CALL_ARG (load);
1034 CALL_CALL ("cf::map::find_async", G_SCALAR); 1063 CALL_CALL ("cf::map::find_async", G_SCALAR);
1035 1064
1036 maptile *retval; 1065 maptile *retval = 0;
1037
1038 if (count)
1039 sv_to (POPs, retval); 1066 if (count) sv_to (POPs, retval);
1040 else
1041 retval = 0;
1042 1067
1043 CALL_END; 1068 CALL_END;
1044 1069
1045 return retval; 1070 return retval;
1046} 1071}
1053 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1054 CALL_END; 1079 CALL_END;
1055} 1080}
1056 1081
1057void 1082void
1058maptile::change_all_map_light (int change)
1059{
1060 CALL_BEGIN (1);
1061 CALL_ARG (change);
1062 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1063 CALL_END;
1064}
1065
1066void
1067object::enter_exit (object *exit) 1083object::enter_exit (object *exit)
1068{ 1084{
1069 if (type != PLAYER) 1085 if (type != PLAYER)
1070 return; 1086 return;
1071 1087
1072 CALL_BEGIN (2); 1088 CALL_BEGIN (2);
1073 CALL_ARG (this); 1089 CALL_ARG (this);
1074 CALL_ARG (exit); 1090 CALL_ARG (exit);
1075 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1091 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1092 CALL_END;
1093}
1094
1095void
1096object::player_goto (const char *path, int x, int y)
1097{
1098 if (type != PLAYER)
1099 return;
1100
1101 CALL_BEGIN (4);
1102 CALL_ARG (this);
1103 CALL_ARG (path);
1104 CALL_ARG (x);
1105 CALL_ARG (y);
1106 CALL_CALL ("cf::object::player::goto", G_VOID);
1076 CALL_END; 1107 CALL_END;
1077} 1108}
1078 1109
1079const char * 1110const char *
1080object::ref () const 1111object::ref () const
1167 1198
1168 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1199 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1169 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);
1170 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1201 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1171 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);
1172 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1204 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1173 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1205 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1174 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1206 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1175 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1207 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1176 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1208 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1296 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)
1297 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)
1298 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)
1299 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)
1300 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)
1301 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)
1302 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)
1303 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)
1304 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)
1305 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)
1306 1338
1307 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)
1308 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)
1309 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)
1310 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)
1311 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)
1312 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1344 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1313 1345
1314 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)
1315 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)
1316 1348
1317 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)
1369 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)
1370 const_iv (F_LOCKED) 1402 const_iv (F_LOCKED)
1371 1403
1372 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)
1373 1405
1374 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)
1375 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)
1376 1408
1377 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)
1378 1410
1379 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)
1419 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION) 1451 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1420 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL) 1452 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1421 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL) 1453 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1422 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE) 1454 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1423 1455
1424 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1456 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1457 const_iv (MAP_INACTIVE)
1425 1458
1426 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1459 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1427 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1460 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1428 1461
1429 const_iv (VERSION_CS) const_iv (VERSION_SC) 1462 const_iv (VERSION_CS) const_iv (VERSION_SC)
1444 1477
1445 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1478 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1446 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1479 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1447 1480
1448 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1481 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1449 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1482 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1450 const_iv (GT_MINIMAL)
1451 1483
1452 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND) 1484 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1453 const_iv (FT_RSRC) const_iv (FT_NUM) 1485 const_iv (FT_RSRC) const_iv (FT_NUM)
1454 }; 1486 };
1455 1487
1477 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1509 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1478 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1510 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1479 } 1511 }
1480} 1512}
1481 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
1482void _connect_to_perl () 1528void _connect_to_perl ()
1483 1529
1484void _recalc_want () 1530void _recalc_want ()
1485 1531
1532# not used by default anymore
1486void _global_reattach () 1533void _global_reattach ()
1487 CODE: 1534 CODE:
1488{ 1535{
1489 // reattach to all attachable objects in the game. 1536 // reattach to all attachable objects in the game.
1490 for_all_clients (ns) 1537 for_all_clients (ns)
1534 } 1581 }
1535 1582
1536 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1583 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1537} 1584}
1538 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 ()
1611
1539void evthread_start () 1612void evthread_start (int aiofd)
1540 1613
1541void cede_to_tick () 1614void cede_to_tick ()
1542 CODE: 1615 CODE:
1543 coroapi::cede_to_tick (); 1616 coroapi::cede_to_tick ();
1544 1617
1586NV floor (NV x) 1659NV floor (NV x)
1587 1660
1588NV ceil (NV x) 1661NV ceil (NV x)
1589 1662
1590NV rndm (...) 1663NV rndm (...)
1664 ALIAS:
1665 rmg_rndm = 1
1591 CODE: 1666 CODE:
1667{
1668 rand_gen &gen = ix ? rmg_rndm : rndm;
1592 switch (items) 1669 switch (items)
1593 { 1670 {
1594 case 0: RETVAL = rndm (); break; 1671 case 0: RETVAL = gen (); break;
1595 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1672 case 1: RETVAL = gen (SvUV (ST (0))); break;
1596 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1673 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1597 default: croak ("cf::rndm requires none, one or two parameters."); break; 1674 default: croak ("cf::rndm requires none, one or two parameters."); break;
1598 } 1675 }
1676}
1599 OUTPUT: 1677 OUTPUT:
1600 RETVAL 1678 RETVAL
1601 1679
1602NV clamp (NV value, NV min_value, NV max_value) 1680NV clamp (NV value, NV min_value, NV max_value)
1603 CODE: 1681 CODE:
1628octet_string path_combine (octet_string base, octet_string path) 1706octet_string path_combine (octet_string base, octet_string path)
1629 PROTOTYPE: $$ 1707 PROTOTYPE: $$
1630 1708
1631octet_string path_combine_and_normalize (octet_string base, octet_string path) 1709octet_string path_combine_and_normalize (octet_string base, octet_string path)
1632 PROTOTYPE: $$ 1710 PROTOTYPE: $$
1633
1634void
1635mallinfo ()
1636 PPCODE:
1637{
1638#if __GLIBC__
1639 struct mallinfo mai = mallinfo ();
1640 EXTEND (SP, 10*2);
1641 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1642 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1643 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1644 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1645 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1646 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1647 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1648 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1649 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1650 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1651#endif
1652 EXTEND (SP, 2*2);
1653 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1654 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1655}
1656 1711
1657void 1712void
1658sub_generation_inc () 1713sub_generation_inc ()
1659 CODE: 1714 CODE:
1660 PL_sub_generation++; 1715 PL_sub_generation++;
1697 1752
1698#if _POSIX_MEMLOCK 1753#if _POSIX_MEMLOCK
1699 1754
1700int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1755int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1701 INIT: 1756 INIT:
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
1702 mallopt (M_PERTURB, 0xaa); // bug-workaround for linux glibc+mlockall+calloc 1761 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1762#endif
1703 1763
1704int munlockall () 1764int munlockall ()
1705 1765
1706#endif 1766#endif
1767
1768int
1769malloc_trim (IV pad = 0)
1770
1771void
1772mallinfo ()
1773 PPCODE:
1774{
1775#if __GLIBC__
1776 struct mallinfo mai = mallinfo ();
1777 EXTEND (SP, 10*2);
1778 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1779 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1780 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1781 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1782 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1783 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1784 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1785 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1786 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1787 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1788#endif
1789 EXTEND (SP, 5*2);
1790 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1791 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
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)));
1795}
1707 1796
1708int find_animation (utf8_string text) 1797int find_animation (utf8_string text)
1709 PROTOTYPE: $ 1798 PROTOTYPE: $
1710 1799
1711int random_roll (int min, int max, object *op, int goodbad); 1800int random_roll (int min, int max, object *op, int goodbad);
1749 RETVAL = newSVpv (resist_plus[atnr], 0); 1838 RETVAL = newSVpv (resist_plus[atnr], 0);
1750 else 1839 else
1751 XSRETURN_UNDEF; 1840 XSRETURN_UNDEF;
1752 OUTPUT: RETVAL 1841 OUTPUT: RETVAL
1753 1842
1843UUID
1844uuid_cur ()
1845 CODE:
1846 RETVAL = UUID::cur;
1847 OUTPUT:
1848 RETVAL
1849
1850UUID
1851uuid_gen ()
1852 CODE:
1853 RETVAL = UUID::gen ();
1854 OUTPUT:
1855 RETVAL
1856
1857val64
1858uuid_seq (UUID uuid)
1859 CODE:
1860 RETVAL = uuid.seq;
1861 OUTPUT:
1862 RETVAL
1863
1864UUID
1865uuid_str (val64 seq)
1866 CODE:
1867 RETVAL.seq = seq;
1868 OUTPUT:
1869 RETVAL
1870
1871void
1872coin_names ()
1873 PPCODE:
1874 EXTEND (SP, NUM_COINS);
1875 for (int i = 0; i < NUM_COINS; ++i)
1876 PUSHs (sv_2mortal (newSVpv (coins [i], 0)));
1877
1878void
1879coin_archetypes ()
1880 PPCODE:
1881 EXTEND (SP, NUM_COINS);
1882 for (int i = 0; i < NUM_COINS; ++i)
1883 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1884
1754bool 1885bool
1755load_resource_file (octet_string filename) 1886load_resource_file_ (octet_string filename)
1887
1888void
1889fix_weight ()
1756 1890
1757MODULE = cf PACKAGE = cf::attachable 1891MODULE = cf PACKAGE = cf::attachable
1758 1892
1759int 1893int
1760valid (SV *obj) 1894valid (SV *obj)
1824object *actives (U32 index) 1958object *actives (U32 index)
1825 CODE: 1959 CODE:
1826 RETVAL = index < actives.size () ? actives [index] : 0; 1960 RETVAL = index < actives.size () ? actives [index] : 0;
1827 OUTPUT: RETVAL 1961 OUTPUT: RETVAL
1828 1962
1963int mortals_size ()
1964 CODE:
1965 RETVAL = attachable::mortals.size ();
1966 OUTPUT: RETVAL
1967
1829const char *slot_use_name (U32 slot) 1968const char *slot_use_name (U32 slot)
1830 ALIAS: 1969 ALIAS:
1831 slot_nonuse_name = 1 1970 slot_nonuse_name = 1
1832 CODE: 1971 CODE:
1833{ 1972{
1911void apply_below (object *op) 2050void apply_below (object *op)
1912 CODE: 2051 CODE:
1913 player_apply_below (op); 2052 player_apply_below (op);
1914 2053
1915int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2054int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1916
1917#//TODO
1918object *clone_ (object *op, int recursive = 0)
1919 CODE:
1920 if (recursive)
1921 RETVAL = object_create_clone (op);
1922 else
1923 {
1924 RETVAL = object::create ();
1925 op->copy_to (RETVAL);
1926 }
1927 OUTPUT: RETVAL
1928 2055
1929int pay_item (object *op, object *buyer) 2056int pay_item (object *op, object *buyer)
1930 CODE: 2057 CODE:
1931 RETVAL = pay_for_item (op, buyer); 2058 RETVAL = pay_for_item (op, buyer);
1932 OUTPUT: RETVAL 2059 OUTPUT: RETVAL
2010 CODE: 2137 CODE:
2011{ 2138{
2012 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2139 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2013} 2140}
2014 2141
2015const_utf8_string get_ob_key_value (object *op, utf8_string key) 2142shstr
2143object::kv_get (shstr key)
2016 2144
2017bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2145void
2146object::kv_del (shstr key)
2147
2148void
2149object::kv_set (shstr key, shstr value)
2018 2150
2019object *get_nearest_player (object *ob) 2151object *get_nearest_player (object *ob)
2020 ALIAS: nearest_player = 0 2152 ALIAS: nearest_player = 0
2021 PREINIT: 2153 PREINIT:
2022 extern object *get_nearest_player (object *); 2154 extern object *get_nearest_player (object *);
2024void rangevector (object *ob, object *other, int flags = 0) 2156void rangevector (object *ob, object *other, int flags = 0)
2025 PROTOTYPE: $$;$ 2157 PROTOTYPE: $$;$
2026 PPCODE: 2158 PPCODE:
2027{ 2159{
2028 rv_vector rv; 2160 rv_vector rv;
2161
2162 PUTBACK;
2029 get_rangevector (ob, other, &rv, flags); 2163 get_rangevector (ob, other, &rv, flags);
2164 SPAGAIN;
2165
2030 EXTEND (SP, 5); 2166 EXTEND (SP, 5);
2031 PUSHs (newSVuv (rv.distance)); 2167 PUSHs (newSVuv (rv.distance));
2032 PUSHs (newSViv (rv.distance_x)); 2168 PUSHs (newSViv (rv.distance_x));
2033 PUSHs (newSViv (rv.distance_y)); 2169 PUSHs (newSViv (rv.distance_y));
2034 PUSHs (newSViv (rv.direction)); 2170 PUSHs (newSViv (rv.direction));
2044base_name (object *op, int plural = op->nrof > 1) 2180base_name (object *op, int plural = op->nrof > 1)
2045 CODE: 2181 CODE:
2046 RETVAL = query_base_name (op, plural); 2182 RETVAL = query_base_name (op, plural);
2047 OUTPUT: RETVAL 2183 OUTPUT: RETVAL
2048 2184
2049object *decrease_ob_nr (object *op, unsigned long i)
2050
2051# return the tail of an object, excluding itself 2185# return the tail of an object, excluding itself
2052void 2186void
2053tail (object *op) 2187tail (object *op)
2054 PPCODE: 2188 PPCODE:
2055 while ((op = op->more)) 2189 while ((op = op->more))
2105 pl->ob->stats.hp = pl->ob->stats.maxhp; 2239 pl->ob->stats.hp = pl->ob->stats.maxhp;
2106 pl->ob->stats.sp = pl->ob->stats.maxsp; 2240 pl->ob->stats.sp = pl->ob->stats.maxsp;
2107 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2241 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2108 pl->orig_stats = pl->ob->stats; 2242 pl->orig_stats = pl->ob->stats;
2109 2243
2110void clear_los (player *pl) 2244# should only be temporary
2245void esrv_new_player (player *pl)
2111 2246
2247#d# TODO: replace by blocked_los accessor, fix code using this
2112bool 2248bool
2113cell_visible (player *pl, int dx, int dy) 2249cell_visible (player *pl, int dx, int dy)
2114 CODE: 2250 CODE:
2115 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2251 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2116 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2117 OUTPUT: 2252 OUTPUT:
2118 RETVAL 2253 RETVAL
2119 2254
2120void 2255void
2121send (player *pl, SV *packet) 2256send (player *pl, SV *packet)
2127 if (len > MAXSOCKBUF) 2262 if (len > MAXSOCKBUF)
2128 pl->failmsg ("[packet too long for client]"); 2263 pl->failmsg ("[packet too long for client]");
2129 else if (pl->ns) 2264 else if (pl->ns)
2130 pl->ns->send_packet (buf, len); 2265 pl->ns->send_packet (buf, len);
2131} 2266}
2132
2133int
2134listening (player *pl, int new_value = -1)
2135 CODE:
2136 RETVAL = pl->listening;
2137 if (new_value >= 0)
2138 pl->listening = new_value;
2139 OUTPUT:
2140 RETVAL
2141 2267
2142void 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)
2143 PROTOTYPE: $;$$$ 2269 PROTOTYPE: $;$$$
2144 PPCODE: 2270 PPCODE:
2145 if (GIMME_V != G_VOID) 2271 if (GIMME_V != G_VOID)
2198} 2324}
2199 2325
2200INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2201 2327
2202void 2328void
2329adjust_daylight ()
2330 CODE:
2331 maptile::adjust_daylight ();
2332
2333void
2203maptile::instantiate () 2334maptile::instantiate ()
2204 2335
2205maptile *new () 2336maptile *new ()
2206 PROTOTYPE: 2337 PROTOTYPE:
2207 CODE: 2338 CODE:
2300} 2431}
2301 2432
2302void 2433void
2303maptile::create_region_treasure () 2434maptile::create_region_treasure ()
2304 CODE: 2435 CODE:
2305{
2306 object *op = object::create ();
2307 op->type = FLOOR;
2308 op->map = THIS;
2309
2310 for (int x = 0; x < THIS->width; ++x) 2436 for (int x = 0; x < THIS->width; ++x)
2311 for (int y = 0; y < THIS->height; ++y) 2437 for (int y = 0; y < THIS->height; ++y)
2312 { 2438 {
2313 region *rgn = THIS->region (x, y); 2439 region *rgn = THIS->region (x, y);
2314 2440
2315 //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)
2316 if (rgn->treasure && rndm () < rgn->treasure_density) 2443 if (rgn->treasure && rndm () < rgn->treasure_density)
2317 {
2318 op->x = x;
2319 op->y = y;
2320 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2444 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2321 }
2322 } 2445 }
2323
2324 op->destroy ();
2325}
2326 2446
2327int out_of_map (maptile *map, int x, int y) 2447int out_of_map (maptile *map, int x, int y)
2328 2448
2329void 2449void
2330trigger (maptile *map, long connection, bool state = true) 2450trigger (maptile *map, long connection, bool state = true)
2343get_map_flags (maptile *map, int x, int y) 2463get_map_flags (maptile *map, int x, int y)
2344 PPCODE: 2464 PPCODE:
2345{ 2465{
2346 maptile *nmap = 0; 2466 maptile *nmap = 0;
2347 I16 nx = 0, ny = 0; 2467 I16 nx = 0, ny = 0;
2468
2469 PUTBACK;
2348 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;
2349 2472
2350 EXTEND (SP, 4); 2473 EXTEND (SP, 4);
2351 PUSHs (sv_2mortal (newSViv (flags))); 2474 PUSHs (sv_2mortal (newSViv (flags)));
2352 2475
2353 if (GIMME_V == G_ARRAY) 2476 if (GIMME_V == G_ARRAY)
2356 PUSHs (sv_2mortal (newSViv (nx))); 2479 PUSHs (sv_2mortal (newSViv (nx)));
2357 PUSHs (sv_2mortal (newSViv (ny))); 2480 PUSHs (sv_2mortal (newSViv (ny)));
2358 } 2481 }
2359} 2482}
2360 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
2361void 2504void
2362at (maptile *map, unsigned int x, unsigned int y) 2505at (maptile *map, unsigned int x, unsigned int y)
2363 PROTOTYPE: $$$ 2506 PROTOTYPE: $$$
2364 PPCODE: 2507 PPCODE:
2365{ 2508{
2366 object *o;
2367 maptile *nmap = 0; 2509 maptile *nmap = 0;
2368 I16 nx, ny; 2510 I16 nx, ny;
2369 2511
2512 PUTBACK;
2370 get_map_flags (map, &nmap, x, y, &nx, &ny); 2513 get_map_flags (map, &nmap, x, y, &nx, &ny);
2514 SPAGAIN;
2371 2515
2372 if (nmap) 2516 if (nmap)
2373 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)
2374 XPUSHs (sv_2mortal (to_sv (o))); 2518 XPUSHs (sv_2mortal (to_sv (o)));
2375} 2519}
2376 2520
2377SV * 2521SV *
2378bot_at (maptile *obj, unsigned int x, unsigned int y) 2522bot_at (maptile *map, unsigned int x, unsigned int y)
2379 PROTOTYPE: $$$ 2523 PROTOTYPE: $$$
2380 ALIAS: 2524 ALIAS:
2381 top_at = 1 2525 top_at = 1
2382 flags_at = 2 2526 flags_at = 2
2383 light_at = 3 2527 light_at = 3
2384 move_block_at = 4 2528 move_block_at = 4
2385 move_slow_at = 5 2529 move_slow_at = 5
2386 move_on_at = 6 2530 move_on_at = 6
2387 move_off_at = 7 2531 move_off_at = 7
2388 INIT:
2389 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2390 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
2391 switch (ix) 2544 switch (ix)
2392 { 2545 {
2393 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2546 case 0: RETVAL = to_sv (ms.bot ); break;
2394 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2547 case 1: RETVAL = to_sv (ms.top ); break;
2395 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2548 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2396 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2549 case 3: RETVAL = newSViv (ms.light ); break;
2397 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2550 case 4: RETVAL = newSVuv (ms.move_block); break;
2398 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2551 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2399 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2552 case 6: RETVAL = newSVuv (ms.move_on ); break;
2400 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2553 case 7: RETVAL = newSVuv (ms.move_off ); break;
2401 } 2554 }
2555}
2402 OUTPUT: RETVAL 2556 OUTPUT: RETVAL
2403 2557
2404void fix_walls (maptile *map, int x, int y) 2558void fix_walls (maptile *map, int x, int y)
2405 2559
2406void fix_walls_around (maptile *map, int x, int y) 2560void fix_walls_around (maptile *map, int x, int y)
2491 RETVAL = self->generate_random_map (&rmp); 2645 RETVAL = self->generate_random_map (&rmp);
2492} 2646}
2493 OUTPUT: 2647 OUTPUT:
2494 RETVAL 2648 RETVAL
2495 2649
2650MODULE = cf PACKAGE = cf::mapspace
2651
2652INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2653
2496MODULE = cf PACKAGE = cf::arch 2654MODULE = cf PACKAGE = cf::arch
2497 2655
2498int archetypes_size () 2656int archetypes_size ()
2499 CODE: 2657 CODE:
2500 RETVAL = archetypes.size (); 2658 RETVAL = archetypes.size ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines