+ 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, 4 insertions, 3 deletions

diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 50ded9bba9..b685550733 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -81,6 +81,7 @@
 #include "output.h"
 #include "place.h"
 #include "player.h"
+#include "quiver.h"
 #include "randart.h"
 #include "religion.h"
 #include "skills.h"
@@ -2585,7 +2586,7 @@ static bool fsim_ranged_combat(FILE *out, int wskill, int mi,
     long hits = 0L;
     int maxdam = 0;
 
-    const int thrown = missile_slot == -1? get_current_fire_item() : missile_slot;
+    const int thrown = missile_slot == -1 ? you.m_quiver->get_fire_item() : missile_slot;
     if (thrown == ENDOFPACK || thrown == -1)
     {
         mprf("No suitable missiles for combat simulation.");
@@ -2737,9 +2738,9 @@ static std::string fsim_weapon(int missile_slot)
             if (is_range_weapon(weapon))
             {
                 const int missile = 
-                    missile_slot == -1? get_current_fire_item() :
+                    missile_slot == -1? you.m_quiver->get_fire_item() :
                     missile_slot;
-                if (missile < ENDOFPACK)
+                if (missile < ENDOFPACK && missile >= 0)
                     return item_buf + " with "
                         + you.inv[missile].name(DESC_PLAIN);
             }