row -> iRow
This commit is contained in:
@@ -220,12 +220,12 @@ void ScreenCourseManager::ProcessMenuStart( PlayerNumber pn, const InputEventTyp
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenCourseManager::ImportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenCourseManager::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ScreenCourseManager::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenCourseManager::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -13,8 +13,8 @@ public:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
protected:
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
virtual void AfterChangeValueInRow( PlayerNumber pn );
|
||||
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
|
||||
|
||||
@@ -275,7 +275,7 @@ void ScreenEditCourse::ImportOptions( int iRow, const vector<PlayerNumber> &vpns
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenEditCourse::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenEditCourse::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ public:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
protected:
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
virtual void AfterChangeValueInRow( PlayerNumber pn );
|
||||
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
|
||||
|
||||
@@ -326,7 +326,7 @@ void ScreenEditCourseEntry::ImportAllOptions()
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenEditCourseEntry::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenEditCourseEntry::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ public:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
protected:
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ) {}
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) {}
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
virtual void AfterChangeValueInRow( PlayerNumber pn );
|
||||
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
|
||||
|
||||
@@ -87,8 +87,8 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void OnChange( PlayerNumber pn );
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
// Screens that get pushed on top of other screens don't
|
||||
// use the ScreenManager's shared background, so they must draw their own.
|
||||
|
||||
@@ -144,8 +144,8 @@ void ScreenNetworkOptions::MenuStart( PlayerNumber pn, const InputEventType type
|
||||
#endif
|
||||
}
|
||||
|
||||
void ScreenNetworkOptions::ImportOptions( int row, const vector<PlayerNumber> &vpns ) { }
|
||||
void ScreenNetworkOptions::ExportOptions( int row, const vector<PlayerNumber> &vpns ) { }
|
||||
void ScreenNetworkOptions::ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
|
||||
void ScreenNetworkOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
|
||||
|
||||
void ScreenNetworkOptions::UpdateConnectStatus( )
|
||||
{
|
||||
|
||||
@@ -14,8 +14,8 @@ public:
|
||||
virtual void MenuStart( PlayerNumber pn, const InputEventType type );
|
||||
|
||||
private:
|
||||
void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
void UpdateConnectStatus();
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@ public:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
protected:
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ) = 0;
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ) = 0;
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) = 0;
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns ) = 0;
|
||||
|
||||
void InitOptionsText();
|
||||
void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut );
|
||||
|
||||
@@ -21,8 +21,8 @@ protected:
|
||||
protected:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
virtual void BeginFadingOut();
|
||||
|
||||
|
||||
@@ -85,14 +85,14 @@ void ScreenProfileOptions::Init()
|
||||
SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music") );
|
||||
}
|
||||
|
||||
void ScreenProfileOptions::ImportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenProfileOptions::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
switch( row )
|
||||
switch( iRow )
|
||||
{
|
||||
case PO_PLAYER1:
|
||||
case PO_PLAYER2:
|
||||
{
|
||||
PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1);
|
||||
PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1);
|
||||
vector<CString> vsProfiles;
|
||||
PROFILEMAN->GetLocalProfileIDs( vsProfiles );
|
||||
|
||||
@@ -101,25 +101,25 @@ void ScreenProfileOptions::ImportOptions( int row, const vector<PlayerNumber> &v
|
||||
vsProfiles.end(),
|
||||
PREFSMAN->GetDefaultLocalProfileID(pn).Get() );
|
||||
if( iter != vsProfiles.end() )
|
||||
m_pRows[row]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 );
|
||||
m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 );
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenProfileOptions::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenProfileOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
switch( row )
|
||||
switch( iRow )
|
||||
{
|
||||
case PO_PLAYER1:
|
||||
case PO_PLAYER2:
|
||||
{
|
||||
PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1);
|
||||
PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1);
|
||||
vector<CString> vsProfiles;
|
||||
PROFILEMAN->GetLocalProfileIDs( vsProfiles );
|
||||
|
||||
if( m_pRows[row]->GetOneSharedSelection() > 0 )
|
||||
PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[row]->GetOneSharedSelection()-1] );
|
||||
if( m_pRows[iRow]->GetOneSharedSelection() > 0 )
|
||||
PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[iRow]->GetOneSharedSelection()-1] );
|
||||
else
|
||||
PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" );
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ public:
|
||||
virtual void MenuStart( PlayerNumber pn, const InputEventType type );
|
||||
|
||||
private:
|
||||
void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
|
||||
CString GetSelectedProfileID();
|
||||
CString GetSelectedProfileName();
|
||||
|
||||
@@ -55,9 +55,9 @@ void ScreenSMOnlineLogin::Init()
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenSMOnlineLogin::ImportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenSMOnlineLogin::ImportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
switch( row )
|
||||
switch( iRow )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
@@ -75,9 +75,9 @@ void ScreenSMOnlineLogin::ImportOptions( int row, const vector<PlayerNumber> &vp
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenSMOnlineLogin::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenSMOnlineLogin::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
switch( row )
|
||||
switch( iRow )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
|
||||
@@ -13,8 +13,8 @@ public:
|
||||
void SendLogin(CString sPassword);
|
||||
|
||||
private:
|
||||
void ImportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
CString GetSelectedProfileID();
|
||||
int m_iPlayer;
|
||||
};
|
||||
|
||||
@@ -26,11 +26,11 @@ void ScreenSongOptions::Init()
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenSongOptions::ExportOptions( int row, const vector<PlayerNumber> &vpns )
|
||||
void ScreenSongOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
|
||||
{
|
||||
const SongOptions::FailType ft = GAMESTATE->m_SongOptions.m_FailType;
|
||||
|
||||
ScreenOptionsMaster::ExportOptions( row, vpns );
|
||||
ScreenOptionsMaster::ExportOptions( iRow, vpns );
|
||||
|
||||
if( ft != GAMESTATE->m_SongOptions.m_FailType )
|
||||
GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true;
|
||||
|
||||
@@ -13,7 +13,7 @@ public:
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
private:
|
||||
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns );
|
||||
virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user