Changed: Merge changes from next patch
This commit is contained in:
parent
15158c4514
commit
8d099d236a
1 changed files with 1 additions and 1 deletions
|
@ -18084,7 +18084,7 @@ void CCharacter::resetTpTicketSlot()
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void CCharacter::updateParry(ITEMFAMILY::EItemFamily family, SKILLS::ESkills skill)
|
void CCharacter::updateParry(ITEMFAMILY::EItemFamily family, SKILLS::ESkills skill)
|
||||||
{
|
{
|
||||||
if (family == ITEMFAMILY::MELEE_WEAPON && skill < SKILLS::NUM_SKILLS)
|
if ((family == ITEMFAMILY::MELEE_WEAPON || family == ITEMFAMILY::RANGE_WEAPON) && skill < SKILLS::NUM_SKILLS)
|
||||||
_CurrentParrySkill = skill;
|
_CurrentParrySkill = skill;
|
||||||
else
|
else
|
||||||
_CurrentParrySkill = BarehandCombatSkill;
|
_CurrentParrySkill = BarehandCombatSkill;
|
||||||
|
|
Loading…
Reference in a new issue