From 749a8468a9ae753a5ba34ef3c85e626aaf4a6bc7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 29 Nov 2005 23:13:43 +0000 Subject: [PATCH] complete removal of memory card blacklist --- stepmania/src/MemoryCardManager.cpp | 20 ++++++-------------- stepmania/src/MemoryCardManager.h | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 6fa383ec70..d8dcc7d992 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -326,23 +326,15 @@ MemoryCardManager::~MemoryCardManager() } } -void MemoryCardManager::Update( float fDelta, bool bForceUpdate ) +void MemoryCardManager::Update( float fDelta ) { vector vOld; - if( bForceUpdate ) - { - // force a redetect on the next update - FOREACH_PlayerNumber( p ) - m_Device[p].MakeBlank(); - // leave vOld empty - } - else - { - vOld = m_vStorageDevices; // copy - if( !g_pWorker->StorageDevicesChanged( m_vStorageDevices ) ) - return; - } + vOld = m_vStorageDevices; // copy + if( !g_pWorker->StorageDevicesChanged( m_vStorageDevices ) ) + return; + + MESSAGEMAN->Broadcast( Message_StorageDevicesChanged ); // make a list of unassigned vector vUnassignedDevices = m_vStorageDevices; // copy diff --git a/stepmania/src/MemoryCardManager.h b/stepmania/src/MemoryCardManager.h index 7c1d6963bb..526f1d2d69 100644 --- a/stepmania/src/MemoryCardManager.h +++ b/stepmania/src/MemoryCardManager.h @@ -16,7 +16,7 @@ public: MemoryCardManager(); ~MemoryCardManager(); - void Update( float fDelta, bool bForceUpdate = false ); + void Update( float fDelta ); MemoryCardState GetCardState( PlayerNumber pn ) const { return m_State[pn]; } CString GetCardError( PlayerNumber pn ) const { return m_sError[pn]; }