Mercurial > mm7

diff UI/UIRest.cpp @ 1369:6b4a1c44a56f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Mon, 15 Jul 2013 08:20:28 +0400
parents d6cf8ead9242
children e6908823897f
line wrap: on
line diff
--- a/UI/UIRest.cpp	Mon Jul 15 08:18:35 2013 +0400
+++ b/UI/UIRest.cpp	Mon Jul 15 08:20:28 2013 +0400
@@ -105,7 +105,7 @@
     text_color =   TargetColor(10, 0, 0);
     shadow_color = TargetColor(230, 214, 193);
     for(int i=1; i<5; ++i)
-        if ( !pPlayers[i]->pConditions[Player::Condition_Dead] && !pPlayers[i]->pConditions[Player::Condition_Eradicated] && pPlayers[i]->sHealth > 0 )
+        if ( !pPlayers[i]->IsDead() && !pPlayers[i]->IsEradicated() && pPlayers[i]->sHealth > 0 )
             ++live_characters;
 
     if ( live_characters )