Mercurial > mm7

comparison UI/UICharacter.cpp @ 1717:baa4eda7f924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing bugs introduced by me :)
author Grumpy7
date Wed, 25 Sep 2013 08:39:03 +0200
parents bc0fa6153fe1
children 421c29d4ab3e
comparison
equal deleted inserted replaced
1716:bc0fa6153fe1 1717:baa4eda7f924
1061 } 1061 }
1062 } 1062 }
1063 //--------------------------------------------(Hand/Рука)------------------------------------------------------ 1063 //--------------------------------------------(Hand/Рука)------------------------------------------------------
1064 if ( !pPlayers[uPlayerID]->pEquipment.uMainHand 1064 if ( !pPlayers[uPlayerID]->pEquipment.uMainHand
1065 || ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetItemEquipType() != EQUIP_MAIN_HAND) 1065 || ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetItemEquipType() != EQUIP_MAIN_HAND)
1066 && (pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetItemEquipType() != PLAYER_SKILL_SPEAR 1066 && (pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand -1].GetPlayerSkillType() != PLAYER_SKILL_SPEAR
1067 || pPlayers[uPlayerID]->pEquipment.uShield) ) 1067 || pPlayers[uPlayerID]->pEquipment.uShield) )
1068 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_LeftHand[pBodyComplection][0], 1068 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_LeftHand[pBodyComplection][0],
1069 pPaperdoll_BodyY + pPaperdoll_LeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlads[uPlayerID - 1])); 1069 pPaperdoll_BodyY + pPaperdoll_LeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlads[uPlayerID - 1]));
1070 //--------------------------------------------(Belt/Пояс)------------------------------------------------------- 1070 //--------------------------------------------(Belt/Пояс)-------------------------------------------------------
1071 if ( pPlayers[uPlayerID]->pEquipment.uBelt ) 1071 if ( pPlayers[uPlayerID]->pEquipment.uBelt )
1129 } 1129 }
1130 //---------------------------------------------(Hand2/Рука2)-------------------------------------------------- 1130 //---------------------------------------------(Hand2/Рука2)--------------------------------------------------
1131 if ( pPlayers[uPlayerID]->pEquipment.uMainHand ) 1131 if ( pPlayers[uPlayerID]->pEquipment.uMainHand )
1132 { 1132 {
1133 if ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetItemEquipType() == EQUIP_MAIN_HAND 1133 if ( pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetItemEquipType() == EQUIP_MAIN_HAND
1134 || pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetItemEquipType() == PLAYER_SKILL_SPEAR 1134 || pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1].GetPlayerSkillType() == PLAYER_SKILL_SPEAR
1135 && !pPlayers[uPlayerID]->pEquipment.uShield ) 1135 && !pPlayers[uPlayerID]->pEquipment.uShield )
1136 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0], 1136 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0],
1137 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1])); 1137 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
1138 } 1138 }
1139 //--------------------------------(Shoulder/Плечи)--------------------------------------------- 1139 //--------------------------------(Shoulder/Плечи)---------------------------------------------
1524 //--------------------------------------------------------(LeftHand/Левая рука)---------------------------------------------------- 1524 //--------------------------------------------------------(LeftHand/Левая рука)----------------------------------------------------
1525 if ( pPlayers[uPlayerID]->pEquipment.uMainHand ) 1525 if ( pPlayers[uPlayerID]->pEquipment.uMainHand )
1526 { 1526 {
1527 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1]; 1527 item = &pPlayers[uPlayerID]->pInventoryItemList[pPlayers[uPlayerID]->pEquipment.uMainHand - 1];
1528 if ( item->GetItemEquipType() == EQUIP_MAIN_HAND 1528 if ( item->GetItemEquipType() == EQUIP_MAIN_HAND
1529 || item->GetItemEquipType() == PLAYER_SKILL_SPEAR 1529 || item->GetPlayerSkillType() == PLAYER_SKILL_SPEAR
1530 && !pPlayers[uPlayerID]->pEquipment.uShield ) 1530 && !pPlayers[uPlayerID]->pEquipment.uShield )
1531 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0], 1531 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0],
1532 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], 1532 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1],
1533 pIcons_LOD->GetTexture(papredoll_dlhus[uPlayerID - 1])); 1533 pIcons_LOD->GetTexture(papredoll_dlhus[uPlayerID - 1]));
1534 } 1534 }