From aa71c794ec1ca5ea7a9517a3a16d32049f363ce8 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 29 Jun 2005 06:36:51 +0000 Subject: [PATCH] Fix warnings. --- stepmania/src/Course.cpp | 2 +- stepmania/src/Profile.cpp | 2 +- stepmania/src/ScreenOptionsMasterPrefs.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index d91d223a63..2f17726cbe 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -977,7 +977,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) break; } - if( e->iChooseIndex < vpPossibleSongs.size() ) + if( e->iChooseIndex < int(vpPossibleSongs.size()) ) { pResolvedSong = vpPossibleSongs[e->iChooseIndex]; vector &vpPossibleSteps = mapSongToSteps[pResolvedSong]; diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 3af3dbf871..73f4a3fcf1 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -1049,7 +1049,7 @@ Profile::LoadResult Profile::LoadEditableDataFromDir( CString sDir ) // This is data that the user can change, so we have to validate it. wstring wstr = CStringToWstring(m_sDisplayName); - if( (int) wstr.size() > MAX_DISPLAY_NAME_LENGTH ) + if( wstr.size() > MAX_DISPLAY_NAME_LENGTH ) wstr = wstr.substr(0, MAX_DISPLAY_NAME_LENGTH); m_sDisplayName = WStringToCString(wstr); // TODO: strip invalid chars? diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 6e36f55d3e..185da614f0 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -372,7 +372,7 @@ static void LifeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption static int GetLifeDifficulty() { - int iLifeDifficulty; + int iLifeDifficulty = 0; LifeDifficulty( iLifeDifficulty, true, NULL ); iLifeDifficulty++; // LifeDifficulty returns an index return iLifeDifficulty;