diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
commit | a291e99809652bb3308f08d777bafb134328d835 (patch) | |
tree | e6fa16ffe6ec572ac2f8ba44a62575d70a2e6bfe /crawl-ref/source/quiver.cc | |
parent | 7dd20bb5af17f48ca9a2ff5e4d63cd494e0498de (diff) | |
download | crawl-ref-a291e99809652bb3308f08d777bafb134328d835.tar.gz crawl-ref-a291e99809652bb3308f08d777bafb134328d835.zip |
Disallow quivering equipped items. (You can still (fi)re your wielded
weapon if you insist, you just can't quiver it.)
And another general clean-up.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6149 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/quiver.cc')
-rw-r--r-- | crawl-ref/source/quiver.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc index 8aa598d480..aa9f38e768 100644 --- a/crawl-ref/source/quiver.cc +++ b/crawl-ref/source/quiver.cc @@ -168,6 +168,22 @@ void choose_item_for_quiver() : "hand crossbows"); return; } + else if (slot == you.equip[EQ_WEAPON]) + { + mpr("You can't quiver wielded items."); + return; + } + else + { + for (int i = 0; i < NUM_EQUIP; i++) + { + if (you.equip[i] == slot) + { + mpr("You can't quiver worn items."); + return; + } + } + } const item_def item = you.inv[slot]; ASSERT(is_valid_item(item)); |