From 6e8a6464eeefd3c1c30dc568cbe33845f57579e6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 1 Feb 2006 04:37:20 +0000
Subject: [PATCH] partial: split out GetRealtimeAttackBeats from GetAttackBeats

---
 stepmania/src/Attack.cpp | 27 +++++++++++++++++++++++++++
 stepmania/src/Attack.h   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/stepmania/src/Attack.cpp b/stepmania/src/Attack.cpp
index 70576fd226..56be9016f3 100644
--- a/stepmania/src/Attack.cpp
+++ b/stepmania/src/Attack.cpp
@@ -36,6 +36,33 @@ void Attack::GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState,
 	ASSERT_M( fEndBeat >= fStartBeat, ssprintf("%f >= %f", fEndBeat, fStartBeat) );
 }
 
+/* Get the range for an attack that's being applied in realtime, eg. during battle
+ * mode.  We need a PlayerState for this, so we can push the region off-screen to
+ * prevent popping when the attack has note modifers. */
+void Attack::GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const
+{
+	if( fStartSecond >= 0 )
+	{
+		GetAttackBeats( pSong, pPlayerState, fStartBeat, fEndBeat );
+		return;
+	}
+
+	ASSERT( pPlayerState );
+	ASSERT( pSong );
+
+	/* If reasonable, push the attack forward so notes on screen don't change suddenly. */
+	fStartBeat = min( GAMESTATE->m_fSongBeat+BEATS_PER_MEASURE*2, pPlayerState->m_fLastDrawnBeat );
+	fStartBeat = truncf(fStartBeat)+1;
+
+	const float fStartSecond = pSong->GetElapsedTimeFromBeat( fStartBeat );
+	const float fEndSecond = fStartSecond + fSecsRemaining;
+	fEndBeat = pSong->GetBeatFromElapsedTime( fEndSecond );
+	fEndBeat = truncf(fEndBeat)+1;
+
+	// loading the course should have caught this.
+	ASSERT_M( fEndBeat >= fStartBeat, ssprintf("%f >= %f", fEndBeat, fStartBeat) );
+}
+
 bool Attack::operator== ( const Attack &rhs ) const
 {
 #define EQUAL(a) (a==rhs.a)
diff --git a/stepmania/src/Attack.h b/stepmania/src/Attack.h
index c4cb41bb16..0b1019577c 100644
--- a/stepmania/src/Attack.h
+++ b/stepmania/src/Attack.h
@@ -46,6 +46,7 @@ struct Attack
 	}
 
 	void GetAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
+	void GetRealtimeAttackBeats( const Song *pSong, const PlayerState* pPlayerState, float &fStartBeat, float &fEndBeat ) const;
 	bool IsBlank() const { return sModifiers.empty(); }
 	bool operator== ( const Attack &rhs ) const;
 	bool ContainsTransformOrTurn() const;