Mercurial > mm7

diff Player.cpp @ 1717:baa4eda7f924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing bugs introduced by me :)
author Grumpy7
date Wed, 25 Sep 2013 08:39:03 +0200
parents bafc79e65a4d
children 34dd357a489d
line wrap: on
line diff
--- a/Player.cpp	Wed Sep 25 08:13:09 2013 +0200
+++ b/Player.cpp	Wed Sep 25 08:39:03 2013 +0200
@@ -2593,9 +2593,9 @@
   if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) 
       // ADD: shield check because shield recovery is added later and can be accidentally doubled
   {
+    if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery)
+    {
     weapon = GetOffHandItem();
-    if (base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()] > weapon_recovery)
-    {
       weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()];
     }
   }