diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index f027e4a903..7fdac27ffa 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -307,7 +307,7 @@ void PaneDisplay::SetContent( PaneContents c ) m_textContents[c].SetText( str ); - const unsigned num = NUM_ITEM_COLORS( g_Contents[c].name ); + const int num = NUM_ITEM_COLORS( g_Contents[c].name ); for( p = 0; p < num; ++p ) { const CString metric = ITEM_COLOR(g_Contents[c].name, p); diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 61dd69d819..54d8e052d1 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -188,7 +188,7 @@ static CString GLToString( GLenum e ) if( g_Strings.find(e) != g_Strings.end() ) return g_Strings[e]; - return ssprintf( "%i", e ); + return ssprintf( "%i", int(e) ); } /* GL_PIXFMT_INFO is used for both texture formats and surface formats. For example, @@ -497,7 +497,7 @@ static void CheckPalettedTextures( bool LowColor ) glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GLenum(GL_TEXTURE_INDEX_SIZE_EXT), &size); if( bits > size || size > 8 ) { - error = ssprintf("Expected %i-bit palette, got a %i-bit one instead", bits, size); + error = ssprintf("Expected %i-bit palette, got a %i-bit one instead", bits, int(size)); goto fail; } @@ -506,7 +506,7 @@ static void CheckPalettedTextures( bool LowColor ) GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_WIDTH)" ); if( RealWidth != 1 << bits ) { - error = ssprintf("GL_COLOR_TABLE_WIDTH returned %i instead of %i", RealWidth, 1 << bits ); + error = ssprintf("GL_COLOR_TABLE_WIDTH returned %i instead of %i", int(RealWidth), 1 << bits ); goto fail; } diff --git a/stepmania/src/RageSounds.cpp b/stepmania/src/RageSounds.cpp index 9276e0720e..7a19e57c09 100644 --- a/stepmania/src/RageSounds.cpp +++ b/stepmania/src/RageSounds.cpp @@ -228,7 +228,7 @@ void RageSounds::PlayMusic( const CString &file, const CString &timing_file, boo MsdFile msd; bool bResult = msd.ReadFile( real_timing_file ); if( !bResult ) - LOG->Warn( "Couldn't load %s", real_timing_file.c_str(), msd.GetError().c_str() ); + LOG->Warn( "Couldn't load %s, \"%s\"", real_timing_file.c_str(), msd.GetError().c_str() ); else { SMLoader::LoadTimingFromSMFile( msd, g_MusicToPlay.timing ); diff --git a/stepmania/src/ScreenExit.cpp b/stepmania/src/ScreenExit.cpp index 1723209b8b..3e9d66fdde 100644 --- a/stepmania/src/ScreenExit.cpp +++ b/stepmania/src/ScreenExit.cpp @@ -32,8 +32,8 @@ void ScreenExit::Update( float fDelta ) if( !DoQuit && m_ShutdownTimer.PeekDeltaTime() > 3 ) { DoQuit = true; - CString warn = ssprintf("ScreenExit: %i sound%s failed to finish playing quickly: ", - PlayingSounds.size(), PlayingSounds.size()==1?"":"s" ); + CString warn = ssprintf("ScreenExit: %lu sound%s failed to finish playing quickly: ", + PlayingSounds.size(), (PlayingSounds.size()==1?"":"s") ); for( set::const_iterator i = PlayingSounds.begin(); i != PlayingSounds.end(); ++i ) { diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 62f127adfb..335be6873c 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1724,7 +1724,7 @@ void ScreenGameplay::StageFinished() { if( GAMESTATE->IsCourseMode() && GAMESTATE->m_PlayMode != PLAY_MODE_ENDLESS ) { - LOG->Trace("Stage finished at index %i/%i", GAMESTATE->GetCourseSongIndex(), m_apSongsQueue.size() ); + LOG->Trace("Stage finished at index %i/%lu", GAMESTATE->GetCourseSongIndex(), m_apSongsQueue.size() ); /* +1 to skip the current song; that's done already. */ for( unsigned iPlaySongIndex = GAMESTATE->GetCourseSongIndex()+1; iPlaySongIndex < m_apSongsQueue.size(); ++iPlaySongIndex ) diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 372ac2eaad..1f476abfc5 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -594,7 +594,7 @@ void ScreenOptionsMaster::RefreshIcons() if( iSelection >= (int)m_OptionRow[i].choices.size() ) { /* Invalid selection. Send debug output, to aid debugging. */ - CString error = ssprintf("Option row with name '%s' selects item %i, but there are only %i items:\n", + CString error = ssprintf("Option row with name '%s' selects item %i, but there are only %lu items:\n", m_OptionRow[i].name.c_str(), iSelection, m_OptionRow[i].choices.size() );