# HG changeset patch # User Ritor1 # Date 1380090158 -21600 # Node ID 9e81a9147752640c06417ef2e3b82e35ac3231c3 # Parent 8de9b24ace8623391fac8eb6d040f1a09868983a# Parent bc0fa6153fe1f8c656015f1ea85e93645c8fb374 Слияние diff -r 8de9b24ace86 -r 9e81a9147752 UI/UICharacter.cpp --- a/UI/UICharacter.cpp Wed Sep 25 12:22:32 2013 +0600 +++ b/UI/UICharacter.cpp Wed Sep 25 12:22:38 2013 +0600 @@ -2348,7 +2348,7 @@ if ( pParty->pPickedItem.uItemID ) { pEquipType = pParty->pPickedItem.GetItemEquipType(); - pSkillType = pParty->pPickedItem.GetItemEquipType(); + pSkillType = pParty->pPickedItem.GetPlayerSkillType(); if ( pSkillType == 4 ) { if ( v2 )