From cb57db0d031b086d4c56203001d6bccfc8d61c20 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Wed, 14 Feb 2007 10:44:54 +0000
Subject: [PATCH] These are just local variables.

---
 stepmania/src/NotesLoaderKSF.cpp | 43 +++++++++++++++++---------------
 stepmania/src/NotesLoaderKSF.h   |  4 ---
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index 09fe508e99..18047bb056 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -165,7 +165,7 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s
 
 	m_bTickChangeNeeded = false;
 	int newTick = -1;
-	m_fCurBeat = 0.0f;
+	float fCurBeat = 0.0f;
 	float prevBeat = 0.0f; // Used for hold tails.
 	for( unsigned r=0; r<m_vNoteRows.size(); r++ )
 	{
@@ -237,7 +237,7 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s
 			{
 				/* Remember when each hold starts; ignore the middle. */
 				if( iHoldStartRow[t] == -1 )
-					iHoldStartRow[t] = BeatToNoteRow(m_fCurBeat);					
+					iHoldStartRow[t] = BeatToNoteRow(fCurBeat);					
 				continue;
 			}
 
@@ -265,10 +265,10 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s
 				return false;
 			}
 
-			notedata.SetTapNote(t, BeatToNoteRow(m_fCurBeat), tap);
+			notedata.SetTapNote(t, BeatToNoteRow(fCurBeat), tap);
 		}
-		prevBeat = m_fCurBeat;
-		m_fCurBeat = prevBeat + 1.0f / m_iTickCount;		
+		prevBeat = fCurBeat;
+		fCurBeat = prevBeat + 1.0f / m_iTickCount;		
 	}
 
 	/* We need to remove holes where the BPM increases. */
@@ -451,9 +451,12 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
 	else
 	{
 		int tickToChange = m_iTickCount;
-		m_fCurBeat = 0.0f;
+		float fCurBeat = 0.0f;
 		float speedToChange = 0.0f, timeToStop = 0.0f;
-		m_bDMRequired = m_bBPMChangeNeeded = m_bBPMStopNeeded = m_bTickChangeNeeded = false;
+		bool bDMRequired = false;
+		bool bBPMChangeNeeded = false;
+		bool bBPMStopNeeded = false;
+		m_bTickChangeNeeded = false;
 
 		for (unsigned i=0; i < m_vNoteRows.size(); i++)
 		{
@@ -465,7 +468,7 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
 			
 			if( NoteRowString == "2222222222222" ) // Row of 2s = end.  Confirm KIUCompliency here.
 			{
-				if (!m_bDMRequired)
+				if (!bDMRequired)
 					m_bKIUCompliant = true;
 				break;
 			}
@@ -476,7 +479,7 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
 				if (BeginsWith(NoteRowString, "|T") || 
 					BeginsWith(NoteRowString, "|B") || BeginsWith(NoteRowString, "|D") )
 				{
-					m_bDMRequired = true;
+					bDMRequired = true;
 					RString temp = NoteRowString.substr(2,NoteRowString.size()-3);
 					float numTemp = StringToFloat(temp);
 					if (BeginsWith(NoteRowString, "|T")) 
@@ -487,13 +490,13 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
 					}
 					else if (BeginsWith(NoteRowString, "|B")) 
 					{
-						m_bBPMChangeNeeded = true;
+						bBPMChangeNeeded = true;
 						speedToChange = numTemp;
 						continue;
 					}
 					else
 					{
-						m_bBPMStopNeeded = true;
+						bBPMStopNeeded = true;
 						timeToStop = numTemp / 1000.0f;
 						continue;
 					}
@@ -512,19 +515,19 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
 				m_iTickCount = tickToChange;
 				m_bTickChangeNeeded = false;
 			}
-			if( m_bBPMChangeNeeded )
+			if( bBPMChangeNeeded )
 			{
-				LOG->Trace( "Adding tempo change of %f BPM at beat %f", speedToChange, m_fCurBeat );
-				out.AddBPMSegment( BPMSegment(BeatToNoteRow(m_fCurBeat), speedToChange) );
-				m_bBPMChangeNeeded = false;
+				LOG->Trace( "Adding tempo change of %f BPM at beat %f", speedToChange, fCurBeat );
+				out.AddBPMSegment( BPMSegment(BeatToNoteRow(fCurBeat), speedToChange) );
+				bBPMChangeNeeded = false;
 			}
-			if( m_bBPMStopNeeded )
+			if( bBPMStopNeeded )
 			{
-				LOG->Trace( "Adding tempo freeze of %f seconds at beat %f", timeToStop, m_fCurBeat );
-				out.AddStopSegment( StopSegment(BeatToNoteRow(m_fCurBeat),timeToStop) );
-				m_bBPMStopNeeded = false;
+				LOG->Trace( "Adding tempo freeze of %f seconds at beat %f", timeToStop, fCurBeat );
+				out.AddStopSegment( StopSegment(BeatToNoteRow(fCurBeat),timeToStop) );
+				bBPMStopNeeded = false;
 			}
-			m_fCurBeat += 1.0f / m_iTickCount;
+			fCurBeat += 1.0f / m_iTickCount;
 		}
 	}
 
diff --git a/stepmania/src/NotesLoaderKSF.h b/stepmania/src/NotesLoaderKSF.h
index 21000feb34..ff2a2a7b7c 100644
--- a/stepmania/src/NotesLoaderKSF.h
+++ b/stepmania/src/NotesLoaderKSF.h
@@ -22,12 +22,8 @@ public:
 
 private:
 	bool m_bKIUCompliant;
-	bool m_bDMRequired;
-	bool m_bBPMChangeNeeded;
-	bool m_bBPMStopNeeded;
 	bool m_bTickChangeNeeded;
 	int m_iTickCount;
-	float m_fCurBeat;
 	vector<RString> m_vNoteRows;
 
 };