changeset 2049:73ee77d482f8

Merge
author Ritor1
date Thu, 28 Nov 2013 21:49:06 +0600
parents ed880ccf468f (current diff) 8622640ffa8f (diff)
children bf89a2e9eea1
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Thu Nov 28 21:48:40 2013 +0600
+++ b/Player.cpp	Thu Nov 28 21:49:06 2013 +0600
@@ -1637,17 +1637,17 @@
 int Player::GetRangedAttack()
 {
   int v3; // edi@3
-  int v4; // eax@4
-  int v5; // edi@4
+  //int v4; // eax@4
+  //int v5; // edi@4
   int v6; // edi@4
   int v7; // edi@4
 
   ItemGen* mainHandItem = GetMainHandItem();
   if ( mainHandItem != nullptr && ( mainHandItem->uItemID < ITEM_BLASTER || mainHandItem->uItemID > ITEM_LASER_RIFLE ))
   {
-    v4 = GetActualAccuracy();
-    v5 = GetParameterBonus(v4);
-    v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v5;
+    //v4 = GetActualAccuracy();
+    //v5 = GetParameterBonus(GetActualAccuracy());
+    v6 = GetItemsBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + GetParameterBonus(GetActualAccuracy());
     v7 = GetSkillBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v6;
     v3 = this->_ranged_atk_bonus + GetMagicalBonus(CHARACTER_ATTRIBUTE_RANGED_ATTACK) + v7;
   }