Mercurial > mm7

comparison UI/UICharacter.cpp @ 2490:0a0c6d75aabe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
two_handed_left_fist
author Ritor1
date Fri, 12 Sep 2014 18:05:26 +0600
parents 0683c0a38282
children 7b076fe64f23
comparison
equal deleted inserted replaced
2489:ceda74e07201 2490:0a0c6d75aabe
745 char *v166; // [sp-8h] [bp-54h]@16 745 char *v166; // [sp-8h] [bp-54h]@16
746 const char *container; // [sp-8h] [bp-54h]@79 746 const char *container; // [sp-8h] [bp-54h]@79
747 char *v181; // [sp-8h] [bp-54h]@337 747 char *v181; // [sp-8h] [bp-54h]@337
748 int item_Y; // [sp+10h] [bp-3Ch]@38 748 int item_Y; // [sp+10h] [bp-3Ch]@38
749 int pBodyComplection; // [sp+24h] [bp-28h]@6 749 int pBodyComplection; // [sp+24h] [bp-28h]@6
750 signed int v245; // [sp+34h] [bp-18h]@361 750 bool two_handed_left_fist; // [sp+34h] [bp-18h]@361
751 signed int IsDwarf; // [sp+40h] [bp-Ch]@4 751 signed int IsDwarf; // [sp+40h] [bp-Ch]@4
752 752
753 pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE); 753 pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE);
754 if (player->GetRace() == CHARACTER_RACE_DWARF) 754 if (player->GetRace() == CHARACTER_RACE_DWARF)
755 { 755 {
1127 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v75), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1127 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v75), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1128 GetTickCount() * 0.1, 0, 255); 1128 GetTickCount() * 0.1, 0, 255);
1129 } 1129 }
1130 } 1130 }
1131 } 1131 }
1132 //---------------------------------------------(Hand2/Рука2)-------------------------------------------------- 1132
1133 if ( player->GetItem(&PlayerEquipment::uMainHand) )
1134 {
1135 if ( player->GetMainHandItem()->GetItemEquipType() == EQUIP_TWO_HANDED
1136 || player->GetMainHandItem()->GetPlayerSkillType() == PLAYER_SKILL_SPEAR
1137 && !player->GetItem(&PlayerEquipment::uShield) )
1138 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0],
1139 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
1140 }
1141 //--------------------------------(Shoulder/Плечи)--------------------------------------------- 1133 //--------------------------------(Shoulder/Плечи)---------------------------------------------
1142 if (player->GetItem(&PlayerEquipment::uArmor)) 1134 if (player->GetItem(&PlayerEquipment::uArmor))
1143 { 1135 {
1144 item = player->GetArmorItem(); 1136 item = player->GetArmorItem();
1145 switch ( item->uItemID ) 1137 switch ( item->uItemID )
1456 if ( item->GetPlayerSkillType() == PLAYER_SKILL_DAGGER 1448 if ( item->GetPlayerSkillType() == PLAYER_SKILL_DAGGER
1457 || item->GetPlayerSkillType() == PLAYER_SKILL_SWORD ) 1449 || item->GetPlayerSkillType() == PLAYER_SKILL_SWORD )
1458 { 1450 {
1459 //v151 = item->uItemID - 400; 1451 //v151 = item->uItemID - 400;
1460 item_X = 596; 1452 item_X = 596;
1461 v245 = 1; 1453 two_handed_left_fist = true;
1462 switch ( item->uItemID ) 1454 switch ( item->uItemID )
1463 { 1455 {
1464 case 400: 1456 case 400:
1465 item_Y = 86; 1457 item_Y = 86;
1466 break; 1458 break;
1477 break; 1469 break;
1478 } 1470 }
1479 } 1471 }
1480 else 1472 else
1481 { 1473 {
1482 v245 = 0; 1474 two_handed_left_fist = false;
1483 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][0][0] - pItemsTable->pItems[item->uItemID].uEquipX; 1475 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][0][0] - pItemsTable->pItems[item->uItemID].uEquipX;
1484 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][0][1] - pItemsTable->pItems[item->uItemID].uEquipY; 1476 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][0][1] - pItemsTable->pItems[item->uItemID].uEquipY;
1485 } 1477 }
1486 v153 = pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE); 1478 v153 = pIcons_LOD->LoadTexture(item->GetIconName(), TEXTURE_16BIT_PALETTE);
1487 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) ) 1479 if ( !(item->uAttributes & ITEM_ENCHANT_ANIMATION) )
1490 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1482 pRenderer->DrawTransparentRedShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1491 else 1483 else
1492 { 1484 {
1493 //v160 = (char *)pIcons_LOD->GetTexture(v153); 1485 //v160 = (char *)pIcons_LOD->GetTexture(v153);
1494 if ( !(item->uAttributes & ITEM_IDENTIFIED) ) 1486 if ( !(item->uAttributes & ITEM_IDENTIFIED) )
1495 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1487 pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1496 else 1488 else
1497 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v153)); 1489 pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v153));
1498 } 1490 }
1499 } 1491 }
1500 else 1492 else
1514 item->uAttributes &= 0xFFFFFF0Fu; 1506 item->uAttributes &= 0xFFFFFF0Fu;
1515 ptr_50C9A4_ItemToEnchant = nullptr; 1507 ptr_50C9A4_ItemToEnchant = nullptr;
1516 } 1508 }
1517 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v153), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE), 1509 pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v153), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
1518 GetTickCount() * 0.1, 0, 255); 1510 GetTickCount() * 0.1, 0, 255);
1519 if ( v245 ) 1511 }
1520 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0], 1512 if ( two_handed_left_fist )//two-handed - left fist/двуручие - левая кисть
1513 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0],
1521 pPaperdoll_BodyY + pPaperdollLeftEmptyHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlhs[uPlayerID - 1])); 1514 pPaperdoll_BodyY + pPaperdollLeftEmptyHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlhs[uPlayerID - 1]));
1522 }
1523 if ( !bRingsShownInCharScreen ) 1515 if ( !bRingsShownInCharScreen )
1524 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(v153), player->pEquipment.uShield); 1516 pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(v153), player->pEquipment.uShield);
1525 } 1517 }
1526 } 1518 }
1527 //--------------------------------------------------------(RightHand/Правая рука)-------------------------------------------------- 1519 //--------------------------------------------------------(RightHand/Правая кисть)--------------------------------------------------
1528 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_RightHand[pBodyComplection][0], pPaperdoll_BodyY + pPaperdoll_RightHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_drhs[uPlayerID - 1])); 1520 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_RightHand[pBodyComplection][0], pPaperdoll_BodyY + pPaperdoll_RightHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_drhs[uPlayerID - 1]));
1529 //--------------------------------------------------------(LeftHand/Левая рука)---------------------------------------------------- 1521 //---------------------------------------------(two-handed - hand/Двуручие - рука)--------------------------------------------------
1522 if ( player->GetItem(&PlayerEquipment::uMainHand) )
1523 {
1524 if ( player->GetMainHandItem()->GetItemEquipType() == EQUIP_TWO_HANDED
1525 || player->GetMainHandItem()->GetPlayerSkillType() == PLAYER_SKILL_SPEAR
1526 && !player->GetItem(&PlayerEquipment::uShield) )
1527 pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_SecondLeftHand[pBodyComplection][0],
1528 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
1529 }
1530 //--------------------------------------------------------(two-handed - fist/двуручие - кисть)----------------------------------------------------
1530 if ( player->GetItem(&PlayerEquipment::uMainHand)) 1531 if ( player->GetItem(&PlayerEquipment::uMainHand))
1531 { 1532 {
1532 item = player->GetMainHandItem(); 1533 item = player->GetMainHandItem();
1533 if ( item->GetItemEquipType() == EQUIP_TWO_HANDED 1534 if ( item->GetItemEquipType() == EQUIP_TWO_HANDED
1534 || item->GetPlayerSkillType() == PLAYER_SKILL_SPEAR 1535 || item->GetPlayerSkillType() == PLAYER_SKILL_SPEAR