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.293 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 2008 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)
… …
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); }
… …
439 446
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 449
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451
452inline SV *to_sv (dynbuf * v)
453{
454 SV *sv = newSV (0);
455
456 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1);
458 SvPOK_only (sv);
459 v->linearise (SvPVX (sv));
460 SvCUR_set (sv, v->size ());
461 *SvEND (sv) = 0;
462
463 return sv;
464}
465
466inline SV *to_sv (dynbuf_text * v)
467{
468 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv);
470 return sv;
471}
444 472
445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
446inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
605 633
606 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
607 635
608 const char *argv[] = { 636 const char *argv[] = {
609 settings.argv [0], 637 settings.argv [0],
610 "-e" 638 "-e0"
611 "use EV; use Coro;" // required for bootstrap
612 "cf->bootstrap;" // required for datadir :*>
613 "unshift @INC, cf::datadir ();"
614 "require cf;"
615 }; 639 };
616 640
617 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
618 || perl_run (perl)) 642 || perl_run (perl))
619 { 643 {
620 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
621 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
622 } 646 }
623 647
648 eval_pv (
649 "#line 1 'cfperl init'\n"
650 "use EV ();\n"
651 "use Coro ();\n"
652 "cf->bootstrap;\n"
653 "unshift @INC, cf::datadir ();\n"
654 "require cf;\n",
655 0
656 );
657
658 if (SvTRUE (ERRSV))
624 { 659 {
625 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
626 661 exit (EXIT_FAILURE);
627 PUSHMARK (SP);
628 PUTBACK;
629 call_pv ("cf::init", G_DISCARD | G_VOID);
630 } 662 }
631} 663}
632 664
633void cfperl_main () 665void cfperl_main ()
634{ 666{
635 dSP; 667 dSP;
… …
945 CALL_CALL ("ext::books::make_book", G_VOID); 977 CALL_CALL ("ext::books::make_book", G_VOID);
946 CALL_END; 978 CALL_END;
947} 979}
948 980
949void 981void
950cfperl_expand_cfpod (player *pl, std::string &msg)
951{
952 CALL_BEGIN (2);
953 CALL_ARG (pl);
954 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
955 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
956
957 if (count)
958 {
959 STRLEN len;
960 char *data = SvPVutf8 (TOPs, len);
961 msg.assign (data, len);
962 }
963
964 CALL_END;
965}
966
967void
968cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 982cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
969{ 983{
970 CALL_BEGIN (4); 984 CALL_BEGIN (4);
971 CALL_ARG (ns); 985 CALL_ARG (ns);
972 CALL_ARG (type); 986 CALL_ARG (type);
… …
1060maptile::do_load_sync () 1074maptile::do_load_sync ()
1061{ 1075{
1062 CALL_BEGIN (1); 1076 CALL_BEGIN (1);
1063 CALL_ARG (this); 1077 CALL_ARG (this);
1064 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1065 CALL_END;
1066}
1067
1068void
1069maptile::change_all_map_light (int change)
1070{
1071 CALL_BEGIN (1);
1072 CALL_ARG (change);
1073 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1074 CALL_END; 1079 CALL_END;
1075} 1080}
1076 1081
1077void 1082void
1078object::enter_exit (object *exit) 1083object::enter_exit (object *exit)
… …
1323 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1328 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1324 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1329 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1325 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1330 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1326 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1331 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1327 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1332 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1328 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1333 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1329 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1334 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1330 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1335 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1331 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1336 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1332 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1337 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1333 1338
1334 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1339 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1335 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1340 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1336 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1341 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1337 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1342 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1338 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1343 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1339 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1344 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1340 1345
1341 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1346 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1342 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1347 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1343 1348
1344 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1349 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1504 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1509 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1505 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1510 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1506 } 1511 }
1507} 1512}
1508 1513
1514void _gv_clear (SV *gv)
1515 CODE:
1516 assert (SvTYPE (gv) == SVt_PVGV);
1517# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1518 f (GvGP (gv)->gp_form);
1519 f (GvGP (gv)->gp_io);
1520 f (GvGP (gv)->gp_sv);
1521 f (GvGP (gv)->gp_av);
1522 f (GvGP (gv)->gp_hv);
1523 f (GvGP (gv)->gp_cv);
1524 GvCVGEN (gv) = 0;
1525 GvMULTI_off (gv);
1526# undef f
1527
1509void _connect_to_perl () 1528void _connect_to_perl ()
1510 1529
1511void _recalc_want () 1530void _recalc_want ()
1512 1531
1532# not used by default anymore
1513void _global_reattach () 1533void _global_reattach ()
1514 CODE: 1534 CODE:
1515{ 1535{
1516 // reattach to all attachable objects in the game. 1536 // reattach to all attachable objects in the game.
1517 for_all_clients (ns) 1537 for_all_clients (ns)
… …
1560 len -= 3; 1580 len -= 3;
1561 } 1581 }
1562 1582
1563 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1583 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1564} 1584}
1585
1586void init_anim ()
1587
1588void init_globals ()
1589
1590void init_experience ()
1591
1592void init_attackmess ()
1593
1594void init_dynamic ()
1595
1596void load_settings ()
1597
1598void load_materials ()
1599
1600void init_uuid ()
1601 CODE:
1602 UUID::init ();
1603
1604void init_signals ()
1605
1606void init_commands ()
1607
1608void init_skills ()
1609
1610void init_beforeplay ()
1565 1611
1566void evthread_start (int aiofd) 1612void evthread_start (int aiofd)
1567 1613
1568void cede_to_tick () 1614void cede_to_tick ()
1569 CODE: 1615 CODE:
… …
1707#if _POSIX_MEMLOCK 1753#if _POSIX_MEMLOCK
1708 1754
1709int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1755int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1710 INIT: 1756 INIT:
1711#if __GLIBC__ 1757#if __GLIBC__
1758 mallopt (M_TOP_PAD, 1024 * 1024);
1759 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1760 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1712 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1761 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1713#endif 1762#endif
1714 1763
1715int munlockall () 1764int munlockall ()
1716 1765
… …
1735 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1784 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1736 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1785 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1737 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1786 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1738 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1787 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1739#endif 1788#endif
1740 EXTEND (SP, 2*2); 1789 EXTEND (SP, 5*2);
1741 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1790 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1742 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1791 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1743 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1792 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1793 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1794 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1744} 1795}
1745 1796
1746int find_animation (utf8_string text) 1797int find_animation (utf8_string text)
1747 PROTOTYPE: $ 1798 PROTOTYPE: $
1748 1799
… …
2188 pl->ob->stats.hp = pl->ob->stats.maxhp; 2239 pl->ob->stats.hp = pl->ob->stats.maxhp;
2189 pl->ob->stats.sp = pl->ob->stats.maxsp; 2240 pl->ob->stats.sp = pl->ob->stats.maxsp;
2190 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2241 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2191 pl->orig_stats = pl->ob->stats; 2242 pl->orig_stats = pl->ob->stats;
2192 2243
2193void clear_los (player *pl) 2244# should only be temporary
2245void esrv_new_player (player *pl)
2194 2246
2247#d# TODO: replace by blocked_los accessor, fix code using this
2195bool 2248bool
2196cell_visible (player *pl, int dx, int dy) 2249cell_visible (player *pl, int dx, int dy)
2197 CODE: 2250 CODE:
2198 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2251 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2199 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2200 OUTPUT: 2252 OUTPUT:
2201 RETVAL 2253 RETVAL
2202 2254
2203void 2255void
2204send (player *pl, SV *packet) 2256send (player *pl, SV *packet)
… …
2210 if (len > MAXSOCKBUF) 2262 if (len > MAXSOCKBUF)
2211 pl->failmsg ("[packet too long for client]"); 2263 pl->failmsg ("[packet too long for client]");
2212 else if (pl->ns) 2264 else if (pl->ns)
2213 pl->ns->send_packet (buf, len); 2265 pl->ns->send_packet (buf, len);
2214} 2266}
2215
2216int
2217listening (player *pl, int new_value = -1)
2218 CODE:
2219 RETVAL = pl->listening;
2220 if (new_value >= 0)
2221 pl->listening = new_value;
2222 OUTPUT:
2223 RETVAL
2224 2267
2225void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2268void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2226 PROTOTYPE: $;$$$ 2269 PROTOTYPE: $;$$$
2227 PPCODE: 2270 PPCODE:
2228 if (GIMME_V != G_VOID) 2271 if (GIMME_V != G_VOID)
… …
2281} 2324}
2282 2325
2283INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2284 2327
2285void 2328void
2329adjust_daylight ()
2330 CODE:
2331 maptile::adjust_daylight ();
2332
2333void
2286maptile::instantiate () 2334maptile::instantiate ()
2287 2335
2288maptile *new () 2336maptile *new ()
2289 PROTOTYPE: 2337 PROTOTYPE:
2290 CODE: 2338 CODE:
… …
2383} 2431}
2384 2432
2385void 2433void
2386maptile::create_region_treasure () 2434maptile::create_region_treasure ()
2387 CODE: 2435 CODE:
2388{
2389 object *op = object::create ();
2390 op->type = FLOOR;
2391 op->map = THIS;
2392
2393 for (int x = 0; x < THIS->width; ++x) 2436 for (int x = 0; x < THIS->width; ++x)
2394 for (int y = 0; y < THIS->height; ++y) 2437 for (int y = 0; y < THIS->height; ++y)
2395 { 2438 {
2396 region *rgn = THIS->region (x, y); 2439 region *rgn = THIS->region (x, y);
2397 2440
2398 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2441 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2442 if (object *op = THIS->at (x, y).top)
2399 if (rgn->treasure && rndm () < rgn->treasure_density) 2443 if (rgn->treasure && rndm () < rgn->treasure_density)
2400 {
2401 op->x = x;
2402 op->y = y;
2403 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2444 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2404 }
2405 } 2445 }
2406
2407 op->destroy ();
2408}
2409 2446
2410int out_of_map (maptile *map, int x, int y) 2447int out_of_map (maptile *map, int x, int y)
2411 2448
2412void 2449void
2413trigger (maptile *map, long connection, bool state = true) 2450trigger (maptile *map, long connection, bool state = true)
… …
2480 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2517 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2481 XPUSHs (sv_2mortal (to_sv (o))); 2518 XPUSHs (sv_2mortal (to_sv (o)));
2482} 2519}
2483 2520
2484SV * 2521SV *
2485bot_at (maptile *obj, unsigned int x, unsigned int y) 2522bot_at (maptile *map, unsigned int x, unsigned int y)
2486 PROTOTYPE: $$$ 2523 PROTOTYPE: $$$
2487 ALIAS: 2524 ALIAS:
2488 top_at = 1 2525 top_at = 1
2489 flags_at = 2 2526 flags_at = 2
2490 light_at = 3 2527 light_at = 3
2491 move_block_at = 4 2528 move_block_at = 4
2492 move_slow_at = 5 2529 move_slow_at = 5
2493 move_on_at = 6 2530 move_on_at = 6
2494 move_off_at = 7 2531 move_off_at = 7
2495 INIT:
2496 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2497 CODE: 2532 CODE:
2533{
2534 sint16 nx = x;
2535 sint16 ny = y;
2536
2537 if (!xy_normalise (map, nx, ny))
2538 XSRETURN_UNDEF;
2539
2540 mapspace &ms = map->at (nx, ny);
2541
2542 ms.update ();
2543
2498 switch (ix) 2544 switch (ix)
2499 { 2545 {
2500 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2546 case 0: RETVAL = to_sv (ms.bot ); break;
2501 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2547 case 1: RETVAL = to_sv (ms.top ); break;
2502 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2548 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2503 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2549 case 3: RETVAL = newSViv (ms.light ); break;
2504 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2550 case 4: RETVAL = newSVuv (ms.move_block); break;
2505 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2551 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2506 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2552 case 6: RETVAL = newSVuv (ms.move_on ); break;
2507 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2553 case 7: RETVAL = newSVuv (ms.move_off ); break;
2508 } 2554 }
2555}
2509 OUTPUT: RETVAL 2556 OUTPUT: RETVAL
2510 2557
2511void fix_walls (maptile *map, int x, int y) 2558void fix_walls (maptile *map, int x, int y)
2512 2559
2513void fix_walls_around (maptile *map, int x, int y) 2560void fix_walls_around (maptile *map, int x, int y)

Diff Legend

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