complete removal of memory card blacklist
This commit is contained in:
@@ -326,23 +326,15 @@ MemoryCardManager::~MemoryCardManager()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryCardManager::Update( float fDelta, bool bForceUpdate )
|
void MemoryCardManager::Update( float fDelta )
|
||||||
{
|
{
|
||||||
vector<UsbStorageDevice> vOld;
|
vector<UsbStorageDevice> vOld;
|
||||||
|
|
||||||
if( bForceUpdate )
|
vOld = m_vStorageDevices; // copy
|
||||||
{
|
if( !g_pWorker->StorageDevicesChanged( m_vStorageDevices ) )
|
||||||
// force a redetect on the next update
|
return;
|
||||||
FOREACH_PlayerNumber( p )
|
|
||||||
m_Device[p].MakeBlank();
|
MESSAGEMAN->Broadcast( Message_StorageDevicesChanged );
|
||||||
// leave vOld empty
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
vOld = m_vStorageDevices; // copy
|
|
||||||
if( !g_pWorker->StorageDevicesChanged( m_vStorageDevices ) )
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// make a list of unassigned
|
// make a list of unassigned
|
||||||
vector<UsbStorageDevice> vUnassignedDevices = m_vStorageDevices; // copy
|
vector<UsbStorageDevice> vUnassignedDevices = m_vStorageDevices; // copy
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public:
|
|||||||
MemoryCardManager();
|
MemoryCardManager();
|
||||||
~MemoryCardManager();
|
~MemoryCardManager();
|
||||||
|
|
||||||
void Update( float fDelta, bool bForceUpdate = false );
|
void Update( float fDelta );
|
||||||
|
|
||||||
MemoryCardState GetCardState( PlayerNumber pn ) const { return m_State[pn]; }
|
MemoryCardState GetCardState( PlayerNumber pn ) const { return m_State[pn]; }
|
||||||
CString GetCardError( PlayerNumber pn ) const { return m_sError[pn]; }
|
CString GetCardError( PlayerNumber pn ) const { return m_sError[pn]; }
|
||||||
|
|||||||
Reference in New Issue
Block a user