From b017c59d10ac4448eb6e2ea8def2086d852a6b0e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 1 Dec 2003 21:32:19 +0000
Subject: [PATCH] stop showing attack titles in course mode

---
 stepmania/src/AttackDisplay.cpp | 43 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/stepmania/src/AttackDisplay.cpp b/stepmania/src/AttackDisplay.cpp
index e67ff9fa21..ad0929672d 100644
--- a/stepmania/src/AttackDisplay.cpp
+++ b/stepmania/src/AttackDisplay.cpp
@@ -19,6 +19,10 @@
 
 AttackDisplay::AttackDisplay()
 {
+	if( GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE &&
+		GAMESTATE->m_PlayMode != PLAY_MODE_RAVE )
+		return;
+
 	m_textAttack.LoadFromFont( THEME->GetPathToF("AttackDisplay") );
 	m_textAttack.SetDiffuseAlpha( 0 );	// invisible
 	this->AddChild( &m_textAttack );
@@ -28,29 +32,32 @@ void AttackDisplay::Update( float fDelta )
 {
 	ActorFrame::Update( fDelta );
 
-	if( GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] )
+	if( GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE &&
+		GAMESTATE->m_PlayMode != PLAY_MODE_RAVE )
+		return;
+
+	if( !GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] )
+		return;
+	// don't handle this again
+	GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] = false;
+
+	for( unsigned s=0; s<GAMESTATE->m_ActiveAttacks[m_PlayerNumber].size(); s++ )
 	{
-		// don't handle this again
-		GAMESTATE->m_bAttackBeganThisUpdate[m_PlayerNumber] = false;
+		if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].fStartSecond >= 0 )
+			continue; /* hasn't started yet */
 
-		for( unsigned s=0; s<GAMESTATE->m_ActiveAttacks[m_PlayerNumber].size(); 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].fSecsRemaining <= 0 )
-				continue; /* ended already */
+		if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].IsBlank() )
+			continue;
 
-			if( GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].IsBlank() )
-				continue;
+		CString sText = GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].sModifier;
 
-			CString sText = GAMESTATE->m_ActiveAttacks[m_PlayerNumber][s].sModifier;
+		m_textAttack.SetDiffuseAlpha( 1 );
+		m_textAttack.SetText( sText );
+		m_textAttack.Command( TEXT_ON_COMMAND(m_PlayerNumber) );
 
-			m_textAttack.SetDiffuseAlpha( 1 );
-			m_textAttack.SetText( sText );
-			m_textAttack.Command( TEXT_ON_COMMAND(m_PlayerNumber) );
-
-			break;
-		}
+		break;
 	}
 }
\ No newline at end of file