From 53155bb6194baec3de28e1c81d738be646fa956c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 20 Oct 2003 06:28:19 +0000
Subject: [PATCH] fix warnings

---
 stepmania/src/GameState.cpp   | 4 ++--
 stepmania/src/SongManager.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 7fd6b15676..d77487f378 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -820,7 +820,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsO
 					feat.Feat = ssprintf("MR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() );
 					feat.pStringToFill = &vMachineHighScores[j].sName;
 					feat.g = vMachineHighScores[j].grade;
-					feat.Score = vMachineHighScores[j].iScore;
+					feat.Score = (float) vMachineHighScores[j].iScore;
 
 					// XXX: temporary hack
 					if( pSong->HasBackground() )
@@ -843,7 +843,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsO
 					feat.Feat = ssprintf("PR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() );
 					feat.pStringToFill = &vPersonalHighScores[j].sName;
 					feat.g = vPersonalHighScores[j].grade;
-					feat.Score = vPersonalHighScores[j].iScore;
+					feat.Score = (float) vPersonalHighScores[j].iScore;
 
 					// XXX: temporary hack
 					if( pSong->HasBackground() )
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 35315bed12..74c4a80d1b 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -343,7 +343,7 @@ bool FileRead( ifstream& f, float& fOut )
 	CString s;
 	if( !FileRead( f, s ) )
 		return false;
-	fOut = atof( s );
+	fOut = (float) atof( s );
 	return true;
 }
 void FileWrite( ofstream& f, const CString& sWrite )
@@ -393,7 +393,7 @@ void SongManager::ReadStepsMemCardDataFromFile( CString fn, int mc )
 		if( !FileRead(f, iNumNotes) )
 			WARN_AND_RETURN;
 
-		for( unsigned n=0; n<iNumNotes; n++ )
+		for( int n=0; n<iNumNotes; n++ )
 		{
 			StepsType nt;
 			if( !FileRead(f, (int&)nt) )
@@ -439,7 +439,7 @@ void SongManager::ReadStepsMemCardDataFromFile( CString fn, int mc )
 					WARN_AND_RETURN;
 				CLAMP( grade, (Grade)0, (Grade)(NUM_GRADES-1) );
 
-				float iScore;
+				int iScore;
 				if( !FileRead(f, iScore) )
 					WARN_AND_RETURN;