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.304 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.327 by root, Mon Nov 2 07:21:50 2009 UTC

… …
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 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * 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 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * 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/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include "autoconf.h" 25#include "autoconf.h"
… …
71static int tick_pending; 72static int tick_pending;
72 73
73global gbl_ev; 74global gbl_ev;
74static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 75static 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; 76static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
77static AV *av_reflect;
76 78
77bitset<NUM_EVENT_TYPES> ev_want_event; 79bitset<NUM_EVENT_TYPES> ev_want_event;
78bitset<NUM_TYPES> ev_want_type; 80bitset<NUM_TYPES> ev_want_type;
79 81
80static HV 82static HV
… …
88 *stash_cf_arch_wrap, 90 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 91 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 92 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 93 *stash_cf_living_wrap;
92 94
95static SV
96 *cv_cf_do_invoke,
97 *cv_cf__can_merge,
98 *cv_cf_client_send_msg,
99 *cv_cf_tick,
100 *cv_cf_match_match;
101
102#ifndef newSVpv_utf8
93static inline SV * 103static inline SV *
94newSVpv_utf8 (const char *s) 104newSVpv_utf8 (const char *s)
95{ 105{
96 if (!s) 106 if (!s)
97 return newSV (0); 107 return newSV (0);
98 108
99 SV *sv = newSVpv (s, 0); 109 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 110 SvUTF8_on (sv);
101 return sv; 111 return sv;
102} 112}
113#endif
103 114
115#ifndef newSVpvn_utf8
104static inline SV * 116static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 117newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 118{
107 if (!s) 119 if (!s)
108 return newSV (0); 120 return newSV (0);
109 121
110 SV *sv = newSVpvn (s, l); 122 SV *sv = newSVpvn (s, l);
123
124 if (utf8)
111 SvUTF8_on (sv); 125 SvUTF8_on (sv);
126
112 return sv; 127 return sv;
113} 128}
129#endif
114 130
115// helper cast function, returns super class * or 0 131// helper cast function, returns super class * or 0
116template<class super> 132template<class super>
117static super * 133static super *
118is_a (attachable *at) 134is_a (attachable *at)
… …
151 SvREFCNT_inc (self); 167 SvREFCNT_inc (self);
152 hv_clear (self); 168 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 169 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 170 SvREFCNT_dec (self);
155 171
156 // self *must* be null now because thats sv_unmagic's job. 172 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 173 assert (!this->self);
158 } 174 }
159} 175}
160 176
161void 177void
… …
310 fprintf (stderr, "P %p\n", pl); 326 fprintf (stderr, "P %p\n", pl);
311 327
312 for_all_clients (ns) 328 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 329 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 330 fprintf (stderr, "C %p\n", ns);
315
316} 331}
317 332
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 333//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 334
320static SV * 335static SV *
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 413 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 414
400 return (long)mg->mg_ptr; 415 return (long)mg->mg_ptr;
401} 416}
402 417
403static long 418static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 419SvPTR_ornull (SV *sv, const char *klass)
405{ 420{
406 if (SvOK (sv)) 421 if (SvOK (sv))
407 return SvPTR (sv, klass); 422 return SvPTR (sv, klass);
408 else 423 else
409 return 0; 424 return 0;
410} 425}
411 426
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 427inline 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); } 428inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 429inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 430inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 431inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 432inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
600 va_end (ap); 615 va_end (ap);
601 616
602 return sv; 617 return sv;
603} 618}
604 619
620// typemap support, mostly to avoid excessive inlining
621template<class type>
622static void noinline
623cf_obj_to (SV *arg, type &var)
624{
625 sv_to (arg, var);
626 if (!var)
627 croak ("must not pass invalid/null cf_obj here");
628}
629
630template<class object>
631static void noinline
632cf_obj_ornull_to (SV *arg, object *&var)
633{
634 if (SvOK (arg))
635 {
636 sv_to (arg, var);
637 if (!var)
638 croak ("unable to convert perl object to C++ object");
639 }
640 else
641 var = 0;
642}
643
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 644//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 645
607SV * 646SV *
608registry (attachable *ext) 647registry (attachable *ext)
609{ 648{
… …
653 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 692 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
654 exit (EXIT_FAILURE); 693 exit (EXIT_FAILURE);
655 } 694 }
656} 695}
657 696
697void
658void cfperl_main () 698cfperl_main ()
659{ 699{
660 dSP; 700 dSP;
661 701
662 PUSHMARK (SP); 702 PUSHMARK (SP);
663 PUTBACK; 703 PUTBACK;
… …
688# undef def 728# undef def
689}; 729};
690 730
691#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 731#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
692 732
693static void 733static void noinline
694gather_callbacks (AV *&callbacks, AV *registry, event_type event) 734gather_callbacks (AV *&callbacks, AV *registry, event_type event)
695{ 735{
696 // event must be in array 736 // event must be in array
697 if (event >= 0 && event <= AvFILLp (registry)) 737 if (event >= 0 && event <= AvFILLp (registry))
698 { 738 {
… …
784{ 824{
785 attachable::gather_callbacks (callbacks, event); 825 attachable::gather_callbacks (callbacks, event);
786 ::gather_callbacks (callbacks, cb_map, event); 826 ::gather_callbacks (callbacks, cb_map, event);
787} 827}
788 828
789void 829static void noinline
790_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 830_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
791{ 831{
792 for (int event = 0; event <= AvFILLp (registry); ++event) 832 for (int event = 0; event <= AvFILLp (registry); ++event)
793 { 833 {
794 SV *cbs_ = AvARRAY (registry)[event]; 834 SV *cbs_ = AvARRAY (registry)[event];
… …
804 } 844 }
805 } 845 }
806} 846}
807 847
808// very slow and inefficient way to recalculate the global want bitsets 848// very slow and inefficient way to recalculate the global want bitsets
809void 849static void
810_recalc_want () 850_recalc_want ()
811{ 851{
812 ev_want_event.reset (); 852 ev_want_event.reset ();
813 853
814 _recalc_want (ev_want_event, cb_global); 854 _recalc_want (ev_want_event, cb_global);
… …
887 XPUSHs (sv_2mortal (newSVdt_va (ap, dt))); 927 XPUSHs (sv_2mortal (newSVdt_va (ap, dt)));
888 } 928 }
889 929
890 va_end (ap); 930 va_end (ap);
891 931
892 CALL_CALL ("cf::do_invoke", G_SCALAR); 932 CALL_CALL (cv_cf_do_invoke, G_SCALAR);
893 count = count > 0 ? POPi : 0; 933 count = count > 0 ? POPi : 0;
894 934
895 CALL_END; 935 CALL_END;
896 936
897 return count; 937 return count;
… …
924} 964}
925 965
926///////////////////////////////////////////////////////////////////////////// 966/////////////////////////////////////////////////////////////////////////////
927// various c++ => perl glue functions 967// various c++ => perl glue functions
928 968
969void
929void cfperl_tick () 970cfperl_tick ()
930{ 971{
931 tick_pending = 1; 972 tick_pending = 1;
932 973
933 if (tick_inhibit) 974 if (tick_inhibit)
934 return; 975 return;
… …
937 978
938 dSP; 979 dSP;
939 980
940 PUSHMARK (SP); 981 PUSHMARK (SP);
941 PUTBACK; 982 PUTBACK;
942 call_pv ("cf::tick", G_DISCARD | G_VOID); 983 call_pvsv (cv_cf_tick, G_DISCARD | G_VOID);
943 984
944 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick); 985 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
945} 986}
946 987
947void 988void
… …
977 CALL_BEGIN (4); 1018 CALL_BEGIN (4);
978 CALL_ARG (ns); 1019 CALL_ARG (ns);
979 CALL_ARG (type); 1020 CALL_ARG (type);
980 CALL_ARG_SV (newSVpv_utf8 (msg)); 1021 CALL_ARG_SV (newSVpv_utf8 (msg));
981 CALL_ARG (color); 1022 CALL_ARG (color);
982 CALL_CALL ("cf::client::send_msg", G_VOID); 1023 CALL_CALL (cv_cf_client_send_msg, G_VOID);
983 CALL_END; 1024 CALL_END;
984} 1025}
985 1026
986int 1027int
987cfperl_can_merge (object *ob1, object *ob2) 1028cfperl_can_merge (object *ob1, object *ob2)
… …
989 int can; 1030 int can;
990 1031
991 CALL_BEGIN (2); 1032 CALL_BEGIN (2);
992 CALL_ARG (ob1); 1033 CALL_ARG (ob1);
993 CALL_ARG (ob2); 1034 CALL_ARG (ob2);
994 CALL_CALL ("cf::_can_merge", G_SCALAR); 1035 CALL_CALL (cv_cf__can_merge, G_SCALAR);
995 can = count && SvTRUE (TOPs); 1036 can = count && SvTRUE (TOPs);
996 CALL_END; 1037 CALL_END;
997 1038
998 return can; 1039 return can;
1040}
1041
1042void
1043cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1044{
1045 CALL_BEGIN (4);
1046 CALL_ARG (ob);
1047 CALL_ARG (state);
1048 CALL_ARG (activator);
1049 CALL_ARG (originator);
1050 CALL_CALL ("cf::mapscript::activate", G_VOID);
1051 CALL_END;
999} 1052}
1000 1053
1001player * 1054player *
1002player::find (const char *name) 1055player::find (const char *name)
1003{ 1056{
… …
1067maptile::do_load_sync () 1120maptile::do_load_sync ()
1068{ 1121{
1069 CALL_BEGIN (1); 1122 CALL_BEGIN (1);
1070 CALL_ARG (this); 1123 CALL_ARG (this);
1071 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1124 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1072 CALL_END;
1073}
1074
1075void
1076maptile::change_all_map_light (int change)
1077{
1078 CALL_BEGIN (1);
1079 CALL_ARG (change);
1080 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1081 CALL_END; 1125 CALL_END;
1082} 1126}
1083 1127
1084void 1128void
1085object::enter_exit (object *exit) 1129object::enter_exit (object *exit)
… …
1152 CALL_CALL ("cf::_log_backtrace", G_VOID); 1196 CALL_CALL ("cf::_log_backtrace", G_VOID);
1153 CALL_END; 1197 CALL_END;
1154#endif 1198#endif
1155} 1199}
1156 1200
1201bool
1202is_match_expr (const char *expr)
1203{
1204 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1205}
1206
1207bool
1208match (const char *expr, object *ob, object *self, object *source, object *originator)
1209{
1210 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1211 expr += sizeof ("match ") - 1;
1212
1213 CALL_BEGIN (5);
1214 CALL_ARG (expr);
1215 CALL_ARG (ob);
1216 CALL_ARG (self);
1217 CALL_ARG (source);
1218 CALL_ARG (originator);
1219 CALL_CALL (cv_cf_match_match, G_SCALAR);
1220
1221 bool matched = count && SvTRUE (TOPs);
1222
1223 CALL_END;
1224
1225 return matched;
1226}
1227
1157///////////////////////////////////////////////////////////////////////////// 1228/////////////////////////////////////////////////////////////////////////////
1158 1229
1159struct EVAPI *evapi::GEVAPI; 1230struct EVAPI *evapi::GEVAPI;
1160struct CoroAPI *coroapi::GCoroAPI; 1231struct CoroAPI *coroapi::GCoroAPI;
1161 1232
1233void
1162void coroapi::do_cede_to_tick () 1234coroapi::do_cede_to_tick ()
1163{ 1235{
1164 cede_pending = 0; 1236 cede_pending = 0;
1165 cede (); 1237 cede ();
1166} 1238}
1167 1239
… …
1191 ev_io_set ((ev_io *)this, fd, events); 1263 ev_io_set ((ev_io *)this, fd, events);
1192 if (active) start (); 1264 if (active) start ();
1193 } 1265 }
1194} 1266}
1195 1267
1196void 1268static void
1197_connect_to_perl () 1269_connect_to_perl_1 ()
1198{ 1270{
1199 stash_cf = gv_stashpv ("cf", 1); 1271 stash_cf = gv_stashpv ("cf", 1);
1200 1272
1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1273 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1202 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1274 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
… …
1221 cb_client = get_av ("cf::CB_CLIENT", 1); 1293 cb_client = get_av ("cf::CB_CLIENT", 1);
1222 cb_type = get_av ("cf::CB_TYPE" , 1); 1294 cb_type = get_av ("cf::CB_TYPE" , 1);
1223 cb_map = get_av ("cf::CB_MAP" , 1); 1295 cb_map = get_av ("cf::CB_MAP" , 1);
1224} 1296}
1225 1297
1298static void
1299_connect_to_perl_2 ()
1300{
1301 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1302 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1303 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1304 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1305 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1306}
1307
1226MODULE = cf PACKAGE = cf PREFIX = cf_ 1308MODULE = cf PACKAGE = cf PREFIX = cf_
1227 1309
1228BOOT: 1310BOOT:
1229{ 1311{
1230 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI; 1312 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1231 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1313 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1232 1314
1233 _connect_to_perl (); 1315 _connect_to_perl_1 ();
1234 1316
1235 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1317 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1236 1318
1237 //{ 1319 //{
1238 // require_pv ("Time::HiRes"); 1320 // require_pv ("Time::HiRes");
… …
1282 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR) 1364 const_iv (MOOD_FLOOR) const_iv (EXIT) const_iv (ENCOUNTER) const_iv (SHOP_FLOOR)
1283 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH) 1365 const_iv (SHOP_MAT) const_iv (RING) const_iv (FLOOR) const_iv (FLESH)
1284 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL) 1366 const_iv (INORGANIC) const_iv (SKILL_TOOL) const_iv (LIGHTER) const_iv (BUILDABLE_WALL)
1285 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK) 1367 const_iv (MISC_OBJECT) const_iv (LAMP) const_iv (DUPLICATOR) const_iv (SPELLBOOK)
1286 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON) 1368 const_iv (CLOAK) const_iv (SPINNER) const_iv (GATE) const_iv (BUTTON)
1287 const_iv (CF_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN) 1369 const_iv (T_HANDLE) const_iv (HOLE) const_iv (TRAPDOOR) const_iv (SIGN)
1288 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT) 1370 const_iv (BOOTS) const_iv (GLOVES) const_iv (SPELL) const_iv (SPELL_EFFECT)
1289 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED) 1371 const_iv (CONVERTER) const_iv (BRACERS) const_iv (POISONING) const_iv (SAVEBED)
1290 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE) 1372 const_iv (WAND) const_iv (SCROLL) const_iv (DIRECTOR) const_iv (GIRDLE)
1291 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1373 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1292 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1374 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1293 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1375 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1294 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1376 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1295 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1377 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1378 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1296 1379
1297 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1380 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1298 1381
1299 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1382 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1300 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1383 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1332 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1415 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1333 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1416 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1334 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1417 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1335 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1418 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1336 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1419 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1337 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1420 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1338 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1421 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1339 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1422 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1340 1423
1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1424 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1342 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1425 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1509 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1592 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1510 av_push (event, newSViv (eiv->klass)); 1593 av_push (event, newSViv (eiv->klass));
1511 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1594 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1512 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1595 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1513 } 1596 }
1597
1598 // used by autogenerated BOOT sections from genacc
1599 av_reflect = get_av ("cf::REFLECT", 1);
1514} 1600}
1515 1601
1516void _gv_clear (SV *gv) 1602void _gv_clear (SV *gv)
1517 CODE: 1603 CODE:
1518 assert (SvTYPE (gv) == SVt_PVGV); 1604 assert (SvTYPE (gv) == SVt_PVGV);
… …
1525 f (GvGP (gv)->gp_cv); 1611 f (GvGP (gv)->gp_cv);
1526 GvCVGEN (gv) = 0; 1612 GvCVGEN (gv) = 0;
1527 GvMULTI_off (gv); 1613 GvMULTI_off (gv);
1528# undef f 1614# undef f
1529 1615
1530void _connect_to_perl () 1616void _connect_to_perl_1 ()
1617
1618void _connect_to_perl_2 ()
1531 1619
1532void _recalc_want () 1620void _recalc_want ()
1533 1621
1534# not used by default anymore 1622# not used by default anymore
1535void _global_reattach () 1623void _global_reattach ()
… …
1592void init_experience () 1680void init_experience ()
1593 1681
1594void init_attackmess () 1682void init_attackmess ()
1595 1683
1596void init_dynamic () 1684void init_dynamic ()
1597
1598void init_block ()
1599 1685
1600void load_settings () 1686void load_settings ()
1601 1687
1602void load_materials () 1688void load_materials ()
1603 1689
… …
1788 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1874 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1789 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1875 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1790 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1876 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1791 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1877 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1792#endif 1878#endif
1793 EXTEND (SP, 2*2); 1879 EXTEND (SP, 5*2);
1794 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1880 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1795 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1881 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1796 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1882 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1883 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1884 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1797} 1885}
1798 1886
1799int find_animation (utf8_string text) 1887int find_animation (utf8_string text)
1800 PROTOTYPE: $ 1888 PROTOTYPE: $
1801 1889
… …
2106 2194
2107int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2195int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2108 2196
2109int calc_skill_exp (object *who, object *op, object *skill); 2197int calc_skill_exp (object *who, object *op, object *skill);
2110 2198
2111void push_button (object *op); 2199void push_button (object *op, object *originator);
2112 2200
2113void use_trigger (object *op); 2201void use_trigger (object *op, object *originator);
2114
2115void add_button_link (object *button, maptile *map, int connected);
2116
2117void remove_button_link (object *op);
2118 2202
2119void handle_apply_yield (object *op); 2203void handle_apply_yield (object *op);
2204
2205int convert_item (object *item, object *converter);
2120 2206
2121 2207
2122MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2208MODULE = cf PACKAGE = cf::object PREFIX = cf_
2123 2209
2124# no clean way to get an object from an archetype - stupid idiotic 2210# no clean way to get an object from an archetype - stupid idiotic
… …
2241 pl->ob->stats.hp = pl->ob->stats.maxhp; 2327 pl->ob->stats.hp = pl->ob->stats.maxhp;
2242 pl->ob->stats.sp = pl->ob->stats.maxsp; 2328 pl->ob->stats.sp = pl->ob->stats.maxsp;
2243 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2329 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2244 pl->orig_stats = pl->ob->stats; 2330 pl->orig_stats = pl->ob->stats;
2245 2331
2246void clear_los (player *pl) 2332# should only be temporary
2333void esrv_new_player (player *pl)
2247 2334
2335#d# TODO: replace by blocked_los accessor, fix code using this
2248bool 2336bool
2249cell_visible (player *pl, int dx, int dy) 2337cell_visible (player *pl, int dx, int dy)
2250 CODE: 2338 CODE:
2251 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2339 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2252 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2253 OUTPUT: 2340 OUTPUT:
2254 RETVAL 2341 RETVAL
2255 2342
2256void 2343void
2257send (player *pl, SV *packet) 2344send (player *pl, SV *packet)
… …
2325} 2412}
2326 2413
2327INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2414INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2328 2415
2329void 2416void
2417adjust_daylight ()
2418 CODE:
2419 maptile::adjust_daylight ();
2420
2421int
2422outdoor_darkness (int darkness = 0)
2423 CODE:
2424 RETVAL = maptile::outdoor_darkness;
2425 if (items)
2426 maptile::outdoor_darkness = darkness;
2427 OUTPUT:
2428 RETVAL
2429
2430void
2330maptile::instantiate () 2431maptile::instantiate ()
2331 2432
2332maptile *new () 2433maptile *new ()
2333 PROTOTYPE: 2434 PROTOTYPE:
2334 CODE: 2435 CODE:
… …
2441 } 2542 }
2442 2543
2443int out_of_map (maptile *map, int x, int y) 2544int out_of_map (maptile *map, int x, int y)
2444 2545
2445void 2546void
2446trigger (maptile *map, long connection, bool state = true) 2547find_link (maptile *map, shstr_tmp connection)
2447 CODE:
2448 activate_connection (map, connection, state);
2449
2450void
2451get_connection (maptile *map, long connection)
2452 PPCODE: 2548 PPCODE:
2453 oblinkpt *obp = get_connection_links (map, connection); 2549 if (oblinkpt *obp = map->find_link (connection))
2454 if (obp)
2455 for (objectlink *ol = obp->link; ol; ol = ol->next) 2550 for (objectlink *ol = obp->link; ol; ol = ol->next)
2456 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2551 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2457 2552
2458void 2553void
2459get_map_flags (maptile *map, int x, int y) 2554get_map_flags (maptile *map, int x, int y)
… …
2513 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2608 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2514 XPUSHs (sv_2mortal (to_sv (o))); 2609 XPUSHs (sv_2mortal (to_sv (o)));
2515} 2610}
2516 2611
2517SV * 2612SV *
2518bot_at (maptile *obj, unsigned int x, unsigned int y) 2613bot_at (maptile *map, unsigned int x, unsigned int y)
2519 PROTOTYPE: $$$ 2614 PROTOTYPE: $$$
2520 ALIAS: 2615 ALIAS:
2521 top_at = 1 2616 top_at = 1
2522 flags_at = 2 2617 flags_at = 2
2523 light_at = 3 2618 light_at = 3
2524 move_block_at = 4 2619 move_block_at = 4
2525 move_slow_at = 5 2620 move_slow_at = 5
2526 move_on_at = 6 2621 move_on_at = 6
2527 move_off_at = 7 2622 move_off_at = 7
2528 INIT:
2529 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2530 CODE: 2623 CODE:
2624{
2625 sint16 nx = x;
2626 sint16 ny = y;
2627
2628 if (!xy_normalise (map, nx, ny))
2629 XSRETURN_UNDEF;
2630
2631 mapspace &ms = map->at (nx, ny);
2632
2633 ms.update ();
2634
2531 switch (ix) 2635 switch (ix)
2532 { 2636 {
2533 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2637 case 0: RETVAL = to_sv (ms.bot ); break;
2534 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2638 case 1: RETVAL = to_sv (ms.top ); break;
2535 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2639 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2536 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2640 case 3: RETVAL = newSViv (ms.light ); break;
2537 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2641 case 4: RETVAL = newSVuv (ms.move_block); break;
2538 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2642 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2539 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2643 case 6: RETVAL = newSVuv (ms.move_on ); break;
2540 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2644 case 7: RETVAL = newSVuv (ms.move_off ); break;
2541 } 2645 }
2646}
2542 OUTPUT: RETVAL 2647 OUTPUT: RETVAL
2543
2544void fix_walls (maptile *map, int x, int y)
2545
2546void fix_walls_around (maptile *map, int x, int y)
2547 2648
2548# worst xs function of my life 2649# worst xs function of my life
2549bool 2650bool
2550_create_random_map (\ 2651_create_random_map (\
2551 maptile *self,\ 2652 maptile *self,\
… …
2679 PROTOTYPE: $ 2780 PROTOTYPE: $
2680 CODE: 2781 CODE:
2681 RETVAL = region::find (name); 2782 RETVAL = region::find (name);
2682 OUTPUT: RETVAL 2783 OUTPUT: RETVAL
2683 2784
2684region *find_fuzzy (utf8_string name)
2685 PROTOTYPE: $
2686 CODE:
2687 RETVAL = region::find_fuzzy (name);
2688 OUTPUT: RETVAL
2689
2690int specificity (region *rgn) 2785int specificity (region *rgn)
2691 CODE: 2786 CODE:
2692 RETVAL = 0; 2787 RETVAL = 0;
2693 while (rgn = rgn->parent) 2788 while (rgn = rgn->parent)
2694 RETVAL++; 2789 RETVAL++;

Diff Legend

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