summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/invent.cc
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-08-03 00:00:13 -0400
committerJesse Luehrs <doy@tozt.net>2014-08-03 00:02:37 -0400
commit9c2101feaf70c73fa1af6fd4a4c1680a560cccb1 (patch)
tree4052e59b30a60a39ae8e6a9dcea27b2f1f6a971d /crawl-ref/source/invent.cc
parent3bfcae4341b28a616fad02823f0487faa81e450c (diff)
downloadcrawl-ref-9c2101feaf70c73fa1af6fd4a4c1680a560cccb1.tar.gz
crawl-ref-9c2101feaf70c73fa1af6fd4a4c1680a560cccb1.zip
prompt for stasis in between swapping amulets too (8708)
Diffstat (limited to 'crawl-ref/source/invent.cc')
-rw-r--r--crawl-ref/source/invent.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index b23998f894..f5101404ac 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1683,7 +1683,7 @@ static bool _is_known_no_tele_item(const item_def &item)
return false;
}
-static bool _nasty_stasis(const item_def &item, operation_types oper)
+bool nasty_stasis(const item_def &item, operation_types oper)
{
return (oper == OPER_PUTON
&& (item.base_type == OBJ_JEWELLERY
@@ -1721,7 +1721,7 @@ bool needs_handle_warning(const item_def &item, operation_types oper)
return true;
}
- if (_nasty_stasis(item, oper))
+ if (nasty_stasis(item, oper))
return true;
if (oper == OPER_WIELD // unwielding uses OPER_WIELD too
@@ -1825,7 +1825,7 @@ bool check_warning_inscriptions(const item_def& item,
string prompt = "Really " + _operation_verb(oper) + " ";
prompt += (in_inventory(item) ? item.name(DESC_INVENTORY)
: item.name(DESC_A));
- if (_nasty_stasis(item, oper))
+ if (nasty_stasis(item, oper))
{
prompt += string(" while ")
+ (you.duration[DUR_TELEPORT] ? "about to teleport" :