actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings.

Browse Source
This commit is contained in:
Steve Checkoway
2004-01-14 21:11:23 +00:00
parent 9e3e3e2b64
commit 1cac9d7b6f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+1 -1
View File
@@ -1021,7 +1021,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsO
for( i=0; i<g_vPlayedStageStats.size(); i++ ) for( i=0; i<g_vPlayedStageStats.size(); i++ )
{ {
CHECKPOINT_M( ssprintf("%i/%i", i, g_vPlayedStageStats.size() ) ); CHECKPOINT_M( ssprintf("%u/%zu", i, g_vPlayedStageStats.size() ) );
SongAndSteps sas; SongAndSteps sas;
sas.pSong = g_vPlayedStageStats[i].pSong; sas.pSong = g_vPlayedStageStats[i].pSong;
ASSERT( sas.pSong ); ASSERT( sas.pSong );
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -1153,7 +1153,7 @@ bool MusicWheel::NextSort() // return true if change successful
// find the index of the current sort // find the index of the current sort
int cur = 0; int cur = 0;
while( cur < ARRAYSIZE(SortOrder) && SortOrder[cur] != GAMESTATE->m_SongSortOrder ) while( cur < int(ARRAYSIZE(SortOrder)) && SortOrder[cur] != GAMESTATE->m_SongSortOrder )
++cur; ++cur;
// move to the next sort with wrapping // move to the next sort with wrapping
stepmania/src/ScreenOptions.cpp
+4 -4
View File
@@ -514,7 +514,7 @@ CString ScreenOptions::GetExplanationTitle( int iRow ) const
BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iChoiceOnRow ) 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]; Row &row = *m_Rows[iRow];
if( row.Type == Row::ROW_EXIT ) if( row.Type == Row::ROW_EXIT )
return *row.m_textItems[0]; return *row.m_textItems[0];
@@ -526,7 +526,7 @@ BitmapText &ScreenOptions::GetTextItemForRow( PlayerNumber pn, int iRow, int iCh
else else
index = iChoiceOnRow; 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]; return *row.m_textItems[index];
} }
@@ -680,7 +680,7 @@ void ScreenOptions::PositionCursors()
continue; continue;
const int iRow = m_iCurrentRow[pn]; 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]; Row &Row = *m_Rows[iRow];
OptionsCursor &highlight = m_Highlight[pn]; 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. // Set the position of the highlight showing the current option the user is changing.
const int iRow = m_iCurrentRow[pn]; 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 Row &Row = *m_Rows[iRow];
const int iChoiceWithFocus = Row.m_iChoiceWithFocus[pn]; const int iChoiceWithFocus = Row.m_iChoiceWithFocus[pn];