Fix warnings.
This commit is contained in:
@@ -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<Steps*> &vpPossibleSteps = mapSongToSteps[pResolvedSong];
|
||||
|
||||
@@ -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?
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user