Mercurial > mm7
diff UI/UICharacter.cpp @ 1484:62c7f07bc05a
UICharacter.cpp cleaning(continue) OnPaperdollLeftClick(3)
author | Ritor1 |
---|---|
date | Thu, 29 Aug 2013 18:08:02 +0600 |
parents | 223605b325b3 |
children | 58d43397b827 |
line wrap: on
line diff
--- a/UI/UICharacter.cpp Thu Aug 29 12:04:55 2013 +0600 +++ b/UI/UICharacter.cpp Thu Aug 29 18:08:02 2013 +0600 @@ -2323,22 +2323,16 @@ unsigned int v3; // edx@4 unsigned int pSkillType; // esi@5 unsigned __int16 v5; // ax@7 - //unsigned int v6; // edi@19 int v7; // esi@27 int v8; // eax@29 - //int v9; // edx@32 int v10; // esi@34 - //int v11; // eax@34 int v12; // esi@38 - //int v13; // eax@38 char v14; // zf@38 int v15; // esi@42 - //int v16; // eax@42 int v17; // eax@44 unsigned int v18; // ecx@55 unsigned int v19; // eax@55 int v20; // esi@60 - //int v21; // eax@60 unsigned int v22; // eax@61 int v23; // eax@62 int v24; // esi@65 @@ -2367,7 +2361,6 @@ v51 = 0; _this.Reset(); - //v0 = pPlayers[uActiveCharacter]; v1 = pPlayers[uActiveCharacter]->pEquipment.uMainHand; v2 = pPlayers[uActiveCharacter]->pEquipment.uShield; //v54 = pPlayers[uActiveCharacter]->pEquipment.uShield; @@ -2397,14 +2390,14 @@ if ( (pSkillType == 8 || pSkillType == 1 || pSkillType == 2) && v1 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1-1]].uSkillType == 4 ) - { + { LOBYTE(v5) = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_SPEAR); if ( (signed int)SkillToMastery(v5) < 3 ) { pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); return; } - } + } } if ( !pPlayers[uActiveCharacter]->CanEquip_RaceAndAlignmentCheck(v3) ) { @@ -2470,12 +2463,12 @@ } if ( v52 == 16 )//замещение последнего кольца { - v52 = pPlayers[uActiveCharacter]->pEquipment.uRings[6] - 1; + v52 = pPlayers[uActiveCharacter]->pEquipment.uRings[5] - 1; memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); v10 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v52); *(char *)(v10 + 556) = 0; pParty->pPickedItem.Reset(); - pParty->SetHoldingItem((ItemGen *)(v10 + 532)); + pParty->SetHoldingItem(&pPlayers[uActiveCharacter]->pInventoryItemList[v52]);//(ItemGen *)(v10 + 532) _this.uBodyAnchor = 16; memcpy((void *)(v10 + 532), &_this, 0x24u); pPlayers[uActiveCharacter]->pEquipment.uRings[6] = v52 + 1;