Mercurial > mm7

comparison UI/UiGame.cpp @ 1407:d4f57df4c299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PlayerSpeechID and uSpeakingCharacter
author Ritor1
date Tue, 23 Jul 2013 16:34:00 +0600
parents d071e0e9ba75
children 38df78aba732
comparison
equal deleted inserted replaced
1406:d071e0e9ba75 1407:d4f57df4c299
2190 bool v12; // edx@43 2190 bool v12; // edx@43
2191 bool v13; // ecx@46 2191 bool v13; // ecx@46
2192 int v16; // eax@57 2192 int v16; // eax@57
2193 int v19; // eax@62 2193 int v19; // eax@62
2194 Texture *pPortrait; // [sp-4h] [bp-1Ch]@27 2194 Texture *pPortrait; // [sp-4h] [bp-1Ch]@27
2195 unsigned int v22; // [sp+14h] [bp-4h]@1 2195 //unsigned int v22; // [sp+14h] [bp-4h]@1
2196 2196
2197 v22 = _this; 2197 //v22 = _this;
2198 if ( qword_A750D8 ) 2198 if ( qword_A750D8 )
2199 { 2199 {
2200 qword_A750D8 -= (signed int)pMiscTimer->uTimeElapsed; 2200 qword_A750D8 -= (signed int)pMiscTimer->uTimeElapsed;
2201 if ( qword_A750D8 <= 0 ) 2201 if ( qword_A750D8 <= 0 )
2202 { 2202 {
2203 if ( pPlayers[word_A750E2]->CanAct() ) 2203 if ( pPlayers[uSpeakingCharacter]->CanAct() )
2204 pPlayers[word_A750E2]->PlaySound(PlayerSpeechID, 0); 2204 pPlayers[uSpeakingCharacter]->PlaySound(PlayerSpeechID, 0);
2205 qword_A750D8 = 0i64; 2205 qword_A750D8 = 0i64;
2206 } 2206 }
2207 } 2207 }
2208 2208
2209 for (uint i = 0; i < 4; ++i) 2209 for (uint i = 0; i < 4; ++i)
2210 { 2210 {
2211 Player* pPlayer = pParty->pPlayers + i; 2211 Player* pPlayer = &pParty->pPlayers[i];
2212 2212
2213 if (pPlayer->IsEradicated()) 2213 if (pPlayer->IsEradicated())
2214 { 2214 {
2215 pFace = pTexture_PlayerFaceEradicated; 2215 pFace = pTexture_PlayerFaceEradicated;
2216 pPortrait = pFace; 2216 pPortrait = pFace;
2261 v7 = 1; 2261 v7 = 1;
2262 if (pPlayer->expression == CHARACTER_EXPRESSION_21) 2262 if (pPlayer->expression == CHARACTER_EXPRESSION_21)
2263 pFrame = pPlayerFrameTable->GetFrameBy_y(&pPlayer->_expression21_frameset, &pPlayer->_expression21_animtime, pMiscTimer->uTimeElapsed); 2263 pFrame = pPlayerFrameTable->GetFrameBy_y(&pPlayer->_expression21_frameset, &pPlayer->_expression21_animtime, pMiscTimer->uTimeElapsed);
2264 else 2264 else
2265 pFrame = pPlayerFrameTable->GetFrameBy_x(v7, pPlayer->uExpressionTimePassed); 2265 pFrame = pPlayerFrameTable->GetFrameBy_x(v7, pPlayer->uExpressionTimePassed);
2266 if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 ) 2266 if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || _this )
2267 { 2267 {
2268 pPlayer->field_1AA2 = pFrame->uTextureID - 1; 2268 pPlayer->field_1AA2 = pFrame->uTextureID - 1;
2269 pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID]; 2269 pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
2270 pPortrait = pFace; 2270 pPortrait = pFace;
2271 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i]; 2271 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];