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

add m_CurrentUsbStorageDevices

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-03 07:31:42 +00:00
parent d9d2c8ed28
commit 99c2f69453
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMemoryCard.cpp
+8 -6
View File
@@ -22,8 +22,10 @@ void ScreenOptionsMemoryCard::Init()
void ScreenOptionsMemoryCard::BeginScreen()
{
vector<OptionRowHandler*> vHands;
m_CurrentUsbStorageDevices = MEMCARDMAN->GetStorageDevices();
FOREACH_CONST( UsbStorageDevice, MEMCARDMAN->GetStorageDevices(), iter )
FOREACH_CONST( UsbStorageDevice, m_CurrentUsbStorageDevices, iter )
{
// TODO: Make these string themable
@@ -52,7 +54,7 @@ void ScreenOptionsMemoryCard::BeginScreen()
def.m_bOneChoiceForAllPlayers = true;
}
if( MEMCARDMAN->GetStorageDevices().empty() )
if( m_CurrentUsbStorageDevices.empty() )
{
OptionRowDefinition def( "No memory cards detected", true, "" );
}
@@ -64,7 +66,7 @@ void ScreenOptionsMemoryCard::BeginScreen()
// select the last chosen memory card (if present)
if( !MEMCARDMAN->m_sEditorMemoryCardOsMountPoint.Get().empty() )
{
const vector<UsbStorageDevice> &v = MEMCARDMAN->GetStorageDevices();
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
for( unsigned i=0; i<v.size(); i++ )
{
if( v[i].sOsMountDir == MEMCARDMAN->m_sEditorMemoryCardOsMountPoint.Get() )
@@ -104,7 +106,7 @@ void ScreenOptionsMemoryCard::ExportOptions( int iRow, const vector<PlayerNumber
PlayerNumber pn = GAMESTATE->m_MasterPlayerNumber;
if( m_iCurrentRow[pn] == iRow )
{
const vector<UsbStorageDevice> &v = MEMCARDMAN->GetStorageDevices();
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
if( iRow < int(v.size()) )
{
const UsbStorageDevice &dev = v[iRow];
@@ -118,10 +120,10 @@ void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
{
int iCurRow = m_iCurrentRow[GAMESTATE->m_MasterPlayerNumber];
const vector<UsbStorageDevice> &v = MEMCARDMAN->GetStorageDevices();
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
if( iCurRow < int(v.size()) ) // a card
{
const vector<UsbStorageDevice> v = MEMCARDMAN->GetStorageDevices();
const vector<UsbStorageDevice> &v = m_CurrentUsbStorageDevices;
const UsbStorageDevice &dev = v[iCurRow];
MEMCARDMAN->m_sEditorMemoryCardOsMountPoint.Set( dev.sOsMountDir );
bool bSuccess = MEMCARDMAN->MountCard( PLAYER_1, dev );