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

move GetSumOfActiveAttackLevels into PlayerState

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-07 21:24:59 +00:00
parent 4f417bcce2
commit c2176f01b2
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+2 -12
View File
@@ -327,6 +327,7 @@ void GameState::BeginGame()
void GameState::PlayersFinalized()
{
// If cards are already locked, this was already called.
if( MEMCARDMAN->GetCardsLocked() )
return;
@@ -1268,7 +1269,7 @@ void GameState::RebuildPlayerOptionsFromActiveAttacks( PlayerNumber pn )
m_pPlayerState[pn]->m_PlayerOptions = po;
int iSumOfAttackLevels = GetSumOfActiveAttackLevels( pn );
int iSumOfAttackLevels = m_pPlayerState[pn]->GetSumOfActiveAttackLevels();
if( iSumOfAttackLevels > 0 )
{
m_pPlayerState[pn]->m_iLastPositiveSumOfAttackLevels = iSumOfAttackLevels;
@@ -1287,17 +1288,6 @@ void GameState::RemoveAllActiveAttacks() // called on end of song
RemoveActiveAttacksForPlayer( p );
}
int GameState::GetSumOfActiveAttackLevels( PlayerNumber pn ) const
{
int iSum = 0;
for( unsigned s=0; s<m_pPlayerState[pn]->m_ActiveAttacks.size(); s++ )
if( m_pPlayerState[pn]->m_ActiveAttacks[s].fSecsRemaining > 0 && m_pPlayerState[pn]->m_ActiveAttacks[s].level != NUM_ATTACK_LEVELS )
iSum += m_pPlayerState[pn]->m_ActiveAttacks[s].level;
return iSum;
}
template<class T>
void setmin( T &a, const T &b )
{