diff UI/UICharacter.cpp @ 1496:ab6bf38b2940

UIGame.cpp cleaning(continue)
author Ritor1
date Sun, 01 Sep 2013 17:10:29 +0600
parents f62e6d06acac
children a109bb203e28
line wrap: on
line diff
--- a/UI/UICharacter.cpp	Fri Aug 30 01:49:29 2013 +0600
+++ b/UI/UICharacter.cpp	Sun Sep 01 17:10:29 2013 +0600
@@ -2325,35 +2325,17 @@
   unsigned __int16 v5; // ax@7
   int v7; // esi@27
   int v8; // eax@29
-  //int v10; // esi@34
-  //int v12; // esi@38
-  //char v14; // zf@38
-  //int v15; // esi@42
   int v17; // eax@44
   unsigned int v18; // ecx@55
   unsigned int v19; // eax@55
-  //int v20; // esi@60
   unsigned int v22; // eax@61
   int v23; // eax@62
-  //int v24; // esi@65
-  //int v25; // eax@65
   int v26; // eax@69
-  //int v27; // esi@81
-  //int v28; // eax@81
-  //int v29; // esi@84
-  //int v30; // eax@84
-  //int v31; // eax@85
-  unsigned int v32; // ecx@88
-  unsigned int v33; // eax@88
   int v34; // esi@90
-  //unsigned int v35; // eax@91
   int v36; // esi@93
-  int v37; // edi@93
   ItemGen *v38; // edi@93
-  //__int16 v39; // dx@99
   ItemGen _this; // [sp+Ch] [bp-40h]@1
   unsigned int v48; // [sp+30h] [bp-1Ch]@88
-  //unsigned int v49; // [sp+34h] [bp-18h]@57
   unsigned int v50; // [sp+38h] [bp-14h]@50
   int v51; // [sp+3Ch] [bp-10h]@1
   int v52; // [sp+40h] [bp-Ch]@5
@@ -2363,8 +2345,6 @@
   _this.Reset();
   v1 = pPlayers[uActiveCharacter]->pEquipment.uMainHand;
   v2 = pPlayers[uActiveCharacter]->pEquipment.uShield;
-  //v54 = pPlayers[uActiveCharacter]->pEquipment.uShield;
-  //v53 = v1;
   if ( v1 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1 - 1]].uEquipType == EQUIP_MAIN_HAND )
     v51 = v1;
   v3 = pParty->pPickedItem.uItemID;
@@ -2411,7 +2391,6 @@
       WetsuitOn(uActiveCharacter);
       return;
     }
-    //v6 = v52;
     switch ( pEquipType )
     {
       case EQUIP_BOW:
@@ -2511,8 +2490,8 @@
             pPlayers[uActiveCharacter]->pEquipment.uShield = v17;
             pMouse->RemoveHoldingItem();
             return;
-          }//ставим щит когда держит двуручный меч
-          v1--;
+          }
+          v1--;//ставим щит когда держит двуручный меч
           memcpy(&_this, &pParty->pPickedItem, sizeof(_this));
           pPlayers[uActiveCharacter]->pInventoryItemList[v1].uBodyAnchor = 0;
           pParty->pPickedItem.Reset();
@@ -2685,19 +2664,16 @@
         return;
 //-------------------------------------------------------------------------------
       default:
-        pPlayers[uActiveCharacter]->UseItem_DrinkPotion_etc(uActiveCharacter, 0);
+        pPlayers[uActiveCharacter]->UseItem_DrinkPotion_etc(uActiveCharacter, 0);//выпить напиток и др.
         return;
     }
     return;
   }
 
-  v32 = pMouse->uMouseClickX;
-  v33 = pMouse->uMouseClickY;
-  v34 = pRenderer->pActiveZBuffer[v32 + pSRZBufferLineOffsets[v33]] & 0xFFFF;
+  v34 = pRenderer->pActiveZBuffer[pMouse->uMouseClickX + pSRZBufferLineOffsets[pMouse->uMouseClickY]] & 0xFFFF;
   if ( v34 )
   {
     v36 = v34 - 1;
-    v37 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v36);
     v38 = &pPlayers[uActiveCharacter]->pInventoryItemList[v36];
     pEquipType = pItemsTable->pItems[v38->uItemID].uEquipType;
     if ( v38->uItemID == ITEM_WETSUIT )