diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index ea6d820ff6..64fec91a93 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -42,11 +42,12 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut static Preference g_bMemoryCards( "MemoryCards", true ); // if set, always use the device that mounts to this point -Preference1D MemoryCardManager::m_sMemoryCardOsMountPoint( MemoryCardOsMountPointInit, NUM_PLAYERS ); +Preference1D MemoryCardManager::m_sMemoryCardOsMountPoint( MemoryCardOsMountPointInit, NUM_PLAYERS ); + // Look for this level, bus, port when assigning cards. -1 = match any -Preference1D MemoryCardManager::m_iMemoryCardUsbBus( MemoryCardUsbBusInit, NUM_PLAYERS ); -Preference1D MemoryCardManager::m_iMemoryCardUsbPort( MemoryCardUsbPortInit, NUM_PLAYERS ); -Preference1D MemoryCardManager::m_iMemoryCardUsbLevel( MemoryCardUsbLevelInit, NUM_PLAYERS ); +Preference1D MemoryCardManager::m_iMemoryCardUsbBus( MemoryCardUsbBusInit, NUM_PLAYERS ); +Preference1D MemoryCardManager::m_iMemoryCardUsbPort( MemoryCardUsbPortInit, NUM_PLAYERS ); +Preference1D MemoryCardManager::m_iMemoryCardUsbLevel( MemoryCardUsbLevelInit, NUM_PLAYERS ); Preference MemoryCardManager::m_sEditorMemoryCardOsMountPoint( "EditorMemoryCardOsMountPoint", "" ); diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp index 8d1ad547b0..9cf6531fc8 100644 --- a/stepmania/src/ScreenSystemLayer.cpp +++ b/stepmania/src/ScreenSystemLayer.cpp @@ -111,8 +111,8 @@ RString ScreenSystemLayer::GetCreditsMessage( PlayerNumber pn ) const return RString(); case MemoryCardState_Error: return THEME->GetMetric( m_sName, "CreditsCard" + MEMCARDMAN->GetCardError(pn) ); - case MemoryCardState_TooLate: return CREDITS_CARD_TOO_LATE.GetValue(); - case MemoryCardState_Checking: return CREDITS_CARD_CHECKING.GetValue(); + case MemoryCardState_TooLate: return CREDITS_CARD_TOO_LATE.GetValue(); + case MemoryCardState_Checking: return CREDITS_CARD_CHECKING.GetValue(); case MemoryCardState_Removed: return CREDITS_CARD_REMOVED.GetValue(); case MemoryCardState_Ready: {