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.332 by root, Fri Nov 6 13:21:20 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 *
… …
374 388
375 return sv; 389 return sv;
376 } 390 }
377} 391}
378 392
393#if 0 // unused
379static void 394static void
380clearSVptr (SV *sv) 395clearSVptr (SV *sv)
381{ 396{
382 if (SvROK (sv)) 397 if (SvROK (sv))
383 sv = SvRV (sv); 398 sv = SvRV (sv);
384 399
385 hv_clear ((HV *)sv); 400 hv_clear ((HV *)sv);
386 sv_unmagic (sv, PERL_MAGIC_ext); 401 sv_unmagic (sv, PERL_MAGIC_ext);
387} 402}
403#endif
388 404
389static long 405static long
390SvPTR (SV *sv, const char *klass) 406SvPTR (SV *sv, const char *klass)
391{ 407{
392 if (!sv_derived_from (sv, klass)) 408 if (!sv_derived_from (sv, klass))
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 414 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 415
400 return (long)mg->mg_ptr; 416 return (long)mg->mg_ptr;
401} 417}
402 418
403static long 419static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 420SvPTR_ornull (SV *sv, const char *klass)
405{ 421{
406 if (SvOK (sv)) 422 if (SvOK (sv))
407 return SvPTR (sv, klass); 423 return SvPTR (sv, klass);
408 else 424 else
409 return 0; 425 return 0;
410} 426}
411 427
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 428inline 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); } 429inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 430inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 431inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 432inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 433inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
600 va_end (ap); 616 va_end (ap);
601 617
602 return sv; 618 return sv;
603} 619}
604 620
621// typemap support, mostly to avoid excessive inlining
622template<class type>
623static void noinline
624cf_obj_to (SV *arg, type &var)
625{
626 sv_to (arg, var);
627 if (!var)
628 croak ("must not pass invalid/null cf_obj here");
629}
630
631template<class object>
632static void noinline
633cf_obj_ornull_to (SV *arg, object *&var)
634{
635 if (SvOK (arg))
636 {
637 sv_to (arg, var);
638 if (!var)
639 croak ("unable to convert perl object to C++ object");
640 }
641 else
642 var = 0;
643}
644
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 645//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 646
607SV * 647SV *
608registry (attachable *ext) 648registry (attachable *ext)
609{ 649{
… …
626 666
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 667 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 668
629 const char *argv[] = { 669 const char *argv[] = {
630 settings.argv [0], 670 settings.argv [0],
631 "-e" 671 "-e0"
632 "use EV ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 672 };
638 673
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 674 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 675 || perl_run (perl))
641 { 676 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 677 printf ("unable to initialize perl-interpreter, aborting.\n");
643 exit (EXIT_FAILURE); 678 exit (EXIT_FAILURE);
644 } 679 }
645}
646 680
681 eval_pv (
682 "#line 1 'cfperl init'\n"
683 "use EV ();\n"
684 "use Coro ();\n"
685 "cf->bootstrap;\n"
686 "unshift @INC, cf::datadir ();\n"
687 "require cf;\n",
688 0
689 );
690
691 if (SvTRUE (ERRSV))
692 {
693 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
694 exit (EXIT_FAILURE);
695 }
696}
697
698void
647void cfperl_main () 699cfperl_main ()
648{ 700{
649 dSP; 701 dSP;
650 702
651 PUSHMARK (SP); 703 PUSHMARK (SP);
652 PUTBACK; 704 PUTBACK;
… …
677# undef def 729# undef def
678}; 730};
679 731
680#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 732#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
681 733
682static void 734static void noinline
683gather_callbacks (AV *&callbacks, AV *registry, event_type event) 735gather_callbacks (AV *&callbacks, AV *registry, event_type event)
684{ 736{
685 // event must be in array 737 // event must be in array
686 if (event >= 0 && event <= AvFILLp (registry)) 738 if (event >= 0 && event <= AvFILLp (registry))
687 { 739 {
… …
773{ 825{
774 attachable::gather_callbacks (callbacks, event); 826 attachable::gather_callbacks (callbacks, event);
775 ::gather_callbacks (callbacks, cb_map, event); 827 ::gather_callbacks (callbacks, cb_map, event);
776} 828}
777 829
778void 830static void noinline
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 831_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{ 832{
781 for (int event = 0; event <= AvFILLp (registry); ++event) 833 for (int event = 0; event <= AvFILLp (registry); ++event)
782 { 834 {
783 SV *cbs_ = AvARRAY (registry)[event]; 835 SV *cbs_ = AvARRAY (registry)[event];
… …
793 } 845 }
794 } 846 }
795} 847}
796 848
797// very slow and inefficient way to recalculate the global want bitsets 849// very slow and inefficient way to recalculate the global want bitsets
798void 850static void
799_recalc_want () 851_recalc_want ()
800{ 852{
801 ev_want_event.reset (); 853 ev_want_event.reset ();
802 854
803 _recalc_want (ev_want_event, cb_global); 855 _recalc_want (ev_want_event, cb_global);
… …
876 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 928 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
877 } 929 }
878 930
879 va_end (ap); 931 va_end (ap);
880 932
881 CALL_CALL ("cf::do_invoke", G_SCALAR); 933 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
882 count = count > 0 ? POPi : 0; 934 count = count > 0 ? POPi : 0;
883 935
884 CALL_END; 936 CALL_END;
885 937
886 return count; 938 return count;
… …
913} 965}
914 966
915///////////////////////////////////////////////////////////////////////////// 967/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions 968// various c++ => perl glue functions
917 969
970void
918void cfperl_tick () 971cfperl_tick ()
919{ 972{
920 tick_pending = 1; 973 tick_pending = 1;
921 974
922 if (tick_inhibit) 975 if (tick_inhibit)
923 return; 976 return;
… …
926 979
927 dSP; 980 dSP;
928 981
929 PUSHMARK (SP); 982 PUSHMARK (SP);
930 PUTBACK; 983 PUTBACK;
931 call_pv ("cf::tick", G_DISCARD | G_VOID); 984 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
932 985
933 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 986 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
934} 987}
935 988
936void 989void
… …
966 CALL_BEGIN (4); 1019 CALL_BEGIN (4);
967 CALL_ARG (ns); 1020 CALL_ARG (ns);
968 CALL_ARG (type); 1021 CALL_ARG (type);
969 CALL_ARG_SV (newSVpv_utf8 (msg)); 1022 CALL_ARG_SV (newSVpv_utf8 (msg));
970 CALL_ARG (color); 1023 CALL_ARG (color);
971 CALL_CALL ("cf::client::send_msg", G_VOID); 1024 CALL_CALL (cv_cf_client_send_msg, G_VOID);
972 CALL_END; 1025 CALL_END;
973} 1026}
974 1027
975int 1028int
976cfperl_can_merge (object *ob1, object *ob2) 1029cfperl_can_merge (object *ob1, object *ob2)
… …
978 int can; 1031 int can;
979 1032
980 CALL_BEGIN (2); 1033 CALL_BEGIN (2);
981 CALL_ARG (ob1); 1034 CALL_ARG (ob1);
982 CALL_ARG (ob2); 1035 CALL_ARG (ob2);
983 CALL_CALL ("cf::_can_merge", G_SCALAR); 1036 CALL_CALL (cv_cf__can_merge, G_SCALAR);
984 can = count && SvTRUE (TOPs); 1037 can = count && SvTRUE (TOPs);
985 CALL_END; 1038 CALL_END;
986 1039
987 return can; 1040 return can;
1041}
1042
1043void
1044cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1045{
1046 CALL_BEGIN (4);
1047 CALL_ARG (ob);
1048 CALL_ARG (state);
1049 CALL_ARG (activator);
1050 CALL_ARG (originator);
1051 CALL_CALL ("cf::mapscript::activate", G_VOID);
1052 CALL_END;
988} 1053}
989 1054
990player * 1055player *
991player::find (const char *name) 1056player::find (const char *name)
992{ 1057{
… …
1056maptile::do_load_sync () 1121maptile::do_load_sync ()
1057{ 1122{
1058 CALL_BEGIN (1); 1123 CALL_BEGIN (1);
1059 CALL_ARG (this); 1124 CALL_ARG (this);
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1125 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; 1126 CALL_END;
1071} 1127}
1072 1128
1073void 1129void
1074object::enter_exit (object *exit) 1130object::enter_exit (object *exit)
… …
1141 CALL_CALL ("cf::_log_backtrace", G_VOID); 1197 CALL_CALL ("cf::_log_backtrace", G_VOID);
1142 CALL_END; 1198 CALL_END;
1143#endif 1199#endif
1144} 1200}
1145 1201
1202bool
1203is_match_expr (const char *expr)
1204{
1205 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1206}
1207
1208bool
1209match (const char *expr, object *ob, object *self, object *source, object *originator)
1210{
1211 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1212 expr += sizeof ("match ") - 1;
1213
1214 CALL_BEGIN (5);
1215 CALL_ARG (expr);
1216 CALL_ARG (ob);
1217 CALL_ARG (self);
1218 CALL_ARG (source);
1219 CALL_ARG (originator);
1220 CALL_CALL (cv_cf_match_match, G_SCALAR);
1221
1222 bool matched = count && SvTRUE (TOPs);
1223
1224 CALL_END;
1225
1226 return matched;
1227}
1228
1229object *
1230match_one (const char *expr, object *ob, object *self, object *source, object *originator)
1231{
1232 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1233 expr += sizeof ("match ") - 1;
1234
1235 CALL_BEGIN (5);
1236 CALL_ARG (expr);
1237 CALL_ARG (ob);
1238 CALL_ARG (self);
1239 CALL_ARG (source);
1240 CALL_ARG (originator);
1241 CALL_CALL (cv_cf_match_match, G_ARRAY);
1242
1243 object *one = 0;
1244
1245 if (count)
1246 sv_to (TOPs, one);
1247
1248 CALL_END;
1249
1250 return one;
1251}
1252
1146///////////////////////////////////////////////////////////////////////////// 1253/////////////////////////////////////////////////////////////////////////////
1147 1254
1148struct EVAPI *evapi::GEVAPI; 1255struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1256struct CoroAPI *coroapi::GCoroAPI;
1150 1257
1258void
1151void coroapi::do_cede_to_tick () 1259coroapi::do_cede_to_tick ()
1152{ 1260{
1153 cede_pending = 0; 1261 cede_pending = 0;
1154 cede (); 1262 cede ();
1155} 1263}
1156 1264
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1288 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1289 if (active) start ();
1182 } 1290 }
1183} 1291}
1184 1292
1185void 1293static void
1186_connect_to_perl () 1294_connect_to_perl_1 ()
1187{ 1295{
1188 stash_cf = gv_stashpv ("cf", 1); 1296 stash_cf = gv_stashpv ("cf", 1);
1189 1297
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1298 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1191 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1299 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1210 cb_client = get_av ("cf::CB_CLIENT", 1); 1318 cb_client = get_av ("cf::CB_CLIENT", 1);
1211 cb_type = get_av ("cf::CB_TYPE" , 1); 1319 cb_type = get_av ("cf::CB_TYPE" , 1);
1212 cb_map = get_av ("cf::CB_MAP" , 1); 1320 cb_map = get_av ("cf::CB_MAP" , 1);
1213} 1321}
1214 1322
1323static void
1324_connect_to_perl_2 ()
1325{
1326 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1327 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1328 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1329 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1330 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1331}
1332
1215MODULE = cf PACKAGE = cf PREFIX = cf_ 1333MODULE = cf PACKAGE = cf PREFIX = cf_
1216 1334
1217BOOT: 1335BOOT:
1218{ 1336{
1219 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1337 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1220 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1338 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1221 1339
1222 _connect_to_perl (); 1340 _connect_to_perl_1 ();
1223 1341
1224 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1342 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1225 1343
1226 //{ 1344 //{
1227 // require_pv ("Time::HiRes"); 1345 // require_pv ("Time::HiRes");
… …
1271 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1389 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) 1390 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) 1391 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) 1392 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) 1393 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) 1394 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) 1395 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) 1396 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) 1397 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) 1398 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) 1399 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) 1400 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) 1401 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) 1402 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1403 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1285 1404
1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1405 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1287 1406
1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1407 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) 1408 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) 1440 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) 1441 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) 1442 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) 1443 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) 1444 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) 1445 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) 1446 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) 1447 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329 1448
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1449 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) 1450 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)); 1617 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1618 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1619 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1620 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502 } 1621 }
1622
1623 // used by autogenerated BOOT sections from genacc
1624 av_reflect = get_av ("cf::REFLECT", 1);
1503} 1625}
1504 1626
1505void _gv_clear (SV *gv) 1627void _gv_clear (SV *gv)
1506 CODE: 1628 CODE:
1507 assert (SvTYPE (gv) == SVt_PVGV); 1629 assert (SvTYPE (gv) == SVt_PVGV);
… …
1514 f (GvGP (gv)->gp_cv); 1636 f (GvGP (gv)->gp_cv);
1515 GvCVGEN (gv) = 0; 1637 GvCVGEN (gv) = 0;
1516 GvMULTI_off (gv); 1638 GvMULTI_off (gv);
1517# undef f 1639# undef f
1518 1640
1519void _connect_to_perl () 1641void _connect_to_perl_1 ()
1642
1643void _connect_to_perl_2 ()
1520 1644
1521void _recalc_want () 1645void _recalc_want ()
1522 1646
1647# not used by default anymore
1523void _global_reattach () 1648void _global_reattach ()
1524 CODE: 1649 CODE:
1525{ 1650{
1526 // reattach to all attachable objects in the game. 1651 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1652 for_all_clients (ns)
… …
1580void init_experience () 1705void init_experience ()
1581 1706
1582void init_attackmess () 1707void init_attackmess ()
1583 1708
1584void init_dynamic () 1709void init_dynamic ()
1585
1586void init_block ()
1587 1710
1588void load_settings () 1711void load_settings ()
1589 1712
1590void load_materials () 1713void load_materials ()
1591 1714
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1899 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))); 1900 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))); 1901 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))); 1902 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1903#endif
1781 EXTEND (SP, 2*2); 1904 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1905 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))); 1906 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)))); 1907 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1908 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1909 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1910}
1786 1911
1787int find_animation (utf8_string text) 1912int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1913 PROTOTYPE: $
1789 1914
… …
2041 CODE: 2166 CODE:
2042 player_apply_below (op); 2167 player_apply_below (op);
2043 2168
2044int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2169int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2045 2170
2171int casting_level (object *caster, object *spell)
2172
2046int pay_item (object *op, object *buyer) 2173int pay_item (object *op, object *buyer)
2047 CODE: 2174 CODE:
2048 RETVAL = pay_for_item (op, buyer); 2175 RETVAL = pay_for_item (op, buyer);
2049 OUTPUT: RETVAL 2176 OUTPUT: RETVAL
2050 2177
… …
2094 2221
2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2222int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2096 2223
2097int calc_skill_exp (object *who, object *op, object *skill); 2224int calc_skill_exp (object *who, object *op, object *skill);
2098 2225
2099void push_button (object *op); 2226void push_button (object *op, object *originator);
2100 2227
2101void use_trigger (object *op); 2228void 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 2229
2107void handle_apply_yield (object *op); 2230void handle_apply_yield (object *op);
2231
2232int convert_item (object *item, object *converter);
2108 2233
2109 2234
2110MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2235MODULE = cf PACKAGE = cf::object PREFIX = cf_
2111 2236
2112# no clean way to get an object from an archetype - stupid idiotic 2237# no clean way to get an object from an archetype - stupid idiotic
… …
2125object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2250object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2126 PROTOTYPE: $$$$$$ 2251 PROTOTYPE: $$$$$$
2127 CODE: 2252 CODE:
2128{ 2253{
2129 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2254 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2255
2256 if (RETVAL->destroyed ())
2257 RETVAL = 0;
2130} 2258}
2131 2259
2132shstr 2260shstr
2133object::kv_get (shstr key) 2261object::kv_get (shstr key)
2134 2262
… …
2229 pl->ob->stats.hp = pl->ob->stats.maxhp; 2357 pl->ob->stats.hp = pl->ob->stats.maxhp;
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2358 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2359 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2360 pl->orig_stats = pl->ob->stats;
2233 2361
2234void clear_los (player *pl) 2362# should only be temporary
2363void esrv_new_player (player *pl)
2235 2364
2365#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2366bool
2237cell_visible (player *pl, int dx, int dy) 2367cell_visible (player *pl, int dx, int dy)
2238 CODE: 2368 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2369 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2370 OUTPUT:
2242 RETVAL 2371 RETVAL
2243 2372
2244void 2373void
2245send (player *pl, SV *packet) 2374send (player *pl, SV *packet)
… …
2313} 2442}
2314 2443
2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2444INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2316 2445
2317void 2446void
2447adjust_daylight ()
2448 CODE:
2449 maptile::adjust_daylight ();
2450
2451int
2452outdoor_darkness (int darkness = 0)
2453 CODE:
2454 RETVAL = maptile::outdoor_darkness;
2455 if (items)
2456 maptile::outdoor_darkness = darkness;
2457 OUTPUT:
2458 RETVAL
2459
2460void
2318maptile::instantiate () 2461maptile::instantiate ()
2319 2462
2320maptile *new () 2463maptile *new ()
2321 PROTOTYPE: 2464 PROTOTYPE:
2322 CODE: 2465 CODE:
… …
2429 } 2572 }
2430 2573
2431int out_of_map (maptile *map, int x, int y) 2574int out_of_map (maptile *map, int x, int y)
2432 2575
2433void 2576void
2434trigger (maptile *map, long connection, bool state = true) 2577find_link (maptile *map, shstr_tmp connection)
2435 CODE:
2436 activate_connection (map, connection, state);
2437
2438void
2439get_connection (maptile *map, long connection)
2440 PPCODE: 2578 PPCODE:
2441 oblinkpt *obp = get_connection_links (map, connection); 2579 if (oblinkpt *obp = map->find_link (connection))
2442 if (obp)
2443 for (objectlink *ol = obp->link; ol; ol = ol->next) 2580 for (objectlink *ol = obp->link; ol; ol = ol->next)
2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2581 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2445 2582
2446void 2583void
2447get_map_flags (maptile *map, int x, int y) 2584get_map_flags (maptile *map, int x, int y)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2638 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2639 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2640}
2504 2641
2505SV * 2642SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2643bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2644 PROTOTYPE: $$$
2508 ALIAS: 2645 ALIAS:
2509 top_at = 1 2646 top_at = 1
2510 flags_at = 2 2647 flags_at = 2
2511 light_at = 3 2648 light_at = 3
2512 move_block_at = 4 2649 move_block_at = 4
2513 move_slow_at = 5 2650 move_slow_at = 5
2514 move_on_at = 6 2651 move_on_at = 6
2515 move_off_at = 7 2652 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2653 CODE:
2654{
2655 sint16 nx = x;
2656 sint16 ny = y;
2657
2658 if (!xy_normalise (map, nx, ny))
2659 XSRETURN_UNDEF;
2660
2661 mapspace &ms = map->at (nx, ny);
2662
2663 ms.update ();
2664
2519 switch (ix) 2665 switch (ix)
2520 { 2666 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2667 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2668 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2669 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2670 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2671 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2672 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2673 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2674 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2675 }
2676}
2530 OUTPUT: RETVAL 2677 OUTPUT: RETVAL
2531
2532void fix_walls (maptile *map, int x, int y)
2533
2534void fix_walls_around (maptile *map, int x, int y)
2535 2678
2536# worst xs function of my life 2679# worst xs function of my life
2537bool 2680bool
2538_create_random_map (\ 2681_create_random_map (\
2539 maptile *self,\ 2682 maptile *self,\
… …
2667 PROTOTYPE: $ 2810 PROTOTYPE: $
2668 CODE: 2811 CODE:
2669 RETVAL = region::find (name); 2812 RETVAL = region::find (name);
2670 OUTPUT: RETVAL 2813 OUTPUT: RETVAL
2671 2814
2672region *find_fuzzy (utf8_string name)
2673 PROTOTYPE: $
2674 CODE:
2675 RETVAL = region::find_fuzzy (name);
2676 OUTPUT: RETVAL
2677
2678int specificity (region *rgn) 2815int specificity (region *rgn)
2679 CODE: 2816 CODE:
2680 RETVAL = 0; 2817 RETVAL = 0;
2681 while (rgn = rgn->parent) 2818 while (rgn = rgn->parent)
2682 RETVAL++; 2819 RETVAL++;

Diff Legend

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