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

Some respect for OOP. (MasterPlayerNumber)

Browse Source
This commit is contained in:
Jason Felds
2011-06-06 20:40:11 -04:00
parent 963cc9d4f1
commit 0a7b9ce170
33 changed files with 106 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMemoryCard.cpp
+4 -4
View File
@@ -111,7 +111,7 @@ void ScreenOptionsMemoryCard::AfterChangeRow( PlayerNumber pn )
}
else
{
int iRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
int iRow = m_iCurrentRow[GAMESTATE->GetMasterPlayerNumber()];
m_textOsMountDir.SetText( m_CurrentUsbStorageDevices[iRow].sOsMountDir );
}
}
@@ -124,7 +124,7 @@ void ScreenOptionsMemoryCard::HandleMessage( const Message &msg )
{
/* Remember the old mountpoint. */
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
int iRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
int iRow = m_iCurrentRow[GAMESTATE->GetMasterPlayerNumber()];
RString sOldMountPoint;
if( iRow < int(v.size()) )
{
@@ -158,7 +158,7 @@ void ScreenOptionsMemoryCard::ExportOptions( int iRow, const vector<PlayerNumber
if( row.GetRowType() == OptionRow::RowType_Exit )
return;
PlayerNumber pn = GAMESTATE->m_MasterPlayerNumber;
PlayerNumber pn = GAMESTATE->GetMasterPlayerNumber();
if( m_iCurrentRow[pn] == iRow )
{
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
@@ -192,7 +192,7 @@ void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
if( IsTransitioning() )
return;
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
int iCurRow = m_iCurrentRow[GAMESTATE->GetMasterPlayerNumber()];
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
if( iCurRow < int(v.size()) ) // a card