# HG changeset patch
# User Ritor1
# Date 1380092074 -21600
# Node ID 7b6b4ce8da761ff7465a2c960c65acd967a33ae8
# Parent  2c38e17e5a3f2bad939680b6665293207bb7d02f# Parent  baa4eda7f924e60bdaa288a888038c1c539348dd
Слияние

diff -r 2c38e17e5a3f -r 7b6b4ce8da76 Player.cpp
--- a/Player.cpp	Wed Sep 25 12:54:27 2013 +0600
+++ b/Player.cpp	Wed Sep 25 12:54:34 2013 +0600
@@ -2593,9 +2593,9 @@
   if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD) 
       // ADD: shield check because shield recovery is added later and can be accidentally doubled
   {
+    if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery)
+    {
     weapon = GetOffHandItem();
-    if (base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()] > weapon_recovery)
-    {
       weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()];
     }
   }
diff -r 2c38e17e5a3f -r 7b6b4ce8da76 UI/UICharacter.cpp
--- a/UI/UICharacter.cpp	Wed Sep 25 12:54:27 2013 +0600
+++ b/UI/UICharacter.cpp	Wed Sep 25 12:54:34 2013 +0600
@@ -1063,7 +1063,7 @@
     //--------------------------------------------(Hand/����)------------------------------------------------------
     if ( !pPlayers[uPlayerID]->pEquipment.uMainHand
         || ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetItemEquipType() != EQUIP_MAIN_HAND)
-        && (pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetItemEquipType() != PLAYER_SKILL_SPEAR
+        && (pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetPlayerSkillType() != PLAYER_SKILL_SPEAR
         || pPlayers[uPlayerID]->pEquipment.uShield) )
       pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_LeftHand[pBodyComplection][0],
                             pPaperdoll_BodyY + pPaperdoll_LeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlads[uPlayerID - 1]));
@@ -1131,7 +1131,7 @@
       if ( pPlayers[uPlayerID]->pEquipment.uMainHand )
       {
         if ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetItemEquipType() == EQUIP_MAIN_HAND
-             || pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetItemEquipType() == PLAYER_SKILL_SPEAR
+             || pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetPlayerSkillType() == PLAYER_SKILL_SPEAR
              && !pPlayers[uPlayerID]->pEquipment.uShield )
           pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0],
                      pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
@@ -1526,7 +1526,7 @@
   {
     item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1];
     if ( item->GetItemEquipType() == EQUIP_MAIN_HAND
-        || item->GetItemEquipType() == PLAYER_SKILL_SPEAR
+        || item->GetPlayerSkillType() == PLAYER_SKILL_SPEAR
         && !pPlayers[uPlayerID]->pEquipment.uShield )
       pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0], 
                                         pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1],