From be662eb72436d534795571685dc0bd8edb9f4fd4 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 3 Sep 2005 23:08:43 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/Banner.cpp     |  5 ++++-
 stepmania/src/Model.cpp      | 14 +++++++-------
 stepmania/src/Transition.cpp |  3 ---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index 2fd3b2f2b2..65161a887d 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -22,7 +22,10 @@ Banner::Banner()
 bool Banner::Load( RageTextureID ID, bool bIsBanner )
 {
 	if( ID.filename == "" )
-		ID = THEME->GetPathG("Common","fallback banner");
+	{
+		LoadFallback();
+		return true;
+	}
 
 	if( bIsBanner )
 		ID = SongBannerTexture(ID);
diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index bc8fa28ba6..64bead8498 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -511,7 +511,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
 	m_fCurFrame = 0;
 	m_fCurAnimationRate = fPlayRate;
 
-	if ( m_pCurAnimation == pNewAnimation )
+	if( m_pCurAnimation == pNewAnimation )
 		return;
 
 	m_pCurAnimation = pNewAnimation;
@@ -532,7 +532,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
 		m_vpBones[i].mRelative.m[3][2] = pBone->Position[2];
 		
 		int nParentBone = m_pCurAnimation->FindBoneByName( pBone->szParentName );
-		if (nParentBone != -1)
+		if( nParentBone != -1 )
 		{
 			RageMatrixMultiply( &m_vpBones[i].mAbsolute, &m_vpBones[nParentBone].mAbsolute, &m_vpBones[i].mRelative );
 
@@ -546,11 +546,11 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
 	}
 
 	// subtract out the bone's resting position
-	for ( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
+	for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
 	{
 		msMesh *pMesh = &m_pGeometry->m_Meshes[i];
 		vector<RageModelVertex> &Vertices = pMesh->Vertices;
-		for (unsigned j = 0; j < Vertices.size(); j++)
+		for( unsigned j = 0; j < Vertices.size(); j++ )
 		{
 //			int nBoneIndex = (pMesh->nBoneIndex!=-1) ? pMesh->nBoneIndex : bone;
 			RageVector3 &pos = Vertices[j].p;
@@ -663,7 +663,7 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
 				}
 				pLastRotationKey = pRotationKey;
 			}
-			if (pLastRotationKey != 0 && pThisRotationKey != 0)
+			if( pLastRotationKey != 0 && pThisRotationKey != 0 )
 			{
 				const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
 
@@ -674,12 +674,12 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
 
 				RageMatrixFromQuat( &m, q );
 			}
-			else if (pLastRotationKey == 0)
+			else if( pLastRotationKey == 0 )
 			{
 				vRot = pThisRotationKey->Rotation;
 				RageMatrixAngles( &m, vRot );
 			}
-			else if (pThisRotationKey == 0)
+			else if( pThisRotationKey == 0 )
 			{
 				vRot = pLastRotationKey->Rotation;
 				RageMatrixAngles( &m, vRot );
diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp
index 3bb65a173b..6f939a53a4 100644
--- a/stepmania/src/Transition.cpp
+++ b/stepmania/src/Transition.cpp
@@ -1,9 +1,6 @@
 #include "global.h"
 #include "Transition.h"
-#include "RageUtil.h"
 #include "ScreenManager.h"
-#include "Screen.h"
-#include "GameState.h"
 
 
 /*