From 21adf68857438844f7aaf94b537280784ce7769e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 10 Jul 2003 03:36:12 +0000 Subject: [PATCH] work on battle stuff --- stepmania/src/CombinedLifeMeterEnemy.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/stepmania/src/CombinedLifeMeterEnemy.cpp b/stepmania/src/CombinedLifeMeterEnemy.cpp index 887b9d14c8..91ba69317a 100644 --- a/stepmania/src/CombinedLifeMeterEnemy.cpp +++ b/stepmania/src/CombinedLifeMeterEnemy.cpp @@ -88,23 +88,15 @@ void CombinedLifeMeterEnemy::Update( float fDelta ) m_sprHealthStream.SetGlow( RageColor(1,1,1,0) ); m_fLastSeenHealthPercent = GAMESTATE->m_fOpponentHealthPercent; + m_sprFace.SetState( damage ); + m_fSecondsUntilReturnToNormalFace = SECONDS_TO_SHOW_FACE; + if( GAMESTATE->m_fOpponentHealthPercent == 0 ) { m_sprFrame.BeginTweening( 0.5f ); m_sprFrame.SetDiffuse( RageColor(0.5f,0.5f,0.5f,1) ); } } - - - /* - SetFace( Face face ) - - if( GAMESTATE->m_fOpponentHealthPercent == 0 ) - return; - - this->SetState( face ); - m_fSecondsUntilReturnToNormalFace = SECONDS_TO_SHOW_FACE; - */ }