From 48911f15722189ad1ce24972815501e6a44e6064 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 15 Feb 2005 21:58:35 +0000
Subject: [PATCH] fix VC7 warnings

---
 stepmania/src/Player.cpp             |  2 +-
 stepmania/src/RollingNumbers.cpp     |  6 +++---
 stepmania/src/ScoreDisplayNormal.cpp | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index d8bcad6e95..e980a96df1 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -705,7 +705,7 @@ void Player::HandleStep( int col, const RageTimer &tm )
 			if( iLbs != 0 )
 			{
 				int iNumTracksHeld = 0;
-				for( unsigned t=0; t<m_NoteData.GetNumTracks(); t++ )
+				for( int t=0; t<m_NoteData.GetNumTracks(); t++ )
 				{
 					const StyleInput StyleI( pn, t );
 					const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( StyleI );
diff --git a/stepmania/src/RollingNumbers.cpp b/stepmania/src/RollingNumbers.cpp
index 742c56c558..950360711c 100644
--- a/stepmania/src/RollingNumbers.cpp
+++ b/stepmania/src/RollingNumbers.cpp
@@ -26,9 +26,9 @@ void RollingNumbers::LoadFromNode( const CString& sDir, const XNode* pNode )
 	pNode->GetAttrValue( "Format", m_sFormat );
 	pNode->GetAttrValue( "ApproachSeconds", m_fApproachSeconds );
 	
-	int iTargetNumber;
-	if( pNode->GetAttrValue( "TargetNumber", iTargetNumber ) )
-		SetTargetNumber( iTargetNumber );
+	float fTargetNumber;
+	if( pNode->GetAttrValue( "TargetNumber", fTargetNumber ) )
+		SetTargetNumber( fTargetNumber );
 
 	UpdateText();
 }
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index 265e7419d5..3bea676b54 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -36,6 +36,8 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState )
 
 void ScoreDisplayNormal::SetScore( int iNewScore ) 
 {
+	float fScore = (float)iNewScore;
+
 	// TODO: Remove use of PlayerNumber.
 	PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
 
@@ -53,21 +55,21 @@ void ScoreDisplayNormal::SetScore( int iNewScore )
 		// nothing to do
 		break;
 	case PlayerOptions::SCORING_SUBTRACT:
-		iNewScore = iMaxScore - ( iCurMaxScore - iNewScore );
+		fScore = iMaxScore - ( iCurMaxScore - fScore );
 		break;
 	case PlayerOptions::SCORING_AVERAGE:
 		if( iCurMaxScore == 0 ) // don't divide by zero fats
 		{
-			iNewScore = 0;
+			fScore = 0;
 		}
 		else
 		{
-			float fScoreRatio = iNewScore / (float)iCurMaxScore;
-			iNewScore = fScoreRatio * iMaxScore;
+			float fScoreRatio = fScore / (float)iCurMaxScore;
+			fScore = fScoreRatio * iMaxScore;
 		}
 	}
 
-	m_text.SetTargetNumber( iNewScore );
+	m_text.SetTargetNumber( fScore );
 }
 
 /*