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.291 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.314 by root, Thu Jan 1 20:49:48 2009 UTC

… …
26#if HAVE_EXECINFO_H 26#if HAVE_EXECINFO_H
27# include <execinfo.h> 27# include <execinfo.h>
28#endif 28#endif
29 29
30#include <cstdarg> 30#include <cstdarg>
31#include <typeinfo>
31 32
32#include "global.h" 33#include "global.h"
33#include "loader.h" 34#include "loader.h"
34#include "../random_maps/random_map.h" 35#include "../random_maps/random_map.h"
35#include "evthread.h" 36#include "evthread.h"
… …
80 *stash_cf, 81 *stash_cf,
81 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
82 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
83 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
84 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
85 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
86 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
87 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
88 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
89 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
90 92
93#ifndef newSVpv_utf8
91static inline SV * 94static inline SV *
92newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
93{ 96{
94 if (!s) 97 if (!s)
95 return newSV (0); 98 return newSV (0);
96 99
97 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
98 SvUTF8_on (sv); 101 SvUTF8_on (sv);
99 return sv; 102 return sv;
100} 103}
104#endif
101 105
106#ifndef newSVpvn_utf8
102static inline SV * 107static inline SV *
103newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
104{ 109{
105 if (!s) 110 if (!s)
106 return newSV (0); 111 return newSV (0);
107 112
108 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
109 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
110 return sv; 118 return sv;
111} 119}
120#endif
112 121
113// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
114template<class super> 123template<class super>
115static super * 124static super *
116is_a (attachable *at) 125is_a (attachable *at)
… …
149 SvREFCNT_inc (self); 158 SvREFCNT_inc (self);
150 hv_clear (self); 159 hv_clear (self);
151 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 160 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
152 SvREFCNT_dec (self); 161 SvREFCNT_dec (self);
153 162
154 // self *must* be null now because thats sv_unmagic's job. 163 // self *must* be null now because that's sv_unmagic's job.
155 assert (!this->self); 164 assert (!this->self);
156 } 165 }
157} 166}
158 167
159void 168void
… …
396 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);
397 406
398 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
399} 408}
400 409
401static long 410static long noinline
402SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
403{ 412{
404 if (SvOK (sv)) 413 if (SvOK (sv))
405 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
406 else 415 else
407 return 0; 416 return 0;
408} 417}
409 418
410inline 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); }
411inline 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); }
412inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
413inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
414inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
415inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
428inline 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); }
429inline 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); }
430inline 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); }
431inline 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); }
432inline 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); }
433 443
434inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
435inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&v); }
436 446
437inline 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 ()); }
438inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
439 449
440inline 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}
441 472
442inline 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; }
443inline 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; }
444inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
445inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
461inline 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"); }
462inline 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"); }
463inline 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"); }
464inline 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"); }
465inline 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"); }
466inline 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"); }
467inline 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" ); }
468 500
469//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)]; }
470inline 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)); }
… …
575 va_end (ap); 607 va_end (ap);
576 608
577 return sv; 609 return sv;
578} 610}
579 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
580////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
581 637
582SV * 638SV *
583registry (attachable *ext) 639registry (attachable *ext)
584{ 640{
… …
601 657
602 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
603 659
604 const char *argv[] = { 660 const char *argv[] = {
605 settings.argv [0], 661 settings.argv [0],
606 "-e" 662 "-e0"
607 "use EV; use Coro;" // required for bootstrap
608 "cf->bootstrap;" // required for datadir :*>
609 "unshift @INC, cf::datadir ();"
610 "require cf;"
611 }; 663 };
612 664
613 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
614 || perl_run (perl)) 666 || perl_run (perl))
615 { 667 {
616 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
617 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
618 } 670 }
619 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))
620 { 683 {
621 dSP; 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
622 685 exit (EXIT_FAILURE);
623 PUSHMARK (SP);
624 PUTBACK;
625 call_pv ("cf::init", G_DISCARD | G_VOID);
626 } 686 }
627} 687}
628 688
689void
629void cfperl_main () 690cfperl_main ()
630{ 691{
631 dSP; 692 dSP;
632 693
633 PUSHMARK (SP); 694 PUSHMARK (SP);
634 PUTBACK; 695 PUTBACK;
… …
659# undef def 720# undef def
660}; 721};
661 722
662#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)
663 724
664static void 725static void noinline
665gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
666{ 727{
667 // event must be in array 728 // event must be in array
668 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
669 { 730 {
… …
755{ 816{
756 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
757 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
758} 819}
759 820
760void 821static void noinline
761_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
762{ 823{
763 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
764 { 825 {
765 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
775 } 836 }
776 } 837 }
777} 838}
778 839
779// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
780void 841static void
781_recalc_want () 842_recalc_want ()
782{ 843{
783 ev_want_event.reset (); 844 ev_want_event.reset ();
784 845
785 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
895} 956}
896 957
897///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
898// various c++ => perl glue functions 959// various c++ => perl glue functions
899 960
961void
900void cfperl_tick () 962cfperl_tick ()
901{ 963{
902 tick_pending = 1; 964 tick_pending = 1;
903 965
904 if (tick_inhibit) 966 if (tick_inhibit)
905 return; 967 return;
… …
937{ 999{
938 CALL_BEGIN (2); 1000 CALL_BEGIN (2);
939 CALL_ARG (book); 1001 CALL_ARG (book);
940 CALL_ARG (level); 1002 CALL_ARG (level);
941 CALL_CALL ("ext::books::make_book", G_VOID); 1003 CALL_CALL ("ext::books::make_book", G_VOID);
942 CALL_END;
943}
944
945void
946cfperl_expand_cfpod (player *pl, std::string &msg)
947{
948 CALL_BEGIN (2);
949 CALL_ARG (pl);
950 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
951 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
952
953 if (count)
954 {
955 STRLEN len;
956 char *data = SvPVutf8 (TOPs, len);
957 msg.assign (data, len);
958 }
959
960 CALL_END; 1004 CALL_END;
961} 1005}
962 1006
963void 1007void
964cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1008cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
… …
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1104 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1061 CALL_END; 1105 CALL_END;
1062} 1106}
1063 1107
1064void 1108void
1065maptile::change_all_map_light (int change)
1066{
1067 CALL_BEGIN (1);
1068 CALL_ARG (change);
1069 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1070 CALL_END;
1071}
1072
1073void
1074object::enter_exit (object *exit) 1109object::enter_exit (object *exit)
1075{ 1110{
1076 if (type != PLAYER) 1111 if (type != PLAYER)
1077 return; 1112 return;
1078 1113
… …
1146///////////////////////////////////////////////////////////////////////////// 1181/////////////////////////////////////////////////////////////////////////////
1147 1182
1148struct EVAPI *evapi::GEVAPI; 1183struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1184struct CoroAPI *coroapi::GCoroAPI;
1150 1185
1186void
1151void coroapi::do_cede_to_tick () 1187coroapi::do_cede_to_tick ()
1152{ 1188{
1153 cede_pending = 0; 1189 cede_pending = 0;
1154 cede (); 1190 cede ();
1155} 1191}
1156 1192
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1216 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1217 if (active) start ();
1182 } 1218 }
1183} 1219}
1184 1220
1185void 1221static void
1186_connect_to_perl () 1222_connect_to_perl ()
1187{ 1223{
1188 stash_cf = gv_stashpv ("cf", 1); 1224 stash_cf = gv_stashpv ("cf", 1);
1189 1225
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1226 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 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);
1192 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1228 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1193 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);
1194 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1231 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1195 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1232 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1196 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1233 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1197 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1234 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1198 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1235 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1318 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)
1319 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)
1320 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)
1321 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)
1322 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)
1323 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)
1324 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)
1325 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)
1326 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)
1327 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)
1328 1365
1329 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)
1330 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)
1331 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)
1332 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)
1333 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)
1334 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1371 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1335 1372
1336 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)
1337 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)
1338 1375
1339 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)
… …
1391 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)
1392 const_iv (F_LOCKED) 1429 const_iv (F_LOCKED)
1393 1430
1394 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)
1395 1432
1396 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)
1397 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)
1398 1435
1399 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)
1400 1437
1401 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)
… …
1499 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1536 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1500 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1537 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1501 } 1538 }
1502} 1539}
1503 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
1504void _connect_to_perl () 1555void _connect_to_perl ()
1505 1556
1506void _recalc_want () 1557void _recalc_want ()
1507 1558
1559# not used by default anymore
1508void _global_reattach () 1560void _global_reattach ()
1509 CODE: 1561 CODE:
1510{ 1562{
1511 // reattach to all attachable objects in the game. 1563 // reattach to all attachable objects in the game.
1512 for_all_clients (ns) 1564 for_all_clients (ns)
… …
1555 len -= 3; 1607 len -= 3;
1556 } 1608 }
1557 1609
1558 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1610 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1559} 1611}
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 ()
1560 1638
1561void evthread_start (int aiofd) 1639void evthread_start (int aiofd)
1562 1640
1563void cede_to_tick () 1641void cede_to_tick ()
1564 CODE: 1642 CODE:
… …
1702#if _POSIX_MEMLOCK 1780#if _POSIX_MEMLOCK
1703 1781
1704int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1782int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1705 INIT: 1783 INIT:
1706#if __GLIBC__ 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
1707 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1788 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1708#endif 1789#endif
1709 1790
1710int munlockall () 1791int munlockall ()
1711 1792
… …
1730 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1811 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1731 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1812 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1732 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1813 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1733 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1814 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1734#endif 1815#endif
1735 EXTEND (SP, 2*2); 1816 EXTEND (SP, 5*2);
1736 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1817 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1737 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1818 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1738 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 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)));
1739} 1822}
1740 1823
1741int find_animation (utf8_string text) 1824int find_animation (utf8_string text)
1742 PROTOTYPE: $ 1825 PROTOTYPE: $
1743 1826
… …
2183 pl->ob->stats.hp = pl->ob->stats.maxhp; 2266 pl->ob->stats.hp = pl->ob->stats.maxhp;
2184 pl->ob->stats.sp = pl->ob->stats.maxsp; 2267 pl->ob->stats.sp = pl->ob->stats.maxsp;
2185 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2268 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2186 pl->orig_stats = pl->ob->stats; 2269 pl->orig_stats = pl->ob->stats;
2187 2270
2188void clear_los (player *pl) 2271# should only be temporary
2272void esrv_new_player (player *pl)
2189 2273
2274#d# TODO: replace by blocked_los accessor, fix code using this
2190bool 2275bool
2191cell_visible (player *pl, int dx, int dy) 2276cell_visible (player *pl, int dx, int dy)
2192 CODE: 2277 CODE:
2193 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2278 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2194 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2195 OUTPUT: 2279 OUTPUT:
2196 RETVAL 2280 RETVAL
2197 2281
2198void 2282void
2199send (player *pl, SV *packet) 2283send (player *pl, SV *packet)
… …
2205 if (len > MAXSOCKBUF) 2289 if (len > MAXSOCKBUF)
2206 pl->failmsg ("[packet too long for client]"); 2290 pl->failmsg ("[packet too long for client]");
2207 else if (pl->ns) 2291 else if (pl->ns)
2208 pl->ns->send_packet (buf, len); 2292 pl->ns->send_packet (buf, len);
2209} 2293}
2210
2211int
2212listening (player *pl, int new_value = -1)
2213 CODE:
2214 RETVAL = pl->listening;
2215 if (new_value >= 0)
2216 pl->listening = new_value;
2217 OUTPUT:
2218 RETVAL
2219 2294
2220void 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)
2221 PROTOTYPE: $;$$$ 2296 PROTOTYPE: $;$$$
2222 PPCODE: 2297 PPCODE:
2223 if (GIMME_V != G_VOID) 2298 if (GIMME_V != G_VOID)
… …
2276} 2351}
2277 2352
2278INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2353INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2279 2354
2280void 2355void
2356adjust_daylight ()
2357 CODE:
2358 maptile::adjust_daylight ();
2359
2360void
2281maptile::instantiate () 2361maptile::instantiate ()
2282 2362
2283maptile *new () 2363maptile *new ()
2284 PROTOTYPE: 2364 PROTOTYPE:
2285 CODE: 2365 CODE:
… …
2378} 2458}
2379 2459
2380void 2460void
2381maptile::create_region_treasure () 2461maptile::create_region_treasure ()
2382 CODE: 2462 CODE:
2383{
2384 object *op = object::create ();
2385 op->type = FLOOR;
2386 op->map = THIS;
2387
2388 for (int x = 0; x < THIS->width; ++x) 2463 for (int x = 0; x < THIS->width; ++x)
2389 for (int y = 0; y < THIS->height; ++y) 2464 for (int y = 0; y < THIS->height; ++y)
2390 { 2465 {
2391 region *rgn = THIS->region (x, y); 2466 region *rgn = THIS->region (x, y);
2392 2467
2393 //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)
2394 if (rgn->treasure && rndm () < rgn->treasure_density) 2470 if (rgn->treasure && rndm () < rgn->treasure_density)
2395 {
2396 op->x = x;
2397 op->y = y;
2398 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2471 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2399 }
2400 } 2472 }
2401
2402 op->destroy ();
2403}
2404 2473
2405int out_of_map (maptile *map, int x, int y) 2474int out_of_map (maptile *map, int x, int y)
2406 2475
2407void 2476void
2408trigger (maptile *map, long connection, bool state = true) 2477trigger (maptile *map, long connection, bool state = true)
… …
2437 PUSHs (sv_2mortal (newSViv (nx))); 2506 PUSHs (sv_2mortal (newSViv (nx)));
2438 PUSHs (sv_2mortal (newSViv (ny))); 2507 PUSHs (sv_2mortal (newSViv (ny)));
2439 } 2508 }
2440} 2509}
2441 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
2442void 2531void
2443at (maptile *map, unsigned int x, unsigned int y) 2532at (maptile *map, unsigned int x, unsigned int y)
2444 PROTOTYPE: $$$ 2533 PROTOTYPE: $$$
2445 PPCODE: 2534 PPCODE:
2446{ 2535{
… …
2455 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2544 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2456 XPUSHs (sv_2mortal (to_sv (o))); 2545 XPUSHs (sv_2mortal (to_sv (o)));
2457} 2546}
2458 2547
2459SV * 2548SV *
2460bot_at (maptile *obj, unsigned int x, unsigned int y) 2549bot_at (maptile *map, unsigned int x, unsigned int y)
2461 PROTOTYPE: $$$ 2550 PROTOTYPE: $$$
2462 ALIAS: 2551 ALIAS:
2463 top_at = 1 2552 top_at = 1
2464 flags_at = 2 2553 flags_at = 2
2465 light_at = 3 2554 light_at = 3
2466 move_block_at = 4 2555 move_block_at = 4
2467 move_slow_at = 5 2556 move_slow_at = 5
2468 move_on_at = 6 2557 move_on_at = 6
2469 move_off_at = 7 2558 move_off_at = 7
2470 INIT:
2471 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2472 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
2473 switch (ix) 2571 switch (ix)
2474 { 2572 {
2475 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2573 case 0: RETVAL = to_sv (ms.bot ); break;
2476 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2574 case 1: RETVAL = to_sv (ms.top ); break;
2477 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2575 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2478 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2576 case 3: RETVAL = newSViv (ms.light ); break;
2479 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2577 case 4: RETVAL = newSVuv (ms.move_block); break;
2480 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2578 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2481 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2579 case 6: RETVAL = newSVuv (ms.move_on ); break;
2482 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2580 case 7: RETVAL = newSVuv (ms.move_off ); break;
2483 } 2581 }
2582}
2484 OUTPUT: RETVAL 2583 OUTPUT: RETVAL
2485 2584
2486void fix_walls (maptile *map, int x, int y) 2585void fix_walls (maptile *map, int x, int y)
2487 2586
2488void fix_walls_around (maptile *map, int x, int y) 2587void fix_walls_around (maptile *map, int x, int y)
… …
2573 RETVAL = self->generate_random_map (&rmp); 2672 RETVAL = self->generate_random_map (&rmp);
2574} 2673}
2575 OUTPUT: 2674 OUTPUT:
2576 RETVAL 2675 RETVAL
2577 2676
2677MODULE = cf PACKAGE = cf::mapspace
2678
2679INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2680
2578MODULE = cf PACKAGE = cf::arch 2681MODULE = cf PACKAGE = cf::arch
2579 2682
2580int archetypes_size () 2683int archetypes_size ()
2581 CODE: 2684 CODE:
2582 RETVAL = archetypes.size (); 2685 RETVAL = archetypes.size ();
… …
2615 2718
2616region *find (utf8_string name) 2719region *find (utf8_string name)
2617 PROTOTYPE: $ 2720 PROTOTYPE: $
2618 CODE: 2721 CODE:
2619 RETVAL = region::find (name); 2722 RETVAL = region::find (name);
2620 OUTPUT: RETVAL
2621
2622region *find_fuzzy (utf8_string name)
2623 PROTOTYPE: $
2624 CODE:
2625 RETVAL = region::find_fuzzy (name);
2626 OUTPUT: RETVAL 2723 OUTPUT: RETVAL
2627 2724
2628int specificity (region *rgn) 2725int specificity (region *rgn)
2629 CODE: 2726 CODE:
2630 RETVAL = 0; 2727 RETVAL = 0;

Diff Legend

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