+ allocate and initialize

 + _fire_prompt_for_item returns -1, not ENDOFPACK
 + remove _fire_get_noitem_reason()
 + remove get_current_fire_item()
 + fix get_next_fire_item
 + remove _get_fire_order()
 + remove _fire_item_matches()
 + verify: no use of ENDOFPACK, use -1
 + on_item_fired
 - implement: tags stuff
 + bug: wielding sling with stones = empty quiver
 - bug: wield sling, no quiver, pick up stones: should quiver
 + bug: wield sling, pick up stones: update # stones
 + bug: wield sling, stones quivered, drop stones: should update
 - feature: explicitly dropping all of ammo stack should remove it from quiver
 - move get_next_fire_item into quiver.cc?
 - remove: fire_quiver_best
 - remove: you.quiver
 - rename: you.quiver_change -> you.redraw_quiver
 - test no item because of fire_order_begin, =f, etc
 - find better place for on_weapon_changed
 - polish Qv: display, the command change
 - PROBLEM: cast_portal_projectile uses empty quiver slot? (test this)



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4191 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 5 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 2719d1eaaf..52aee95021 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -63,6 +63,7 @@
 #include "overmap.h"
 #include "place.h"
 #include "player.h"
+#include "quiver.h"
 #include "randart.h"
 #include "religion.h"
 #include "shopping.h"
@@ -243,8 +244,7 @@ bool dec_inv_item_quantity( int obj, int amount )
     if (you.equip[EQ_WEAPON] == obj)
         you.wield_change = true;
 
-    if (you.quiver[get_quiver_type()] == obj)
-        you.quiver_change = true;
+    you.m_quiver->on_inv_quantity_change(obj, amount);
 
     if (you.inv[obj].quantity <= amount)
     {
@@ -315,9 +315,7 @@ void inc_inv_item_quantity( int obj, int amount )
     if (you.equip[EQ_WEAPON] == obj)
         you.wield_change = true;
         
-    if (you.quiver[get_quiver_type()] == obj)
-        you.quiver_change = true;
-
+    you.m_quiver->on_inv_quantity_change(obj, amount);
     you.inv[obj].quantity += amount;
     burden_change();
 }