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

move RebuildPlayerOptionsFromActiveAttacks into PlayerState (SGameplay

Browse Source 
commit in a moment)
This commit is contained in:
Glenn Maynard
2005-07-07 21:29:35 +00:00
parent c2176f01b2
commit fd700eb123
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PlayerState.cpp
+27 -1
View File
@@ -12,13 +12,39 @@ void PlayerState::Update( float fDelta )
m_CurrentPlayerOptions.Approach( m_PlayerOptions, fDelta );
}
void PlayerState::RebuildPlayerOptionsFromActiveAttacks()
{
// rebuild player options
PlayerOptions po = m_StoredPlayerOptions;
for( unsigned s=0; s<m_ActiveAttacks.size(); s++ )
{
if( !m_ActiveAttacks[s].bOn )
continue; /* hasn't started yet */
po.FromString( m_ActiveAttacks[s].sModifiers );
}
m_PlayerOptions = po;
int iSumOfAttackLevels = GetSumOfActiveAttackLevels();
if( iSumOfAttackLevels > 0 )
{
m_iLastPositiveSumOfAttackLevels = iSumOfAttackLevels;
m_fSecondsUntilAttacksPhasedOut = 10000; // any positive number that won't run out before the attacks
}
else
{
// don't change! m_iLastPositiveSumOfAttackLevels[p] = iSumOfAttackLevels;
m_fSecondsUntilAttacksPhasedOut = 2; // 2 seconds to phase out
}
}
int PlayerState::GetSumOfActiveAttackLevels() const
{
int iSum = 0;
for( unsigned s=0; s<m_ActiveAttacks.size(); s++ )
if( m_ActiveAttacks[s].fSecsRemaining > 0 && m_ActiveAttacks[s].level != NUM_ATTACK_LEVELS )
iSum += m_pPlayerState[pn]m_ActiveAttacks[s].level;
iSum += m_ActiveAttacks[s].level;
return iSum;
}