summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-30 13:19:29 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-30 13:19:29 +0000
commitf792e02e4541ef5d7246229fd69e78ea4c356456 (patch)
treea3f414a7b964d8fc5d922fd70b318c9e4c574fdc /crawl-ref/source/item_use.cc
parent86076a641fc7b9cc1ce20a8f3dca87655bbf62ca (diff)
downloadcrawl-ref-f792e02e4541ef5d7246229fd69e78ea4c356456.tar.gz
crawl-ref-f792e02e4541ef5d7246229fd69e78ea4c356456.zip
Fixed Xom being amused by repeatedly zapping tried wands (like digging), tweaked messages for demon summons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2684 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 29d371fd83..d5707703d0 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2934,6 +2934,7 @@ void zap_wand(void)
}
const bool alreadyknown = item_type_known(wand);
+ const bool alreadytried = item_type_tried(wand);
if (!alreadyknown)
beam.effect_known = false;
@@ -3030,7 +3031,7 @@ void zap_wand(void)
exercise( SK_EVOCATIONS, 1 );
alert_nearby_monsters();
- if (!alreadyknown && dangerous)
+ if (!alreadyknown && !alreadytried && dangerous)
{
// Xom loves it when you use an unknown wand and there is a
// dangerous monster nearby...