diff options
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 753ea5be30..4490e3a59a 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1541,10 +1541,8 @@ int DungeonRegion::handle_mouse(MouseEvent &event) const int cloudidx = env.cgrid(gc); if (cloudidx != EMPTY_CLOUD) { - cloud_type ctype = env.cloud[cloudidx].type; - std::string terrain_desc = desc; - desc = cloud_name(ctype); + desc = cloud_name(cloudidx); if (!terrain_desc.empty()) desc += "\n" + terrain_desc; @@ -1937,9 +1935,7 @@ bool DungeonRegion::update_alt_text(std::string &alt) const int cloudidx = env.cgrid(gc); if (cloudidx != EMPTY_CLOUD) { - cloud_type ctype = env.cloud[cloudidx].type; - - inf.prefix = "There is a cloud of " + cloud_name(ctype) + inf.prefix = "There is a cloud of " + cloud_name(cloudidx) + " here.$$"; } } @@ -2488,7 +2484,7 @@ static bool _can_use_item(const item_def &item, bool equipped) && mons_has_blood(item.plus)); } - if (equipped && item_cursed(item)) + if (equipped && item.cursed()) { // Misc. items/rods can always be evoked, cursed or not. if (item.base_type == OBJ_MISCELLANY || item_is_rod(item)) @@ -2774,7 +2770,7 @@ bool InventoryRegion::update_tip_text(std::string& tip) tip += "\n[R-Click] Info"; // Has to be non-equipped or non-cursed to drop. if (!equipped || !_is_true_equipped_item(you.inv[idx]) - || !item_cursed(you.inv[idx])) + || !you.inv[idx].cursed()) { tip += "\n[Shift-L-Click] Drop (d)"; } |