diff options
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 26747c1f07..1a30607199 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -130,7 +130,7 @@ bool remove_curse(bool suppress_msg) // Only cursed *weapons* in hand count as cursed. - bwr if (you.weapon() && you.weapon()->base_type == OBJ_WEAPONS - && item_cursed(*you.weapon())) + && you.weapon()->cursed()) { // Also sets wield_change. do_uncurse_item(*you.weapon()); @@ -142,7 +142,7 @@ bool remove_curse(bool suppress_msg) for (int i = EQ_WEAPON + 1; i < NUM_EQUIP; i++) { // Melded equipment can also get uncursed this way. - if (you.equip[i] != -1 && item_cursed(you.inv[you.equip[i]])) + if (you.equip[i] != -1 && you.inv[you.equip[i]].cursed()) { do_uncurse_item(you.inv[you.equip[i]]); success = true; @@ -1528,13 +1528,15 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar if (is_controlled) { - mpr("You may choose your destination (press '.' or delete to select)."); - mpr("Expect minor deviation."); check_ring_TC = true; - // Only have the more prompt for non-wizard. + // Only have the messages and the more prompt for non-wizard. if (!wizard_tele) + { + mpr("You may choose your destination (press '.' or delete to select)."); + mpr("Expect minor deviation."); more(); + } while (true) { |