actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenServiceAction.cpp
+31 -46
View File
@@ -37,26 +37,19 @@ RString ClearMachineStats()
static LocalizedString MACHINE_EDITS_CLEARED( "ScreenServiceAction", "%d edits cleared, %d errors." );
static RString ClearMachineEdits()
{
int iNumAttempted = 0;
int iNumSuccessful = 0;
vector<RString> vsEditFiles;
GetDirListing( PROFILEMAN->GetProfileDir(ProfileSlot_Machine)+EDIT_STEPS_SUBDIR+"*.edit", vsEditFiles, false, true );
GetDirListing( PROFILEMAN->GetProfileDir(ProfileSlot_Machine)+EDIT_COURSES_SUBDIR+"*.crs", vsEditFiles, false, true );
FOREACH_CONST( RString, vsEditFiles, i )
{
iNumAttempted++;
bool bSuccess = FILEMAN->Remove( *i );
if( bSuccess )
iNumSuccessful++;
}
int editCount = vsEditFiles.size();
int removedCount = std::count_if(vsEditFiles.begin(), vsEditFiles.end(), [](RString const &i) { return FILEMAN->Remove(i); });
// reload the machine profile
PROFILEMAN->SaveMachineProfile();
PROFILEMAN->LoadMachineProfile();
int iNumErrors = iNumAttempted-iNumSuccessful;
return ssprintf(MACHINE_EDITS_CLEARED.GetValue(),iNumSuccessful,iNumErrors);
int errorCount = editCount - removedCount;
return ssprintf(MACHINE_EDITS_CLEARED.GetValue(), editCount, errorCount);
}
static PlayerNumber GetFirstReadyMemoryCard()
@@ -82,9 +75,6 @@ static RString ClearMemoryCardEdits()
if( pn == PLAYER_INVALID )
return MEMORY_CARD_EDITS_NOT_CLEARED.GetValue();
int iNumAttempted = 0;
int iNumSuccessful = 0;
if( !MEMCARDMAN->IsMounted(pn) )
MEMCARDMAN->MountCard(pn);
@@ -92,17 +82,12 @@ static RString ClearMemoryCardEdits()
vector<RString> vsEditFiles;
GetDirListing( sDir+EDIT_STEPS_SUBDIR+"*.edit", vsEditFiles, false, true );
GetDirListing( sDir+EDIT_COURSES_SUBDIR+"*.crs", vsEditFiles, false, true );
FOREACH_CONST( RString, vsEditFiles, i )
{
iNumAttempted++;
bool bSuccess = FILEMAN->Remove( *i );
if( bSuccess )
iNumSuccessful++;
}
int editCount = vsEditFiles.size();
int removedCount = std::count_if(vsEditFiles.begin(), vsEditFiles.end(), [](RString const &i) { return FILEMAN->Remove(i); });
MEMCARDMAN->UnmountCard(pn);
return ssprintf(EDITS_CLEARED.GetValue(),iNumSuccessful,iNumAttempted-iNumSuccessful);
return ssprintf(EDITS_CLEARED.GetValue(), editCount, editCount - removedCount);
}
@@ -186,11 +171,11 @@ static void CopyEdits( const RString &sFromProfileDir, const RString &sToProfile
vector<RString> vsFiles;
GetDirListing( sFromDir+"*.edit", vsFiles, false, false );
FOREACH_CONST( RString, vsFiles, i )
for (RString const &i : vsFiles)
{
if( DoesFileExist(sToDir+*i) )
if( DoesFileExist(sToDir + i) )
iNumOverwritten++;
bool bSuccess = FileCopy( sFromDir+*i, sToDir+*i );
bool bSuccess = FileCopy( sFromDir + i, sToDir + i );
if( bSuccess )
iNumSucceeded++;
else
@@ -198,7 +183,7 @@ static void CopyEdits( const RString &sFromProfileDir, const RString &sToProfile
// Test whether the song we need for this edit is present and ignore this edit if not present.
SSCLoader loaderSSC;
if( !loaderSSC.LoadEditFromFile( sFromDir+*i, ProfileSlot_Machine, false ) )
if( !loaderSSC.LoadEditFromFile( sFromDir + i, ProfileSlot_Machine, false ) )
{
iNumIgnored++;
continue;
@@ -214,11 +199,11 @@ static void CopyEdits( const RString &sFromProfileDir, const RString &sToProfile
vector<RString> vsFiles;
GetDirListing( sFromDir+"*.crs", vsFiles, false, false );
FOREACH_CONST( RString, vsFiles, i )
for (RString const &i : vsFiles)
{
if( DoesFileExist(sToDir+*i) )
if( DoesFileExist(sToDir + i) )
iNumOverwritten++;
bool bSuccess = FileCopy( sFromDir+*i, sToDir+*i );
bool bSuccess = FileCopy( sFromDir + i, sToDir + i );
if( bSuccess )
iNumSucceeded++;
else
@@ -375,12 +360,12 @@ static RString CopyEditsMemoryCardToMachine()
vector<RString> vs;
vs.push_back( ssprintf( COPIED_FROM_CARD.GetValue(), pn+1 ) );
FOREACH_CONST( RString, vsSubDirs, sSubDir )
for (RString const &sSubDir : vsSubDirs)
{
RString sFromDir = MEM_CARD_MOUNT_POINT[pn] + (RString)(*sSubDir) + "/";
RString sFromDir = MEM_CARD_MOUNT_POINT[pn] + sSubDir + "/";
RString sToDir = PROFILEMAN->GetProfileDir(ProfileSlot_Machine);
RString s = CopyEdits( sFromDir, sToDir, *sSubDir );
RString s = CopyEdits( sFromDir, sToDir, sSubDir );
vs.push_back( s );
}
@@ -410,22 +395,22 @@ void ScreenServiceAction::BeginScreen()
split( sActions, ",", vsActions );
vector<RString> vsResults;
FOREACH( RString, vsActions, s )
for (RString const &s : vsActions)
{
RString (*pfn)() = NULL;
RString (*pfn)() = nullptr;
if( *s == "ClearBookkeepingData" ) pfn = ClearBookkeepingData;
else if( *s == "ClearMachineStats" ) pfn = ClearMachineStats;
else if( *s == "ClearMachineEdits" ) pfn = ClearMachineEdits;
else if( *s == "ClearMemoryCardEdits" ) pfn = ClearMemoryCardEdits;
else if( *s == "TransferStatsMachineToMemoryCard" ) pfn = TransferStatsMachineToMemoryCard;
else if( *s == "TransferStatsMemoryCardToMachine" ) pfn = TransferStatsMemoryCardToMachine;
else if( *s == "CopyEditsMachineToMemoryCard" ) pfn = CopyEditsMachineToMemoryCard;
else if( *s == "CopyEditsMemoryCardToMachine" ) pfn = CopyEditsMemoryCardToMachine;
else if( *s == "SyncEditsMachineToMemoryCard" ) pfn = SyncEditsMachineToMemoryCard;
else if( *s == "ResetPreferences" ) pfn = ResetPreferences;
if( s == "ClearBookkeepingData" ) pfn = ClearBookkeepingData;
else if( s == "ClearMachineStats" ) pfn = ClearMachineStats;
else if( s == "ClearMachineEdits" ) pfn = ClearMachineEdits;
else if( s == "ClearMemoryCardEdits" ) pfn = ClearMemoryCardEdits;
else if( s == "TransferStatsMachineToMemoryCard" ) pfn = TransferStatsMachineToMemoryCard;
else if( s == "TransferStatsMemoryCardToMachine" ) pfn = TransferStatsMemoryCardToMachine;
else if( s == "CopyEditsMachineToMemoryCard" ) pfn = CopyEditsMachineToMemoryCard;
else if( s == "CopyEditsMemoryCardToMachine" ) pfn = CopyEditsMemoryCardToMachine;
else if( s == "SyncEditsMachineToMemoryCard" ) pfn = SyncEditsMachineToMemoryCard;
else if( s == "ResetPreferences" ) pfn = ResetPreferences;
ASSERT_M( pfn != NULL, *s );
ASSERT_M( pfn != nullptr, s );
RString sResult = pfn();
vsResults.push_back( sResult );