Fix some invalid assumptions regarding throwing attacks.

Namely, it was using unarmed combat skill for to-hit calculations, and
even then only if you weren't wielding anything.

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc
index 9cad104e6f..73b46ec496 100644
--- a/crawl-ref/source/attack.cc
+++ b/crawl-ref/source/attack.cc
@@ -172,7 +172,7 @@ int attack::calc_to_hit(bool random)
         mhit += maybe_random_div(you.skill(SK_FIGHTING, 100), 100, random);
 
         // weapon skill contribution
-        if (weapon)
+        if (using_weapon())
         {
             if (wpn_skill != SK_FIGHTING)
             {
@@ -186,14 +186,15 @@ int attack::calc_to_hit(bool random)
         else if (you.form_uses_xl())
             mhit += maybe_random_div(you.experience_level * 100, 100, random);
         else
-        {                       // ...you must be unarmed
+        {                       // ...you must be unarmed or throwing
             // Members of clawed species have presumably been using the claws,
             // making them more practiced and thus more accurate in unarmed
             // combat. They keep this benefit even when the claws are covered
             // (or missing because of a change in form).
-            mhit += species_has_claws(you.species) ? 4 : 2;
+            mhit += species_has_claws(you.species)
+                    && wpn_skill == SK_UNARMED_COMBAT ? 4 : 2;
 
-            mhit += maybe_random_div(you.skill(SK_UNARMED_COMBAT, 100), 100,
+            mhit += maybe_random_div(you.skill(wpn_skill, 100), 100,
                                      random);
         }