From 1925a30a07ab04dde48a0c5b9c671aba0956cae4 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 11 Aug 2003 20:29:55 +0000
Subject: [PATCH] fix warnings

---
 stepmania/src/EditCoursesMenu.cpp   | 10 +++++-----
 stepmania/src/ScreenSongOptions.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/EditCoursesMenu.cpp b/stepmania/src/EditCoursesMenu.cpp
index 14d8215dd0..3787fe0b16 100644
--- a/stepmania/src/EditCoursesMenu.cpp
+++ b/stepmania/src/EditCoursesMenu.cpp
@@ -276,7 +276,7 @@ void EditCoursesMenu::Start()
 
 			m_soundStart.Play();
 			GetSelectedCourse()->m_entries.erase( GetSelectedCourse()->m_entries.begin()+m_iSelection[ROW_ENTRY] );
-			CLAMP( m_iSelection[ROW_ENTRY], 0, GetSelectedCourse()->m_entries.size()-1 );
+			CLAMP( m_iSelection[ROW_ENTRY], 0, (int) GetSelectedCourse()->m_entries.size()-1 );
 			OnRowValueChanged( ROW_ENTRY );
 			break;
 		default:
@@ -328,7 +328,7 @@ void EditCoursesMenu::Start()
 			{
 				CString sDifficulty = (i==NUM_DIFFICULTIES) ? "Don't care" : DifficultyToString((Difficulty)i);
 				g_CourseEntryMenu.rows[difficulty].choices.push_back( sDifficulty );
-				if( GetSelectedEntry()->difficulty == i )
+				if( GetSelectedEntry()->difficulty == (int) i )
 					g_CourseEntryMenu.rows[difficulty].defaultChoice = i;
 			}
 
@@ -345,9 +345,9 @@ void EditCoursesMenu::Start()
 				CString sMeter = (i==0) ? "Don't care" : ssprintf("%d", i);
 				g_CourseEntryMenu.rows[low_meter].choices.push_back( sMeter );
 				g_CourseEntryMenu.rows[high_meter].choices.push_back( sMeter );
-				if( GetSelectedEntry()->low_meter == i )
+				if( GetSelectedEntry()->low_meter == (int) i )
 					g_CourseEntryMenu.rows[low_meter].defaultChoice = i;
-				if( GetSelectedEntry()->high_meter == i )
+				if( GetSelectedEntry()->high_meter == (int) i )
 					g_CourseEntryMenu.rows[high_meter].defaultChoice = i;
 			}
 
@@ -361,7 +361,7 @@ void EditCoursesMenu::Start()
 			{
 				CString sNum = ssprintf("%d", i);
 				g_CourseEntryMenu.rows[high_meter].choices.push_back( sNum );
-				if( GetSelectedEntry()->players_index == i-1 )
+				if( GetSelectedEntry()->players_index == (int) i-1 )
 					g_CourseEntryMenu.rows[best_worst_value].defaultChoice = i;
 			}
 
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 106f66387a..6557e449b4 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -86,7 +86,7 @@ void ScreenSongOptions::ImportOptions()
 	m_iSelectedOption[0][SO_RATE] = 7;	// in case we don't match below
 	for( unsigned i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ )
 	{
-		float fThisRate = atof(g_SongOptionsLines[SO_RATE].choices[i]);
+		float fThisRate = (float) atof(g_SongOptionsLines[SO_RATE].choices[i]);
 		if( fThisRate == so.m_fMusicRate )
 			m_iSelectedOption[0][SO_RATE] = i;
 	}
@@ -109,7 +109,7 @@ void ScreenSongOptions::ExportOptions()
 	so.m_bAutoSync = !!m_iSelectedOption[0][SO_AUTOSYNC];
 
 	int iSel = m_iSelectedOption[0][SO_RATE];
-	so.m_fMusicRate = atof( g_SongOptionsLines[SO_RATE].choices[iSel] );
+	so.m_fMusicRate = (float) atof( g_SongOptionsLines[SO_RATE].choices[iSel] );
 }
 
 void ScreenSongOptions::GoToPrevState()