# HG changeset patch # User Ritor1 # Date 1385653746 -21600 # Node ID 73ee77d482f8eb7042c10df50e75c6cf8c9a8c7a # Parent ed880ccf468fa4aa2ba6b66a345b5abf7044b674# Parent 8622640ffa8f95d4fbf634db645407254eb8d530 Merge diff -r ed880ccf468f -r 73ee77d482f8 Player.cpp --- 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; }