actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove noop (if we want these, better to broadcast a message)

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-09 05:45:10 +00:00
parent 0e69f069e7
commit 0589d3f72a
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CombinedLifeMeter.h
-2
View File
@@ -19,8 +19,6 @@ public:
/* Change life after receiving a hold note grade. tscore is the score /* Change life after receiving a hold note grade. tscore is the score
* received for the initial tap note. */ * received for the initial tap note. */
virtual void ChangeLife( PlayerNumber pn, HoldNoteScore hns, TapNoteScore tns ) = 0; 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 bool IsFailing( PlayerNumber pn ) = 0;
virtual void OnTaunt() {}; virtual void OnTaunt() {};
}; };
stepmania/src/CombinedLifeMeterTug.h
-2
View File
@@ -15,8 +15,6 @@ public:
virtual void ChangeLife( PlayerNumber pn, TapNoteScore score ); virtual void ChangeLife( PlayerNumber pn, TapNoteScore score );
virtual void ChangeLife( PlayerNumber pn, HoldNoteScore score, TapNoteScore tscore ); 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; }; virtual bool IsFailing( PlayerNumber pn ) { return false; };
protected: protected:
stepmania/src/ScreenGameplay.cpp
+3 -8
View File
@@ -1570,15 +1570,11 @@ void ScreenGameplay::Update( float fDeltaTime )
{ {
pi->GetPlayerState()->m_HealthState = PlayerState::DEAD; pi->GetPlayerState()->m_HealthState = PlayerState::DEAD;
} }
else if( else if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsHot() )
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsHot()) ||
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsHot(pn)) )
{ {
pi->GetPlayerState()->m_HealthState = PlayerState::HOT; pi->GetPlayerState()->m_HealthState = PlayerState::HOT;
} }
else if( else if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsInDanger() )
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsInDanger()) ||
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsInDanger(pn)) )
{ {
pi->GetPlayerState()->m_HealthState = PlayerState::DANGER; 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. */ /* Mark failure. This hasn't been done yet if g_bTwoPlayerRecovery is set. */
if( GAMESTATE->GetPlayerFailType(pi->GetPlayerState()) != SongOptions::FAIL_OFF && if( GAMESTATE->GetPlayerFailType(pi->GetPlayerState()) != SongOptions::FAIL_OFF &&
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) || (pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) )
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing(pi->GetStepsAndTrailIndex())) )
pi->GetPlayerStageStats()->bFailed = true; pi->GetPlayerStageStats()->bFailed = true;
if( !pi->GetPlayerStageStats()->bFailed ) if( !pi->GetPlayerStageStats()->bFailed )