Mercurial > mm7

comparison UI/UiGame.cpp @ 1362:d6cf8ead9242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Condition checking functions slightly renamed, some final changes in Player::SetCondition
author Grumpy7
date Mon, 15 Jul 2013 00:42:50 +0200
parents 22cb507446a4
children b51332ab228f
comparison
equal deleted inserted replaced
1361:b3ac17fd12de 1362:d6cf8ead9242
966 window->uFrameHeight = v9; 966 window->uFrameHeight = v9;
967 window->uFrameZ = window->uFrameWidth + window->uFrameX - 1; 967 window->uFrameZ = window->uFrameWidth + window->uFrameX - 1;
968 window->uFrameW = v9 + window->uFrameY - 1; 968 window->uFrameW = v9 + window->uFrameY - 1;
969 window->DrawMessageBox(0); 969 window->DrawMessageBox(0);
970 970
971 if (player->Eradicated()) 971 if (player->IsEradicated())
972 v13 = pTexture_PlayerFaceEradicated; 972 v13 = pTexture_PlayerFaceEradicated;
973 else if (player->Dead()) 973 else if (player->IsDead())
974 v13 = pTexture_PlayerFaceDead; 974 v13 = pTexture_PlayerFaceDead;
975 else 975 else
976 { 976 {
977 uFramesetID = pPlayerFrameTable->GetFrameIdByExpression(player->expression); 977 uFramesetID = pPlayerFrameTable->GetFrameIdByExpression(player->expression);
978 if ( !uFramesetID ) 978 if ( !uFramesetID )
2208 } 2208 }
2209 } 2209 }
2210 2210
2211 for (uint i = 0; i < 4; ++i) 2211 for (uint i = 0; i < 4; ++i)
2212 { 2212 {
2213 auto pPlayer = pParty->pPlayers + i; 2213 Player* pPlayer = pParty->pPlayers + i;
2214 2214
2215 if (pPlayer->Eradicated()) 2215 if (pPlayer->IsEradicated())
2216 { 2216 {
2217 pFace = pTexture_PlayerFaceEradicated; 2217 pFace = pTexture_PlayerFaceEradicated;
2218 pPortrait = pFace; 2218 pPortrait = pFace;
2219 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i]; 2219 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];
2220 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 2220 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
2230 v13 = pPlayer->pPlayerBuffs[13].uExpireTime > 0; 2230 v13 = pPlayer->pPlayerBuffs[13].uExpireTime > 0;
2231 if ( v13 | v12 | v11 | _v1 | v10 ) 2231 if ( v13 | v12 | v11 | _v1 | v10 )
2232 sub_441A4E(i); 2232 sub_441A4E(i);
2233 continue; 2233 continue;
2234 } 2234 }
2235 if (pPlayer->Dead()) 2235 if (pPlayer->IsDead())
2236 { 2236 {
2237 pFace = pTexture_PlayerFaceDead; 2237 pFace = pTexture_PlayerFaceDead;
2238 pPortrait = pFace; 2238 pPortrait = pFace;
2239 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i]; 2239 v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];
2240 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 2240 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )