[Xcode4] May as well fix switch warnings.
Still need some assistance for the linker error.
This commit is contained in:
+32
-30
@@ -449,22 +449,23 @@ void MemoryCardManager::CheckStateChanges()
|
||||
{
|
||||
switch( new_device.m_State )
|
||||
{
|
||||
case UsbStorageDevice::STATE_NONE:
|
||||
state = MemoryCardState_NoCard;
|
||||
break;
|
||||
case UsbStorageDevice::STATE_NONE:
|
||||
state = MemoryCardState_NoCard;
|
||||
break;
|
||||
|
||||
case UsbStorageDevice::STATE_CHECKING:
|
||||
state = MemoryCardState_Checking;
|
||||
break;
|
||||
case UsbStorageDevice::STATE_CHECKING:
|
||||
state = MemoryCardState_Checking;
|
||||
break;
|
||||
|
||||
case UsbStorageDevice::STATE_ERROR:
|
||||
state = MemoryCardState_Error;
|
||||
sError = new_device.m_sError;
|
||||
break;
|
||||
case UsbStorageDevice::STATE_ERROR:
|
||||
state = MemoryCardState_Error;
|
||||
sError = new_device.m_sError;
|
||||
break;
|
||||
|
||||
case UsbStorageDevice::STATE_READY:
|
||||
state = MemoryCardState_Ready;
|
||||
break;
|
||||
case UsbStorageDevice::STATE_READY:
|
||||
state = MemoryCardState_Ready;
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -476,23 +477,24 @@ void MemoryCardManager::CheckStateChanges()
|
||||
params.m_bIsCriticalSound = true;
|
||||
switch( state )
|
||||
{
|
||||
case MemoryCardState_NoCard:
|
||||
case MemoryCardState_Removed:
|
||||
if( LastState == MemoryCardState_Ready )
|
||||
{
|
||||
m_soundDisconnect.Play( ¶ms );
|
||||
MESSAGEMAN->Broadcast( (MessageID)(Message_CardRemovedP1+p) );
|
||||
}
|
||||
break;
|
||||
case MemoryCardState_Ready:
|
||||
m_soundReady.Play( ¶ms );
|
||||
break;
|
||||
case MemoryCardState_TooLate:
|
||||
m_soundTooLate.Play( ¶ms );
|
||||
break;
|
||||
case MemoryCardState_Error:
|
||||
m_soundError.Play( ¶ms );
|
||||
break;
|
||||
case MemoryCardState_NoCard:
|
||||
case MemoryCardState_Removed:
|
||||
if( LastState == MemoryCardState_Ready )
|
||||
{
|
||||
m_soundDisconnect.Play( ¶ms );
|
||||
MESSAGEMAN->Broadcast( (MessageID)(Message_CardRemovedP1+p) );
|
||||
}
|
||||
break;
|
||||
case MemoryCardState_Ready:
|
||||
m_soundReady.Play( ¶ms );
|
||||
break;
|
||||
case MemoryCardState_TooLate:
|
||||
m_soundTooLate.Play( ¶ms );
|
||||
break;
|
||||
case MemoryCardState_Error:
|
||||
m_soundError.Play( ¶ms );
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
m_State[p] = state;
|
||||
|
||||
Reference in New Issue
Block a user