complete removal of memory card blacklist

This commit is contained in:
Chris Danford
2005-11-29 23:13:43 +00:00
parent 7df3399dec
commit 749a8468a9
2 changed files with 7 additions and 15 deletions
+6 -14
View File
@@ -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
+1 -1
View File
@@ -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]; }