Fix warnings.

This commit is contained in:
Steve Checkoway
2005-06-29 06:36:51 +00:00
parent c856d1c68a
commit aa71c794ec
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -977,7 +977,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
break; break;
} }
if( e->iChooseIndex < vpPossibleSongs.size() ) if( e->iChooseIndex < int(vpPossibleSongs.size()) )
{ {
pResolvedSong = vpPossibleSongs[e->iChooseIndex]; pResolvedSong = vpPossibleSongs[e->iChooseIndex];
vector<Steps*> &vpPossibleSteps = mapSongToSteps[pResolvedSong]; vector<Steps*> &vpPossibleSteps = mapSongToSteps[pResolvedSong];
+1 -1
View File
@@ -1049,7 +1049,7 @@ Profile::LoadResult Profile::LoadEditableDataFromDir( CString sDir )
// This is data that the user can change, so we have to validate it. // This is data that the user can change, so we have to validate it.
wstring wstr = CStringToWstring(m_sDisplayName); 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); wstr = wstr.substr(0, MAX_DISPLAY_NAME_LENGTH);
m_sDisplayName = WStringToCString(wstr); m_sDisplayName = WStringToCString(wstr);
// TODO: strip invalid chars? // TODO: strip invalid chars?
+1 -1
View File
@@ -372,7 +372,7 @@ static void LifeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption
static int GetLifeDifficulty() static int GetLifeDifficulty()
{ {
int iLifeDifficulty; int iLifeDifficulty = 0;
LifeDifficulty( iLifeDifficulty, true, NULL ); LifeDifficulty( iLifeDifficulty, true, NULL );
iLifeDifficulty++; // LifeDifficulty returns an index iLifeDifficulty++; // LifeDifficulty returns an index
return iLifeDifficulty; return iLifeDifficulty;