# HG changeset patch # User Ritor1 # Date 1385469908 -21600 # Node ID 8622640ffa8f95d4fbf634db645407254eb8d530 # Parent da35dc35d6353d8ab1eea81d14ecb89ea5bc2171# Parent 2ccf638342d6b73283f4b07272c8540b14616afb Merge diff -r 2ccf638342d6 -r 8622640ffa8f Player.cpp --- 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; }