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.316 by root, Thu Jan 8 04:35:05 2009 UTC

… …
88 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
92 92
93#ifndef newSVpv_utf8
93static inline SV * 94static inline SV *
94newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
95{ 96{
96 if (!s) 97 if (!s)
97 return newSV (0); 98 return newSV (0);
98 99
99 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 101 SvUTF8_on (sv);
101 return sv; 102 return sv;
102} 103}
104#endif
103 105
106#ifndef newSVpvn_utf8
104static inline SV * 107static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 109{
107 if (!s) 110 if (!s)
108 return newSV (0); 111 return newSV (0);
109 112
110 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
111 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
112 return sv; 118 return sv;
113} 119}
120#endif
114 121
115// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
116template<class super> 123template<class super>
117static super * 124static super *
118is_a (attachable *at) 125is_a (attachable *at)
… …
151 SvREFCNT_inc (self); 158 SvREFCNT_inc (self);
152 hv_clear (self); 159 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 160 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 161 SvREFCNT_dec (self);
155 162
156 // self *must* be null now because thats sv_unmagic's job. 163 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 164 assert (!this->self);
158 } 165 }
159} 166}
160 167
161void 168void
… …
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{
… …
626 657
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 659
629 const char *argv[] = { 660 const char *argv[] = {
630 settings.argv [0], 661 settings.argv [0],
631 "-e" 662 "-e0"
632 "use EV ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 663 };
638 664
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 666 || perl_run (perl))
641 { 667 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
643 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
644 } 670 }
645}
646 671
672 eval_pv (
673 "#line 1 'cfperl init'\n"
674 "use EV ();\n"
675 "use Coro ();\n"
676 "cf->bootstrap;\n"
677 "unshift @INC, cf::datadir ();\n"
678 "require cf;\n",
679 0
680 );
681
682 if (SvTRUE (ERRSV))
683 {
684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
685 exit (EXIT_FAILURE);
686 }
687}
688
689void
647void cfperl_main () 690cfperl_main ()
648{ 691{
649 dSP; 692 dSP;
650 693
651 PUSHMARK (SP); 694 PUSHMARK (SP);
652 PUTBACK; 695 PUTBACK;
… …
677# undef def 720# undef def
678}; 721};
679 722
680#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)
681 724
682static void 725static void noinline
683gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
684{ 727{
685 // event must be in array 728 // event must be in array
686 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
687 { 730 {
… …
773{ 816{
774 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
775 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
776} 819}
777 820
778void 821static void noinline
779_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
780{ 823{
781 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
782 { 825 {
783 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
793 } 836 }
794 } 837 }
795} 838}
796 839
797// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
798void 841static void
799_recalc_want () 842_recalc_want ()
800{ 843{
801 ev_want_event.reset (); 844 ev_want_event.reset ();
802 845
803 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
913} 956}
914 957
915///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
916// various c++ => perl glue functions 959// various c++ => perl glue functions
917 960
961void
918void cfperl_tick () 962cfperl_tick ()
919{ 963{
920 tick_pending = 1; 964 tick_pending = 1;
921 965
922 if (tick_inhibit) 966 if (tick_inhibit)
923 return; 967 return;
… …
985 CALL_END; 1029 CALL_END;
986 1030
987 return can; 1031 return can;
988} 1032}
989 1033
1034void
1035cfperl_mapscript_activate (object *ob, bool 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
990player * 1046player *
991player::find (const char *name) 1047player::find (const char *name)
992{ 1048{
993 CALL_BEGIN (1); 1049 CALL_BEGIN (1);
994 CALL_ARG (name); 1050 CALL_ARG (name);
… …
1056maptile::do_load_sync () 1112maptile::do_load_sync ()
1057{ 1113{
1058 CALL_BEGIN (1); 1114 CALL_BEGIN (1);
1059 CALL_ARG (this); 1115 CALL_ARG (this);
1060 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1116 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; 1117 CALL_END;
1071} 1118}
1072 1119
1073void 1120void
1074object::enter_exit (object *exit) 1121object::enter_exit (object *exit)
… …
1146///////////////////////////////////////////////////////////////////////////// 1193/////////////////////////////////////////////////////////////////////////////
1147 1194
1148struct EVAPI *evapi::GEVAPI; 1195struct EVAPI *evapi::GEVAPI;
1149struct CoroAPI *coroapi::GCoroAPI; 1196struct CoroAPI *coroapi::GCoroAPI;
1150 1197
1198void
1151void coroapi::do_cede_to_tick () 1199coroapi::do_cede_to_tick ()
1152{ 1200{
1153 cede_pending = 0; 1201 cede_pending = 0;
1154 cede (); 1202 cede ();
1155} 1203}
1156 1204
… …
1180 ev_io_set ((ev_io *)this, fd, events); 1228 ev_io_set ((ev_io *)this, fd, events);
1181 if (active) start (); 1229 if (active) start ();
1182 } 1230 }
1183} 1231}
1184 1232
1185void 1233static void
1186_connect_to_perl () 1234_connect_to_perl ()
1187{ 1235{
1188 stash_cf = gv_stashpv ("cf", 1); 1236 stash_cf = gv_stashpv ("cf", 1);
1189 1237
1190 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1238 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1280 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1328 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) 1329 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) 1330 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) 1331 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) 1332 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1333 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1285 1334
1286 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1335 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1287 1336
1288 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1337 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) 1338 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) 1370 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) 1371 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) 1372 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) 1373 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) 1374 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) 1375 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) 1376 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) 1377 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329 1378
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1379 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) 1380 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1518 1567
1519void _connect_to_perl () 1568void _connect_to_perl ()
1520 1569
1521void _recalc_want () 1570void _recalc_want ()
1522 1571
1572# not used by default anymore
1523void _global_reattach () 1573void _global_reattach ()
1524 CODE: 1574 CODE:
1525{ 1575{
1526 // reattach to all attachable objects in the game. 1576 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1577 for_all_clients (ns)
… …
1580void init_experience () 1630void init_experience ()
1581 1631
1582void init_attackmess () 1632void init_attackmess ()
1583 1633
1584void init_dynamic () 1634void init_dynamic ()
1585
1586void init_block ()
1587 1635
1588void load_settings () 1636void load_settings ()
1589 1637
1590void load_materials () 1638void load_materials ()
1591 1639
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1824 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))); 1825 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))); 1826 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))); 1827 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1828#endif
1781 EXTEND (SP, 2*2); 1829 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1830 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))); 1831 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)))); 1832 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1833 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1834 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1835}
1786 1836
1787int find_animation (utf8_string text) 1837int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1838 PROTOTYPE: $
1789 1839
… …
2094 2144
2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2145int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2096 2146
2097int calc_skill_exp (object *who, object *op, object *skill); 2147int calc_skill_exp (object *who, object *op, object *skill);
2098 2148
2099void push_button (object *op); 2149void push_button (object *op, object *originator);
2100 2150
2101void use_trigger (object *op); 2151void 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 2152
2107void handle_apply_yield (object *op); 2153void handle_apply_yield (object *op);
2108 2154
2109 2155
2110MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2156MODULE = cf PACKAGE = cf::object PREFIX = cf_
… …
2229 pl->ob->stats.hp = pl->ob->stats.maxhp; 2275 pl->ob->stats.hp = pl->ob->stats.maxhp;
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2276 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2277 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2278 pl->orig_stats = pl->ob->stats;
2233 2279
2234void clear_los (player *pl) 2280# should only be temporary
2281void esrv_new_player (player *pl)
2235 2282
2283#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2284bool
2237cell_visible (player *pl, int dx, int dy) 2285cell_visible (player *pl, int dx, int dy)
2238 CODE: 2286 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2287 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2288 OUTPUT:
2242 RETVAL 2289 RETVAL
2243 2290
2244void 2291void
2245send (player *pl, SV *packet) 2292send (player *pl, SV *packet)
… …
2313} 2360}
2314 2361
2315INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2362INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2316 2363
2317void 2364void
2365adjust_daylight ()
2366 CODE:
2367 maptile::adjust_daylight ();
2368
2369void
2318maptile::instantiate () 2370maptile::instantiate ()
2319 2371
2320maptile *new () 2372maptile *new ()
2321 PROTOTYPE: 2373 PROTOTYPE:
2322 CODE: 2374 CODE:
… …
2429 } 2481 }
2430 2482
2431int out_of_map (maptile *map, int x, int y) 2483int out_of_map (maptile *map, int x, int y)
2432 2484
2433void 2485void
2434trigger (maptile *map, long connection, bool state = true) 2486find_link (maptile *map, shstr_tmp connection)
2435 CODE:
2436 activate_connection (map, connection, state);
2437
2438void
2439get_connection (maptile *map, long connection)
2440 PPCODE: 2487 PPCODE:
2441 oblinkpt *obp = get_connection_links (map, connection); 2488 if (oblinkpt *obp = map->find_link (connection))
2442 if (obp)
2443 for (objectlink *ol = obp->link; ol; ol = ol->next) 2489 for (objectlink *ol = obp->link; ol; ol = ol->next)
2444 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2490 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2445 2491
2446void 2492void
2447get_map_flags (maptile *map, int x, int y) 2493get_map_flags (maptile *map, int x, int y)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2547 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2548 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2549}
2504 2550
2505SV * 2551SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2552bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2553 PROTOTYPE: $$$
2508 ALIAS: 2554 ALIAS:
2509 top_at = 1 2555 top_at = 1
2510 flags_at = 2 2556 flags_at = 2
2511 light_at = 3 2557 light_at = 3
2512 move_block_at = 4 2558 move_block_at = 4
2513 move_slow_at = 5 2559 move_slow_at = 5
2514 move_on_at = 6 2560 move_on_at = 6
2515 move_off_at = 7 2561 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2562 CODE:
2563{
2564 sint16 nx = x;
2565 sint16 ny = y;
2566
2567 if (!xy_normalise (map, nx, ny))
2568 XSRETURN_UNDEF;
2569
2570 mapspace &ms = map->at (nx, ny);
2571
2572 ms.update ();
2573
2519 switch (ix) 2574 switch (ix)
2520 { 2575 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2576 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2577 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2578 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2579 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2580 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2581 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2582 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2583 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2584 }
2585}
2530 OUTPUT: RETVAL 2586 OUTPUT: RETVAL
2531 2587
2532void fix_walls (maptile *map, int x, int y) 2588void fix_walls (maptile *map, int x, int y)
2533 2589
2534void fix_walls_around (maptile *map, int x, int y) 2590void fix_walls_around (maptile *map, int x, int y)
… …
2667 PROTOTYPE: $ 2723 PROTOTYPE: $
2668 CODE: 2724 CODE:
2669 RETVAL = region::find (name); 2725 RETVAL = region::find (name);
2670 OUTPUT: RETVAL 2726 OUTPUT: RETVAL
2671 2727
2672region *find_fuzzy (utf8_string name)
2673 PROTOTYPE: $
2674 CODE:
2675 RETVAL = region::find_fuzzy (name);
2676 OUTPUT: RETVAL
2677
2678int specificity (region *rgn) 2728int specificity (region *rgn)
2679 CODE: 2729 CODE:
2680 RETVAL = 0; 2730 RETVAL = 0;
2681 while (rgn = rgn->parent) 2731 while (rgn = rgn->parent)
2682 RETVAL++; 2732 RETVAL++;

Diff Legend

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