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

working on AttackDisplay

Browse Source
This commit is contained in:
Chris Danford
2003-11-27 02:30:54 +00:00
parent d5a859f877
commit 8ca12364bd
7 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/AttackDisplay.cpp
+25 -6
View File
@@ -14,6 +14,8 @@
#include "ThemeManager.h"
#include "GameState.h"
#define TEXT_ON_COMMAND( p ) THEME->GetMetric("AttackDisplay",ssprintf("TextP%dOnCommand",p+1))
AttackDisplay::AttackDisplay()
{
@@ -27,13 +29,30 @@ void AttackDisplay::Update( float fDelta )
ActorFrame::Update( fDelta );
// FIXME: Make GAMESTATE->m_ActiveAttacks a vector
if( !GAMESTATE->m_ActiveAttacks[m_PlayerNumber][0].IsBlank() )
if( GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] )
{
// don't handle this again
GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] = false;
int s;
for( s=0; s<GameState::MAX_SIMULTANEOUS_ATTACKS; s++ )
{
if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].fStartSecond >= 0 )
continue; /* hasn't started yet */
if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].fSecsRemaining <= 0 )
continue; /* ended already */
if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].IsBlank() )
continue;
break;
}
CString sText = GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].sModifier;
m_textAttack.SetDiffuseAlpha( 1 );
m_textAttack.SetText( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][0].sModifier );
}
else
{
m_textAttack.SetDiffuseAlpha( 0 );
m_textAttack.SetText( sText );
m_textAttack.Command( TEXT_ON_COMMAND(m_PlayerNumber) );
}
}