Mercurial > mm7

changeset 2047:8622640ffa8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Tue, 26 Nov 2013 18:45:08 +0600
parents da35dc35d635 (diff) 2ccf638342d6 (current diff)
children 73ee77d482f8
files lib/swig/swigwin-2.0.11/UIControlModule.swig
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Tue Nov 26 17:49:42 2013 +0600
+++ b/Player.cpp	Tue Nov 26 18:45:08 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;
   }