use Preference1D

This commit is contained in:
Chris Danford
2005-10-26 23:09:56 +00:00
parent 9b3a007551
commit e00a57e05e
16 changed files with 140 additions and 130 deletions
+8 -8
View File
@@ -386,21 +386,21 @@ void MemoryCardManager::Update( float fDelta )
FOREACH( UsbStorageDevice, vUnassignedDevices, d )
{
// search for card dir match
if( !PREFSMAN->GetMemoryCardOsMountPoint(p).Get().empty() &&
d->sOsMountDir.CompareNoCase(PREFSMAN->GetMemoryCardOsMountPoint(p).Get()) )
if( !PREFSMAN->m_sMemoryCardOsMountPoint[p].Get().empty() &&
d->sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p].Get()) )
continue; // not a match
// search for USB bus match
if( PREFSMAN->GetMemoryCardUsbBus(p) != -1 &&
PREFSMAN->GetMemoryCardUsbBus(p) != d->iBus )
if( PREFSMAN->m_iMemoryCardUsbBus[p] != -1 &&
PREFSMAN->m_iMemoryCardUsbBus[p] != d->iBus )
continue; // not a match
if( PREFSMAN->GetMemoryCardUsbPort(p) != -1 &&
PREFSMAN->GetMemoryCardUsbPort(p) != d->iPort )
if( PREFSMAN->m_iMemoryCardUsbPort[p] != -1 &&
PREFSMAN->m_iMemoryCardUsbPort[p] != d->iPort )
continue; // not a match
if( PREFSMAN->GetMemoryCardUsbLevel(p) != -1 &&
PREFSMAN->GetMemoryCardUsbLevel(p) != d->iLevel )
if( PREFSMAN->m_iMemoryCardUsbLevel[p] != -1 &&
PREFSMAN->m_iMemoryCardUsbLevel[p] != d->iLevel )
continue; // not a match
LOG->Trace( "Player %i: matched %s", p+1, d->sDevice.c_str() );