Mercurial > mm7

diff UI/UIRest.cpp @ 1361:b3ac17fd12de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved condition checking to a separate class, extracted it from player::SetCondition
author Grumpy7
date Sun, 14 Jul 2013 23:22:43 +0200
parents 8c2f689b5f0b
children d6cf8ead9242
line wrap: on
line diff
--- a/UI/UIRest.cpp	Sat Jul 13 21:36:35 2013 +0200
+++ b/UI/UIRest.cpp	Sun Jul 14 23:22:43 2013 +0200
@@ -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]->Dead() && !pPlayers[i]->Eradicated() && pPlayers[i]->sHealth > 0 )
             ++live_characters;
 
     if ( live_characters )