summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-23 21:30:08 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-23 21:30:08 +0000
commit8bc8c04fbe230fb0f962f43da1acb3c51c4f88f0 (patch)
tree70f4c3d5336e09492f3c46b73c58c47014825e45 /crawl-ref/source/item_use.cc
parent7ace26d7f10f5eaefbe12f454183c88dbcb09b73 (diff)
downloadcrawl-ref-8bc8c04fbe230fb0f962f43da1acb3c51c4f88f0.tar.gz
crawl-ref-8bc8c04fbe230fb0f962f43da1acb3c51c4f88f0.zip
Fix monster emergency spells not checking for ENCH_TP, thus allowing
monsters to cancel their teleportation without meaning to. (BR 2000428) Fix the quiver not being cleared when wielding the only quiverable (and thus previously quivered) item. (Un)wielding such an item now switches nicely between "Nothing wielded" and "Nothing quivered", as it should be. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6089 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 0f9640d5fe..220aaefc69 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1284,7 +1284,8 @@ int get_next_fire_item(int current, int direction)
{
if (fire_order[i] == current)
{
- unsigned next = (i + fire_order.size() + direction) % fire_order.size();
+ unsigned next =
+ (i + fire_order.size() + direction) % fire_order.size();
return fire_order[next];
}
}