From 63368f99dafc9eebe7f8e0a53aeef0ee3bc2903d Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 24 Jan 2006 01:00:49 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/BitmapText.cpp      | 12 ++++++------
 stepmania/src/ScreenTestInput.cpp | 18 +++++-------------
 stepmania/src/ScreenTestInput.h   |  1 -
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index 1b7526bc0d..a994596324 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -222,17 +222,17 @@ void BitmapText::BuildChars()
 				iX -= g.m_iHadvance;
 
 			/* set vertex positions */
-			v[0].p = RageVector3( iX+g.m_fHshift,				iY+g.m_pPage->m_fVshift,		  0 );	// top left
-			v[1].p = RageVector3( iX+g.m_fHshift,				iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 );	// bottom left
-			v[2].p = RageVector3( iX+g.m_fHshift+g.m_fWidth,	iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 );	// bottom right
-			v[3].p = RageVector3( iX+g.m_fHshift+g.m_fWidth,	iY+g.m_pPage->m_fVshift,		  0 );	// top right
+			v[0].p = RageVector3( iX+g.m_fHshift,			iY+g.m_pPage->m_fVshift,		0 );	// top left
+			v[1].p = RageVector3( iX+g.m_fHshift,			iY+g.m_pPage->m_fVshift+g.m_fHeight,	0 );	// bottom left
+			v[2].p = RageVector3( iX+g.m_fHshift+g.m_fWidth,	iY+g.m_pPage->m_fVshift+g.m_fHeight,	0 );	// bottom right
+			v[3].p = RageVector3( iX+g.m_fHshift+g.m_fWidth,	iY+g.m_pPage->m_fVshift,		0 );	// top right
 
 			/* Advance the cursor. */
 			iX += g.m_iHadvance;
 
 			/* set texture coordinates */
-			v[0].t = RageVector2( g.m_TexRect.left,	g.m_TexRect.top );
-			v[1].t = RageVector2( g.m_TexRect.left,	g.m_TexRect.bottom );
+			v[0].t = RageVector2( g.m_TexRect.left,		g.m_TexRect.top );
+			v[1].t = RageVector2( g.m_TexRect.left,		g.m_TexRect.bottom );
 			v[2].t = RageVector2( g.m_TexRect.right,	g.m_TexRect.bottom );
 			v[3].t = RageVector2( g.m_TexRect.right,	g.m_TexRect.top );
 
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index f382db9e58..358383888f 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -38,12 +38,6 @@ void ScreenTestInput::Init()
 }
 
 
-
-ScreenTestInput::~ScreenTestInput()
-{
-	LOG->Trace( "ScreenTestInput::~ScreenTestInput()" );
-}
-
 static LocalizedString CONTROLLER	( "ScreenTestInput", "Controller" );
 static LocalizedString SECONDARY	( "ScreenTestInput", "secondary" );
 static LocalizedString NOT_MAPPED	( "ScreenTestInput", "not mapped" );
@@ -120,14 +114,12 @@ void ScreenTestInput::Input( const InputEventPlus &input )
 	{
 	case IET_FIRST_PRESS:
 	case IET_RELEASE:
+		switch( input.type )
 		{
-			switch( input.type )
-			{
-			case IET_FIRST_PRESS:	sMessage += "Pressed";	break;
-			case IET_RELEASE:		sMessage += "Released";	break;
-			}
-			MESSAGEMAN->Broadcast( sMessage );
+		case IET_FIRST_PRESS:	sMessage += "Pressed";	break;
+		case IET_RELEASE:		sMessage += "Released";	break;
 		}
+		MESSAGEMAN->Broadcast( sMessage );
 	}
 
 	if( input.type != IET_FIRST_PRESS && input.type != IET_SLOW_REPEAT )
@@ -143,7 +135,7 @@ void ScreenTestInput::MenuStart( PlayerNumber pn )
 
 void ScreenTestInput::MenuBack( PlayerNumber pn )
 {
-	if(!IsTransitioning())
+	if( !IsTransitioning() )
 	{
 		SCREENMAN->PlayStartSound();
 		StartTransitioningScreen( SM_GoToPrevScreen );		
diff --git a/stepmania/src/ScreenTestInput.h b/stepmania/src/ScreenTestInput.h
index e92e5047f5..881050cbff 100644
--- a/stepmania/src/ScreenTestInput.h
+++ b/stepmania/src/ScreenTestInput.h
@@ -11,7 +11,6 @@ class ScreenTestInput : public ScreenWithMenuElements
 {
 public:
 	virtual void Init();
-	virtual ~ScreenTestInput();
 
 	virtual void Update( float fDelta );
 	virtual void Input( const InputEventPlus &input );