From 5430ecb232f82eeb7f9455ee3f195acbb440096f Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 29 Aug 2004 07:12:37 +0000
Subject: [PATCH] rename: Converge -> Centered

---
 stepmania/src/ArrowEffects.cpp  | 4 ++--
 stepmania/src/NoteField.cpp     | 8 ++++----
 stepmania/src/OptionIconRow.cpp | 2 +-
 stepmania/src/PlayerOptions.cpp | 4 ++--
 stepmania/src/PlayerOptions.h   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp
index 22242d3b4d..a19e86bdd4 100644
--- a/stepmania/src/ArrowEffects.cpp
+++ b/stepmania/src/ArrowEffects.cpp
@@ -109,8 +109,8 @@ static void ArrowGetReverseShiftAndScale( PlayerNumber pn, int iCol, float fYRev
 
 	float fPercentReverse = GAMESTATE->m_CurrentPlayerOptions[pn].GetReversePercentForColumn(iCol);
 	fShiftOut = SCALE( fPercentReverse, 0.f, 1.f, -fYReverseOffsetPixels/fZoom/2, fYReverseOffsetPixels/fZoom/2 );
-	float fPercentConverge = GAMESTATE->m_CurrentPlayerOptions[pn].m_fScrolls[PlayerOptions::SCROLL_CONVERGE];
-	fShiftOut = SCALE( fPercentConverge, 0.f, 1.f, fShiftOut, 0.5f );
+	float fPercentCentered = GAMESTATE->m_CurrentPlayerOptions[pn].m_fScrolls[PlayerOptions::SCROLL_CENTERED];
+	fShiftOut = SCALE( fPercentCentered, 0.f, 1.f, fShiftOut, 0.5f );
 
 	fScaleOut = SCALE( fPercentReverse, 0.f, 1.f, 1.f, -1.f);
 }
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 526dc974be..500614ec1c 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -407,12 +407,12 @@ void NoteField::DrawPrimitives()
 	// Adjust draw range depending on some effects
 	//
 	int iFirstPixelToDraw = m_iStartDrawingPixel;
-	// HACK: if boomerang and converge are on, then we want to draw much 
+	// HACK: if boomerang and centered are on, then we want to draw much 
 	// earlier to that the notes don't pop on screen.
-	float fConvergeTimesBoomerang = 
-		current_po.m_fScrolls[PlayerOptions::SCROLL_CONVERGE] * 
+	float fCenteredTimesBoomerang = 
+		current_po.m_fScrolls[PlayerOptions::SCROLL_CENTERED] * 
 		current_po.m_fAccels[PlayerOptions::ACCEL_BOOMERANG];
-	iFirstPixelToDraw += SCALE( fConvergeTimesBoomerang, 0.f, 1.f, 0.f, -SCREEN_HEIGHT/2 );
+	iFirstPixelToDraw += SCALE( fCenteredTimesBoomerang, 0.f, 1.f, 0.f, -SCREEN_HEIGHT/2 );
 	int iLastPixelToDraw = m_iEndDrawingPixel;
 	
 	float fDrawScale = 1;
diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp
index fe520a9b16..a1b4a7342f 100644
--- a/stepmania/src/OptionIconRow.cpp
+++ b/stepmania/src/OptionIconRow.cpp
@@ -57,7 +57,7 @@ const OptionColumnEntry g_OptionColumnEntries[] =
 	{"Split",		5},
 	{"Alternate",	5},
 	{"Cross",		5},
-	{"Converge",	5},
+	{"Centered",	5},
 	{"Incoming",	6},
 	{"Space",		6},
 	{"Hallway",		6},
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 1a6327fe03..cb7cfd4254 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -122,7 +122,7 @@ CString PlayerOptions::GetString() const
 	sReturn += AddPart( m_fScrolls[SCROLL_SPLIT],		"Split" );
 	sReturn += AddPart( m_fScrolls[SCROLL_ALTERNATE],	"Alternate" );
 	sReturn += AddPart( m_fScrolls[SCROLL_CROSS],		"Cross" );
-	sReturn += AddPart( m_fScrolls[SCROLL_CONVERGE],	"Converge" );
+	sReturn += AddPart( m_fScrolls[SCROLL_CENTERED],	"Centered" );
 
 	sReturn += AddPart( m_fDark, "Dark");
 
@@ -285,7 +285,7 @@ void PlayerOptions::FromString( CString sOptions )
 		else if( sBit == "split" )		SET_FLOAT( fScrolls[SCROLL_SPLIT] )
 		else if( sBit == "alternate" )	SET_FLOAT( fScrolls[SCROLL_ALTERNATE] )
 		else if( sBit == "cross" )		SET_FLOAT( fScrolls[SCROLL_CROSS] )
-		else if( sBit == "converge" )	SET_FLOAT( fScrolls[SCROLL_CONVERGE] )
+		else if( sBit == "centered" || sBit == "converge" )	SET_FLOAT( fScrolls[SCROLL_CENTERED] )
 		else if( sBit == "noholds" || sBit == "nofreeze" )	m_bTransforms[TRANSFORM_NOHOLDS] = on;
 		else if( sBit == "nomines" )	m_bTransforms[TRANSFORM_NOMINES] = on;
 		else if( sBit == "dark" )		SET_FLOAT( fDark )
diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h
index 0c5d75fb9b..5769cb5a56 100644
--- a/stepmania/src/PlayerOptions.h
+++ b/stepmania/src/PlayerOptions.h
@@ -86,7 +86,7 @@ struct PlayerOptions
 		SCROLL_SPLIT,
 		SCROLL_ALTERNATE,
 		SCROLL_CROSS,
-		SCROLL_CONVERGE,
+		SCROLL_CENTERED,
 		NUM_SCROLLS
 	};
 	float GetReversePercentForColumn( int iCol ); // accounts for all Directions