summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.cc
diff options
context:
space:
mode:
authorMatthew Cline <zelgadis@sourceforge.net>2009-11-19 01:41:45 -0800
committerMatthew Cline <zelgadis@sourceforge.net>2009-11-19 01:41:45 -0800
commiteeb573573884f03dc46b85c4d68b759955ff182b (patch)
tree13509ec34359c0e4543d63fd3523ca9f3befe475 /crawl-ref/source/tilereg.cc
parent7334982fb7de15bdf0ebf0673bc91f7fb121e73c (diff)
downloadcrawl-ref-eeb573573884f03dc46b85c4d68b759955ff182b.tar.gz
crawl-ref-eeb573573884f03dc46b85c4d68b759955ff182b.zip
tiles: Don't zap empty wands.
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 59fd216c56..73b82580f0 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1321,6 +1321,16 @@ static bool _evoke_item_on_target(actor* target)
if (item == NULL)
return (false);
+ if (item->base_type == OBJ_WANDS)
+ {
+ if (item->plus2 == ZAPCOUNT_EMPTY
+ || item_type_known(*item) && item->plus <= 0)
+ {
+ mpr("That wand is empty.");
+ return (false);
+ }
+ }
+
macro_buf_add_cmd(CMD_EVOKE);
macro_buf_add(index_to_letter(item->link)); // Inventory letter.
_add_targeting_commands(target->pos());