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.323 by root, Sun Oct 11 23:51:41 2009 UTC

… …
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
94#ifndef newSVpv_utf8
93static inline SV * 95static inline SV *
94newSVpv_utf8 (const char *s) 96newSVpv_utf8 (const char *s)
95{ 97{
96 if (!s) 98 if (!s)
97 return newSV (0); 99 return newSV (0);
98 100
99 SV *sv = newSVpv (s, 0); 101 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 102 SvUTF8_on (sv);
101 return sv; 103 return sv;
102} 104}
105#endif
103 106
107#ifndef newSVpvn_utf8
104static inline SV * 108static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 109newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 110{
107 if (!s) 111 if (!s)
108 return newSV (0); 112 return newSV (0);
109 113
110 SV *sv = newSVpvn (s, l); 114 SV *sv = newSVpvn (s, l);
115
116 if (utf8)
111 SvUTF8_on (sv); 117 SvUTF8_on (sv);
118
112 return sv; 119 return sv;
113} 120}
121#endif
114 122
115// helper cast function, returns super class * or 0 123// helper cast function, returns super class * or 0
116template<class super> 124template<class super>
117static super * 125static super *
118is_a (attachable *at) 126is_a (attachable *at)
… …
151 SvREFCNT_inc (self); 159 SvREFCNT_inc (self);
152 hv_clear (self); 160 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 161 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 162 SvREFCNT_dec (self);
155 163
156 // self *must* be null now because thats sv_unmagic's job. 164 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 165 assert (!this->self);
158 } 166 }
159} 167}
160 168
161void 169void
… …
310 fprintf (stderr, "P %p\n", pl); 318 fprintf (stderr, "P %p\n", pl);
311 319
312 for_all_clients (ns) 320 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 321 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 322 fprintf (stderr, "C %p\n", ns);
315
316} 323}
317 324
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 325//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 326
320static SV * 327static SV *
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 406
400 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
401} 408}
402 409
403static long 410static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
405{ 412{
406 if (SvOK (sv)) 413 if (SvOK (sv))
407 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
408 else 415 else
409 return 0; 416 return 0;
410} 417}
411 418
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
413inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 420inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
600 va_end (ap); 607 va_end (ap);
601 608
602 return sv; 609 return sv;
603} 610}
604 611
612// typemap support, mostly to avoid excessive inlining
613template<class type>
614static void noinline
615cf_obj_to (SV *arg, type &var)
616{
617 sv_to (arg, var);
618 if (!var)
619 croak ("must not pass invalid/null cf_obj here");
620}
621
622template<class object>
623static void noinline
624cf_obj_ornull_to (SV *arg, object *&var)
625{
626 if (SvOK (arg))
627 {
628 sv_to (arg, var);
629 if (!var)
630 croak ("unable to convert perl object to C++ object");
631 }
632 else
633 var = 0;
634}
635
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 637
607SV * 638SV *
608registry (attachable *ext) 639registry (attachable *ext)
609{ 640{
… …
653 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV)); 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
654 exit (EXIT_FAILURE); 685 exit (EXIT_FAILURE);
655 } 686 }
656} 687}
657 688
689void
658void cfperl_main () 690cfperl_main ()
659{ 691{
660 dSP; 692 dSP;
661 693
662 PUSHMARK (SP); 694 PUSHMARK (SP);
663 PUTBACK; 695 PUTBACK;
… …
688# undef def 720# undef def
689}; 721};
690 722
691#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 723#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
692 724
693static void 725static void noinline
694gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
695{ 727{
696 // event must be in array 728 // event must be in array
697 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
698 { 730 {
… …
784{ 816{
785 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
786 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
787} 819}
788 820
789void 821static void noinline
790_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
791{ 823{
792 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
793 { 825 {
794 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
804 } 836 }
805 } 837 }
806} 838}
807 839
808// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
809void 841static void
810_recalc_want () 842_recalc_want ()
811{ 843{
812 ev_want_event.reset (); 844 ev_want_event.reset ();
813 845
814 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
924} 956}
925 957
926///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
927// various c++ => perl glue functions 959// various c++ => perl glue functions
928 960
961void
929void cfperl_tick () 962cfperl_tick ()
930{ 963{
931 tick_pending = 1; 964 tick_pending = 1;
932 965
933 if (tick_inhibit) 966 if (tick_inhibit)
934 return; 967 return;
… …
996 CALL_END; 1029 CALL_END;
997 1030
998 return can; 1031 return can;
999} 1032}
1000 1033
1034void
1035cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1036{
1037 CALL_BEGIN (4);
1038 CALL_ARG (ob);
1039 CALL_ARG (state);
1040 CALL_ARG (activator);
1041 CALL_ARG (originator);
1042 CALL_CALL ("cf::mapscript::activate", G_VOID);
1043 CALL_END;
1044}
1045
1001player * 1046player *
1002player::find (const char *name) 1047player::find (const char *name)
1003{ 1048{
1004 CALL_BEGIN (1); 1049 CALL_BEGIN (1);
1005 CALL_ARG (name); 1050 CALL_ARG (name);
… …
1067maptile::do_load_sync () 1112maptile::do_load_sync ()
1068{ 1113{
1069 CALL_BEGIN (1); 1114 CALL_BEGIN (1);
1070 CALL_ARG (this); 1115 CALL_ARG (this);
1071 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1116 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; 1117 CALL_END;
1082} 1118}
1083 1119
1084void 1120void
1085object::enter_exit (object *exit) 1121object::enter_exit (object *exit)
… …
1152 CALL_CALL ("cf::_log_backtrace", G_VOID); 1188 CALL_CALL ("cf::_log_backtrace", G_VOID);
1153 CALL_END; 1189 CALL_END;
1154#endif 1190#endif
1155} 1191}
1156 1192
1193bool
1194is_match_expr (const char *expr)
1195{
1196 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1197}
1198
1199bool
1200match (const char *expr, object *ob, object *self, object *source, object *originator)
1201{
1202 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1203 expr += sizeof ("match ") - 1;
1204
1205 CALL_BEGIN (5);
1206 CALL_ARG (expr);
1207 CALL_ARG (ob);
1208 CALL_ARG (self);
1209 CALL_ARG (source);
1210 CALL_ARG (originator);
1211 CALL_CALL ("cf::match::match", G_SCALAR);
1212
1213 bool matched = count && SvTRUE (POPs);
1214
1215 CALL_END;
1216
1217 return matched;
1218}
1219
1157///////////////////////////////////////////////////////////////////////////// 1220/////////////////////////////////////////////////////////////////////////////
1158 1221
1159struct EVAPI *evapi::GEVAPI; 1222struct EVAPI *evapi::GEVAPI;
1160struct CoroAPI *coroapi::GCoroAPI; 1223struct CoroAPI *coroapi::GCoroAPI;
1161 1224
1225void
1162void coroapi::do_cede_to_tick () 1226coroapi::do_cede_to_tick ()
1163{ 1227{
1164 cede_pending = 0; 1228 cede_pending = 0;
1165 cede (); 1229 cede ();
1166} 1230}
1167 1231
… …
1191 ev_io_set ((ev_io *)this, fd, events); 1255 ev_io_set ((ev_io *)this, fd, events);
1192 if (active) start (); 1256 if (active) start ();
1193 } 1257 }
1194} 1258}
1195 1259
1196void 1260static void
1197_connect_to_perl () 1261_connect_to_perl ()
1198{ 1262{
1199 stash_cf = gv_stashpv ("cf", 1); 1263 stash_cf = gv_stashpv ("cf", 1);
1200 1264
1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1265 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1219 cb_object = get_av ("cf::CB_OBJECT", 1); 1283 cb_object = get_av ("cf::CB_OBJECT", 1);
1220 cb_player = get_av ("cf::CB_PLAYER", 1); 1284 cb_player = get_av ("cf::CB_PLAYER", 1);
1221 cb_client = get_av ("cf::CB_CLIENT", 1); 1285 cb_client = get_av ("cf::CB_CLIENT", 1);
1222 cb_type = get_av ("cf::CB_TYPE" , 1); 1286 cb_type = get_av ("cf::CB_TYPE" , 1);
1223 cb_map = get_av ("cf::CB_MAP" , 1); 1287 cb_map = get_av ("cf::CB_MAP" , 1);
1288
1289 av_reflect = get_av ("cf::REFLECT" , 1);
1224} 1290}
1225 1291
1226MODULE = cf PACKAGE = cf PREFIX = cf_ 1292MODULE = cf PACKAGE = cf PREFIX = cf_
1227 1293
1228BOOT: 1294BOOT:
… …
1291 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1357 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) 1358 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) 1359 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) 1360 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) 1361 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1362 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1296 1363
1297 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1364 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1298 1365
1299 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1366 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) 1367 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) 1399 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) 1400 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) 1401 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) 1402 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) 1403 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) 1404 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) 1405 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) 1406 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1340 1407
1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1408 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) 1409 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1593 1660
1594void init_attackmess () 1661void init_attackmess ()
1595 1662
1596void init_dynamic () 1663void init_dynamic ()
1597 1664
1598void init_block ()
1599
1600void load_settings () 1665void load_settings ()
1601 1666
1602void load_materials () 1667void load_materials ()
1603 1668
1604void init_uuid () 1669void init_uuid ()
… …
1788 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1853 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))); 1854 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))); 1855 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))); 1856 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1792#endif 1857#endif
1793 EXTEND (SP, 2*2); 1858 EXTEND (SP, 5*2);
1794 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1859 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))); 1860 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)))); 1861 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1862 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1863 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1797} 1864}
1798 1865
1799int find_animation (utf8_string text) 1866int find_animation (utf8_string text)
1800 PROTOTYPE: $ 1867 PROTOTYPE: $
1801 1868
… …
2106 2173
2107int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2174int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2108 2175
2109int calc_skill_exp (object *who, object *op, object *skill); 2176int calc_skill_exp (object *who, object *op, object *skill);
2110 2177
2111void push_button (object *op); 2178void push_button (object *op, object *originator);
2112 2179
2113void use_trigger (object *op); 2180void 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 2181
2119void handle_apply_yield (object *op); 2182void handle_apply_yield (object *op);
2183
2184int convert_item (object *item, object *converter);
2120 2185
2121 2186
2122MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2187MODULE = cf PACKAGE = cf::object PREFIX = cf_
2123 2188
2124# no clean way to get an object from an archetype - stupid idiotic 2189# no clean way to get an object from an archetype - stupid idiotic
… …
2241 pl->ob->stats.hp = pl->ob->stats.maxhp; 2306 pl->ob->stats.hp = pl->ob->stats.maxhp;
2242 pl->ob->stats.sp = pl->ob->stats.maxsp; 2307 pl->ob->stats.sp = pl->ob->stats.maxsp;
2243 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2308 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2244 pl->orig_stats = pl->ob->stats; 2309 pl->orig_stats = pl->ob->stats;
2245 2310
2246void clear_los (player *pl) 2311# should only be temporary
2312void esrv_new_player (player *pl)
2247 2313
2314#d# TODO: replace by blocked_los accessor, fix code using this
2248bool 2315bool
2249cell_visible (player *pl, int dx, int dy) 2316cell_visible (player *pl, int dx, int dy)
2250 CODE: 2317 CODE:
2251 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2318 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2252 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2253 OUTPUT: 2319 OUTPUT:
2254 RETVAL 2320 RETVAL
2255 2321
2256void 2322void
2257send (player *pl, SV *packet) 2323send (player *pl, SV *packet)
… …
2325} 2391}
2326 2392
2327INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2393INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2328 2394
2329void 2395void
2396adjust_daylight ()
2397 CODE:
2398 maptile::adjust_daylight ();
2399
2400int
2401outdoor_darkness (int darkness = 0)
2402 CODE:
2403 RETVAL = maptile::outdoor_darkness;
2404 if (items)
2405 maptile::outdoor_darkness = darkness;
2406 OUTPUT:
2407 RETVAL
2408
2409void
2330maptile::instantiate () 2410maptile::instantiate ()
2331 2411
2332maptile *new () 2412maptile *new ()
2333 PROTOTYPE: 2413 PROTOTYPE:
2334 CODE: 2414 CODE:
… …
2441 } 2521 }
2442 2522
2443int out_of_map (maptile *map, int x, int y) 2523int out_of_map (maptile *map, int x, int y)
2444 2524
2445void 2525void
2446trigger (maptile *map, long connection, bool state = true) 2526find_link (maptile *map, shstr_tmp connection)
2447 CODE:
2448 activate_connection (map, connection, state);
2449
2450void
2451get_connection (maptile *map, long connection)
2452 PPCODE: 2527 PPCODE:
2453 oblinkpt *obp = get_connection_links (map, connection); 2528 if (oblinkpt *obp = map->find_link (connection))
2454 if (obp)
2455 for (objectlink *ol = obp->link; ol; ol = ol->next) 2529 for (objectlink *ol = obp->link; ol; ol = ol->next)
2456 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2530 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2457 2531
2458void 2532void
2459get_map_flags (maptile *map, int x, int y) 2533get_map_flags (maptile *map, int x, int y)
… …
2513 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2587 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2514 XPUSHs (sv_2mortal (to_sv (o))); 2588 XPUSHs (sv_2mortal (to_sv (o)));
2515} 2589}
2516 2590
2517SV * 2591SV *
2518bot_at (maptile *obj, unsigned int x, unsigned int y) 2592bot_at (maptile *map, unsigned int x, unsigned int y)
2519 PROTOTYPE: $$$ 2593 PROTOTYPE: $$$
2520 ALIAS: 2594 ALIAS:
2521 top_at = 1 2595 top_at = 1
2522 flags_at = 2 2596 flags_at = 2
2523 light_at = 3 2597 light_at = 3
2524 move_block_at = 4 2598 move_block_at = 4
2525 move_slow_at = 5 2599 move_slow_at = 5
2526 move_on_at = 6 2600 move_on_at = 6
2527 move_off_at = 7 2601 move_off_at = 7
2528 INIT:
2529 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2530 CODE: 2602 CODE:
2603{
2604 sint16 nx = x;
2605 sint16 ny = y;
2606
2607 if (!xy_normalise (map, nx, ny))
2608 XSRETURN_UNDEF;
2609
2610 mapspace &ms = map->at (nx, ny);
2611
2612 ms.update ();
2613
2531 switch (ix) 2614 switch (ix)
2532 { 2615 {
2533 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2616 case 0: RETVAL = to_sv (ms.bot ); break;
2534 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2617 case 1: RETVAL = to_sv (ms.top ); break;
2535 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2618 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2536 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2619 case 3: RETVAL = newSViv (ms.light ); break;
2537 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2620 case 4: RETVAL = newSVuv (ms.move_block); break;
2538 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2621 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2539 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2622 case 6: RETVAL = newSVuv (ms.move_on ); break;
2540 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2623 case 7: RETVAL = newSVuv (ms.move_off ); break;
2541 } 2624 }
2625}
2542 OUTPUT: RETVAL 2626 OUTPUT: RETVAL
2543 2627
2544void fix_walls (maptile *map, int x, int y) 2628void fix_walls (maptile *map, int x, int y)
2545 2629
2546void fix_walls_around (maptile *map, int x, int y) 2630void fix_walls_around (maptile *map, int x, int y)
… …
2679 PROTOTYPE: $ 2763 PROTOTYPE: $
2680 CODE: 2764 CODE:
2681 RETVAL = region::find (name); 2765 RETVAL = region::find (name);
2682 OUTPUT: RETVAL 2766 OUTPUT: RETVAL
2683 2767
2684region *find_fuzzy (utf8_string name)
2685 PROTOTYPE: $
2686 CODE:
2687 RETVAL = region::find_fuzzy (name);
2688 OUTPUT: RETVAL
2689
2690int specificity (region *rgn) 2768int specificity (region *rgn)
2691 CODE: 2769 CODE:
2692 RETVAL = 0; 2770 RETVAL = 0;
2693 while (rgn = rgn->parent) 2771 while (rgn = rgn->parent)
2694 RETVAL++; 2772 RETVAL++;

Diff Legend

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