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.315 by root, Thu Jan 8 03:03:24 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{
… …
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, object *activator, int state)
1036{
1037 CALL_BEGIN (3);
1038 CALL_ARG (ob);
1039 CALL_ARG (activator);
1040 CALL_ARG (state);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END;
1043}
1044
1001player * 1045player *
1002player::find (const char *name) 1046player::find (const char *name)
1003{ 1047{
1004 CALL_BEGIN (1); 1048 CALL_BEGIN (1);
1005 CALL_ARG (name); 1049 CALL_ARG (name);
… …
1067maptile::do_load_sync () 1111maptile::do_load_sync ()
1068{ 1112{
1069 CALL_BEGIN (1); 1113 CALL_BEGIN (1);
1070 CALL_ARG (this); 1114 CALL_ARG (this);
1071 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1115 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; 1116 CALL_END;
1082} 1117}
1083 1118
1084void 1119void
1085object::enter_exit (object *exit) 1120object::enter_exit (object *exit)
… …
1157///////////////////////////////////////////////////////////////////////////// 1192/////////////////////////////////////////////////////////////////////////////
1158 1193
1159struct EVAPI *evapi::GEVAPI; 1194struct EVAPI *evapi::GEVAPI;
1160struct CoroAPI *coroapi::GCoroAPI; 1195struct CoroAPI *coroapi::GCoroAPI;
1161 1196
1197void
1162void coroapi::do_cede_to_tick () 1198coroapi::do_cede_to_tick ()
1163{ 1199{
1164 cede_pending = 0; 1200 cede_pending = 0;
1165 cede (); 1201 cede ();
1166} 1202}
1167 1203
… …
1191 ev_io_set ((ev_io *)this, fd, events); 1227 ev_io_set ((ev_io *)this, fd, events);
1192 if (active) start (); 1228 if (active) start ();
1193 } 1229 }
1194} 1230}
1195 1231
1196void 1232static void
1197_connect_to_perl () 1233_connect_to_perl ()
1198{ 1234{
1199 stash_cf = gv_stashpv ("cf", 1); 1235 stash_cf = gv_stashpv ("cf", 1);
1200 1236
1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1291 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1327 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) 1328 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) 1329 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) 1330 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) 1331 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1332 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1296 1333
1297 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1334 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1298 1335
1299 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1336 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) 1337 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) 1369 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) 1370 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) 1371 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) 1372 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) 1373 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) 1374 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) 1375 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) 1376 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1340 1377
1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1378 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) 1379 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1593 1630
1594void init_attackmess () 1631void init_attackmess ()
1595 1632
1596void init_dynamic () 1633void init_dynamic ()
1597 1634
1598void init_block ()
1599
1600void load_settings () 1635void load_settings ()
1601 1636
1602void load_materials () 1637void load_materials ()
1603 1638
1604void init_uuid () 1639void init_uuid ()
… …
1788 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1823 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))); 1824 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))); 1825 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))); 1826 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1792#endif 1827#endif
1793 EXTEND (SP, 2*2); 1828 EXTEND (SP, 5*2);
1794 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1829 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))); 1830 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)))); 1831 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1832 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1833 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1797} 1834}
1798 1835
1799int find_animation (utf8_string text) 1836int find_animation (utf8_string text)
1800 PROTOTYPE: $ 1837 PROTOTYPE: $
1801 1838
… …
2110 2147
2111void push_button (object *op); 2148void push_button (object *op);
2112 2149
2113void use_trigger (object *op); 2150void use_trigger (object *op);
2114 2151
2115void add_button_link (object *button, maptile *map, int connected);
2116
2117void remove_button_link (object *op);
2118
2119void handle_apply_yield (object *op); 2152void handle_apply_yield (object *op);
2120 2153
2121 2154
2122MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2155MODULE = cf PACKAGE = cf::object PREFIX = cf_
2123 2156
… …
2241 pl->ob->stats.hp = pl->ob->stats.maxhp; 2274 pl->ob->stats.hp = pl->ob->stats.maxhp;
2242 pl->ob->stats.sp = pl->ob->stats.maxsp; 2275 pl->ob->stats.sp = pl->ob->stats.maxsp;
2243 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2276 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2244 pl->orig_stats = pl->ob->stats; 2277 pl->orig_stats = pl->ob->stats;
2245 2278
2246void clear_los (player *pl) 2279# should only be temporary
2280void esrv_new_player (player *pl)
2247 2281
2282#d# TODO: replace by blocked_los accessor, fix code using this
2248bool 2283bool
2249cell_visible (player *pl, int dx, int dy) 2284cell_visible (player *pl, int dx, int dy)
2250 CODE: 2285 CODE:
2251 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2286 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2252 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2253 OUTPUT: 2287 OUTPUT:
2254 RETVAL 2288 RETVAL
2255 2289
2256void 2290void
2257send (player *pl, SV *packet) 2291send (player *pl, SV *packet)
… …
2325} 2359}
2326 2360
2327INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2361INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2328 2362
2329void 2363void
2364adjust_daylight ()
2365 CODE:
2366 maptile::adjust_daylight ();
2367
2368void
2330maptile::instantiate () 2369maptile::instantiate ()
2331 2370
2332maptile *new () 2371maptile *new ()
2333 PROTOTYPE: 2372 PROTOTYPE:
2334 CODE: 2373 CODE:
… …
2441 } 2480 }
2442 2481
2443int out_of_map (maptile *map, int x, int y) 2482int out_of_map (maptile *map, int x, int y)
2444 2483
2445void 2484void
2446trigger (maptile *map, long connection, bool state = true) 2485find_link (maptile *map, shstr_tmp connection)
2447 CODE:
2448 activate_connection (map, connection, state);
2449
2450void
2451get_connection (maptile *map, long connection)
2452 PPCODE: 2486 PPCODE:
2453 oblinkpt *obp = get_connection_links (map, connection); 2487 if (oblinkpt *obp = map->find_link (connection))
2454 if (obp)
2455 for (objectlink *ol = obp->link; ol; ol = ol->next) 2488 for (objectlink *ol = obp->link; ol; ol = ol->next)
2456 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2489 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2457 2490
2458void 2491void
2459get_map_flags (maptile *map, int x, int y) 2492get_map_flags (maptile *map, int x, int y)
… …
2513 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2546 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2514 XPUSHs (sv_2mortal (to_sv (o))); 2547 XPUSHs (sv_2mortal (to_sv (o)));
2515} 2548}
2516 2549
2517SV * 2550SV *
2518bot_at (maptile *obj, unsigned int x, unsigned int y) 2551bot_at (maptile *map, unsigned int x, unsigned int y)
2519 PROTOTYPE: $$$ 2552 PROTOTYPE: $$$
2520 ALIAS: 2553 ALIAS:
2521 top_at = 1 2554 top_at = 1
2522 flags_at = 2 2555 flags_at = 2
2523 light_at = 3 2556 light_at = 3
2524 move_block_at = 4 2557 move_block_at = 4
2525 move_slow_at = 5 2558 move_slow_at = 5
2526 move_on_at = 6 2559 move_on_at = 6
2527 move_off_at = 7 2560 move_off_at = 7
2528 INIT:
2529 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2530 CODE: 2561 CODE:
2562{
2563 sint16 nx = x;
2564 sint16 ny = y;
2565
2566 if (!xy_normalise (map, nx, ny))
2567 XSRETURN_UNDEF;
2568
2569 mapspace &ms = map->at (nx, ny);
2570
2571 ms.update ();
2572
2531 switch (ix) 2573 switch (ix)
2532 { 2574 {
2533 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2575 case 0: RETVAL = to_sv (ms.bot ); break;
2534 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2576 case 1: RETVAL = to_sv (ms.top ); break;
2535 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2577 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2536 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2578 case 3: RETVAL = newSViv (ms.light ); break;
2537 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2579 case 4: RETVAL = newSVuv (ms.move_block); break;
2538 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2580 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2539 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2581 case 6: RETVAL = newSVuv (ms.move_on ); break;
2540 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2582 case 7: RETVAL = newSVuv (ms.move_off ); break;
2541 } 2583 }
2584}
2542 OUTPUT: RETVAL 2585 OUTPUT: RETVAL
2543 2586
2544void fix_walls (maptile *map, int x, int y) 2587void fix_walls (maptile *map, int x, int y)
2545 2588
2546void fix_walls_around (maptile *map, int x, int y) 2589void fix_walls_around (maptile *map, int x, int y)
… …
2679 PROTOTYPE: $ 2722 PROTOTYPE: $
2680 CODE: 2723 CODE:
2681 RETVAL = region::find (name); 2724 RETVAL = region::find (name);
2682 OUTPUT: RETVAL 2725 OUTPUT: RETVAL
2683 2726
2684region *find_fuzzy (utf8_string name)
2685 PROTOTYPE: $
2686 CODE:
2687 RETVAL = region::find_fuzzy (name);
2688 OUTPUT: RETVAL
2689
2690int specificity (region *rgn) 2727int specificity (region *rgn)
2691 CODE: 2728 CODE:
2692 RETVAL = 0; 2729 RETVAL = 0;
2693 while (rgn = rgn->parent) 2730 while (rgn = rgn->parent)
2694 RETVAL++; 2731 RETVAL++;

Diff Legend

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