Mercurial > mm7
diff UI/UICharacter.cpp @ 1989:33787c8938a5
Single and Two-handed ENUM
| author | zipi |
|---|---|
| date | Sat, 02 Nov 2013 17:45:58 +0000 |
| parents | c1c74df0a33e |
| children | 28cb79ae2f6f |
line wrap: on
line diff
--- a/UI/UICharacter.cpp Sat Nov 02 17:24:31 2013 +0000 +++ b/UI/UICharacter.cpp Sat Nov 02 17:45:58 2013 +0000 @@ -777,7 +777,7 @@ pRenderer->DrawMaskToZBuffer(pPaperdoll_BodyX, pPaperdoll_BodyY, pIcons_LOD->GetTexture(papredoll_dbods[uPlayerID - 1]), player->pEquipment.uArmor); //Рука не занята или ... if ( !player->GetItem(&PlayerEquipment::uMainHand) - || ( player->GetMainHandItem()->GetItemEquipType() != EQUIP_MAIN_HAND) + || ( player->GetMainHandItem()->GetItemEquipType() != EQUIP_TWO_HANDED) && (player->GetMainHandItem()->GetItemEquipType() != PLAYER_SKILL_SPEAR || player->GetItem(&PlayerEquipment::uShield)) ) pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_LeftHand[pBodyComplection][0], pPaperdoll_BodyY + pPaperdoll_LeftHand[pBodyComplection][1], @@ -1062,7 +1062,7 @@ } //--------------------------------------------(Hand/Рука)------------------------------------------------------ if ( !player->GetItem(&PlayerEquipment::uMainHand) - || ( player->GetMainHandItem()->GetItemEquipType() != EQUIP_MAIN_HAND) + || ( player->GetMainHandItem()->GetItemEquipType() != EQUIP_TWO_HANDED) && (player->GetMainHandItem()->GetPlayerSkillType() != PLAYER_SKILL_SPEAR || player->GetItem(&PlayerEquipment::uShield)) ) pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_LeftHand[pBodyComplection][0], @@ -1130,7 +1130,7 @@ //---------------------------------------------(Hand2/Рука2)-------------------------------------------------- if ( player->GetItem(&PlayerEquipment::uMainHand) ) { - if ( player->GetMainHandItem()->GetItemEquipType() == EQUIP_MAIN_HAND + if ( player->GetMainHandItem()->GetItemEquipType() == EQUIP_TWO_HANDED || player->GetMainHandItem()->GetPlayerSkillType() == PLAYER_SKILL_SPEAR && !player->GetItem(&PlayerEquipment::uShield) ) pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0], @@ -1161,7 +1161,7 @@ if ( index >= 0 && index < 17 ) { if ( player->GetItem(&PlayerEquipment::uMainHand) - && (player->GetMainHandItem()->GetItemEquipType() == EQUIP_MAIN_HAND + && (player->GetMainHandItem()->GetItemEquipType() == EQUIP_TWO_HANDED || player->GetMainHandItem()->GetPlayerSkillType() == PLAYER_SKILL_SPEAR && !player->GetItem(&PlayerEquipment::uShield) ))//без щита { @@ -1528,7 +1528,7 @@ if ( player->GetItem(&PlayerEquipment::uMainHand)) { item = player->GetMainHandItem(); - if ( item->GetItemEquipType() == EQUIP_MAIN_HAND + if ( item->GetItemEquipType() == EQUIP_TWO_HANDED || item->GetPlayerSkillType() == PLAYER_SKILL_SPEAR && !player->GetItem(&PlayerEquipment::uShield) ) pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0], @@ -2347,7 +2347,7 @@ _this.Reset(); v1 = pPlayers[uActiveCharacter]->pEquipment.uMainHand; v2 = pPlayers[uActiveCharacter]->pEquipment.uShield; - if ( v1 && pPlayers[uActiveCharacter]->pInventoryItemList[v1 - 1].GetItemEquipType() == EQUIP_MAIN_HAND ) + if ( v1 && pPlayers[uActiveCharacter]->pInventoryItemList[v1 - 1].GetItemEquipType() == EQUIP_TWO_HANDED ) v51 = v1; v3 = pParty->pPickedItem.uItemID; if ( pParty->pPickedItem.uItemID ) @@ -2476,7 +2476,7 @@ _this.uBodyAnchor = 1; memcpy(&pPlayers[uActiveCharacter]->pInventoryItemList[v2], &_this, 0x24u); pPlayers[uActiveCharacter]->pEquipment.uShield = v2 + 1; - if ( v51 == EQUIP_OFF_HAND ) + if ( v51 == EQUIP_SINGLE_HANDED ) return; } else @@ -2505,7 +2505,7 @@ pPlayers[uActiveCharacter]->pEquipment.uMainHand = 0; return; //-------------------------taken in hand(взять в руку)------------------------------------------- - case EQUIP_OFF_HAND: + case EQUIP_SINGLE_HANDED: case EQUIP_WAND: if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() && pParty->pPickedItem.uItemID != 64 @@ -2610,7 +2610,7 @@ } break; //---------------------------take two hands(взять двумя руками)--------------------------------- - case EQUIP_MAIN_HAND: + case EQUIP_TWO_HANDED: if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() ) { pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);