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.276 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.314 by root, Thu Jan 1 20:49:48 2009 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"
43# include <sys/mman.h> 41# include <sys/mman.h>
44#endif 42#endif
45 43
46#if HAVE_MALLOC_H 44#if HAVE_MALLOC_H
47# include <malloc.h> 45# include <malloc.h>
46#endif
47
48#if !__GLIBC__
49# define malloc_trim(pad) -1
48#endif 50#endif
49 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>
79 *stash_cf, 81 *stash_cf,
80 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
81 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
82 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
83 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
84 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
85 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
86 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
87 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
88 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
89 92
93#ifndef newSVpv_utf8
90static inline SV * 94static inline SV *
91newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
92{ 96{
93 if (!s) 97 if (!s)
94 return newSV (0); 98 return newSV (0);
95 99
96 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
97 SvUTF8_on (sv); 101 SvUTF8_on (sv);
98 return sv; 102 return sv;
99} 103}
104#endif
100 105
106#ifndef newSVpvn_utf8
101static inline SV * 107static inline SV *
102newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
103{ 109{
104 if (!s) 110 if (!s)
105 return newSV (0); 111 return newSV (0);
106 112
107 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
108 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
109 return sv; 118 return sv;
110} 119}
120#endif
111 121
112// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
113template<class super> 123template<class super>
114static super * 124static super *
115is_a (attachable *at) 125is_a (attachable *at)
148 SvREFCNT_inc (self); 158 SvREFCNT_inc (self);
149 hv_clear (self); 159 hv_clear (self);
150 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 160 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
151 SvREFCNT_dec (self); 161 SvREFCNT_dec (self);
152 162
153 // self *must* be null now because thats sv_unmagic's job. 163 // self *must* be null now because that's sv_unmagic's job.
154 assert (!this->self); 164 assert (!this->self);
155 } 165 }
156} 166}
157 167
158void 168void
395 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
396 406
397 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
398} 408}
399 409
400static long 410static long noinline
401SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
402{ 412{
403 if (SvOK (sv)) 413 if (SvOK (sv))
404 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
405 else 415 else
406 return 0; 416 return 0;
407} 417}
408 418
409inline 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); }
410inline 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); }
411inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
412inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
413inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
414inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
427inline 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); }
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432 443
433inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
434inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&v); }
435 446
436inline 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 ()); }
437inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
438 449
439inline 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}
440 472
441inline 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; }
442inline 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; }
443inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
444inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
460inline 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"); }
461inline 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"); }
462inline 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"); }
463inline 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"); }
464inline 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"); }
465inline 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"); }
466inline 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" ); }
467 500
468//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)]; }
469inline 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)); }
574 va_end (ap); 607 va_end (ap);
575 608
576 return sv; 609 return sv;
577} 610}
578 611
612// typemap support, mostly to avoid excessive inlining
613template<class type>
614static void noinline
615cf_obj_to (SV *arg, type &var)
616{
617 sv_to (arg, var);
618 if (!var)
619 croak ("must not pass invalid/null cf_obj here");
620}
621
622template<class object>
623static void noinline
624cf_obj_ornull_to (SV *arg, object *&var)
625{
626 if (SvOK (arg))
627 {
628 sv_to (arg, var);
629 if (!var)
630 croak ("unable to convert perl object to C++ object");
631 }
632 else
633 var = 0;
634}
635
579////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
580 637
581SV * 638SV *
582registry (attachable *ext) 639registry (attachable *ext)
583{ 640{
600 657
601 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
602 659
603 const char *argv[] = { 660 const char *argv[] = {
604 settings.argv [0], 661 settings.argv [0],
605 "-e" 662 "-e0"
606 "use EV; use Coro;" // required for bootstrap
607 "cf->bootstrap;" // required for datadir :*>
608 "unshift @INC, cf::datadir ();"
609 "require cf;"
610 }; 663 };
611 664
612 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
613 || perl_run (perl)) 666 || perl_run (perl))
614 { 667 {
615 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
616 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
617 } 670 }
618 671
672 eval_pv (
673 "#line 1 'cfperl init'\n"
674 "use EV ();\n"
675 "use Coro ();\n"
676 "cf->bootstrap;\n"
677 "unshift @INC, cf::datadir ();\n"
678 "require cf;\n",
679 0
680 );
681
682 if (SvTRUE (ERRSV))
619 { 683 {
620 dSP; 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
621 685 exit (EXIT_FAILURE);
622 PUSHMARK (SP);
623 PUTBACK;
624 call_pv ("cf::init", G_DISCARD | G_VOID);
625 } 686 }
626} 687}
627 688
689void
628void cfperl_main () 690cfperl_main ()
629{ 691{
630 dSP; 692 dSP;
631 693
632 PUSHMARK (SP); 694 PUSHMARK (SP);
633 PUTBACK; 695 PUTBACK;
658# undef def 720# undef def
659}; 721};
660 722
661#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 723#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
662 724
663static void 725static void noinline
664gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
665{ 727{
666 // event must be in array 728 // event must be in array
667 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
668 { 730 {
754{ 816{
755 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
756 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
757} 819}
758 820
759void 821static void noinline
760_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
761{ 823{
762 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
763 { 825 {
764 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
774 } 836 }
775 } 837 }
776} 838}
777 839
778// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
779void 841static void
780_recalc_want () 842_recalc_want ()
781{ 843{
782 ev_want_event.reset (); 844 ev_want_event.reset ();
783 845
784 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
894} 956}
895 957
896///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
897// various c++ => perl glue functions 959// various c++ => perl glue functions
898 960
961void
899void cfperl_tick () 962cfperl_tick ()
900{ 963{
901 tick_pending = 1; 964 tick_pending = 1;
902 965
903 if (tick_inhibit) 966 if (tick_inhibit)
904 return; 967 return;
973{ 1036{
974 CALL_BEGIN (1); 1037 CALL_BEGIN (1);
975 CALL_ARG (name); 1038 CALL_ARG (name);
976 CALL_CALL ("cf::player::find", G_SCALAR); 1039 CALL_CALL ("cf::player::find", G_SCALAR);
977 1040
978 player *retval; 1041 player *retval = 0;
979
980 if (count)
981 sv_to (POPs, retval); 1042 if (count) sv_to (POPs, retval);
982 else 1043
983 retval = 0; 1044 CALL_END;
1045
1046 return retval;
1047}
1048
1049maptile *
1050find_style (const char *dirname, const char *stylename, int difficulty)
1051{
1052 CALL_BEGIN (3);
1053 CALL_ARG (dirname);
1054 CALL_ARG (stylename);
1055 CALL_ARG (difficulty);
1056 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1057
1058 maptile *retval = 0;
1059 if (count) sv_to (POPs, retval);
984 1060
985 CALL_END; 1061 CALL_END;
986 1062
987 return retval; 1063 return retval;
988} 1064}
993 CALL_BEGIN (2); 1069 CALL_BEGIN (2);
994 CALL_ARG (path); 1070 CALL_ARG (path);
995 CALL_ARG (origin); 1071 CALL_ARG (origin);
996 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1072 CALL_CALL ("cf::map::find_sync", G_SCALAR);
997 1073
998 maptile *retval; 1074 maptile *retval = 0;
999
1000 if (count)
1001 sv_to (POPs, retval); 1075 if (count) sv_to (POPs, retval);
1002 else
1003 retval = 0;
1004 1076
1005 CALL_END; 1077 CALL_END;
1006 1078
1007 return retval; 1079 return retval;
1008} 1080}
1014 CALL_ARG (path); 1086 CALL_ARG (path);
1015 CALL_ARG (origin); 1087 CALL_ARG (origin);
1016 CALL_ARG (load); 1088 CALL_ARG (load);
1017 CALL_CALL ("cf::map::find_async", G_SCALAR); 1089 CALL_CALL ("cf::map::find_async", G_SCALAR);
1018 1090
1019 maptile *retval; 1091 maptile *retval = 0;
1020
1021 if (count)
1022 sv_to (POPs, retval); 1092 if (count) sv_to (POPs, retval);
1023 else
1024 retval = 0;
1025 1093
1026 CALL_END; 1094 CALL_END;
1027 1095
1028 return retval; 1096 return retval;
1029} 1097}
1036 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1104 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1037 CALL_END; 1105 CALL_END;
1038} 1106}
1039 1107
1040void 1108void
1041maptile::change_all_map_light (int change)
1042{
1043 CALL_BEGIN (1);
1044 CALL_ARG (change);
1045 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1046 CALL_END;
1047}
1048
1049void
1050object::enter_exit (object *exit) 1109object::enter_exit (object *exit)
1051{ 1110{
1052 if (type != PLAYER) 1111 if (type != PLAYER)
1053 return; 1112 return;
1054 1113
1055 CALL_BEGIN (2); 1114 CALL_BEGIN (2);
1056 CALL_ARG (this); 1115 CALL_ARG (this);
1057 CALL_ARG (exit); 1116 CALL_ARG (exit);
1058 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1117 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1118 CALL_END;
1119}
1120
1121void
1122object::player_goto (const char *path, int x, int y)
1123{
1124 if (type != PLAYER)
1125 return;
1126
1127 CALL_BEGIN (4);
1128 CALL_ARG (this);
1129 CALL_ARG (path);
1130 CALL_ARG (x);
1131 CALL_ARG (y);
1132 CALL_CALL ("cf::object::player::goto", G_VOID);
1059 CALL_END; 1133 CALL_END;
1060} 1134}
1061 1135
1062const char * 1136const char *
1063object::ref () const 1137object::ref () const
1107///////////////////////////////////////////////////////////////////////////// 1181/////////////////////////////////////////////////////////////////////////////
1108 1182
1109struct EVAPI *evapi::GEVAPI; 1183struct EVAPI *evapi::GEVAPI;
1110struct CoroAPI *coroapi::GCoroAPI; 1184struct CoroAPI *coroapi::GCoroAPI;
1111 1185
1186void
1112void coroapi::do_cede_to_tick () 1187coroapi::do_cede_to_tick ()
1113{ 1188{
1114 cede_pending = 0; 1189 cede_pending = 0;
1115 cede (); 1190 cede ();
1116} 1191}
1117 1192
1141 ev_io_set ((ev_io *)this, fd, events); 1216 ev_io_set ((ev_io *)this, fd, events);
1142 if (active) start (); 1217 if (active) start ();
1143 } 1218 }
1144} 1219}
1145 1220
1146void 1221static void
1147_connect_to_perl () 1222_connect_to_perl ()
1148{ 1223{
1149 stash_cf = gv_stashpv ("cf", 1); 1224 stash_cf = gv_stashpv ("cf", 1);
1150 1225
1151 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1226 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1152 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1227 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1153 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1228 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1154 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1229 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1230 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1155 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1231 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1156 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1232 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1157 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1233 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1158 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1234 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1159 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1235 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1279 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1355 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1280 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1356 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1281 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1357 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1282 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1358 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1283 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1359 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1284 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1360 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1285 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1361 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1286 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1362 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1287 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1363 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1288 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1364 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1289 1365
1290 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1366 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1291 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1367 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1292 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1368 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1293 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1369 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1294 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1370 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1295 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1371 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1296 1372
1297 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1373 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1298 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1374 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1299 1375
1300 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1376 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1352 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1428 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1353 const_iv (F_LOCKED) 1429 const_iv (F_LOCKED)
1354 1430
1355 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1431 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1356 1432
1357 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1433 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1358 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1434 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1359 1435
1360 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1436 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1361 1437
1362 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1438 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1428 1504
1429 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1505 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1430 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1506 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1431 1507
1432 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1508 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1433 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1509 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1434 const_iv (GT_MINIMAL)
1435 1510
1436 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND) 1511 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1437 const_iv (FT_RSRC) const_iv (FT_NUM) 1512 const_iv (FT_RSRC) const_iv (FT_NUM)
1438 }; 1513 };
1439 1514
1461 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1536 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1462 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1537 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1463 } 1538 }
1464} 1539}
1465 1540
1541void _gv_clear (SV *gv)
1542 CODE:
1543 assert (SvTYPE (gv) == SVt_PVGV);
1544# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1545 f (GvGP (gv)->gp_form);
1546 f (GvGP (gv)->gp_io);
1547 f (GvGP (gv)->gp_sv);
1548 f (GvGP (gv)->gp_av);
1549 f (GvGP (gv)->gp_hv);
1550 f (GvGP (gv)->gp_cv);
1551 GvCVGEN (gv) = 0;
1552 GvMULTI_off (gv);
1553# undef f
1554
1466void _connect_to_perl () 1555void _connect_to_perl ()
1467 1556
1468void _recalc_want () 1557void _recalc_want ()
1469 1558
1559# not used by default anymore
1470void _global_reattach () 1560void _global_reattach ()
1471 CODE: 1561 CODE:
1472{ 1562{
1473 // reattach to all attachable objects in the game. 1563 // reattach to all attachable objects in the game.
1474 for_all_clients (ns) 1564 for_all_clients (ns)
1518 } 1608 }
1519 1609
1520 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1610 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1521} 1611}
1522 1612
1613void init_anim ()
1614
1615void init_globals ()
1616
1617void init_experience ()
1618
1619void init_attackmess ()
1620
1621void init_dynamic ()
1622
1623void load_settings ()
1624
1625void load_materials ()
1626
1627void init_uuid ()
1628 CODE:
1629 UUID::init ();
1630
1631void init_signals ()
1632
1633void init_commands ()
1634
1635void init_skills ()
1636
1637void init_beforeplay ()
1638
1523void evthread_start (int aiofd) 1639void evthread_start (int aiofd)
1524 1640
1525void cede_to_tick () 1641void cede_to_tick ()
1526 CODE: 1642 CODE:
1527 coroapi::cede_to_tick (); 1643 coroapi::cede_to_tick ();
1570NV floor (NV x) 1686NV floor (NV x)
1571 1687
1572NV ceil (NV x) 1688NV ceil (NV x)
1573 1689
1574NV rndm (...) 1690NV rndm (...)
1691 ALIAS:
1692 rmg_rndm = 1
1575 CODE: 1693 CODE:
1694{
1695 rand_gen &gen = ix ? rmg_rndm : rndm;
1576 switch (items) 1696 switch (items)
1577 { 1697 {
1578 case 0: RETVAL = rndm (); break; 1698 case 0: RETVAL = gen (); break;
1579 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1699 case 1: RETVAL = gen (SvUV (ST (0))); break;
1580 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1700 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1581 default: croak ("cf::rndm requires none, one or two parameters."); break; 1701 default: croak ("cf::rndm requires none, one or two parameters."); break;
1582 } 1702 }
1703}
1583 OUTPUT: 1704 OUTPUT:
1584 RETVAL 1705 RETVAL
1585 1706
1586NV clamp (NV value, NV min_value, NV max_value) 1707NV clamp (NV value, NV min_value, NV max_value)
1587 CODE: 1708 CODE:
1612octet_string path_combine (octet_string base, octet_string path) 1733octet_string path_combine (octet_string base, octet_string path)
1613 PROTOTYPE: $$ 1734 PROTOTYPE: $$
1614 1735
1615octet_string path_combine_and_normalize (octet_string base, octet_string path) 1736octet_string path_combine_and_normalize (octet_string base, octet_string path)
1616 PROTOTYPE: $$ 1737 PROTOTYPE: $$
1617
1618void
1619mallinfo ()
1620 PPCODE:
1621{
1622#if __GLIBC__
1623 struct mallinfo mai = mallinfo ();
1624 EXTEND (SP, 10*2);
1625 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1626 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1627 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1628 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1629 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1630 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1631 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1632 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1633 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1634 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1635#endif
1636 EXTEND (SP, 2*2);
1637 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1638 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1639}
1640 1738
1641void 1739void
1642sub_generation_inc () 1740sub_generation_inc ()
1643 CODE: 1741 CODE:
1644 PL_sub_generation++; 1742 PL_sub_generation++;
1681 1779
1682#if _POSIX_MEMLOCK 1780#if _POSIX_MEMLOCK
1683 1781
1684int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1782int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1685 INIT: 1783 INIT:
1784#if __GLIBC__
1785 mallopt (M_TOP_PAD, 1024 * 1024);
1786 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1787 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1686 mallopt (M_PERTURB, 0xaa); // bug-workaround for linux glibc+mlockall+calloc 1788 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1789#endif
1687 1790
1688int munlockall () 1791int munlockall ()
1689 1792
1690#endif 1793#endif
1794
1795int
1796malloc_trim (IV pad = 0)
1797
1798void
1799mallinfo ()
1800 PPCODE:
1801{
1802#if __GLIBC__
1803 struct mallinfo mai = mallinfo ();
1804 EXTEND (SP, 10*2);
1805 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1806 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1807 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1808 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1809 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1810 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1811 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1812 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1813 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1814 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1815#endif
1816 EXTEND (SP, 5*2);
1817 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1818 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1819 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1820 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1821 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1822}
1691 1823
1692int find_animation (utf8_string text) 1824int find_animation (utf8_string text)
1693 PROTOTYPE: $ 1825 PROTOTYPE: $
1694 1826
1695int random_roll (int min, int max, object *op, int goodbad); 1827int random_roll (int min, int max, object *op, int goodbad);
1776 EXTEND (SP, NUM_COINS); 1908 EXTEND (SP, NUM_COINS);
1777 for (int i = 0; i < NUM_COINS; ++i) 1909 for (int i = 0; i < NUM_COINS; ++i)
1778 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i])))); 1910 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1779 1911
1780bool 1912bool
1781load_resource_file (octet_string filename) 1913load_resource_file_ (octet_string filename)
1914
1915void
1916fix_weight ()
1782 1917
1783MODULE = cf PACKAGE = cf::attachable 1918MODULE = cf PACKAGE = cf::attachable
1784 1919
1785int 1920int
1786valid (SV *obj) 1921valid (SV *obj)
1850object *actives (U32 index) 1985object *actives (U32 index)
1851 CODE: 1986 CODE:
1852 RETVAL = index < actives.size () ? actives [index] : 0; 1987 RETVAL = index < actives.size () ? actives [index] : 0;
1853 OUTPUT: RETVAL 1988 OUTPUT: RETVAL
1854 1989
1990int mortals_size ()
1991 CODE:
1992 RETVAL = attachable::mortals.size ();
1993 OUTPUT: RETVAL
1994
1855const char *slot_use_name (U32 slot) 1995const char *slot_use_name (U32 slot)
1856 ALIAS: 1996 ALIAS:
1857 slot_nonuse_name = 1 1997 slot_nonuse_name = 1
1858 CODE: 1998 CODE:
1859{ 1999{
1937void apply_below (object *op) 2077void apply_below (object *op)
1938 CODE: 2078 CODE:
1939 player_apply_below (op); 2079 player_apply_below (op);
1940 2080
1941int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2081int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1942
1943#//TODO
1944object *clone_ (object *op, int recursive = 0)
1945 CODE:
1946 if (recursive)
1947 RETVAL = object_create_clone (op);
1948 else
1949 {
1950 RETVAL = object::create ();
1951 op->copy_to (RETVAL);
1952 }
1953 OUTPUT: RETVAL
1954 2082
1955int pay_item (object *op, object *buyer) 2083int pay_item (object *op, object *buyer)
1956 CODE: 2084 CODE:
1957 RETVAL = pay_for_item (op, buyer); 2085 RETVAL = pay_for_item (op, buyer);
1958 OUTPUT: RETVAL 2086 OUTPUT: RETVAL
2036 CODE: 2164 CODE:
2037{ 2165{
2038 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2166 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2039} 2167}
2040 2168
2041const_utf8_string get_ob_key_value (object *op, utf8_string key) 2169shstr
2170object::kv_get (shstr key)
2042 2171
2043bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2172void
2173object::kv_del (shstr key)
2174
2175void
2176object::kv_set (shstr key, shstr value)
2044 2177
2045object *get_nearest_player (object *ob) 2178object *get_nearest_player (object *ob)
2046 ALIAS: nearest_player = 0 2179 ALIAS: nearest_player = 0
2047 PREINIT: 2180 PREINIT:
2048 extern object *get_nearest_player (object *); 2181 extern object *get_nearest_player (object *);
2050void rangevector (object *ob, object *other, int flags = 0) 2183void rangevector (object *ob, object *other, int flags = 0)
2051 PROTOTYPE: $$;$ 2184 PROTOTYPE: $$;$
2052 PPCODE: 2185 PPCODE:
2053{ 2186{
2054 rv_vector rv; 2187 rv_vector rv;
2188
2189 PUTBACK;
2055 get_rangevector (ob, other, &rv, flags); 2190 get_rangevector (ob, other, &rv, flags);
2191 SPAGAIN;
2192
2056 EXTEND (SP, 5); 2193 EXTEND (SP, 5);
2057 PUSHs (newSVuv (rv.distance)); 2194 PUSHs (newSVuv (rv.distance));
2058 PUSHs (newSViv (rv.distance_x)); 2195 PUSHs (newSViv (rv.distance_x));
2059 PUSHs (newSViv (rv.distance_y)); 2196 PUSHs (newSViv (rv.distance_y));
2060 PUSHs (newSViv (rv.direction)); 2197 PUSHs (newSViv (rv.direction));
2070base_name (object *op, int plural = op->nrof > 1) 2207base_name (object *op, int plural = op->nrof > 1)
2071 CODE: 2208 CODE:
2072 RETVAL = query_base_name (op, plural); 2209 RETVAL = query_base_name (op, plural);
2073 OUTPUT: RETVAL 2210 OUTPUT: RETVAL
2074 2211
2075object *decrease_ob_nr (object *op, unsigned long i)
2076
2077# return the tail of an object, excluding itself 2212# return the tail of an object, excluding itself
2078void 2213void
2079tail (object *op) 2214tail (object *op)
2080 PPCODE: 2215 PPCODE:
2081 while ((op = op->more)) 2216 while ((op = op->more))
2131 pl->ob->stats.hp = pl->ob->stats.maxhp; 2266 pl->ob->stats.hp = pl->ob->stats.maxhp;
2132 pl->ob->stats.sp = pl->ob->stats.maxsp; 2267 pl->ob->stats.sp = pl->ob->stats.maxsp;
2133 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2268 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2134 pl->orig_stats = pl->ob->stats; 2269 pl->orig_stats = pl->ob->stats;
2135 2270
2136void clear_los (player *pl) 2271# should only be temporary
2272void esrv_new_player (player *pl)
2137 2273
2274#d# TODO: replace by blocked_los accessor, fix code using this
2138bool 2275bool
2139cell_visible (player *pl, int dx, int dy) 2276cell_visible (player *pl, int dx, int dy)
2140 CODE: 2277 CODE:
2141 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2278 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2142 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2143 OUTPUT: 2279 OUTPUT:
2144 RETVAL 2280 RETVAL
2145 2281
2146void 2282void
2147send (player *pl, SV *packet) 2283send (player *pl, SV *packet)
2153 if (len > MAXSOCKBUF) 2289 if (len > MAXSOCKBUF)
2154 pl->failmsg ("[packet too long for client]"); 2290 pl->failmsg ("[packet too long for client]");
2155 else if (pl->ns) 2291 else if (pl->ns)
2156 pl->ns->send_packet (buf, len); 2292 pl->ns->send_packet (buf, len);
2157} 2293}
2158
2159int
2160listening (player *pl, int new_value = -1)
2161 CODE:
2162 RETVAL = pl->listening;
2163 if (new_value >= 0)
2164 pl->listening = new_value;
2165 OUTPUT:
2166 RETVAL
2167 2294
2168void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2295void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2169 PROTOTYPE: $;$$$ 2296 PROTOTYPE: $;$$$
2170 PPCODE: 2297 PPCODE:
2171 if (GIMME_V != G_VOID) 2298 if (GIMME_V != G_VOID)
2224} 2351}
2225 2352
2226INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2353INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2227 2354
2228void 2355void
2356adjust_daylight ()
2357 CODE:
2358 maptile::adjust_daylight ();
2359
2360void
2229maptile::instantiate () 2361maptile::instantiate ()
2230 2362
2231maptile *new () 2363maptile *new ()
2232 PROTOTYPE: 2364 PROTOTYPE:
2233 CODE: 2365 CODE:
2326} 2458}
2327 2459
2328void 2460void
2329maptile::create_region_treasure () 2461maptile::create_region_treasure ()
2330 CODE: 2462 CODE:
2331{
2332 object *op = object::create ();
2333 op->type = FLOOR;
2334 op->map = THIS;
2335
2336 for (int x = 0; x < THIS->width; ++x) 2463 for (int x = 0; x < THIS->width; ++x)
2337 for (int y = 0; y < THIS->height; ++y) 2464 for (int y = 0; y < THIS->height; ++y)
2338 { 2465 {
2339 region *rgn = THIS->region (x, y); 2466 region *rgn = THIS->region (x, y);
2340 2467
2341 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2468 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2469 if (object *op = THIS->at (x, y).top)
2342 if (rgn->treasure && rndm () < rgn->treasure_density) 2470 if (rgn->treasure && rndm () < rgn->treasure_density)
2343 {
2344 op->x = x;
2345 op->y = y;
2346 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2471 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2347 }
2348 } 2472 }
2349
2350 op->destroy ();
2351}
2352 2473
2353int out_of_map (maptile *map, int x, int y) 2474int out_of_map (maptile *map, int x, int y)
2354 2475
2355void 2476void
2356trigger (maptile *map, long connection, bool state = true) 2477trigger (maptile *map, long connection, bool state = true)
2369get_map_flags (maptile *map, int x, int y) 2490get_map_flags (maptile *map, int x, int y)
2370 PPCODE: 2491 PPCODE:
2371{ 2492{
2372 maptile *nmap = 0; 2493 maptile *nmap = 0;
2373 I16 nx = 0, ny = 0; 2494 I16 nx = 0, ny = 0;
2495
2496 PUTBACK;
2374 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2497 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2498 SPAGAIN;
2375 2499
2376 EXTEND (SP, 4); 2500 EXTEND (SP, 4);
2377 PUSHs (sv_2mortal (newSViv (flags))); 2501 PUSHs (sv_2mortal (newSViv (flags)));
2378 2502
2379 if (GIMME_V == G_ARRAY) 2503 if (GIMME_V == G_ARRAY)
2382 PUSHs (sv_2mortal (newSViv (nx))); 2506 PUSHs (sv_2mortal (newSViv (nx)));
2383 PUSHs (sv_2mortal (newSViv (ny))); 2507 PUSHs (sv_2mortal (newSViv (ny)));
2384 } 2508 }
2385} 2509}
2386 2510
2511mapspace *
2512ms (maptile *map, unsigned int x, unsigned int y)
2513 PROTOTYPE: $$$
2514 CODE:
2515{
2516 maptile *nmap = 0;
2517 I16 nx, ny;
2518
2519 PUTBACK;
2520 get_map_flags (map, &nmap, x, y, &nx, &ny);
2521 SPAGAIN;
2522
2523 if (!nmap)
2524 XSRETURN_UNDEF;
2525
2526 RETVAL = &nmap->at (nx, ny);
2527}
2528 OUTPUT:
2529 RETVAL
2530
2387void 2531void
2388at (maptile *map, unsigned int x, unsigned int y) 2532at (maptile *map, unsigned int x, unsigned int y)
2389 PROTOTYPE: $$$ 2533 PROTOTYPE: $$$
2390 PPCODE: 2534 PPCODE:
2391{ 2535{
2392 object *o;
2393 maptile *nmap = 0; 2536 maptile *nmap = 0;
2394 I16 nx, ny; 2537 I16 nx, ny;
2395 2538
2539 PUTBACK;
2396 get_map_flags (map, &nmap, x, y, &nx, &ny); 2540 get_map_flags (map, &nmap, x, y, &nx, &ny);
2541 SPAGAIN;
2397 2542
2398 if (nmap) 2543 if (nmap)
2399 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2544 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2400 XPUSHs (sv_2mortal (to_sv (o))); 2545 XPUSHs (sv_2mortal (to_sv (o)));
2401} 2546}
2402 2547
2403SV * 2548SV *
2404bot_at (maptile *obj, unsigned int x, unsigned int y) 2549bot_at (maptile *map, unsigned int x, unsigned int y)
2405 PROTOTYPE: $$$ 2550 PROTOTYPE: $$$
2406 ALIAS: 2551 ALIAS:
2407 top_at = 1 2552 top_at = 1
2408 flags_at = 2 2553 flags_at = 2
2409 light_at = 3 2554 light_at = 3
2410 move_block_at = 4 2555 move_block_at = 4
2411 move_slow_at = 5 2556 move_slow_at = 5
2412 move_on_at = 6 2557 move_on_at = 6
2413 move_off_at = 7 2558 move_off_at = 7
2414 INIT:
2415 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2416 CODE: 2559 CODE:
2560{
2561 sint16 nx = x;
2562 sint16 ny = y;
2563
2564 if (!xy_normalise (map, nx, ny))
2565 XSRETURN_UNDEF;
2566
2567 mapspace &ms = map->at (nx, ny);
2568
2569 ms.update ();
2570
2417 switch (ix) 2571 switch (ix)
2418 { 2572 {
2419 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2573 case 0: RETVAL = to_sv (ms.bot ); break;
2420 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2574 case 1: RETVAL = to_sv (ms.top ); break;
2421 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2575 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2422 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2576 case 3: RETVAL = newSViv (ms.light ); break;
2423 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2577 case 4: RETVAL = newSVuv (ms.move_block); break;
2424 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2578 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2425 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2579 case 6: RETVAL = newSVuv (ms.move_on ); break;
2426 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2580 case 7: RETVAL = newSVuv (ms.move_off ); break;
2427 } 2581 }
2582}
2428 OUTPUT: RETVAL 2583 OUTPUT: RETVAL
2429 2584
2430void fix_walls (maptile *map, int x, int y) 2585void fix_walls (maptile *map, int x, int y)
2431 2586
2432void fix_walls_around (maptile *map, int x, int y) 2587void fix_walls_around (maptile *map, int x, int y)
2517 RETVAL = self->generate_random_map (&rmp); 2672 RETVAL = self->generate_random_map (&rmp);
2518} 2673}
2519 OUTPUT: 2674 OUTPUT:
2520 RETVAL 2675 RETVAL
2521 2676
2677MODULE = cf PACKAGE = cf::mapspace
2678
2679INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2680
2522MODULE = cf PACKAGE = cf::arch 2681MODULE = cf PACKAGE = cf::arch
2523 2682
2524int archetypes_size () 2683int archetypes_size ()
2525 CODE: 2684 CODE:
2526 RETVAL = archetypes.size (); 2685 RETVAL = archetypes.size ();
2559 2718
2560region *find (utf8_string name) 2719region *find (utf8_string name)
2561 PROTOTYPE: $ 2720 PROTOTYPE: $
2562 CODE: 2721 CODE:
2563 RETVAL = region::find (name); 2722 RETVAL = region::find (name);
2564 OUTPUT: RETVAL
2565
2566region *find_fuzzy (utf8_string name)
2567 PROTOTYPE: $
2568 CODE:
2569 RETVAL = region::find_fuzzy (name);
2570 OUTPUT: RETVAL 2723 OUTPUT: RETVAL
2571 2724
2572int specificity (region *rgn) 2725int specificity (region *rgn)
2573 CODE: 2726 CODE:
2574 RETVAL = 0; 2727 RETVAL = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines