diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 85ad7feada..c49ca71ca8 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1021,7 +1021,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector &asFeatsO for( i=0; im_SongSortOrder ) + while( cur < int(ARRAYSIZE(SortOrder)) && SortOrder[cur] != GAMESTATE->m_SongSortOrder ) ++cur; // move to the next sort with wrapping diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 6a9e47f9b9..dca6641a1e 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -514,7 +514,7 @@ CString ScreenOptions::GetExplanationTitle( int iRow ) const BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iChoiceOnRow ) { - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, m_Rows.size() ) ); + RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %zu", iRow, m_Rows.size() ) ); Row &row = *m_Rows[iRow]; if( row.Type == Row::ROW_EXIT ) return *row.m_textItems[0]; @@ -526,7 +526,7 @@ BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iCh else index = iChoiceOnRow; - RAGE_ASSERT_M( index < (int)row.m_textItems.size(), ssprintf("%i < %i", index, row.m_textItems.size() ) ); + RAGE_ASSERT_M( index < (int)row.m_textItems.size(), ssprintf("%i < %zu", index, row.m_textItems.size() ) ); return *row.m_textItems[index]; } @@ -680,7 +680,7 @@ void ScreenOptions::PositionCursors() continue; const int iRow = m_iCurrentRow[pn]; - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, m_Rows.size() ) ); + RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %zu", iRow, m_Rows.size() ) ); Row &Row = *m_Rows[iRow]; OptionsCursor &highlight = m_Highlight[pn]; @@ -698,7 +698,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn ) { // Set the position of the highlight showing the current option the user is changing. const int iRow = m_iCurrentRow[pn]; - RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %i", iRow, m_Rows.size() ) ); + RAGE_ASSERT_M( iRow < (int)m_Rows.size(), ssprintf("%i < %zu", iRow, m_Rows.size() ) ); const Row &Row = *m_Rows[iRow]; const int iChoiceWithFocus = Row.m_iChoiceWithFocus[pn];