Mercurial > mm7

comparison UI/UIRest.cpp @ 1371:d1c8121cf0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 15 Jul 2013 15:03:56 +0600
parents d6cf8ead9242
children e6908823897f
comparison
equal deleted inserted replaced
1370:14695590d7a6 1371:d1c8121cf0ad
103 103
104 live_characters = 0; 104 live_characters = 0;
105 text_color = TargetColor(10, 0, 0); 105 text_color = TargetColor(10, 0, 0);
106 shadow_color = TargetColor(230, 214, 193); 106 shadow_color = TargetColor(230, 214, 193);
107 for(int i=1; i<5; ++i) 107 for(int i=1; i<5; ++i)
108 if ( !pPlayers[i]->pConditions[Player::Condition_Dead] && !pPlayers[i]->pConditions[Player::Condition_Eradicated] && pPlayers[i]->sHealth > 0 ) 108 if ( !pPlayers[i]->IsDead() && !pPlayers[i]->IsEradicated() && pPlayers[i]->sHealth > 0 )
109 ++live_characters; 109 ++live_characters;
110 110
111 if ( live_characters ) 111 if ( live_characters )
112 { 112 {
113 pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_RestUI_restmain)); 113 pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_RestUI_restmain));