From aa2c86ce353c49d8bf7e28f5ef65661335444171 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Sat, 24 Jun 2006 00:06:57 +0000
Subject: [PATCH] Cleanup.

---
 stepmania/src/GameInput.h           |  2 +-
 stepmania/src/MusicWheel.cpp        | 14 +++++++-------
 stepmania/src/ScoreKeeperNormal.cpp |  4 ++--
 stepmania/src/Style.h               |  2 +-
 stepmania/src/StyleInput.h          |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index 33e79733de..fc3b8c0115 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -10,7 +10,7 @@ class Game;
 enum GameController
 {
 	GAME_CONTROLLER_1 = 0,	// left controller
-	GAME_CONTROLLER_2,		// right controller
+	GAME_CONTROLLER_2,	// right controller
 	MAX_GAME_CONTROLLERS,	// leave this at the end
 	GAME_CONTROLLER_INVALID,
 };
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 4c1c4d8712..e7df0c253c 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -204,19 +204,19 @@ void MusicWheel::LoadFromMetrics( RString sType )
 
 	ROULETTE_SWITCH_SECONDS		.Load(sType,"RouletteSwitchSeconds");
 	ROULETTE_SLOW_DOWN_SWITCHES	.Load(sType,"RouletteSlowDownSwitches");
-	NUM_SECTION_COLORS			.Load(sType,"NumSectionColors");
+	NUM_SECTION_COLORS		.Load(sType,"NumSectionColors");
 	SONG_REAL_EXTRA_COLOR		.Load(sType,"SongRealExtraColor");
-	SORT_MENU_COLOR				.Load(sType,"SortMenuColor");
-	SHOW_ROULETTE				.Load(sType,"ShowRoulette");
-	SHOW_RANDOM					.Load(sType,"ShowRandom");
-	SHOW_PORTAL					.Load(sType,"ShowPortal");
+	SORT_MENU_COLOR			.Load(sType,"SortMenuColor");
+	SHOW_ROULETTE			.Load(sType,"ShowRoulette");
+	SHOW_RANDOM			.Load(sType,"ShowRandom");
+	SHOW_PORTAL			.Load(sType,"ShowPortal");
 	RANDOM_PICKS_LOCKED_SONGS	.Load(sType,"RandomPicksLockedSongs");
 	MOST_PLAYED_SONGS_TO_SHOW	.Load(sType,"MostPlayedSongsToShow");
 	MODE_MENU_CHOICE_NAMES		.Load(sType,"ModeMenuChoiceNames");
 	vector<RString> vsModeChoiceNames;
 	split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames );
-	CHOICE						.Load(sType,CHOICE_NAME,vsModeChoiceNames);
-	SECTION_COLORS				.Load(sType,SECTION_COLORS_NAME,NUM_SECTION_COLORS);
+	CHOICE				.Load(sType,CHOICE_NAME,vsModeChoiceNames);
+	SECTION_COLORS			.Load(sType,SECTION_COLORS_NAME,NUM_SECTION_COLORS);
 }
 
 MusicWheel::~MusicWheel()
diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp
index 4892de7293..626e3fa602 100644
--- a/stepmania/src/ScoreKeeperNormal.cpp
+++ b/stepmania/src/ScoreKeeperNormal.cpp
@@ -270,8 +270,8 @@ void ScoreKeeperNormal::AddScore( TapNoteScore score )
 	{
 	case TNS_W1:	p = 10;		break;
 	case TNS_W2:	p = GAMESTATE->ShowW1()? 9:10; break;
-	case TNS_W3:		p = 5;		break;
-	default:			p = 0;		break;
+	case TNS_W3:	p = 5;		break;
+	default:	p = 0;		break;
 	}
 
 	m_iTapNotesHit++;
diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h
index 3c928e1f9e..3b1c74dc43 100644
--- a/stepmania/src/Style.h
+++ b/stepmania/src/Style.h
@@ -25,7 +25,7 @@ public:
 	bool		m_bUsedForHowToPlay;		// Can be used for HowToPlay?
 	
 	/* The name of the style.  (This is currently unused.) */
-	const char *m_szName;
+	const char 	*m_szName;
 	
 	/* Steps format used for each player.  For example, "dance versus" reads
 	 * the Steps with the tag "dance-single". */
diff --git a/stepmania/src/StyleInput.h b/stepmania/src/StyleInput.h
index 049e098dee..69cd174c01 100644
--- a/stepmania/src/StyleInput.h
+++ b/stepmania/src/StyleInput.h
@@ -9,7 +9,7 @@
 struct StyleInput
 {
 	PlayerNumber	player;
-	int				col;
+	int		col;
 
 	StyleInput() { MakeInvalid(); };
 	StyleInput( PlayerNumber pn, int c ) { player = pn; col = c; };