From 0589d3f72a8ea798c99257287b2143efd42204a9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 05:45:10 +0000 Subject: [PATCH] remove noop (if we want these, better to broadcast a message) --- stepmania/src/CombinedLifeMeter.h | 2 -- stepmania/src/CombinedLifeMeterTug.h | 2 -- stepmania/src/ScreenGameplay.cpp | 11 +++-------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/stepmania/src/CombinedLifeMeter.h b/stepmania/src/CombinedLifeMeter.h index 7739f3640d..05123de1b1 100644 --- a/stepmania/src/CombinedLifeMeter.h +++ b/stepmania/src/CombinedLifeMeter.h @@ -19,8 +19,6 @@ public: /* Change life after receiving a hold note grade. tscore is the score * received for the initial tap note. */ virtual void ChangeLife( PlayerNumber pn, HoldNoteScore hns, TapNoteScore tns ) = 0; - virtual bool IsInDanger( PlayerNumber pn ) = 0; - virtual bool IsHot( PlayerNumber pn ) = 0; virtual bool IsFailing( PlayerNumber pn ) = 0; virtual void OnTaunt() {}; }; diff --git a/stepmania/src/CombinedLifeMeterTug.h b/stepmania/src/CombinedLifeMeterTug.h index 72e54e51ce..876fde57a5 100644 --- a/stepmania/src/CombinedLifeMeterTug.h +++ b/stepmania/src/CombinedLifeMeterTug.h @@ -15,8 +15,6 @@ public: virtual void ChangeLife( PlayerNumber pn, TapNoteScore score ); virtual void ChangeLife( PlayerNumber pn, HoldNoteScore score, TapNoteScore tscore ); - virtual bool IsInDanger( PlayerNumber pn ) { return false; }; - virtual bool IsHot( PlayerNumber pn ) { return false; }; virtual bool IsFailing( PlayerNumber pn ) { return false; }; protected: diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 76c38a68d0..ad81b8d67d 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1570,15 +1570,11 @@ void ScreenGameplay::Update( float fDeltaTime ) { pi->GetPlayerState()->m_HealthState = PlayerState::DEAD; } - else if( - (pi->m_pLifeMeter && pi->m_pLifeMeter->IsHot()) || - (m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsHot(pn)) ) + else if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsHot() ) { pi->GetPlayerState()->m_HealthState = PlayerState::HOT; } - else if( - (pi->m_pLifeMeter && pi->m_pLifeMeter->IsInDanger()) || - (m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsInDanger(pn)) ) + else if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsInDanger() ) { pi->GetPlayerState()->m_HealthState = PlayerState::DANGER; } @@ -2333,8 +2329,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) /* Mark failure. This hasn't been done yet if g_bTwoPlayerRecovery is set. */ if( GAMESTATE->GetPlayerFailType(pi->GetPlayerState()) != SongOptions::FAIL_OFF && - (pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) || - (m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing(pi->GetStepsAndTrailIndex())) ) + (pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) ) pi->GetPlayerStageStats()->bFailed = true; if( !pi->GetPlayerStageStats()->bFailed )