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

row -> iRow

Browse Source
This commit is contained in:
Chris Danford
2005-07-13 19:01:42 +00:00
parent 505e835214
commit 4459393d84
17 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenCourseManager.cpp
+2 -2
View File
@@ -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 )
{ {
} }
stepmania/src/ScreenCourseManager.h
+2 -2
View File
@@ -13,8 +13,8 @@ public:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
protected: protected:
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void AfterChangeValueInRow( PlayerNumber pn );
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
stepmania/src/ScreenEditCourse.cpp
+1 -1
View File
@@ -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 )
{ {
} }
stepmania/src/ScreenEditCourse.h
+2 -2
View File
@@ -14,8 +14,8 @@ public:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
protected: protected:
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void AfterChangeValueInRow( PlayerNumber pn );
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
stepmania/src/ScreenEditCourseEntry.cpp
+1 -1
View File
@@ -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 )
{ {
} }
stepmania/src/ScreenEditCourseEntry.h
+2 -2
View File
@@ -14,8 +14,8 @@ public:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
protected: protected:
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ) {} virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) {}
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void AfterChangeValueInRow( PlayerNumber pn ); virtual void AfterChangeValueInRow( PlayerNumber pn );
virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type ); virtual void ProcessMenuStart( PlayerNumber pn, const InputEventType type );
stepmania/src/ScreenMiniMenu.h
+2 -2
View File
@@ -87,8 +87,8 @@ public:
protected: protected:
virtual void OnChange( PlayerNumber pn ); virtual void OnChange( PlayerNumber pn );
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
// Screens that get pushed on top of other screens don't // Screens that get pushed on top of other screens don't
// use the ScreenManager's shared background, so they must draw their own. // use the ScreenManager's shared background, so they must draw their own.
stepmania/src/ScreenNetworkOptions.cpp
+2 -2
View File
@@ -144,8 +144,8 @@ void ScreenNetworkOptions::MenuStart( PlayerNumber pn, const InputEventType type
#endif #endif
} }
void ScreenNetworkOptions::ImportOptions( int row, const vector<PlayerNumber> &vpns ) { } void ScreenNetworkOptions::ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
void ScreenNetworkOptions::ExportOptions( int row, const vector<PlayerNumber> &vpns ) { } void ScreenNetworkOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpns ) { }
void ScreenNetworkOptions::UpdateConnectStatus( ) void ScreenNetworkOptions::UpdateConnectStatus( )
{ {
stepmania/src/ScreenNetworkOptions.h
+2 -2
View File
@@ -14,8 +14,8 @@ public:
virtual void MenuStart( PlayerNumber pn, const InputEventType type ); virtual void MenuStart( PlayerNumber pn, const InputEventType type );
private: private:
void ImportOptions( int row, const vector<PlayerNumber> &vpns ); void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
void ExportOptions( int row, const vector<PlayerNumber> &vpns ); void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
void UpdateConnectStatus(); void UpdateConnectStatus();
stepmania/src/ScreenOptions.h
+2 -2
View File
@@ -35,8 +35,8 @@ public:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
protected: protected:
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ) = 0; virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns ) = 0;
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ) = 0; virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns ) = 0;
void InitOptionsText(); void InitOptionsText();
void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ); void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut );
stepmania/src/ScreenOptionsMaster.h
+2 -2
View File
@@ -21,8 +21,8 @@ protected:
protected: protected:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
virtual void ImportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
virtual void BeginFadingOut(); virtual void BeginFadingOut();
stepmania/src/ScreenProfileOptions.cpp
+9 -9
View File
@@ -85,14 +85,14 @@ void ScreenProfileOptions::Init()
SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music") ); 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_PLAYER1:
case PO_PLAYER2: case PO_PLAYER2:
{ {
PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1); PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1);
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -101,25 +101,25 @@ void ScreenProfileOptions::ImportOptions( int row, const vector<PlayerNumber> &v
vsProfiles.end(), vsProfiles.end(),
PREFSMAN->GetDefaultLocalProfileID(pn).Get() ); PREFSMAN->GetDefaultLocalProfileID(pn).Get() );
if( iter != vsProfiles.end() ) if( iter != vsProfiles.end() )
m_pRows[row]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 ); m_pRows[iRow]->SetOneSharedSelection( iter - vsProfiles.begin() + 1 );
} }
break; 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_PLAYER1:
case PO_PLAYER2: case PO_PLAYER2:
{ {
PlayerNumber pn = (PlayerNumber)(row - PO_PLAYER1); PlayerNumber pn = (PlayerNumber)(iRow - PO_PLAYER1);
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
if( m_pRows[row]->GetOneSharedSelection() > 0 ) if( m_pRows[iRow]->GetOneSharedSelection() > 0 )
PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[row]->GetOneSharedSelection()-1] ); PREFSMAN->GetDefaultLocalProfileID(pn).Set( vsProfiles[m_pRows[iRow]->GetOneSharedSelection()-1] );
else else
PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" ); PREFSMAN->GetDefaultLocalProfileID(pn).Set( "" );
} }
stepmania/src/ScreenProfileOptions.h
+2 -2
View File
@@ -14,8 +14,8 @@ public:
virtual void MenuStart( PlayerNumber pn, const InputEventType type ); virtual void MenuStart( PlayerNumber pn, const InputEventType type );
private: private:
void ImportOptions( int row, const vector<PlayerNumber> &vpns ); void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
void ExportOptions( int row, const vector<PlayerNumber> &vpns ); void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
CString GetSelectedProfileID(); CString GetSelectedProfileID();
CString GetSelectedProfileName(); CString GetSelectedProfileName();
stepmania/src/ScreenSMOnlineLogin.cpp
+4 -4
View File
@@ -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: 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: case 0:
{ {
stepmania/src/ScreenSMOnlineLogin.h
+2 -2
View File
@@ -13,8 +13,8 @@ public:
void SendLogin(CString sPassword); void SendLogin(CString sPassword);
private: private:
void ImportOptions( int row, const vector<PlayerNumber> &vpns ); void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
void ExportOptions( int row, const vector<PlayerNumber> &vpns ); void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
CString GetSelectedProfileID(); CString GetSelectedProfileID();
int m_iPlayer; int m_iPlayer;
}; };
stepmania/src/ScreenSongOptions.cpp
+2 -2
View File
@@ -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; const SongOptions::FailType ft = GAMESTATE->m_SongOptions.m_FailType;
ScreenOptionsMaster::ExportOptions( row, vpns ); ScreenOptionsMaster::ExportOptions( iRow, vpns );
if( ft != GAMESTATE->m_SongOptions.m_FailType ) if( ft != GAMESTATE->m_SongOptions.m_FailType )
GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true; GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true;
stepmania/src/ScreenSongOptions.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
private: private:
virtual void ExportOptions( int row, const vector<PlayerNumber> &vpns ); virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
}; };
#endif #endif