diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-28 18:44:44 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-28 18:44:44 -0600 |
| commit | 3b1f5a4a8bf98798f556ad0f3643436cfd71b868 (patch) | |
| tree | f5ae10b2b163d72ce770a82437baca5f2e564aa1 /crawl-ref/source/spl-goditem.cc | |
| parent | dad628392bd8d9f1342730c29a3fdf016249f038 (diff) | |
| download | crawl-ref-3b1f5a4a8bf98798f556ad0f3643436cfd71b868.tar.gz crawl-ref-3b1f5a4a8bf98798f556ad0f3643436cfd71b868.zip | |
Make HUPping at a read-ID scroll prompt behave more consistently.
Namely, aborting out in this fashion wastes the scroll, like other means
of aborting out; this was the case with the weapon selection prompt but
not the prompts added afterwards.
Also removes a FIXME comment which prompted this; some discussion on IRC
suggests that this patch generates the desired behaviour.
Diffstat (limited to 'crawl-ref/source/spl-goditem.cc')
| -rw-r--r-- | crawl-ref/source/spl-goditem.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc index 25510f727b..7080b6a5d9 100644 --- a/crawl-ref/source/spl-goditem.cc +++ b/crawl-ref/source/spl-goditem.cc @@ -75,9 +75,9 @@ int identify(int power, int item_slot, bool alreadyknown, string *pre_msg) || yesno("Really abort (and waste the scroll)?", false, 0)) { canned_msg(MSG_OK); - return identified > 0 ? identified : - alreadyknown || crawl_state.seen_hups ? 0 - : -1; + return identified > 0 ? identified : + alreadyknown ? 0 + : -1; } else { |