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.280 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.316 by root, Thu Jan 8 04:35:05 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"
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)
152 SvREFCNT_inc (self); 158 SvREFCNT_inc (self);
153 hv_clear (self); 159 hv_clear (self);
154 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 160 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
155 SvREFCNT_dec (self); 161 SvREFCNT_dec (self);
156 162
157 // self *must* be null now because thats sv_unmagic's job. 163 // self *must* be null now because that's sv_unmagic's job.
158 assert (!this->self); 164 assert (!this->self);
159 } 165 }
160} 166}
161 167
162void 168void
399 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);
400 406
401 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
402} 408}
403 409
404static long 410static long noinline
405SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
406{ 412{
407 if (SvOK (sv)) 413 if (SvOK (sv))
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)); }
578 va_end (ap); 607 va_end (ap);
579 608
580 return sv; 609 return sv;
581} 610}
582 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
583////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
584 637
585SV * 638SV *
586registry (attachable *ext) 639registry (attachable *ext)
587{ 640{
604 657
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 659
607 const char *argv[] = { 660 const char *argv[] = {
608 settings.argv [0], 661 settings.argv [0],
609 "-e" 662 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 663 };
615 664
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 666 || perl_run (perl))
618 { 667 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
621 } 670 }
622 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))
623 { 683 {
624 dSP; 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 685 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 686 }
630} 687}
631 688
689void
632void cfperl_main () 690cfperl_main ()
633{ 691{
634 dSP; 692 dSP;
635 693
636 PUSHMARK (SP); 694 PUSHMARK (SP);
637 PUTBACK; 695 PUTBACK;
662# undef def 720# undef def
663}; 721};
664 722
665#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)
666 724
667static void 725static void noinline
668gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
669{ 727{
670 // event must be in array 728 // event must be in array
671 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
672 { 730 {
758{ 816{
759 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
760 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
761} 819}
762 820
763void 821static void noinline
764_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
765{ 823{
766 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
767 { 825 {
768 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
778 } 836 }
779 } 837 }
780} 838}
781 839
782// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
783void 841static void
784_recalc_want () 842_recalc_want ()
785{ 843{
786 ev_want_event.reset (); 844 ev_want_event.reset ();
787 845
788 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
898} 956}
899 957
900///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
901// various c++ => perl glue functions 959// various c++ => perl glue functions
902 960
961void
903void cfperl_tick () 962cfperl_tick ()
904{ 963{
905 tick_pending = 1; 964 tick_pending = 1;
906 965
907 if (tick_inhibit) 966 if (tick_inhibit)
908 return; 967 return;
970 CALL_END; 1029 CALL_END;
971 1030
972 return can; 1031 return can;
973} 1032}
974 1033
1034void
1035cfperl_mapscript_activate (object *ob, bool state, object *activator, object *originator)
1036{
1037 CALL_BEGIN (4);
1038 CALL_ARG (ob);
1039 CALL_ARG (state);
1040 CALL_ARG (activator);
1041 CALL_ARG (originator);
1042 CALL_CALL ("cf::mapscript::activate", G_VOID);
1043 CALL_END;
1044}
1045
975player * 1046player *
976player::find (const char *name) 1047player::find (const char *name)
977{ 1048{
978 CALL_BEGIN (1); 1049 CALL_BEGIN (1);
979 CALL_ARG (name); 1050 CALL_ARG (name);
980 CALL_CALL ("cf::player::find", G_SCALAR); 1051 CALL_CALL ("cf::player::find", G_SCALAR);
981 1052
982 player *retval; 1053 player *retval = 0;
983
984 if (count)
985 sv_to (POPs, retval); 1054 if (count) sv_to (POPs, retval);
986 else 1055
987 retval = 0; 1056 CALL_END;
1057
1058 return retval;
1059}
1060
1061maptile *
1062find_style (const char *dirname, const char *stylename, int difficulty)
1063{
1064 CALL_BEGIN (3);
1065 CALL_ARG (dirname);
1066 CALL_ARG (stylename);
1067 CALL_ARG (difficulty);
1068 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1069
1070 maptile *retval = 0;
1071 if (count) sv_to (POPs, retval);
988 1072
989 CALL_END; 1073 CALL_END;
990 1074
991 return retval; 1075 return retval;
992} 1076}
997 CALL_BEGIN (2); 1081 CALL_BEGIN (2);
998 CALL_ARG (path); 1082 CALL_ARG (path);
999 CALL_ARG (origin); 1083 CALL_ARG (origin);
1000 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1084 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1001 1085
1002 maptile *retval; 1086 maptile *retval = 0;
1003
1004 if (count)
1005 sv_to (POPs, retval); 1087 if (count) sv_to (POPs, retval);
1006 else
1007 retval = 0;
1008 1088
1009 CALL_END; 1089 CALL_END;
1010 1090
1011 return retval; 1091 return retval;
1012} 1092}
1018 CALL_ARG (path); 1098 CALL_ARG (path);
1019 CALL_ARG (origin); 1099 CALL_ARG (origin);
1020 CALL_ARG (load); 1100 CALL_ARG (load);
1021 CALL_CALL ("cf::map::find_async", G_SCALAR); 1101 CALL_CALL ("cf::map::find_async", G_SCALAR);
1022 1102
1023 maptile *retval; 1103 maptile *retval = 0;
1024
1025 if (count)
1026 sv_to (POPs, retval); 1104 if (count) sv_to (POPs, retval);
1027 else
1028 retval = 0;
1029 1105
1030 CALL_END; 1106 CALL_END;
1031 1107
1032 return retval; 1108 return retval;
1033} 1109}
1040 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1116 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1041 CALL_END; 1117 CALL_END;
1042} 1118}
1043 1119
1044void 1120void
1045maptile::change_all_map_light (int change)
1046{
1047 CALL_BEGIN (1);
1048 CALL_ARG (change);
1049 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1050 CALL_END;
1051}
1052
1053void
1054object::enter_exit (object *exit) 1121object::enter_exit (object *exit)
1055{ 1122{
1056 if (type != PLAYER) 1123 if (type != PLAYER)
1057 return; 1124 return;
1058 1125
1059 CALL_BEGIN (2); 1126 CALL_BEGIN (2);
1060 CALL_ARG (this); 1127 CALL_ARG (this);
1061 CALL_ARG (exit); 1128 CALL_ARG (exit);
1062 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1129 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1130 CALL_END;
1131}
1132
1133void
1134object::player_goto (const char *path, int x, int y)
1135{
1136 if (type != PLAYER)
1137 return;
1138
1139 CALL_BEGIN (4);
1140 CALL_ARG (this);
1141 CALL_ARG (path);
1142 CALL_ARG (x);
1143 CALL_ARG (y);
1144 CALL_CALL ("cf::object::player::goto", G_VOID);
1063 CALL_END; 1145 CALL_END;
1064} 1146}
1065 1147
1066const char * 1148const char *
1067object::ref () const 1149object::ref () const
1111///////////////////////////////////////////////////////////////////////////// 1193/////////////////////////////////////////////////////////////////////////////
1112 1194
1113struct EVAPI *evapi::GEVAPI; 1195struct EVAPI *evapi::GEVAPI;
1114struct CoroAPI *coroapi::GCoroAPI; 1196struct CoroAPI *coroapi::GCoroAPI;
1115 1197
1198void
1116void coroapi::do_cede_to_tick () 1199coroapi::do_cede_to_tick ()
1117{ 1200{
1118 cede_pending = 0; 1201 cede_pending = 0;
1119 cede (); 1202 cede ();
1120} 1203}
1121 1204
1145 ev_io_set ((ev_io *)this, fd, events); 1228 ev_io_set ((ev_io *)this, fd, events);
1146 if (active) start (); 1229 if (active) start ();
1147 } 1230 }
1148} 1231}
1149 1232
1150void 1233static void
1151_connect_to_perl () 1234_connect_to_perl ()
1152{ 1235{
1153 stash_cf = gv_stashpv ("cf", 1); 1236 stash_cf = gv_stashpv ("cf", 1);
1154 1237
1155 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1238 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1156 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1239 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1157 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1240 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1158 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1241 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1242 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1159 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1243 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1160 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1244 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1161 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1245 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1162 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1246 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1163 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1247 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1244 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1328 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1245 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1329 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1246 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1330 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1247 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1331 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1248 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1332 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1333 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1249 1334
1250 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1335 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1251 1336
1252 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1337 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1253 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1338 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1283 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1368 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1284 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1369 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1285 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1370 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1286 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1371 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1287 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1372 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1288 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1373 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1289 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1374 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1290 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1375 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1291 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1376 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1292 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1377 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1293 1378
1294 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1379 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1295 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1380 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1296 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1381 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1297 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1382 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1298 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1383 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1299 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1384 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1300 1385
1301 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1386 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1302 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1387 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1303 1388
1304 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1389 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1356 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1441 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1357 const_iv (F_LOCKED) 1442 const_iv (F_LOCKED)
1358 1443
1359 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1444 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1360 1445
1361 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1446 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1362 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1447 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1363 1448
1364 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1449 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1365 1450
1366 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1451 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1432 1517
1433 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1518 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1434 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1519 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1435 1520
1436 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1521 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1437 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1522 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1438 const_iv (GT_MINIMAL)
1439 1523
1440 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND) 1524 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1441 const_iv (FT_RSRC) const_iv (FT_NUM) 1525 const_iv (FT_RSRC) const_iv (FT_NUM)
1442 }; 1526 };
1443 1527
1465 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1549 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1466 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1550 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1467 } 1551 }
1468} 1552}
1469 1553
1554void _gv_clear (SV *gv)
1555 CODE:
1556 assert (SvTYPE (gv) == SVt_PVGV);
1557# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1558 f (GvGP (gv)->gp_form);
1559 f (GvGP (gv)->gp_io);
1560 f (GvGP (gv)->gp_sv);
1561 f (GvGP (gv)->gp_av);
1562 f (GvGP (gv)->gp_hv);
1563 f (GvGP (gv)->gp_cv);
1564 GvCVGEN (gv) = 0;
1565 GvMULTI_off (gv);
1566# undef f
1567
1470void _connect_to_perl () 1568void _connect_to_perl ()
1471 1569
1472void _recalc_want () 1570void _recalc_want ()
1473 1571
1572# not used by default anymore
1474void _global_reattach () 1573void _global_reattach ()
1475 CODE: 1574 CODE:
1476{ 1575{
1477 // reattach to all attachable objects in the game. 1576 // reattach to all attachable objects in the game.
1478 for_all_clients (ns) 1577 for_all_clients (ns)
1522 } 1621 }
1523 1622
1524 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1623 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1525} 1624}
1526 1625
1626void init_anim ()
1627
1628void init_globals ()
1629
1630void init_experience ()
1631
1632void init_attackmess ()
1633
1634void init_dynamic ()
1635
1636void load_settings ()
1637
1638void load_materials ()
1639
1640void init_uuid ()
1641 CODE:
1642 UUID::init ();
1643
1644void init_signals ()
1645
1646void init_commands ()
1647
1648void init_skills ()
1649
1650void init_beforeplay ()
1651
1527void evthread_start (int aiofd) 1652void evthread_start (int aiofd)
1528 1653
1529void cede_to_tick () 1654void cede_to_tick ()
1530 CODE: 1655 CODE:
1531 coroapi::cede_to_tick (); 1656 coroapi::cede_to_tick ();
1574NV floor (NV x) 1699NV floor (NV x)
1575 1700
1576NV ceil (NV x) 1701NV ceil (NV x)
1577 1702
1578NV rndm (...) 1703NV rndm (...)
1704 ALIAS:
1705 rmg_rndm = 1
1579 CODE: 1706 CODE:
1707{
1708 rand_gen &gen = ix ? rmg_rndm : rndm;
1580 switch (items) 1709 switch (items)
1581 { 1710 {
1582 case 0: RETVAL = rndm (); break; 1711 case 0: RETVAL = gen (); break;
1583 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1712 case 1: RETVAL = gen (SvUV (ST (0))); break;
1584 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1713 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1585 default: croak ("cf::rndm requires none, one or two parameters."); break; 1714 default: croak ("cf::rndm requires none, one or two parameters."); break;
1586 } 1715 }
1716}
1587 OUTPUT: 1717 OUTPUT:
1588 RETVAL 1718 RETVAL
1589 1719
1590NV clamp (NV value, NV min_value, NV max_value) 1720NV clamp (NV value, NV min_value, NV max_value)
1591 CODE: 1721 CODE:
1663#if _POSIX_MEMLOCK 1793#if _POSIX_MEMLOCK
1664 1794
1665int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1795int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1666 INIT: 1796 INIT:
1667#if __GLIBC__ 1797#if __GLIBC__
1798 mallopt (M_TOP_PAD, 1024 * 1024);
1799 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1800 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1668 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1801 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1669#endif 1802#endif
1670 1803
1671int munlockall () 1804int munlockall ()
1672 1805
1691 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1824 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1692 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1825 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1693 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1826 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1694 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1827 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1695#endif 1828#endif
1696 EXTEND (SP, 2*2); 1829 EXTEND (SP, 5*2);
1697 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1830 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1698 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1831 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1832 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1833 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1834 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1699} 1835}
1700 1836
1701int find_animation (utf8_string text) 1837int find_animation (utf8_string text)
1702 PROTOTYPE: $ 1838 PROTOTYPE: $
1703 1839
1787 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i])))); 1923 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1788 1924
1789bool 1925bool
1790load_resource_file_ (octet_string filename) 1926load_resource_file_ (octet_string filename)
1791 1927
1928void
1929fix_weight ()
1930
1792MODULE = cf PACKAGE = cf::attachable 1931MODULE = cf PACKAGE = cf::attachable
1793 1932
1794int 1933int
1795valid (SV *obj) 1934valid (SV *obj)
1796 CODE: 1935 CODE:
1859object *actives (U32 index) 1998object *actives (U32 index)
1860 CODE: 1999 CODE:
1861 RETVAL = index < actives.size () ? actives [index] : 0; 2000 RETVAL = index < actives.size () ? actives [index] : 0;
1862 OUTPUT: RETVAL 2001 OUTPUT: RETVAL
1863 2002
2003int mortals_size ()
2004 CODE:
2005 RETVAL = attachable::mortals.size ();
2006 OUTPUT: RETVAL
2007
1864const char *slot_use_name (U32 slot) 2008const char *slot_use_name (U32 slot)
1865 ALIAS: 2009 ALIAS:
1866 slot_nonuse_name = 1 2010 slot_nonuse_name = 1
1867 CODE: 2011 CODE:
1868{ 2012{
1947 CODE: 2091 CODE:
1948 player_apply_below (op); 2092 player_apply_below (op);
1949 2093
1950int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2094int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1951 2095
1952#//TODO
1953object *clone_ (object *op, int recursive = 0)
1954 CODE:
1955 if (recursive)
1956 RETVAL = object_create_clone (op);
1957 else
1958 {
1959 RETVAL = object::create ();
1960 op->copy_to (RETVAL);
1961 }
1962 OUTPUT: RETVAL
1963
1964int pay_item (object *op, object *buyer) 2096int pay_item (object *op, object *buyer)
1965 CODE: 2097 CODE:
1966 RETVAL = pay_for_item (op, buyer); 2098 RETVAL = pay_for_item (op, buyer);
1967 OUTPUT: RETVAL 2099 OUTPUT: RETVAL
1968 2100
2012 2144
2013int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2145int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2014 2146
2015int calc_skill_exp (object *who, object *op, object *skill); 2147int calc_skill_exp (object *who, object *op, object *skill);
2016 2148
2017void push_button (object *op); 2149void push_button (object *op, object *originator);
2018 2150
2019void use_trigger (object *op); 2151void use_trigger (object *op, object *originator);
2020
2021void add_button_link (object *button, maptile *map, int connected);
2022
2023void remove_button_link (object *op);
2024 2152
2025void handle_apply_yield (object *op); 2153void handle_apply_yield (object *op);
2026 2154
2027 2155
2028MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2156MODULE = cf PACKAGE = cf::object PREFIX = cf_
2045 CODE: 2173 CODE:
2046{ 2174{
2047 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2175 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2048} 2176}
2049 2177
2050const_utf8_string get_ob_key_value (object *op, utf8_string key) 2178shstr
2179object::kv_get (shstr key)
2051 2180
2052bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2181void
2182object::kv_del (shstr key)
2183
2184void
2185object::kv_set (shstr key, shstr value)
2053 2186
2054object *get_nearest_player (object *ob) 2187object *get_nearest_player (object *ob)
2055 ALIAS: nearest_player = 0 2188 ALIAS: nearest_player = 0
2056 PREINIT: 2189 PREINIT:
2057 extern object *get_nearest_player (object *); 2190 extern object *get_nearest_player (object *);
2059void rangevector (object *ob, object *other, int flags = 0) 2192void rangevector (object *ob, object *other, int flags = 0)
2060 PROTOTYPE: $$;$ 2193 PROTOTYPE: $$;$
2061 PPCODE: 2194 PPCODE:
2062{ 2195{
2063 rv_vector rv; 2196 rv_vector rv;
2197
2198 PUTBACK;
2064 get_rangevector (ob, other, &rv, flags); 2199 get_rangevector (ob, other, &rv, flags);
2200 SPAGAIN;
2201
2065 EXTEND (SP, 5); 2202 EXTEND (SP, 5);
2066 PUSHs (newSVuv (rv.distance)); 2203 PUSHs (newSVuv (rv.distance));
2067 PUSHs (newSViv (rv.distance_x)); 2204 PUSHs (newSViv (rv.distance_x));
2068 PUSHs (newSViv (rv.distance_y)); 2205 PUSHs (newSViv (rv.distance_y));
2069 PUSHs (newSViv (rv.direction)); 2206 PUSHs (newSViv (rv.direction));
2138 pl->ob->stats.hp = pl->ob->stats.maxhp; 2275 pl->ob->stats.hp = pl->ob->stats.maxhp;
2139 pl->ob->stats.sp = pl->ob->stats.maxsp; 2276 pl->ob->stats.sp = pl->ob->stats.maxsp;
2140 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2277 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2141 pl->orig_stats = pl->ob->stats; 2278 pl->orig_stats = pl->ob->stats;
2142 2279
2143void clear_los (player *pl) 2280# should only be temporary
2281void esrv_new_player (player *pl)
2144 2282
2283#d# TODO: replace by blocked_los accessor, fix code using this
2145bool 2284bool
2146cell_visible (player *pl, int dx, int dy) 2285cell_visible (player *pl, int dx, int dy)
2147 CODE: 2286 CODE:
2148 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2287 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2149 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2150 OUTPUT: 2288 OUTPUT:
2151 RETVAL 2289 RETVAL
2152 2290
2153void 2291void
2154send (player *pl, SV *packet) 2292send (player *pl, SV *packet)
2160 if (len > MAXSOCKBUF) 2298 if (len > MAXSOCKBUF)
2161 pl->failmsg ("[packet too long for client]"); 2299 pl->failmsg ("[packet too long for client]");
2162 else if (pl->ns) 2300 else if (pl->ns)
2163 pl->ns->send_packet (buf, len); 2301 pl->ns->send_packet (buf, len);
2164} 2302}
2165
2166int
2167listening (player *pl, int new_value = -1)
2168 CODE:
2169 RETVAL = pl->listening;
2170 if (new_value >= 0)
2171 pl->listening = new_value;
2172 OUTPUT:
2173 RETVAL
2174 2303
2175void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2304void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2176 PROTOTYPE: $;$$$ 2305 PROTOTYPE: $;$$$
2177 PPCODE: 2306 PPCODE:
2178 if (GIMME_V != G_VOID) 2307 if (GIMME_V != G_VOID)
2231} 2360}
2232 2361
2233INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2362INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2234 2363
2235void 2364void
2365adjust_daylight ()
2366 CODE:
2367 maptile::adjust_daylight ();
2368
2369void
2236maptile::instantiate () 2370maptile::instantiate ()
2237 2371
2238maptile *new () 2372maptile *new ()
2239 PROTOTYPE: 2373 PROTOTYPE:
2240 CODE: 2374 CODE:
2333} 2467}
2334 2468
2335void 2469void
2336maptile::create_region_treasure () 2470maptile::create_region_treasure ()
2337 CODE: 2471 CODE:
2338{
2339 object *op = object::create ();
2340 op->type = FLOOR;
2341 op->map = THIS;
2342
2343 for (int x = 0; x < THIS->width; ++x) 2472 for (int x = 0; x < THIS->width; ++x)
2344 for (int y = 0; y < THIS->height; ++y) 2473 for (int y = 0; y < THIS->height; ++y)
2345 { 2474 {
2346 region *rgn = THIS->region (x, y); 2475 region *rgn = THIS->region (x, y);
2347 2476
2348 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2477 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2478 if (object *op = THIS->at (x, y).top)
2349 if (rgn->treasure && rndm () < rgn->treasure_density) 2479 if (rgn->treasure && rndm () < rgn->treasure_density)
2350 {
2351 op->x = x;
2352 op->y = y;
2353 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2480 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2354 }
2355 } 2481 }
2356 2482
2357 op->destroy ();
2358}
2359
2360int out_of_map (maptile *map, int x, int y) 2483int out_of_map (maptile *map, int x, int y)
2361 2484
2362void 2485void
2363trigger (maptile *map, long connection, bool state = true) 2486find_link (maptile *map, shstr_tmp connection)
2364 CODE:
2365 activate_connection (map, connection, state);
2366
2367void
2368get_connection (maptile *map, long connection)
2369 PPCODE: 2487 PPCODE:
2370 oblinkpt *obp = get_connection_links (map, connection); 2488 if (oblinkpt *obp = map->find_link (connection))
2371 if (obp)
2372 for (objectlink *ol = obp->link; ol; ol = ol->next) 2489 for (objectlink *ol = obp->link; ol; ol = ol->next)
2373 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2490 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2374 2491
2375void 2492void
2376get_map_flags (maptile *map, int x, int y) 2493get_map_flags (maptile *map, int x, int y)
2377 PPCODE: 2494 PPCODE:
2378{ 2495{
2379 maptile *nmap = 0; 2496 maptile *nmap = 0;
2380 I16 nx = 0, ny = 0; 2497 I16 nx = 0, ny = 0;
2498
2499 PUTBACK;
2381 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2500 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2501 SPAGAIN;
2382 2502
2383 EXTEND (SP, 4); 2503 EXTEND (SP, 4);
2384 PUSHs (sv_2mortal (newSViv (flags))); 2504 PUSHs (sv_2mortal (newSViv (flags)));
2385 2505
2386 if (GIMME_V == G_ARRAY) 2506 if (GIMME_V == G_ARRAY)
2389 PUSHs (sv_2mortal (newSViv (nx))); 2509 PUSHs (sv_2mortal (newSViv (nx)));
2390 PUSHs (sv_2mortal (newSViv (ny))); 2510 PUSHs (sv_2mortal (newSViv (ny)));
2391 } 2511 }
2392} 2512}
2393 2513
2514mapspace *
2515ms (maptile *map, unsigned int x, unsigned int y)
2516 PROTOTYPE: $$$
2517 CODE:
2518{
2519 maptile *nmap = 0;
2520 I16 nx, ny;
2521
2522 PUTBACK;
2523 get_map_flags (map, &nmap, x, y, &nx, &ny);
2524 SPAGAIN;
2525
2526 if (!nmap)
2527 XSRETURN_UNDEF;
2528
2529 RETVAL = &nmap->at (nx, ny);
2530}
2531 OUTPUT:
2532 RETVAL
2533
2394void 2534void
2395at (maptile *map, unsigned int x, unsigned int y) 2535at (maptile *map, unsigned int x, unsigned int y)
2396 PROTOTYPE: $$$ 2536 PROTOTYPE: $$$
2397 PPCODE: 2537 PPCODE:
2398{ 2538{
2399 object *o;
2400 maptile *nmap = 0; 2539 maptile *nmap = 0;
2401 I16 nx, ny; 2540 I16 nx, ny;
2402 2541
2542 PUTBACK;
2403 get_map_flags (map, &nmap, x, y, &nx, &ny); 2543 get_map_flags (map, &nmap, x, y, &nx, &ny);
2544 SPAGAIN;
2404 2545
2405 if (nmap) 2546 if (nmap)
2406 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2547 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2407 XPUSHs (sv_2mortal (to_sv (o))); 2548 XPUSHs (sv_2mortal (to_sv (o)));
2408} 2549}
2409 2550
2410SV * 2551SV *
2411bot_at (maptile *obj, unsigned int x, unsigned int y) 2552bot_at (maptile *map, unsigned int x, unsigned int y)
2412 PROTOTYPE: $$$ 2553 PROTOTYPE: $$$
2413 ALIAS: 2554 ALIAS:
2414 top_at = 1 2555 top_at = 1
2415 flags_at = 2 2556 flags_at = 2
2416 light_at = 3 2557 light_at = 3
2417 move_block_at = 4 2558 move_block_at = 4
2418 move_slow_at = 5 2559 move_slow_at = 5
2419 move_on_at = 6 2560 move_on_at = 6
2420 move_off_at = 7 2561 move_off_at = 7
2421 INIT:
2422 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2423 CODE: 2562 CODE:
2563{
2564 sint16 nx = x;
2565 sint16 ny = y;
2566
2567 if (!xy_normalise (map, nx, ny))
2568 XSRETURN_UNDEF;
2569
2570 mapspace &ms = map->at (nx, ny);
2571
2572 ms.update ();
2573
2424 switch (ix) 2574 switch (ix)
2425 { 2575 {
2426 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2576 case 0: RETVAL = to_sv (ms.bot ); break;
2427 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2577 case 1: RETVAL = to_sv (ms.top ); break;
2428 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2578 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2429 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2579 case 3: RETVAL = newSViv (ms.light ); break;
2430 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2580 case 4: RETVAL = newSVuv (ms.move_block); break;
2431 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2581 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2432 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2582 case 6: RETVAL = newSVuv (ms.move_on ); break;
2433 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2583 case 7: RETVAL = newSVuv (ms.move_off ); break;
2434 } 2584 }
2585}
2435 OUTPUT: RETVAL 2586 OUTPUT: RETVAL
2436 2587
2437void fix_walls (maptile *map, int x, int y) 2588void fix_walls (maptile *map, int x, int y)
2438 2589
2439void fix_walls_around (maptile *map, int x, int y) 2590void fix_walls_around (maptile *map, int x, int y)
2524 RETVAL = self->generate_random_map (&rmp); 2675 RETVAL = self->generate_random_map (&rmp);
2525} 2676}
2526 OUTPUT: 2677 OUTPUT:
2527 RETVAL 2678 RETVAL
2528 2679
2680MODULE = cf PACKAGE = cf::mapspace
2681
2682INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2683
2529MODULE = cf PACKAGE = cf::arch 2684MODULE = cf PACKAGE = cf::arch
2530 2685
2531int archetypes_size () 2686int archetypes_size ()
2532 CODE: 2687 CODE:
2533 RETVAL = archetypes.size (); 2688 RETVAL = archetypes.size ();
2566 2721
2567region *find (utf8_string name) 2722region *find (utf8_string name)
2568 PROTOTYPE: $ 2723 PROTOTYPE: $
2569 CODE: 2724 CODE:
2570 RETVAL = region::find (name); 2725 RETVAL = region::find (name);
2571 OUTPUT: RETVAL
2572
2573region *find_fuzzy (utf8_string name)
2574 PROTOTYPE: $
2575 CODE:
2576 RETVAL = region::find_fuzzy (name);
2577 OUTPUT: RETVAL 2726 OUTPUT: RETVAL
2578 2727
2579int specificity (region *rgn) 2728int specificity (region *rgn)
2580 CODE: 2729 CODE:
2581 RETVAL = 0; 2730 RETVAL = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines