From 23ad0104c6b6ccda70f1e4ee5f4804499ecb4e6c Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 26 Apr 2005 20:46:06 +0000
Subject: [PATCH] don't show forced beginner mods in attack list

---
 stepmania/src/ActiveAttackList.cpp | 2 ++
 stepmania/src/Attack.h             | 6 +++++-
 stepmania/src/ScreenGameplay.cpp   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ActiveAttackList.cpp b/stepmania/src/ActiveAttackList.cpp
index 4c6bb97fda..c8fe9531e0 100644
--- a/stepmania/src/ActiveAttackList.cpp
+++ b/stepmania/src/ActiveAttackList.cpp
@@ -41,6 +41,8 @@ void ActiveAttackList::Refresh()
 
 		if( !attack.bOn )
 			continue; /* hasn't started yet */
+		if( !attack.bShowInAttackList )
+			continue;
 
 		PlayerOptions po;
 		po.FromString( attack.sModifier, true );
diff --git a/stepmania/src/Attack.h b/stepmania/src/Attack.h
index de00630715..4a08da6690 100644
--- a/stepmania/src/Attack.h
+++ b/stepmania/src/Attack.h
@@ -14,6 +14,7 @@ struct Attack
 	CString sModifier;
 	bool bOn; // set and used by GAMESTATE
 	bool bGlobal; // true for song-wide course mods
+	bool bShowInAttackList;
 
 	void MakeBlank()
 	{
@@ -23,6 +24,7 @@ struct Attack
 		sModifier = CString();
 		bOn = false;
 		bGlobal = false;
+		bShowInAttackList = true;
 	}
 	Attack() { MakeBlank(); }
 	Attack(
@@ -31,7 +33,8 @@ struct Attack
 		float fSecsRemaining_,
 		CString sModifier_,
 		bool bOn_,
-		bool bGlobal_ )
+		bool bGlobal_,
+		bool bShowInAttackList_ = true )
 	{
 		level = level_;
 		fStartSecond = fStartSecond_;
@@ -39,6 +42,7 @@ struct Attack
 		sModifier = sModifier_;
 		bOn = bOn_;
 		bGlobal = bGlobal_;
+		bShowInAttackList = bShowInAttackList_;
 	}
 
 	void GetAttackBeats( const Song *song, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 5f94d01d35..372cc2b9cc 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -741,7 +741,7 @@ void ScreenGameplay::InitSongQueues()
 
 			AttackArray aa;
 			if( pSteps->GetDifficulty() == DIFFICULTY_BEGINNER && (bool)USE_FORCED_MODIFIERS_IN_BEGINNER )
-				aa.push_back( Attack(ATTACK_LEVEL_1, 0, 0, FORCED_MODIFIERS_IN_BEGINNER, false, true) );
+				aa.push_back( Attack(ATTACK_LEVEL_1, 0, 0, FORCED_MODIFIERS_IN_BEGINNER, false, true, false) );	// don't show in AttackList
 
 			m_asModifiersQueue[p].push_back( aa );
 		}