summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 07:52:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 07:52:37 +0000
commitce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28 (patch)
tree4e546f0e70ac9c88be6c39358089d783a96ec0f0 /crawl-ref/source/delay.cc
parenteedd926a2de32ac965b9cae1dd30242f75c479f5 (diff)
downloadcrawl-ref-ce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28.tar.gz
crawl-ref-ce05e64645f5e9ba07c5b8b72d0da8d5f8cecb28.zip
Change quiver output to that of the next item actually fired. Currently
updates correctly on firing and dropping quivered items. May be buggy. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6107 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 66b3c95ef1..d215c38e39 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -65,9 +65,9 @@ static bool _recite_mons_useless(const monsters *mon)
return (mons_intel(mon->type) < I_NORMAL
|| holiness != MH_HOLY
- || holiness != MH_NATURAL
- || holiness != MH_UNDEAD
- || holiness != MH_DEMONIC
+ && holiness != MH_NATURAL
+ && holiness != MH_UNDEAD
+ && holiness != MH_DEMONIC
|| mons_is_stationary(mon)
|| mons_is_fleeing(mon)
|| mons_is_sleeping(mon)
@@ -79,7 +79,7 @@ static bool _recite_mons_useless(const monsters *mon)
|| mon->has_ench(ENCH_HASTE));
}
-// power is maximum 50
+// Power is maximum 50.
static int _recite_to_monsters(int x, int y, int pow, int unused)
{
UNUSED(unused);