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.284 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.315 by root, Thu Jan 8 03:03:24 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, object *activator, int state)
1036{
1037 CALL_BEGIN (3);
1038 CALL_ARG (ob);
1039 CALL_ARG (activator);
1040 CALL_ARG (state);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END;
1043}
1044
975player * 1045player *
976player::find (const char *name) 1046player::find (const char *name)
977{ 1047{
978 CALL_BEGIN (1); 1048 CALL_BEGIN (1);
979 CALL_ARG (name); 1049 CALL_ARG (name);
980 CALL_CALL ("cf::player::find", G_SCALAR); 1050 CALL_CALL ("cf::player::find", G_SCALAR);
981 1051
982 player *retval; 1052 player *retval = 0;
983
984 if (count)
985 sv_to (POPs, retval); 1053 if (count) sv_to (POPs, retval);
986 else 1054
987 retval = 0; 1055 CALL_END;
1056
1057 return retval;
1058}
1059
1060maptile *
1061find_style (const char *dirname, const char *stylename, int difficulty)
1062{
1063 CALL_BEGIN (3);
1064 CALL_ARG (dirname);
1065 CALL_ARG (stylename);
1066 CALL_ARG (difficulty);
1067 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1068
1069 maptile *retval = 0;
1070 if (count) sv_to (POPs, retval);
988 1071
989 CALL_END; 1072 CALL_END;
990 1073
991 return retval; 1074 return retval;
992} 1075}
… …
997 CALL_BEGIN (2); 1080 CALL_BEGIN (2);
998 CALL_ARG (path); 1081 CALL_ARG (path);
999 CALL_ARG (origin); 1082 CALL_ARG (origin);
1000 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1083 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1001 1084
1002 maptile *retval; 1085 maptile *retval = 0;
1003
1004 if (count)
1005 sv_to (POPs, retval); 1086 if (count) sv_to (POPs, retval);
1006 else
1007 retval = 0;
1008 1087
1009 CALL_END; 1088 CALL_END;
1010 1089
1011 return retval; 1090 return retval;
1012} 1091}
… …
1018 CALL_ARG (path); 1097 CALL_ARG (path);
1019 CALL_ARG (origin); 1098 CALL_ARG (origin);
1020 CALL_ARG (load); 1099 CALL_ARG (load);
1021 CALL_CALL ("cf::map::find_async", G_SCALAR); 1100 CALL_CALL ("cf::map::find_async", G_SCALAR);
1022 1101
1023 maptile *retval; 1102 maptile *retval = 0;
1024
1025 if (count)
1026 sv_to (POPs, retval); 1103 if (count) sv_to (POPs, retval);
1027 else
1028 retval = 0;
1029 1104
1030 CALL_END; 1105 CALL_END;
1031 1106
1032 return retval; 1107 return retval;
1033} 1108}
… …
1040 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1115 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1041 CALL_END; 1116 CALL_END;
1042} 1117}
1043 1118
1044void 1119void
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) 1120object::enter_exit (object *exit)
1055{ 1121{
1056 if (type != PLAYER) 1122 if (type != PLAYER)
1057 return; 1123 return;
1058 1124
1059 CALL_BEGIN (2); 1125 CALL_BEGIN (2);
1060 CALL_ARG (this); 1126 CALL_ARG (this);
1061 CALL_ARG (exit); 1127 CALL_ARG (exit);
1062 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1128 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1129 CALL_END;
1130}
1131
1132void
1133object::player_goto (const char *path, int x, int y)
1134{
1135 if (type != PLAYER)
1136 return;
1137
1138 CALL_BEGIN (4);
1139 CALL_ARG (this);
1140 CALL_ARG (path);
1141 CALL_ARG (x);
1142 CALL_ARG (y);
1143 CALL_CALL ("cf::object::player::goto", G_VOID);
1063 CALL_END; 1144 CALL_END;
1064} 1145}
1065 1146
1066const char * 1147const char *
1067object::ref () const 1148object::ref () const
… …
1111///////////////////////////////////////////////////////////////////////////// 1192/////////////////////////////////////////////////////////////////////////////
1112 1193
1113struct EVAPI *evapi::GEVAPI; 1194struct EVAPI *evapi::GEVAPI;
1114struct CoroAPI *coroapi::GCoroAPI; 1195struct CoroAPI *coroapi::GCoroAPI;
1115 1196
1197void
1116void coroapi::do_cede_to_tick () 1198coroapi::do_cede_to_tick ()
1117{ 1199{
1118 cede_pending = 0; 1200 cede_pending = 0;
1119 cede (); 1201 cede ();
1120} 1202}
1121 1203
… …
1145 ev_io_set ((ev_io *)this, fd, events); 1227 ev_io_set ((ev_io *)this, fd, events);
1146 if (active) start (); 1228 if (active) start ();
1147 } 1229 }
1148} 1230}
1149 1231
1150void 1232static void
1151_connect_to_perl () 1233_connect_to_perl ()
1152{ 1234{
1153 stash_cf = gv_stashpv ("cf", 1); 1235 stash_cf = gv_stashpv ("cf", 1);
1154 1236
1155 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1156 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1238 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1157 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1239 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1158 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1240 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1241 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1159 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1242 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1160 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1243 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1161 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1244 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1162 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1245 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1163 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1246 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) 1327 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) 1328 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) 1329 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) 1330 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) 1331 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1332 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1249 1333
1250 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1334 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1251 1335
1252 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1336 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) 1337 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) 1367 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) 1368 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) 1369 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) 1370 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) 1371 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) 1372 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) 1373 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) 1374 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) 1375 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) 1376 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1293 1377
1294 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1378 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) 1379 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) 1380 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) 1381 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) 1382 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) 1383 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1300 1384
1301 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1385 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) 1386 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1303 1387
1304 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1388 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) 1440 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1357 const_iv (F_LOCKED) 1441 const_iv (F_LOCKED)
1358 1442
1359 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1443 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1360 1444
1361 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1445 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) 1446 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1363 1447
1364 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1448 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1365 1449
1366 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1450 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
… …
1464 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1465 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1466 } 1550 }
1467} 1551}
1468 1552
1553void _gv_clear (SV *gv)
1554 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV);
1556# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1557 f (GvGP (gv)->gp_form);
1558 f (GvGP (gv)->gp_io);
1559 f (GvGP (gv)->gp_sv);
1560 f (GvGP (gv)->gp_av);
1561 f (GvGP (gv)->gp_hv);
1562 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv);
1565# undef f
1566
1469void _connect_to_perl () 1567void _connect_to_perl ()
1470 1568
1471void _recalc_want () 1569void _recalc_want ()
1472 1570
1571# not used by default anymore
1473void _global_reattach () 1572void _global_reattach ()
1474 CODE: 1573 CODE:
1475{ 1574{
1476 // reattach to all attachable objects in the game. 1575 // reattach to all attachable objects in the game.
1477 for_all_clients (ns) 1576 for_all_clients (ns)
… …
1521 } 1620 }
1522 1621
1523 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1622 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1524} 1623}
1525 1624
1625void init_anim ()
1626
1627void init_globals ()
1628
1629void init_experience ()
1630
1631void init_attackmess ()
1632
1633void init_dynamic ()
1634
1635void load_settings ()
1636
1637void load_materials ()
1638
1639void init_uuid ()
1640 CODE:
1641 UUID::init ();
1642
1643void init_signals ()
1644
1645void init_commands ()
1646
1647void init_skills ()
1648
1649void init_beforeplay ()
1650
1526void evthread_start (int aiofd) 1651void evthread_start (int aiofd)
1527 1652
1528void cede_to_tick () 1653void cede_to_tick ()
1529 CODE: 1654 CODE:
1530 coroapi::cede_to_tick (); 1655 coroapi::cede_to_tick ();
… …
1573NV floor (NV x) 1698NV floor (NV x)
1574 1699
1575NV ceil (NV x) 1700NV ceil (NV x)
1576 1701
1577NV rndm (...) 1702NV rndm (...)
1703 ALIAS:
1704 rmg_rndm = 1
1578 CODE: 1705 CODE:
1706{
1707 rand_gen &gen = ix ? rmg_rndm : rndm;
1579 switch (items) 1708 switch (items)
1580 { 1709 {
1581 case 0: RETVAL = rndm (); break; 1710 case 0: RETVAL = gen (); break;
1582 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1711 case 1: RETVAL = gen (SvUV (ST (0))); break;
1583 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1712 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1584 default: croak ("cf::rndm requires none, one or two parameters."); break; 1713 default: croak ("cf::rndm requires none, one or two parameters."); break;
1585 } 1714 }
1715}
1586 OUTPUT: 1716 OUTPUT:
1587 RETVAL 1717 RETVAL
1588 1718
1589NV clamp (NV value, NV min_value, NV max_value) 1719NV clamp (NV value, NV min_value, NV max_value)
1590 CODE: 1720 CODE:
… …
1662#if _POSIX_MEMLOCK 1792#if _POSIX_MEMLOCK
1663 1793
1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1794int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1665 INIT: 1795 INIT:
1666#if __GLIBC__ 1796#if __GLIBC__
1797 mallopt (M_TOP_PAD, 1024 * 1024);
1798 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1799 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1667 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1800 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1668#endif 1801#endif
1669 1802
1670int munlockall () 1803int munlockall ()
1671 1804
… …
1690 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1823 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1691 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1824 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1692 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1825 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1693 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1826 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1694#endif 1827#endif
1695 EXTEND (SP, 2*2); 1828 EXTEND (SP, 5*2);
1696 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1829 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1697 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1830 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1698 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1831 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1832 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1833 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1699} 1834}
1700 1835
1701int find_animation (utf8_string text) 1836int find_animation (utf8_string text)
1702 PROTOTYPE: $ 1837 PROTOTYPE: $
1703 1838
… …
1787 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i])))); 1922 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1788 1923
1789bool 1924bool
1790load_resource_file_ (octet_string filename) 1925load_resource_file_ (octet_string filename)
1791 1926
1927void
1928fix_weight ()
1929
1792MODULE = cf PACKAGE = cf::attachable 1930MODULE = cf PACKAGE = cf::attachable
1793 1931
1794int 1932int
1795valid (SV *obj) 1933valid (SV *obj)
1796 CODE: 1934 CODE:
… …
1952 CODE: 2090 CODE:
1953 player_apply_below (op); 2091 player_apply_below (op);
1954 2092
1955int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2093int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1956 2094
1957#//TODO
1958object *clone_ (object *op, int recursive = 0)
1959 CODE:
1960 if (recursive)
1961 RETVAL = object_create_clone (op);
1962 else
1963 {
1964 RETVAL = object::create ();
1965 op->copy_to (RETVAL);
1966 }
1967 OUTPUT: RETVAL
1968
1969int pay_item (object *op, object *buyer) 2095int pay_item (object *op, object *buyer)
1970 CODE: 2096 CODE:
1971 RETVAL = pay_for_item (op, buyer); 2097 RETVAL = pay_for_item (op, buyer);
1972 OUTPUT: RETVAL 2098 OUTPUT: RETVAL
1973 2099
… …
2020int calc_skill_exp (object *who, object *op, object *skill); 2146int calc_skill_exp (object *who, object *op, object *skill);
2021 2147
2022void push_button (object *op); 2148void push_button (object *op);
2023 2149
2024void use_trigger (object *op); 2150void use_trigger (object *op);
2025
2026void add_button_link (object *button, maptile *map, int connected);
2027
2028void remove_button_link (object *op);
2029 2151
2030void handle_apply_yield (object *op); 2152void handle_apply_yield (object *op);
2031 2153
2032 2154
2033MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2155MODULE = cf PACKAGE = cf::object PREFIX = cf_
… …
2069void rangevector (object *ob, object *other, int flags = 0) 2191void rangevector (object *ob, object *other, int flags = 0)
2070 PROTOTYPE: $$;$ 2192 PROTOTYPE: $$;$
2071 PPCODE: 2193 PPCODE:
2072{ 2194{
2073 rv_vector rv; 2195 rv_vector rv;
2196
2197 PUTBACK;
2074 get_rangevector (ob, other, &rv, flags); 2198 get_rangevector (ob, other, &rv, flags);
2199 SPAGAIN;
2200
2075 EXTEND (SP, 5); 2201 EXTEND (SP, 5);
2076 PUSHs (newSVuv (rv.distance)); 2202 PUSHs (newSVuv (rv.distance));
2077 PUSHs (newSViv (rv.distance_x)); 2203 PUSHs (newSViv (rv.distance_x));
2078 PUSHs (newSViv (rv.distance_y)); 2204 PUSHs (newSViv (rv.distance_y));
2079 PUSHs (newSViv (rv.direction)); 2205 PUSHs (newSViv (rv.direction));
… …
2148 pl->ob->stats.hp = pl->ob->stats.maxhp; 2274 pl->ob->stats.hp = pl->ob->stats.maxhp;
2149 pl->ob->stats.sp = pl->ob->stats.maxsp; 2275 pl->ob->stats.sp = pl->ob->stats.maxsp;
2150 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2276 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2151 pl->orig_stats = pl->ob->stats; 2277 pl->orig_stats = pl->ob->stats;
2152 2278
2153void clear_los (player *pl) 2279# should only be temporary
2280void esrv_new_player (player *pl)
2154 2281
2282#d# TODO: replace by blocked_los accessor, fix code using this
2155bool 2283bool
2156cell_visible (player *pl, int dx, int dy) 2284cell_visible (player *pl, int dx, int dy)
2157 CODE: 2285 CODE:
2158 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2286 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2159 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2160 OUTPUT: 2287 OUTPUT:
2161 RETVAL 2288 RETVAL
2162 2289
2163void 2290void
2164send (player *pl, SV *packet) 2291send (player *pl, SV *packet)
… …
2170 if (len > MAXSOCKBUF) 2297 if (len > MAXSOCKBUF)
2171 pl->failmsg ("[packet too long for client]"); 2298 pl->failmsg ("[packet too long for client]");
2172 else if (pl->ns) 2299 else if (pl->ns)
2173 pl->ns->send_packet (buf, len); 2300 pl->ns->send_packet (buf, len);
2174} 2301}
2175
2176int
2177listening (player *pl, int new_value = -1)
2178 CODE:
2179 RETVAL = pl->listening;
2180 if (new_value >= 0)
2181 pl->listening = new_value;
2182 OUTPUT:
2183 RETVAL
2184 2302
2185void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2303void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2186 PROTOTYPE: $;$$$ 2304 PROTOTYPE: $;$$$
2187 PPCODE: 2305 PPCODE:
2188 if (GIMME_V != G_VOID) 2306 if (GIMME_V != G_VOID)
… …
2241} 2359}
2242 2360
2243INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2361INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2244 2362
2245void 2363void
2364adjust_daylight ()
2365 CODE:
2366 maptile::adjust_daylight ();
2367
2368void
2246maptile::instantiate () 2369maptile::instantiate ()
2247 2370
2248maptile *new () 2371maptile *new ()
2249 PROTOTYPE: 2372 PROTOTYPE:
2250 CODE: 2373 CODE:
… …
2343} 2466}
2344 2467
2345void 2468void
2346maptile::create_region_treasure () 2469maptile::create_region_treasure ()
2347 CODE: 2470 CODE:
2348{
2349 object *op = object::create ();
2350 op->type = FLOOR;
2351 op->map = THIS;
2352
2353 for (int x = 0; x < THIS->width; ++x) 2471 for (int x = 0; x < THIS->width; ++x)
2354 for (int y = 0; y < THIS->height; ++y) 2472 for (int y = 0; y < THIS->height; ++y)
2355 { 2473 {
2356 region *rgn = THIS->region (x, y); 2474 region *rgn = THIS->region (x, y);
2357 2475
2358 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2476 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2477 if (object *op = THIS->at (x, y).top)
2359 if (rgn->treasure && rndm () < rgn->treasure_density) 2478 if (rgn->treasure && rndm () < rgn->treasure_density)
2360 {
2361 op->x = x;
2362 op->y = y;
2363 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2479 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2364 }
2365 } 2480 }
2366 2481
2367 op->destroy ();
2368}
2369
2370int out_of_map (maptile *map, int x, int y) 2482int out_of_map (maptile *map, int x, int y)
2371 2483
2372void 2484void
2373trigger (maptile *map, long connection, bool state = true) 2485find_link (maptile *map, shstr_tmp connection)
2374 CODE:
2375 activate_connection (map, connection, state);
2376
2377void
2378get_connection (maptile *map, long connection)
2379 PPCODE: 2486 PPCODE:
2380 oblinkpt *obp = get_connection_links (map, connection); 2487 if (oblinkpt *obp = map->find_link (connection))
2381 if (obp)
2382 for (objectlink *ol = obp->link; ol; ol = ol->next) 2488 for (objectlink *ol = obp->link; ol; ol = ol->next)
2383 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2489 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2384 2490
2385void 2491void
2386get_map_flags (maptile *map, int x, int y) 2492get_map_flags (maptile *map, int x, int y)
2387 PPCODE: 2493 PPCODE:
2388{ 2494{
2389 maptile *nmap = 0; 2495 maptile *nmap = 0;
2390 I16 nx = 0, ny = 0; 2496 I16 nx = 0, ny = 0;
2497
2498 PUTBACK;
2391 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2499 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2500 SPAGAIN;
2392 2501
2393 EXTEND (SP, 4); 2502 EXTEND (SP, 4);
2394 PUSHs (sv_2mortal (newSViv (flags))); 2503 PUSHs (sv_2mortal (newSViv (flags)));
2395 2504
2396 if (GIMME_V == G_ARRAY) 2505 if (GIMME_V == G_ARRAY)
… …
2399 PUSHs (sv_2mortal (newSViv (nx))); 2508 PUSHs (sv_2mortal (newSViv (nx)));
2400 PUSHs (sv_2mortal (newSViv (ny))); 2509 PUSHs (sv_2mortal (newSViv (ny)));
2401 } 2510 }
2402} 2511}
2403 2512
2513mapspace *
2514ms (maptile *map, unsigned int x, unsigned int y)
2515 PROTOTYPE: $$$
2516 CODE:
2517{
2518 maptile *nmap = 0;
2519 I16 nx, ny;
2520
2521 PUTBACK;
2522 get_map_flags (map, &nmap, x, y, &nx, &ny);
2523 SPAGAIN;
2524
2525 if (!nmap)
2526 XSRETURN_UNDEF;
2527
2528 RETVAL = &nmap->at (nx, ny);
2529}
2530 OUTPUT:
2531 RETVAL
2532
2404void 2533void
2405at (maptile *map, unsigned int x, unsigned int y) 2534at (maptile *map, unsigned int x, unsigned int y)
2406 PROTOTYPE: $$$ 2535 PROTOTYPE: $$$
2407 PPCODE: 2536 PPCODE:
2408{ 2537{
2409 object *o;
2410 maptile *nmap = 0; 2538 maptile *nmap = 0;
2411 I16 nx, ny; 2539 I16 nx, ny;
2412 2540
2541 PUTBACK;
2413 get_map_flags (map, &nmap, x, y, &nx, &ny); 2542 get_map_flags (map, &nmap, x, y, &nx, &ny);
2543 SPAGAIN;
2414 2544
2415 if (nmap) 2545 if (nmap)
2416 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2546 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2417 XPUSHs (sv_2mortal (to_sv (o))); 2547 XPUSHs (sv_2mortal (to_sv (o)));
2418} 2548}
2419 2549
2420SV * 2550SV *
2421bot_at (maptile *obj, unsigned int x, unsigned int y) 2551bot_at (maptile *map, unsigned int x, unsigned int y)
2422 PROTOTYPE: $$$ 2552 PROTOTYPE: $$$
2423 ALIAS: 2553 ALIAS:
2424 top_at = 1 2554 top_at = 1
2425 flags_at = 2 2555 flags_at = 2
2426 light_at = 3 2556 light_at = 3
2427 move_block_at = 4 2557 move_block_at = 4
2428 move_slow_at = 5 2558 move_slow_at = 5
2429 move_on_at = 6 2559 move_on_at = 6
2430 move_off_at = 7 2560 move_off_at = 7
2431 INIT:
2432 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2433 CODE: 2561 CODE:
2562{
2563 sint16 nx = x;
2564 sint16 ny = y;
2565
2566 if (!xy_normalise (map, nx, ny))
2567 XSRETURN_UNDEF;
2568
2569 mapspace &ms = map->at (nx, ny);
2570
2571 ms.update ();
2572
2434 switch (ix) 2573 switch (ix)
2435 { 2574 {
2436 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2575 case 0: RETVAL = to_sv (ms.bot ); break;
2437 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2576 case 1: RETVAL = to_sv (ms.top ); break;
2438 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2577 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2439 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2578 case 3: RETVAL = newSViv (ms.light ); break;
2440 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2579 case 4: RETVAL = newSVuv (ms.move_block); break;
2441 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2580 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2442 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2581 case 6: RETVAL = newSVuv (ms.move_on ); break;
2443 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2582 case 7: RETVAL = newSVuv (ms.move_off ); break;
2444 } 2583 }
2584}
2445 OUTPUT: RETVAL 2585 OUTPUT: RETVAL
2446 2586
2447void fix_walls (maptile *map, int x, int y) 2587void fix_walls (maptile *map, int x, int y)
2448 2588
2449void fix_walls_around (maptile *map, int x, int y) 2589void fix_walls_around (maptile *map, int x, int y)
… …
2534 RETVAL = self->generate_random_map (&rmp); 2674 RETVAL = self->generate_random_map (&rmp);
2535} 2675}
2536 OUTPUT: 2676 OUTPUT:
2537 RETVAL 2677 RETVAL
2538 2678
2679MODULE = cf PACKAGE = cf::mapspace
2680
2681INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2682
2539MODULE = cf PACKAGE = cf::arch 2683MODULE = cf PACKAGE = cf::arch
2540 2684
2541int archetypes_size () 2685int archetypes_size ()
2542 CODE: 2686 CODE:
2543 RETVAL = archetypes.size (); 2687 RETVAL = archetypes.size ();
… …
2576 2720
2577region *find (utf8_string name) 2721region *find (utf8_string name)
2578 PROTOTYPE: $ 2722 PROTOTYPE: $
2579 CODE: 2723 CODE:
2580 RETVAL = region::find (name); 2724 RETVAL = region::find (name);
2581 OUTPUT: RETVAL
2582
2583region *find_fuzzy (utf8_string name)
2584 PROTOTYPE: $
2585 CODE:
2586 RETVAL = region::find_fuzzy (name);
2587 OUTPUT: RETVAL 2725 OUTPUT: RETVAL
2588 2726
2589int specificity (region *rgn) 2727int specificity (region *rgn)
2590 CODE: 2728 CODE:
2591 RETVAL = 0; 2729 RETVAL = 0;

Diff Legend

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