diff UI/UICharacter.cpp @ 2490:0a0c6d75aabe

two_handed_left_fist
author Ritor1
date Fri, 12 Sep 2014 18:05:26 +0600
parents 0683c0a38282
children 7b076fe64f23
line wrap: on
line diff
--- a/UI/UICharacter.cpp	Thu Sep 11 17:30:59 2014 +0600
+++ b/UI/UICharacter.cpp	Fri Sep 12 18:05:26 2014 +0600
@@ -747,7 +747,7 @@
   char *v181; // [sp-8h] [bp-54h]@337
   int item_Y; // [sp+10h] [bp-3Ch]@38
   int pBodyComplection; // [sp+24h] [bp-28h]@6
-  signed int v245; // [sp+34h] [bp-18h]@361
+  bool two_handed_left_fist; // [sp+34h] [bp-18h]@361
   signed int IsDwarf; // [sp+40h] [bp-Ch]@4
 
   pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE);
@@ -1129,15 +1129,7 @@
           }
         }
       }
-      //---------------------------------------------(Hand2/Рука2)--------------------------------------------------
-      if ( player->GetItem(&PlayerEquipment::uMainHand) )
-      {
-        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],
-                     pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
-      }
+
       //--------------------------------(Shoulder/Плечи)---------------------------------------------
       if (player->GetItem(&PlayerEquipment::uArmor))
       {
@@ -1458,7 +1450,7 @@
       {
         //v151 = item->uItemID - 400;
         item_X = 596;
-        v245 = 1;
+        two_handed_left_fist = true;
         switch ( item->uItemID )
         {
           case 400:
@@ -1479,7 +1471,7 @@
       }
       else
       {
-        v245 = 0;
+        two_handed_left_fist = false;
         item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][0][0] - pItemsTable->pItems[item->uItemID].uEquipX;
         item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][0][1] - pItemsTable->pItems[item->uItemID].uEquipY;
       }
@@ -1492,7 +1484,7 @@
         {
           //v160 = (char *)pIcons_LOD->GetTexture(v153);
           if ( !(item->uAttributes & ITEM_IDENTIFIED) )
-          pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
+            pRenderer->DrawTransparentGreenShade(item_X, item_Y, pIcons_LOD->GetTexture(v153));
           else
             pRenderer->DrawTextureTransparent(item_X, item_Y, pIcons_LOD->GetTexture(v153));
         }
@@ -1516,17 +1508,26 @@
         }
         pRenderer->DrawAura(item_X, item_Y, pIcons_LOD->GetTexture(v153), pIcons_LOD->LoadTexturePtr(container, TEXTURE_16BIT_PALETTE),
                      GetTickCount() * 0.1, 0, 255);
-        if ( v245 )
-          pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0],
+      }
+      if ( two_handed_left_fist )//two-handed - left fist/двуручие - левая кисть
+        pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdollLeftEmptyHand[pBodyComplection][0],
                  pPaperdoll_BodyY + pPaperdollLeftEmptyHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlhs[uPlayerID - 1]));
-      }
       if ( !bRingsShownInCharScreen )
         pRenderer->DrawMaskToZBuffer(item_X, item_Y, pIcons_LOD->GetTexture(v153), player->pEquipment.uShield);
     }
   }
-  //--------------------------------------------------------(RightHand/Правая рука)--------------------------------------------------
+  //--------------------------------------------------------(RightHand/Правая кисть)--------------------------------------------------
   pRenderer->DrawTextureTransparent(pPaperdoll_BodyX + pPaperdoll_RightHand[pBodyComplection][0], pPaperdoll_BodyY + pPaperdoll_RightHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_drhs[uPlayerID - 1]));
-  //--------------------------------------------------------(LeftHand/Левая рука)----------------------------------------------------
+  //---------------------------------------------(two-handed - hand/Двуручие - рука)--------------------------------------------------
+  if ( player->GetItem(&PlayerEquipment::uMainHand) )
+  {
+    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],
+                 pPaperdoll_BodyY + pPaperdoll_SecondLeftHand[pBodyComplection][1], pIcons_LOD->GetTexture(papredoll_dlaus[uPlayerID - 1]));
+  }
+  //--------------------------------------------------------(two-handed - fist/двуручие - кисть)----------------------------------------------------
   if ( player->GetItem(&PlayerEquipment::uMainHand))
   {
     item = player->GetMainHandItem();