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.293 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.331 by root, Thu Nov 5 14:38:47 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 6 *
8 * Deliantra is free software: you can redistribute it and/or modify 7 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 10 * option) any later version.
12 * 11 *
13 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 15 * GNU General Public License for more details.
17 * 16 *
18 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
20 * 20 *
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"
71static int tick_pending; 71static int tick_pending;
72 72
73global gbl_ev; 73global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 75static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
76static AV *av_reflect;
76 77
77bitset<NUM_EVENT_TYPES> ev_want_event; 78bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 79bitset<NUM_TYPES> ev_want_type;
79 80
80static HV 81static HV
88 *stash_cf_arch_wrap, 89 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 90 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 91 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 92 *stash_cf_living_wrap;
92 93
94static SV
95 *cv_cf_do_invoke,
96 *cv_cf__can_merge,
97 *cv_cf_client_send_msg,
98 *cv_cf_tick,
99 *cv_cf_match_match;
100
101#ifndef newSVpv_utf8
93static inline SV * 102static inline SV *
94newSVpv_utf8 (const char *s) 103newSVpv_utf8 (const char *s)
95{ 104{
96 if (!s) 105 if (!s)
97 return newSV (0); 106 return newSV (0);
98 107
99 SV *sv = newSVpv (s, 0); 108 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 109 SvUTF8_on (sv);
101 return sv; 110 return sv;
102} 111}
112#endif
103 113
114#ifndef newSVpvn_utf8
104static inline SV * 115static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 116newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 117{
107 if (!s) 118 if (!s)
108 return newSV (0); 119 return newSV (0);
109 120
110 SV *sv = newSVpvn (s, l); 121 SV *sv = newSVpvn (s, l);
122
123 if (utf8)
111 SvUTF8_on (sv); 124 SvUTF8_on (sv);
125
112 return sv; 126 return sv;
113} 127}
128#endif
114 129
115// helper cast function, returns super class * or 0 130// helper cast function, returns super class * or 0
116template<class super> 131template<class super>
117static super * 132static super *
118is_a (attachable *at) 133is_a (attachable *at)
151 SvREFCNT_inc (self); 166 SvREFCNT_inc (self);
152 hv_clear (self); 167 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 168 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 169 SvREFCNT_dec (self);
155 170
156 // self *must* be null now because thats sv_unmagic's job. 171 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 172 assert (!this->self);
158 } 173 }
159} 174}
160 175
161void 176void
310 fprintf (stderr, "P %p\n", pl); 325 fprintf (stderr, "P %p\n", pl);
311 326
312 for_all_clients (ns) 327 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 328 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 329 fprintf (stderr, "C %p\n", ns);
315
316} 330}
317 331
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 332//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 333
320static SV * 334static SV *
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 412 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 413
400 return (long)mg->mg_ptr; 414 return (long)mg->mg_ptr;
401} 415}
402 416
403static long 417static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 418SvPTR_ornull (SV *sv, const char *klass)
405{ 419{
406 if (SvOK (sv)) 420 if (SvOK (sv))
407 return SvPTR (sv, klass); 421 return SvPTR (sv, klass);
408 else 422 else
409 return 0; 423 return 0;
410} 424}
411 425
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 426inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 427inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 428inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 429inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 430inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 431inline SV *to_sv ( signed short v) { return newSViv (v); }
439 453
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 454inline 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); } 455inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 456
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 457inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
458
459inline SV *to_sv (dynbuf * v)
460{
461 SV *sv = newSV (0);
462
463 sv_upgrade (sv, SVt_PV);
464 SvGROW (sv, v->size () + 1);
465 SvPOK_only (sv);
466 v->linearise (SvPVX (sv));
467 SvCUR_set (sv, v->size ());
468 *SvEND (sv) = 0;
469
470 return sv;
471}
472
473inline SV *to_sv (dynbuf_text * v)
474{
475 SV *sv = to_sv (static_cast<dynbuf *> (v));
476 SvUTF8_on (sv);
477 return sv;
478}
444 479
445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 480inline 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; } 481inline 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); } 482inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 483inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
579 va_end (ap); 614 va_end (ap);
580 615
581 return sv; 616 return sv;
582} 617}
583 618
619// typemap support, mostly to avoid excessive inlining
620template<class type>
621static void noinline
622cf_obj_to (SV *arg, type &var)
623{
624 sv_to (arg, var);
625 if (!var)
626 croak ("must not pass invalid/null cf_obj here");
627}
628
629template<class object>
630static void noinline
631cf_obj_ornull_to (SV *arg, object *&var)
632{
633 if (SvOK (arg))
634 {
635 sv_to (arg, var);
636 if (!var)
637 croak ("unable to convert perl object to C++ object");
638 }
639 else
640 var = 0;
641}
642
584////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 643//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
585 644
586SV * 645SV *
587registry (attachable *ext) 646registry (attachable *ext)
588{ 647{
605 664
606 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 665 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
607 666
608 const char *argv[] = { 667 const char *argv[] = {
609 settings.argv [0], 668 settings.argv [0],
610 "-e" 669 "-e0"
611 "use EV; use Coro;" // required for bootstrap
612 "cf->bootstrap;" // required for datadir :*>
613 "unshift @INC, cf::datadir ();"
614 "require cf;"
615 }; 670 };
616 671
617 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 672 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
618 || perl_run (perl)) 673 || perl_run (perl))
619 { 674 {
620 printf ("unable to initialize perl-interpreter, aborting.\n"); 675 printf ("unable to initialize perl-interpreter, aborting.\n");
621 exit (EXIT_FAILURE); 676 exit (EXIT_FAILURE);
622 } 677 }
623 678
679 eval_pv (
680 "#line 1 'cfperl init'\n"
681 "use EV ();\n"
682 "use Coro ();\n"
683 "cf->bootstrap;\n"
684 "unshift @INC, cf::datadir ();\n"
685 "require cf;\n",
686 0
687 );
688
689 if (SvTRUE (ERRSV))
624 { 690 {
625 dSP; 691 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
626 692 exit (EXIT_FAILURE);
627 PUSHMARK (SP);
628 PUTBACK;
629 call_pv ("cf::init", G_DISCARD | G_VOID);
630 } 693 }
631} 694}
632 695
696void
633void cfperl_main () 697cfperl_main ()
634{ 698{
635 dSP; 699 dSP;
636 700
637 PUSHMARK (SP); 701 PUSHMARK (SP);
638 PUTBACK; 702 PUTBACK;
663# undef def 727# undef def
664}; 728};
665 729
666#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 730#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
667 731
668static void 732static void noinline
669gather_callbacks (AV *&callbacks, AV *registry, event_type event) 733gather_callbacks (AV *&callbacks, AV *registry, event_type event)
670{ 734{
671 // event must be in array 735 // event must be in array
672 if (event >= 0 && event <= AvFILLp (registry)) 736 if (event >= 0 && event <= AvFILLp (registry))
673 { 737 {
759{ 823{
760 attachable::gather_callbacks (callbacks, event); 824 attachable::gather_callbacks (callbacks, event);
761 ::gather_callbacks (callbacks, cb_map, event); 825 ::gather_callbacks (callbacks, cb_map, event);
762} 826}
763 827
764void 828static void noinline
765_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 829_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
766{ 830{
767 for (int event = 0; event <= AvFILLp (registry); ++event) 831 for (int event = 0; event <= AvFILLp (registry); ++event)
768 { 832 {
769 SV *cbs_ = AvARRAY (registry)[event]; 833 SV *cbs_ = AvARRAY (registry)[event];
779 } 843 }
780 } 844 }
781} 845}
782 846
783// very slow and inefficient way to recalculate the global want bitsets 847// very slow and inefficient way to recalculate the global want bitsets
784void 848static void
785_recalc_want () 849_recalc_want ()
786{ 850{
787 ev_want_event.reset (); 851 ev_want_event.reset ();
788 852
789 _recalc_want (ev_want_event, cb_global); 853 _recalc_want (ev_want_event, cb_global);
862 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 926 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
863 } 927 }
864 928
865 va_end (ap); 929 va_end (ap);
866 930
867 CALL_CALL ("cf::do_invoke", G_SCALAR); 931 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
868 count = count > 0 ? POPi : 0; 932 count = count > 0 ? POPi : 0;
869 933
870 CALL_END; 934 CALL_END;
871 935
872 return count; 936 return count;
899} 963}
900 964
901///////////////////////////////////////////////////////////////////////////// 965/////////////////////////////////////////////////////////////////////////////
902// various c++ => perl glue functions 966// various c++ => perl glue functions
903 967
968void
904void cfperl_tick () 969cfperl_tick ()
905{ 970{
906 tick_pending = 1; 971 tick_pending = 1;
907 972
908 if (tick_inhibit) 973 if (tick_inhibit)
909 return; 974 return;
912 977
913 dSP; 978 dSP;
914 979
915 PUSHMARK (SP); 980 PUSHMARK (SP);
916 PUTBACK; 981 PUTBACK;
917 call_pv ("cf::tick", G_DISCARD | G_VOID); 982 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
918 983
919 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 984 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
920} 985}
921 986
922void 987void
945 CALL_CALL ("ext::books::make_book", G_VOID); 1010 CALL_CALL ("ext::books::make_book", G_VOID);
946 CALL_END; 1011 CALL_END;
947} 1012}
948 1013
949void 1014void
950cfperl_expand_cfpod (player *pl, std::string &msg)
951{
952 CALL_BEGIN (2);
953 CALL_ARG (pl);
954 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
955 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
956
957 if (count)
958 {
959 STRLEN len;
960 char *data = SvPVutf8 (TOPs, len);
961 msg.assign (data, len);
962 }
963
964 CALL_END;
965}
966
967void
968cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1015cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
969{ 1016{
970 CALL_BEGIN (4); 1017 CALL_BEGIN (4);
971 CALL_ARG (ns); 1018 CALL_ARG (ns);
972 CALL_ARG (type); 1019 CALL_ARG (type);
973 CALL_ARG_SV (newSVpv_utf8 (msg)); 1020 CALL_ARG_SV (newSVpv_utf8 (msg));
974 CALL_ARG (color); 1021 CALL_ARG (color);
975 CALL_CALL ("cf::client::send_msg", G_VOID); 1022 CALL_CALL (cv_cf_client_send_msg, G_VOID);
976 CALL_END; 1023 CALL_END;
977} 1024}
978 1025
979int 1026int
980cfperl_can_merge (object *ob1, object *ob2) 1027cfperl_can_merge (object *ob1, object *ob2)
982 int can; 1029 int can;
983 1030
984 CALL_BEGIN (2); 1031 CALL_BEGIN (2);
985 CALL_ARG (ob1); 1032 CALL_ARG (ob1);
986 CALL_ARG (ob2); 1033 CALL_ARG (ob2);
987 CALL_CALL ("cf::_can_merge", G_SCALAR); 1034 CALL_CALL (cv_cf__can_merge, G_SCALAR);
988 can = count && SvTRUE (TOPs); 1035 can = count && SvTRUE (TOPs);
989 CALL_END; 1036 CALL_END;
990 1037
991 return can; 1038 return can;
1039}
1040
1041void
1042cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1043{
1044 CALL_BEGIN (4);
1045 CALL_ARG (ob);
1046 CALL_ARG (state);
1047 CALL_ARG (activator);
1048 CALL_ARG (originator);
1049 CALL_CALL ("cf::mapscript::activate", G_VOID);
1050 CALL_END;
992} 1051}
993 1052
994player * 1053player *
995player::find (const char *name) 1054player::find (const char *name)
996{ 1055{
1060maptile::do_load_sync () 1119maptile::do_load_sync ()
1061{ 1120{
1062 CALL_BEGIN (1); 1121 CALL_BEGIN (1);
1063 CALL_ARG (this); 1122 CALL_ARG (this);
1064 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1123 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1065 CALL_END;
1066}
1067
1068void
1069maptile::change_all_map_light (int change)
1070{
1071 CALL_BEGIN (1);
1072 CALL_ARG (change);
1073 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1074 CALL_END; 1124 CALL_END;
1075} 1125}
1076 1126
1077void 1127void
1078object::enter_exit (object *exit) 1128object::enter_exit (object *exit)
1145 CALL_CALL ("cf::_log_backtrace", G_VOID); 1195 CALL_CALL ("cf::_log_backtrace", G_VOID);
1146 CALL_END; 1196 CALL_END;
1147#endif 1197#endif
1148} 1198}
1149 1199
1200bool
1201is_match_expr (const char *expr)
1202{
1203 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1204}
1205
1206bool
1207match (const char *expr, object *ob, object *self, object *source, object *originator)
1208{
1209 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1210 expr += sizeof ("match ") - 1;
1211
1212 CALL_BEGIN (5);
1213 CALL_ARG (expr);
1214 CALL_ARG (ob);
1215 CALL_ARG (self);
1216 CALL_ARG (source);
1217 CALL_ARG (originator);
1218 CALL_CALL (cv_cf_match_match, G_SCALAR);
1219
1220 bool matched = count && SvTRUE (TOPs);
1221
1222 CALL_END;
1223
1224 return matched;
1225}
1226
1227object *
1228match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1229{
1230 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1231 expr += sizeof ("match ") - 1;
1232
1233 CALL_BEGIN (5);
1234 CALL_ARG (expr);
1235 CALL_ARG (ob);
1236 CALL_ARG (self);
1237 CALL_ARG (source);
1238 CALL_ARG (originator);
1239 CALL_CALL (cv_cf_match_match, G_ARRAY);
1240
1241 object *one = 0;
1242
1243 if (count)
1244 sv_to (TOPs, one);
1245
1246 CALL_END;
1247
1248 return one;
1249}
1250
1150///////////////////////////////////////////////////////////////////////////// 1251/////////////////////////////////////////////////////////////////////////////
1151 1252
1152struct EVAPI *evapi::GEVAPI; 1253struct EVAPI *evapi::GEVAPI;
1153struct CoroAPI *coroapi::GCoroAPI; 1254struct CoroAPI *coroapi::GCoroAPI;
1154 1255
1256void
1155void coroapi::do_cede_to_tick () 1257coroapi::do_cede_to_tick ()
1156{ 1258{
1157 cede_pending = 0; 1259 cede_pending = 0;
1158 cede (); 1260 cede ();
1159} 1261}
1160 1262
1184 ev_io_set ((ev_io *)this, fd, events); 1286 ev_io_set ((ev_io *)this, fd, events);
1185 if (active) start (); 1287 if (active) start ();
1186 } 1288 }
1187} 1289}
1188 1290
1189void 1291static void
1190_connect_to_perl () 1292_connect_to_perl_1 ()
1191{ 1293{
1192 stash_cf = gv_stashpv ("cf", 1); 1294 stash_cf = gv_stashpv ("cf", 1);
1193 1295
1194 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1296 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1195 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1297 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1214 cb_client = get_av ("cf::CB_CLIENT", 1); 1316 cb_client = get_av ("cf::CB_CLIENT", 1);
1215 cb_type = get_av ("cf::CB_TYPE" , 1); 1317 cb_type = get_av ("cf::CB_TYPE" , 1);
1216 cb_map = get_av ("cf::CB_MAP" , 1); 1318 cb_map = get_av ("cf::CB_MAP" , 1);
1217} 1319}
1218 1320
1321static void
1322_connect_to_perl_2 ()
1323{
1324 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1325 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1326 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1327 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1328 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1329}
1330
1219MODULE = cf PACKAGE = cf PREFIX = cf_ 1331MODULE = cf PACKAGE = cf PREFIX = cf_
1220 1332
1221BOOT: 1333BOOT:
1222{ 1334{
1223 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1335 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1224 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1336 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1225 1337
1226 _connect_to_perl (); 1338 _connect_to_perl_1 ();
1227 1339
1228 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1340 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1229 1341
1230 //{ 1342 //{
1231 // require_pv ("Time::HiRes"); 1343 // require_pv ("Time::HiRes");
1275 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1387 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1276 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1388 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1277 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1389 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1278 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1390 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1279 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1391 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1280 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1392 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1281 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1393 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1282 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1394 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1283 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1395 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1284 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1396 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1285 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1397 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1286 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1398 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1287 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1399 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1288 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1400 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1401 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1289 1402
1290 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1403 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1291 1404
1292 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1405 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1293 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1406 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
1323 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1436 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1324 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1437 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1325 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1438 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1326 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1439 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1327 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1440 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1328 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1441 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1329 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1442 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1330 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1443 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1331 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1444 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1332 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1445 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1333 1446
1334 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1447 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1335 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1448 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1336 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1449 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1337 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1450 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1338 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1451 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1339 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1452 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1340 1453
1341 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1454 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1342 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1455 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1343 1456
1344 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1457 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1502 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1615 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1503 av_push (event, newSViv (eiv->klass)); 1616 av_push (event, newSViv (eiv->klass));
1504 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1617 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1505 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1618 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1506 } 1619 }
1507}
1508 1620
1621 // used by autogenerated BOOT sections from genacc
1622 av_reflect = get_av ("cf::REFLECT", 1);
1623}
1624
1625void _gv_clear (SV *gv)
1626 CODE:
1627 assert (SvTYPE (gv) == SVt_PVGV);
1628# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1629 f (GvGP (gv)->gp_form);
1630 f (GvGP (gv)->gp_io);
1631 f (GvGP (gv)->gp_sv);
1632 f (GvGP (gv)->gp_av);
1633 f (GvGP (gv)->gp_hv);
1634 f (GvGP (gv)->gp_cv);
1635 GvCVGEN (gv) = 0;
1636 GvMULTI_off (gv);
1637# undef f
1638
1509void _connect_to_perl () 1639void _connect_to_perl_1 ()
1640
1641void _connect_to_perl_2 ()
1510 1642
1511void _recalc_want () 1643void _recalc_want ()
1512 1644
1645# not used by default anymore
1513void _global_reattach () 1646void _global_reattach ()
1514 CODE: 1647 CODE:
1515{ 1648{
1516 // reattach to all attachable objects in the game. 1649 // reattach to all attachable objects in the game.
1517 for_all_clients (ns) 1650 for_all_clients (ns)
1560 len -= 3; 1693 len -= 3;
1561 } 1694 }
1562 1695
1563 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1696 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1564} 1697}
1698
1699void init_anim ()
1700
1701void init_globals ()
1702
1703void init_experience ()
1704
1705void init_attackmess ()
1706
1707void init_dynamic ()
1708
1709void load_settings ()
1710
1711void load_materials ()
1712
1713void init_uuid ()
1714 CODE:
1715 UUID::init ();
1716
1717void init_signals ()
1718
1719void init_commands ()
1720
1721void init_skills ()
1722
1723void init_beforeplay ()
1565 1724
1566void evthread_start (int aiofd) 1725void evthread_start (int aiofd)
1567 1726
1568void cede_to_tick () 1727void cede_to_tick ()
1569 CODE: 1728 CODE:
1707#if _POSIX_MEMLOCK 1866#if _POSIX_MEMLOCK
1708 1867
1709int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1868int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1710 INIT: 1869 INIT:
1711#if __GLIBC__ 1870#if __GLIBC__
1871 mallopt (M_TOP_PAD, 1024 * 1024);
1872 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1873 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1712 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1874 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1713#endif 1875#endif
1714 1876
1715int munlockall () 1877int munlockall ()
1716 1878
1735 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1897 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1736 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1898 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1737 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1899 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1738 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1900 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1739#endif 1901#endif
1740 EXTEND (SP, 2*2); 1902 EXTEND (SP, 5*2);
1741 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1903 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1742 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1904 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1743 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1905 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1906 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1907 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1744} 1908}
1745 1909
1746int find_animation (utf8_string text) 1910int find_animation (utf8_string text)
1747 PROTOTYPE: $ 1911 PROTOTYPE: $
1748 1912
2000 CODE: 2164 CODE:
2001 player_apply_below (op); 2165 player_apply_below (op);
2002 2166
2003int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2167int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2004 2168
2169int casting_level (object *caster, object *spell)
2170
2005int pay_item (object *op, object *buyer) 2171int pay_item (object *op, object *buyer)
2006 CODE: 2172 CODE:
2007 RETVAL = pay_for_item (op, buyer); 2173 RETVAL = pay_for_item (op, buyer);
2008 OUTPUT: RETVAL 2174 OUTPUT: RETVAL
2009 2175
2053 2219
2054int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2220int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2055 2221
2056int calc_skill_exp (object *who, object *op, object *skill); 2222int calc_skill_exp (object *who, object *op, object *skill);
2057 2223
2058void push_button (object *op); 2224void push_button (object *op, object *originator);
2059 2225
2060void use_trigger (object *op); 2226void use_trigger (object *op, object *originator);
2061
2062void add_button_link (object *button, maptile *map, int connected);
2063
2064void remove_button_link (object *op);
2065 2227
2066void handle_apply_yield (object *op); 2228void handle_apply_yield (object *op);
2229
2230int convert_item (object *item, object *converter);
2067 2231
2068 2232
2069MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2233MODULE = cf PACKAGE = cf::object PREFIX = cf_
2070 2234
2071# no clean way to get an object from an archetype - stupid idiotic 2235# no clean way to get an object from an archetype - stupid idiotic
2084object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2248object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2085 PROTOTYPE: $$$$$$ 2249 PROTOTYPE: $$$$$$
2086 CODE: 2250 CODE:
2087{ 2251{
2088 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2252 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2253
2254 if (RETVAL->destroyed ())
2255 RETVAL = 0;
2089} 2256}
2090 2257
2091shstr 2258shstr
2092object::kv_get (shstr key) 2259object::kv_get (shstr key)
2093 2260
2188 pl->ob->stats.hp = pl->ob->stats.maxhp; 2355 pl->ob->stats.hp = pl->ob->stats.maxhp;
2189 pl->ob->stats.sp = pl->ob->stats.maxsp; 2356 pl->ob->stats.sp = pl->ob->stats.maxsp;
2190 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2357 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2191 pl->orig_stats = pl->ob->stats; 2358 pl->orig_stats = pl->ob->stats;
2192 2359
2193void clear_los (player *pl) 2360# should only be temporary
2361void esrv_new_player (player *pl)
2194 2362
2363#d# TODO: replace by blocked_los accessor, fix code using this
2195bool 2364bool
2196cell_visible (player *pl, int dx, int dy) 2365cell_visible (player *pl, int dx, int dy)
2197 CODE: 2366 CODE:
2198 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2367 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2199 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2200 OUTPUT: 2368 OUTPUT:
2201 RETVAL 2369 RETVAL
2202 2370
2203void 2371void
2204send (player *pl, SV *packet) 2372send (player *pl, SV *packet)
2210 if (len > MAXSOCKBUF) 2378 if (len > MAXSOCKBUF)
2211 pl->failmsg ("[packet too long for client]"); 2379 pl->failmsg ("[packet too long for client]");
2212 else if (pl->ns) 2380 else if (pl->ns)
2213 pl->ns->send_packet (buf, len); 2381 pl->ns->send_packet (buf, len);
2214} 2382}
2215
2216int
2217listening (player *pl, int new_value = -1)
2218 CODE:
2219 RETVAL = pl->listening;
2220 if (new_value >= 0)
2221 pl->listening = new_value;
2222 OUTPUT:
2223 RETVAL
2224 2383
2225void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2384void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2226 PROTOTYPE: $;$$$ 2385 PROTOTYPE: $;$$$
2227 PPCODE: 2386 PPCODE:
2228 if (GIMME_V != G_VOID) 2387 if (GIMME_V != G_VOID)
2281} 2440}
2282 2441
2283INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2442INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2284 2443
2285void 2444void
2445adjust_daylight ()
2446 CODE:
2447 maptile::adjust_daylight ();
2448
2449int
2450outdoor_darkness (int darkness = 0)
2451 CODE:
2452 RETVAL = maptile::outdoor_darkness;
2453 if (items)
2454 maptile::outdoor_darkness = darkness;
2455 OUTPUT:
2456 RETVAL
2457
2458void
2286maptile::instantiate () 2459maptile::instantiate ()
2287 2460
2288maptile *new () 2461maptile *new ()
2289 PROTOTYPE: 2462 PROTOTYPE:
2290 CODE: 2463 CODE:
2383} 2556}
2384 2557
2385void 2558void
2386maptile::create_region_treasure () 2559maptile::create_region_treasure ()
2387 CODE: 2560 CODE:
2388{
2389 object *op = object::create ();
2390 op->type = FLOOR;
2391 op->map = THIS;
2392
2393 for (int x = 0; x < THIS->width; ++x) 2561 for (int x = 0; x < THIS->width; ++x)
2394 for (int y = 0; y < THIS->height; ++y) 2562 for (int y = 0; y < THIS->height; ++y)
2395 { 2563 {
2396 region *rgn = THIS->region (x, y); 2564 region *rgn = THIS->region (x, y);
2397 2565
2398 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2566 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2567 if (object *op = THIS->at (x, y).top)
2399 if (rgn->treasure && rndm () < rgn->treasure_density) 2568 if (rgn->treasure && rndm () < rgn->treasure_density)
2400 {
2401 op->x = x;
2402 op->y = y;
2403 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2569 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2404 }
2405 } 2570 }
2406 2571
2407 op->destroy ();
2408}
2409
2410int out_of_map (maptile *map, int x, int y) 2572int out_of_map (maptile *map, int x, int y)
2411 2573
2412void 2574void
2413trigger (maptile *map, long connection, bool state = true) 2575find_link (maptile *map, shstr_tmp connection)
2414 CODE:
2415 activate_connection (map, connection, state);
2416
2417void
2418get_connection (maptile *map, long connection)
2419 PPCODE: 2576 PPCODE:
2420 oblinkpt *obp = get_connection_links (map, connection); 2577 if (oblinkpt *obp = map->find_link (connection))
2421 if (obp)
2422 for (objectlink *ol = obp->link; ol; ol = ol->next) 2578 for (objectlink *ol = obp->link; ol; ol = ol->next)
2423 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2579 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2424 2580
2425void 2581void
2426get_map_flags (maptile *map, int x, int y) 2582get_map_flags (maptile *map, int x, int y)
2480 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2636 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2481 XPUSHs (sv_2mortal (to_sv (o))); 2637 XPUSHs (sv_2mortal (to_sv (o)));
2482} 2638}
2483 2639
2484SV * 2640SV *
2485bot_at (maptile *obj, unsigned int x, unsigned int y) 2641bot_at (maptile *map, unsigned int x, unsigned int y)
2486 PROTOTYPE: $$$ 2642 PROTOTYPE: $$$
2487 ALIAS: 2643 ALIAS:
2488 top_at = 1 2644 top_at = 1
2489 flags_at = 2 2645 flags_at = 2
2490 light_at = 3 2646 light_at = 3
2491 move_block_at = 4 2647 move_block_at = 4
2492 move_slow_at = 5 2648 move_slow_at = 5
2493 move_on_at = 6 2649 move_on_at = 6
2494 move_off_at = 7 2650 move_off_at = 7
2495 INIT:
2496 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2497 CODE: 2651 CODE:
2652{
2653 sint16 nx = x;
2654 sint16 ny = y;
2655
2656 if (!xy_normalise (map, nx, ny))
2657 XSRETURN_UNDEF;
2658
2659 mapspace &ms = map->at (nx, ny);
2660
2661 ms.update ();
2662
2498 switch (ix) 2663 switch (ix)
2499 { 2664 {
2500 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2665 case 0: RETVAL = to_sv (ms.bot ); break;
2501 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2666 case 1: RETVAL = to_sv (ms.top ); break;
2502 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2667 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2503 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2668 case 3: RETVAL = newSViv (ms.light ); break;
2504 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2669 case 4: RETVAL = newSVuv (ms.move_block); break;
2505 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2670 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2506 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2671 case 6: RETVAL = newSVuv (ms.move_on ); break;
2507 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2672 case 7: RETVAL = newSVuv (ms.move_off ); break;
2508 } 2673 }
2674}
2509 OUTPUT: RETVAL 2675 OUTPUT: RETVAL
2510
2511void fix_walls (maptile *map, int x, int y)
2512
2513void fix_walls_around (maptile *map, int x, int y)
2514 2676
2515# worst xs function of my life 2677# worst xs function of my life
2516bool 2678bool
2517_create_random_map (\ 2679_create_random_map (\
2518 maptile *self,\ 2680 maptile *self,\
2646 PROTOTYPE: $ 2808 PROTOTYPE: $
2647 CODE: 2809 CODE:
2648 RETVAL = region::find (name); 2810 RETVAL = region::find (name);
2649 OUTPUT: RETVAL 2811 OUTPUT: RETVAL
2650 2812
2651region *find_fuzzy (utf8_string name)
2652 PROTOTYPE: $
2653 CODE:
2654 RETVAL = region::find_fuzzy (name);
2655 OUTPUT: RETVAL
2656
2657int specificity (region *rgn) 2813int specificity (region *rgn)
2658 CODE: 2814 CODE:
2659 RETVAL = 0; 2815 RETVAL = 0;
2660 while (rgn = rgn->parent) 2816 while (rgn = rgn->parent)
2661 RETVAL++; 2817 RETVAL++;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines