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.303 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.328 by root, Tue Nov 3 22:57:06 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); }
… …
600 va_end (ap); 614 va_end (ap);
601 615
602 return sv; 616 return sv;
603} 617}
604 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
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 643//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 644
607SV * 645SV *
608registry (attachable *ext) 646registry (attachable *ext)
609{ 647{
… …
626 664
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 665 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 666
629 const char *argv[] = { 667 const char *argv[] = {
630 settings.argv [0], 668 settings.argv [0],
631 "-e" 669 "-e0"
632 "use EV ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 670 };
638 671
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 672 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 673 || perl_run (perl))
641 { 674 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 675 printf ("unable to initialize perl-interpreter, aborting.\n");
643 exit (EXIT_FAILURE); 676 exit (EXIT_FAILURE);
644 } 677 }
645}
646 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))
690 {
691 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
692 exit (EXIT_FAILURE);
693 }
694}
695
696void
647void cfperl_main () 697cfperl_main ()
648{ 698{
649 dSP; 699 dSP;
650 700
651 PUSHMARK (SP); 701 PUSHMARK (SP);
652 PUTBACK; 702 PUTBACK;
… …
677# undef def 727# undef def
678}; 728};
679 729
680#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)
681 731
682static void 732static void noinline
683gather_callbacks (AV *&callbacks, AV *registry, event_type event) 733gather_callbacks (AV *&callbacks, AV *registry, event_type event)
684{ 734{
685 // event must be in array 735 // event must be in array
686 if (event >= 0 && event <= AvFILLp (registry)) 736 if (event >= 0 && event <= AvFILLp (registry))
687 { 737 {
… …
773{ 823{
774 attachable::gather_callbacks (callbacks, event); 824 attachable::gather_callbacks (callbacks, event);
775 ::gather_callbacks (callbacks, cb_map, event); 825 ::gather_callbacks (callbacks, cb_map, event);
776} 826}
777 827
778void 828static void noinline
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 829_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{ 830{
781 for (int event = 0; event <= AvFILLp (registry); ++event) 831 for (int event = 0; event <= AvFILLp (registry); ++event)
782 { 832 {
783 SV *cbs_ = AvARRAY (registry)[event]; 833 SV *cbs_ = AvARRAY (registry)[event];
… …
793 } 843 }
794 } 844 }
795} 845}
796 846
797// very slow and inefficient way to recalculate the global want bitsets 847// very slow and inefficient way to recalculate the global want bitsets
798void 848static void
799_recalc_want () 849_recalc_want ()
800{ 850{
801 ev_want_event.reset (); 851 ev_want_event.reset ();
802 852
803 _recalc_want (ev_want_event, cb_global); 853 _recalc_want (ev_want_event, cb_global);
… …
876 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 926 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
877 } 927 }
878 928
879 va_end (ap); 929 va_end (ap);
880 930
881 CALL_CALL ("cf::do_invoke", G_SCALAR); 931 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
882 count = count > 0 ? POPi : 0; 932 count = count > 0 ? POPi : 0;
883 933
884 CALL_END; 934 CALL_END;
885 935
886 return count; 936 return count;
… …
913} 963}
914 964
915///////////////////////////////////////////////////////////////////////////// 965/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions 966// various c++ => perl glue functions
917 967
968void
918void cfperl_tick () 969cfperl_tick ()
919{ 970{
920 tick_pending = 1; 971 tick_pending = 1;
921 972
922 if (tick_inhibit) 973 if (tick_inhibit)
923 return; 974 return;
… …
926 977
927 dSP; 978 dSP;
928 979
929 PUSHMARK (SP); 980 PUSHMARK (SP);
930 PUTBACK; 981 PUTBACK;
931 call_pv ("cf::tick", G_DISCARD | G_VOID); 982 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
932 983
933 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);
934} 985}
935 986
936void 987void
… …
966 CALL_BEGIN (4); 1017 CALL_BEGIN (4);
967 CALL_ARG (ns); 1018 CALL_ARG (ns);
968 CALL_ARG (type); 1019 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg)); 1020 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color); 1021 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID); 1022 CALL_CALL (cv_cf_client_send_msg, G_VOID);
972 CALL_END; 1023 CALL_END;
973} 1024}
974 1025
975int 1026int
976cfperl_can_merge (object *ob1, object *ob2) 1027cfperl_can_merge (object *ob1, object *ob2)
… …
978 int can; 1029 int can;
979 1030
980 CALL_BEGIN (2); 1031 CALL_BEGIN (2);
981 CALL_ARG (ob1); 1032 CALL_ARG (ob1);
982 CALL_ARG (ob2); 1033 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR); 1034 CALL_CALL (cv_cf__can_merge, G_SCALAR);
984 can = count && SvTRUE (TOPs); 1035 can = count && SvTRUE (TOPs);
985 CALL_END; 1036 CALL_END;
986 1037
987 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;
988} 1051}
989 1052
990player * 1053player *
991player::find (const char *name) 1054player::find (const char *name)
992{ 1055{
… …
1056maptile::do_load_sync () 1119maptile::do_load_sync ()
1057{ 1120{
1058 CALL_BEGIN (1); 1121 CALL_BEGIN (1);
1059 CALL_ARG (this); 1122 CALL_ARG (this);
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1123 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1061 CALL_END;
1062}
1063
1064void
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; 1124 CALL_END;
1071} 1125}
1072 1126
1073void 1127void
1074object::enter_exit (object *exit) 1128object::enter_exit (object *exit)
… …
1141 CALL_CALL ("cf::_log_backtrace", G_VOID); 1195 CALL_CALL ("cf::_log_backtrace", G_VOID);
1142 CALL_END; 1196 CALL_END;
1143#endif 1197#endif
1144} 1198}
1145 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
1146///////////////////////////////////////////////////////////////////////////// 1227/////////////////////////////////////////////////////////////////////////////
1147 1228
1148struct EVAPI *evapi::GEVAPI; 1229struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1230struct CoroAPI *coroapi::GCoroAPI;
1150 1231
1232void
1151void coroapi::do_cede_to_tick () 1233coroapi::do_cede_to_tick ()
1152{ 1234{
1153 cede_pending = 0; 1235 cede_pending = 0;
1154 cede (); 1236 cede ();
1155} 1237}
1156 1238
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1262 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1263 if (active) start ();
1182 } 1264 }
1183} 1265}
1184 1266
1185void 1267static void
1186_connect_to_perl () 1268_connect_to_perl_1 ()
1187{ 1269{
1188 stash_cf = gv_stashpv ("cf", 1); 1270 stash_cf = gv_stashpv ("cf", 1);
1189 1271
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1272 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1273 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1210 cb_client = get_av ("cf::CB_CLIENT", 1); 1292 cb_client = get_av ("cf::CB_CLIENT", 1);
1211 cb_type = get_av ("cf::CB_TYPE" , 1); 1293 cb_type = get_av ("cf::CB_TYPE" , 1);
1212 cb_map = get_av ("cf::CB_MAP" , 1); 1294 cb_map = get_av ("cf::CB_MAP" , 1);
1213} 1295}
1214 1296
1297static void
1298_connect_to_perl_2 ()
1299{
1300 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1301 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1302 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1303 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1304 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1305}
1306
1215MODULE = cf PACKAGE = cf PREFIX = cf_ 1307MODULE = cf PACKAGE = cf PREFIX = cf_
1216 1308
1217BOOT: 1309BOOT:
1218{ 1310{
1219 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1311 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1220 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1312 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1221 1313
1222 _connect_to_perl (); 1314 _connect_to_perl_1 ();
1223 1315
1224 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1316 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1225 1317
1226 //{ 1318 //{
1227 // require_pv ("Time::HiRes"); 1319 // require_pv ("Time::HiRes");
… …
1271 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1363 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1272 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1364 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1273 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1365 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1274 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1366 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1275 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1367 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1276 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1368 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1277 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1369 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1278 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1370 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1279 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1371 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1280 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1372 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1281 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1373 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1282 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1374 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1283 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1375 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1284 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1376 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1377 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1285 1378
1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1379 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1287 1380
1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1381 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1289 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1382 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1321 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1414 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1322 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1415 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1323 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1416 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1324 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1417 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1325 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1418 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1326 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1419 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1327 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1420 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1328 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1421 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329 1422
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1423 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1331 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1424 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1498 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1591 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1592 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1593 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1594 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502 } 1595 }
1596
1597 // used by autogenerated BOOT sections from genacc
1598 av_reflect = get_av ("cf::REFLECT", 1);
1503} 1599}
1504 1600
1505void _gv_clear (SV *gv) 1601void _gv_clear (SV *gv)
1506 CODE: 1602 CODE:
1507 assert (SvTYPE (gv) == SVt_PVGV); 1603 assert (SvTYPE (gv) == SVt_PVGV);
… …
1514 f (GvGP (gv)->gp_cv); 1610 f (GvGP (gv)->gp_cv);
1515 GvCVGEN (gv) = 0; 1611 GvCVGEN (gv) = 0;
1516 GvMULTI_off (gv); 1612 GvMULTI_off (gv);
1517# undef f 1613# undef f
1518 1614
1519void _connect_to_perl () 1615void _connect_to_perl_1 ()
1616
1617void _connect_to_perl_2 ()
1520 1618
1521void _recalc_want () 1619void _recalc_want ()
1522 1620
1621# not used by default anymore
1523void _global_reattach () 1622void _global_reattach ()
1524 CODE: 1623 CODE:
1525{ 1624{
1526 // reattach to all attachable objects in the game. 1625 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1626 for_all_clients (ns)
… …
1580void init_experience () 1679void init_experience ()
1581 1680
1582void init_attackmess () 1681void init_attackmess ()
1583 1682
1584void init_dynamic () 1683void init_dynamic ()
1585
1586void init_block ()
1587 1684
1588void load_settings () 1685void load_settings ()
1589 1686
1590void load_materials () 1687void load_materials ()
1591 1688
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1873 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1777 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1874 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1778 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1875 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1779 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1876 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1877#endif
1781 EXTEND (SP, 2*2); 1878 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1879 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1783 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1880 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1784 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1881 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1882 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1883 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1884}
1786 1885
1787int find_animation (utf8_string text) 1886int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1887 PROTOTYPE: $
1789 1888
… …
2094 2193
2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2194int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2096 2195
2097int calc_skill_exp (object *who, object *op, object *skill); 2196int calc_skill_exp (object *who, object *op, object *skill);
2098 2197
2099void push_button (object *op); 2198void push_button (object *op, object *originator);
2100 2199
2101void use_trigger (object *op); 2200void use_trigger (object *op, object *originator);
2102
2103void add_button_link (object *button, maptile *map, int connected);
2104
2105void remove_button_link (object *op);
2106 2201
2107void handle_apply_yield (object *op); 2202void handle_apply_yield (object *op);
2203
2204int convert_item (object *item, object *converter);
2108 2205
2109 2206
2110MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2207MODULE = cf PACKAGE = cf::object PREFIX = cf_
2111 2208
2112# no clean way to get an object from an archetype - stupid idiotic 2209# no clean way to get an object from an archetype - stupid idiotic
… …
2229 pl->ob->stats.hp = pl->ob->stats.maxhp; 2326 pl->ob->stats.hp = pl->ob->stats.maxhp;
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2327 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2328 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2329 pl->orig_stats = pl->ob->stats;
2233 2330
2234void clear_los (player *pl) 2331# should only be temporary
2332void esrv_new_player (player *pl)
2235 2333
2334#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2335bool
2237cell_visible (player *pl, int dx, int dy) 2336cell_visible (player *pl, int dx, int dy)
2238 CODE: 2337 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2338 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2339 OUTPUT:
2242 RETVAL 2340 RETVAL
2243 2341
2244void 2342void
2245send (player *pl, SV *packet) 2343send (player *pl, SV *packet)
… …
2313} 2411}
2314 2412
2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2413INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2316 2414
2317void 2415void
2416adjust_daylight ()
2417 CODE:
2418 maptile::adjust_daylight ();
2419
2420int
2421outdoor_darkness (int darkness = 0)
2422 CODE:
2423 RETVAL = maptile::outdoor_darkness;
2424 if (items)
2425 maptile::outdoor_darkness = darkness;
2426 OUTPUT:
2427 RETVAL
2428
2429void
2318maptile::instantiate () 2430maptile::instantiate ()
2319 2431
2320maptile *new () 2432maptile *new ()
2321 PROTOTYPE: 2433 PROTOTYPE:
2322 CODE: 2434 CODE:
… …
2429 } 2541 }
2430 2542
2431int out_of_map (maptile *map, int x, int y) 2543int out_of_map (maptile *map, int x, int y)
2432 2544
2433void 2545void
2434trigger (maptile *map, long connection, bool state = true) 2546find_link (maptile *map, shstr_tmp connection)
2435 CODE:
2436 activate_connection (map, connection, state);
2437
2438void
2439get_connection (maptile *map, long connection)
2440 PPCODE: 2547 PPCODE:
2441 oblinkpt *obp = get_connection_links (map, connection); 2548 if (oblinkpt *obp = map->find_link (connection))
2442 if (obp)
2443 for (objectlink *ol = obp->link; ol; ol = ol->next) 2549 for (objectlink *ol = obp->link; ol; ol = ol->next)
2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2550 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2445 2551
2446void 2552void
2447get_map_flags (maptile *map, int x, int y) 2553get_map_flags (maptile *map, int x, int y)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2607 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2608 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2609}
2504 2610
2505SV * 2611SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2612bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2613 PROTOTYPE: $$$
2508 ALIAS: 2614 ALIAS:
2509 top_at = 1 2615 top_at = 1
2510 flags_at = 2 2616 flags_at = 2
2511 light_at = 3 2617 light_at = 3
2512 move_block_at = 4 2618 move_block_at = 4
2513 move_slow_at = 5 2619 move_slow_at = 5
2514 move_on_at = 6 2620 move_on_at = 6
2515 move_off_at = 7 2621 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2622 CODE:
2623{
2624 sint16 nx = x;
2625 sint16 ny = y;
2626
2627 if (!xy_normalise (map, nx, ny))
2628 XSRETURN_UNDEF;
2629
2630 mapspace &ms = map->at (nx, ny);
2631
2632 ms.update ();
2633
2519 switch (ix) 2634 switch (ix)
2520 { 2635 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2636 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2637 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2638 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2639 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2640 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2641 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2642 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2643 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2644 }
2645}
2530 OUTPUT: RETVAL 2646 OUTPUT: RETVAL
2531
2532void fix_walls (maptile *map, int x, int y)
2533
2534void fix_walls_around (maptile *map, int x, int y)
2535 2647
2536# worst xs function of my life 2648# worst xs function of my life
2537bool 2649bool
2538_create_random_map (\ 2650_create_random_map (\
2539 maptile *self,\ 2651 maptile *self,\
… …
2667 PROTOTYPE: $ 2779 PROTOTYPE: $
2668 CODE: 2780 CODE:
2669 RETVAL = region::find (name); 2781 RETVAL = region::find (name);
2670 OUTPUT: RETVAL 2782 OUTPUT: RETVAL
2671 2783
2672region *find_fuzzy (utf8_string name)
2673 PROTOTYPE: $
2674 CODE:
2675 RETVAL = region::find_fuzzy (name);
2676 OUTPUT: RETVAL
2677
2678int specificity (region *rgn) 2784int specificity (region *rgn)
2679 CODE: 2785 CODE:
2680 RETVAL = 0; 2786 RETVAL = 0;
2681 while (rgn = rgn->parent) 2787 while (rgn = rgn->parent)
2682 RETVAL++; 2788 RETVAL++;

Diff Legend

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