Mercurial > might-and-magic-trilogy
diff mm7_4.cpp @ 205:6d982dfab925
8.01.13
author | Ritor1 |
---|---|
date | Tue, 08 Jan 2013 17:29:13 +0600 |
parents | 11a199790ce0 |
children | c38d2f00e3ad |
line wrap: on
line diff
--- a/mm7_4.cpp Mon Jan 07 14:16:50 2013 +0600 +++ b/mm7_4.cpp Tue Jan 08 17:29:13 2013 +0600 @@ -3162,9 +3162,9 @@ //----- (004921C1) -------------------------------------------------------- void GameUI_DrawPortraits(unsigned int _this) { - Texture *v4; // eax@10 + Texture *pFace; // eax@10 unsigned int v7; // eax@17 - PlayerFrame *v8; // eax@21 + PlayerFrame *pFrame; // eax@21 unsigned int v9; // eax@27 bool v10; // eax@33 bool v11; // edi@40 @@ -3172,7 +3172,7 @@ bool v13; // ecx@46 int v16; // eax@57 int v19; // eax@62 - Texture *v20; // [sp-4h] [bp-1Ch]@27 + Texture *pPortrait; // [sp-4h] [bp-1Ch]@27 unsigned int v22; // [sp+14h] [bp-4h]@1 v22 = _this; @@ -3193,14 +3193,14 @@ if (pPlayer->Eradicated()) { - v4 = pTexture_PlayerFaceEradicated; + pFace = pTexture_PlayerFaceEradicated; LABEL_27: - v20 = v4; + pPortrait = pFace; v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i]; if ( pParty->pPartyBuffs[11].uExpireTime ) - pRenderer->_4A6E7E(v9, 0x183u, v20); + pRenderer->_4A6E7E(v9, 0x183u, pPortrait); else - pRenderer->DrawTextureTransparent(v9 + 1, 0x184u, v20); + pRenderer->DrawTextureTransparent(v9 + 1, 0x184u, pPortrait); auto _v1 = 0; v10 = pPlayer->pPlayerBuffs[14].uExpireTime > 0; if (pPlayer->pPlayerBuffs[1].uExpireTime > 0) @@ -3214,10 +3214,9 @@ } if (pPlayer->Dead()) { - v4 = pTexture_PlayerFaceDead; + pFace = pTexture_PlayerFaceDead; goto LABEL_27; } - v7 = 0; for (uint j = 0; j < pPlayerFrameTable->uNumFrames; ++j) if (pPlayerFrameTable->pFrames[j].uSequenceID == pPlayer->uExpressionID) @@ -3225,26 +3224,21 @@ v7 = j; break; } - if ( v7 == 0 ) v7 = 1; if (pPlayer->uExpressionID == 21 ) - v8 = pPlayerFrameTable->GetFrameBy_y( - &pPlayer->field_1AA8, - &pPlayer->field_1AA4, - pMiscTimer->uTimeElapsed); + pFrame = pPlayerFrameTable->GetFrameBy_y(&pPlayer->field_1AA8, &pPlayer->field_1AA4, pMiscTimer->uTimeElapsed); else - v8 = pPlayerFrameTable->GetFrameBy_x(v7, pPlayer->uExpressionTimePassed); - if (pPlayer->field_1AA2 != v8->uTextureID - 1 || v22 ) - { - pPlayer->field_1AA2 = v8->uTextureID - 1; - v4 = (Texture *)pTextures_PlayerFaces[i][v8->uTextureID]; + pFrame = pPlayerFrameTable->GetFrameBy_x(v7, pPlayer->uExpressionTimePassed); + if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 ) + { + pPlayer->field_1AA2 = pFrame->uTextureID - 1; + pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID]; goto LABEL_27; } LABEL_50: ; } - if ( pParty->bTurnBasedModeOn == 1 ) { if ( pTurnEngine->field_4 != 1 ) @@ -3271,10 +3265,8 @@ if ( pParty->uFlags & 0x20 ) v16 = dword_5079C8; } - pRenderer->DrawTextureTransparent( - pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[pElem->uPackedID >> 3] - 4, - 0x181u, - (Texture *)(v16 != -1 ? &pIcons_LOD->pTextures[v16] : 0)); + pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[pElem->uPackedID >> 3] - 4, + 0x181u, (Texture *)(v16 != -1 ? &pIcons_LOD->pTextures[v16] : 0)); } } } @@ -3297,10 +3289,8 @@ if ( pParty->uFlags & 0x20 ) v19 = dword_5079C8; } - pRenderer->DrawTextureTransparent( - pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] - 4, - 0x181u, - (Texture *)(v19 != -1 ? &pIcons_LOD->pTextures[v19] : 0)); + pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] - 4, + 0x181u, (Texture *)(v19 != -1 ? &pIcons_LOD->pTextures[v19] : 0)); } } } @@ -5487,7 +5477,7 @@ if ( v120 && v126 != v120 ) strcpy(Str, (const char *)pKeyActionMap->pPressedKeysBuffer); pGUIWindow_CurrentMenu->DrawTextInRect(pFontCreate, pOrder, 0x7C, 0, Str, 130, 0); - *((short *)pPlayer->pName + 3323) = 1; + *((short *)pPlayer->pName + 3323) = 1; // } } else @@ -5715,11 +5705,11 @@ if ( pMessageQueue_50CBD0->uNumMessages ) pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; - pAudioPlayer->SetMusicVolume((signed __int64)(pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0));// ?? + pAudioPlayer->SetMusicVolume((pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0)); ++pIcons_LOD->uTexturePacksCount; if ( !pIcons_LOD->uNumPrevLoadedFiles ) pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; - pCurrentScreen = 21; + pCurrentScreen = 21;//окно Создания группы uPlayerCreationUI_ArrowAnim = 0; uPlayerCreationUI_SkySliderPos = 0; uPlayerCreationUI_SelectedCharacter = 0;