From d33d89654926f5cfcd762fa713a629f451573d56 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 21 Dec 2005 20:07:48 +0000 Subject: [PATCH] most of the time, all copies will succeed --- stepmania/src/ScreenServiceAction.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenServiceAction.cpp b/stepmania/src/ScreenServiceAction.cpp index ba8d928628..27f85118c8 100644 --- a/stepmania/src/ScreenServiceAction.cpp +++ b/stepmania/src/ScreenServiceAction.cpp @@ -294,7 +294,9 @@ static void CopyEdits( const CString &sFrom, const CString &sTo, int &iNumAttemp } static LocalizedString EDITS_NOT_COPIED( "ScreenServiceAction", "Edits not copied - No memory cards ready." ); -static LocalizedString COPIED_TO_CARD( "ScreenServiceAction", "Copied to P%d card: %d/%d copies OK (%d overwritten)." ); +static LocalizedString COPIED_TO_CARD( "ScreenServiceAction", "Copied to P%d card:" ); +static LocalizedString COPIED_AND_OVERWRITTEN( "ScreenServiceAction", "%d copied (%d overwritten)" ); +static LocalizedString COPIED_FAILED( "ScreenServiceAction", "(%d failed)" ); static CString CopyEditsMachineToMemoryCard() { PlayerNumber pn = GetFirstReadyMemoryCard(); @@ -314,11 +316,14 @@ static CString CopyEditsMachineToMemoryCard() MEMCARDMAN->UnmountCard(pn); - // TODO: Make string themable - return ssprintf(COPIED_TO_CARD.GetValue(),pn+1,iNumSuccessful,iNumAttempted,iNumOverwritten); + CString sRet = ssprintf( COPIED_TO_CARD.GetValue(), pn+1 ) + " "; + sRet += ssprintf( COPIED_AND_OVERWRITTEN.GetValue(), iNumSuccessful, iNumOverwritten ); + if( iNumSuccessful < iNumAttempted ) + sRet += CString(" ") + ssprintf( COPIED_FAILED.GetValue(), iNumAttempted-iNumSuccessful ); + return sRet; } -static LocalizedString COPIED_FROM_CARD( "ScreenServiceAction", "Copied from P%d card: %d/%d copies OK (%d overwritten)." ); +static LocalizedString COPIED_FROM_CARD( "ScreenServiceAction", "Copied from P%d card:" ); static CString CopyEditsMemoryCardToMachine() { PlayerNumber pn = GetFirstReadyMemoryCard(); @@ -342,8 +347,11 @@ static CString CopyEditsMemoryCardToMachine() PROFILEMAN->SaveMachineProfile(); PROFILEMAN->LoadMachineProfile(); - // TODO: Make themeable - return ssprintf(COPIED_FROM_CARD.GetValue(),pn+1,iNumSuccessful,iNumAttempted,iNumOverwritten); + CString sRet = ssprintf( COPIED_FROM_CARD.GetValue(), pn+1 ) + " "; + sRet += ssprintf( COPIED_AND_OVERWRITTEN.GetValue(), iNumSuccessful, iNumOverwritten ); + if( iNumSuccessful < iNumAttempted ) + sRet += CString(" ") + ssprintf( COPIED_FAILED.GetValue(), iNumAttempted-iNumSuccessful ); + return sRet; } static LocalizedString PREFERENCES_RESET( "ScreenServiceAction", "Preferences reset." );