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

warnings

Browse Source
This commit is contained in:
Glenn Maynard
2005-08-05 16:18:07 +00:00
parent 60c6cab3f7
commit 1e0b236ac4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+2 -2
View File
@@ -440,7 +440,7 @@ void ScreenOptions::PositionCursors()
cursor.SetBarWidth( iWidth ); cursor.SetBarWidth( iWidth );
cursor.SetXY( (float)iX, (float)iY ); cursor.SetXY( (float)iX, (float)iY );
bool bCanGoLeft = iChoiceWithFocus > 0; bool bCanGoLeft = iChoiceWithFocus > 0;
bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1; bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < (int) row.GetRowDef().m_vsChoices.size()-1;
cursor.SetCanGo( bCanGoLeft, bCanGoRight ); cursor.SetCanGo( bCanGoLeft, bCanGoRight );
} }
} }
@@ -470,7 +470,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn )
bool bCanGoLeft = iChoiceWithFocus > 0; bool bCanGoLeft = iChoiceWithFocus > 0;
bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1; bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < (int) row.GetRowDef().m_vsChoices.size()-1;
cursor.SetCanGo( bCanGoLeft, bCanGoRight ); cursor.SetCanGo( bCanGoLeft, bCanGoRight );
if( GAMESTATE->IsHumanPlayer(pn) ) if( GAMESTATE->IsHumanPlayer(pn) )
stepmania/src/ScreenOptionsEditCourseEntry.cpp
+3 -3
View File
@@ -195,7 +195,7 @@ void ScreenOptionsEditCourseEntry::AfterChangeValueInRow( int iRow, PlayerNumber
GAMESTATE->m_pCurTrail[PLAYER_1].Set( NULL ); GAMESTATE->m_pCurTrail[PLAYER_1].Set( NULL );
Trail *pTrail = pCourse->GetTrailForceRegenCache( GAMESTATE->m_stEdit, GAMESTATE->m_PreferredCourseDifficulty[PLAYER_1] ); Trail *pTrail = pCourse->GetTrailForceRegenCache( GAMESTATE->m_stEdit, GAMESTATE->m_PreferredCourseDifficulty[PLAYER_1] );
int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex; int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() ); ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ]; CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
switch( iRow ) switch( iRow )
@@ -238,7 +238,7 @@ void ScreenOptionsEditCourseEntry::ImportOptions( int iRow, const vector<PlayerN
{ {
Course *pCourse = GAMESTATE->m_pCurCourse; Course *pCourse = GAMESTATE->m_pCurCourse;
int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex; int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() ); ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ]; CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
OptionRow &row = *m_pRows[iRow]; OptionRow &row = *m_pRows[iRow];
@@ -315,7 +315,7 @@ void ScreenOptionsEditCourseEntry::ExportOptions( int iRow, const vector<PlayerN
{ {
Course *pCourse = GAMESTATE->m_pCurCourse; Course *pCourse = GAMESTATE->m_pCurCourse;
int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex; int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() ); ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ]; CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
switch( iRow ) switch( iRow )