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, 2 insertions, 5 deletions

diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index a7ff0beb02..112ce5b4c2 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -449,11 +449,8 @@ static int _exercise2(int exsk)
         if (best != old_best_skill || old_best_skill == exsk)
             redraw_skill( you.your_name, player_title() );
 
-        if (you.equip[EQ_WEAPON] != -1
-            && item_is_staff( you.inv[you.equip[EQ_WEAPON]] ))
-        {
-            maybe_identify_staff(you.inv[you.equip[EQ_WEAPON]]);
-        }
+        if (you.weapon() && item_is_staff( *you.weapon() ))
+            maybe_identify_staff(*you.weapon());
     }
 
     return (skill_inc);