Rewrite of beam.cc: put all beam data in one place. Might be buggy.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 1e4cdf7141..b387d75e20 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1167,13 +1167,13 @@ static bool _check_old_item_warning( const item_def& item,
                                     operation_types oper )
 {
     item_def old_item;
-    std::string prompt = "";
+    std::string prompt;
     if (oper == OPER_WIELD) // can we safely unwield old item?
     {
-        if (you.equip[EQ_WEAPON] == -1)
+        if (!you.weapon())
             return (true);
 
-        old_item = you.inv[you.equip[EQ_WEAPON]];
+        old_item = *you.weapon();
         if (!has_warning_inscription(old_item, OPER_WIELD))
             return (true);