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

MemoryCardManager::TryMountAllCards gone

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-28 00:08:16 +00:00
parent a930c41ed7
commit f8a00af09f
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+10 -5
View File
@@ -627,20 +627,23 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
} }
if( m_bTransferStatsFromMachine ) if( m_bTransferStatsFromMachine )
{ {
MEMCARDMAN->TryMountAllCards();
bool bTriedToSave = false; bool bTriedToSave = false;
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
continue; // skip continue; // skip
MEMCARDMAN->MountUsedCard(pn);
bTriedToSave = true; bTriedToSave = true;
CString sDir = MEM_CARD_MOUNT_POINT[pn]; CString sDir = MEM_CARD_MOUNT_POINT[pn];
sDir += "MachineProfile/"; sDir += "MachineProfile/";
bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData ); bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData );
MEMCARDMAN->UnmountCard(pn);
if( bSaved ) if( bSaved )
SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) ); SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) );
else else
@@ -655,14 +658,14 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
} }
if( m_bTransferStatsToMachine ) if( m_bTransferStatsToMachine )
{ {
MEMCARDMAN->TryMountAllCards();
bool bTriedToLoad = false; bool bTriedToLoad = false;
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
continue; // skip continue; // skip
MEMCARDMAN->MountUsedCard(pn);
bTriedToLoad = true; bTriedToLoad = true;
CString sDir = MEM_CARD_MOUNT_POINT[pn]; CString sDir = MEM_CARD_MOUNT_POINT[pn];
@@ -681,12 +684,14 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
*PROFILEMAN->GetMachineProfile() = backup; *PROFILEMAN->GetMachineProfile() = backup;
break; break;
case Profile::failed_tampered: case Profile::failed_tampered:
SCREENMAN->SystemMessage( ssprintf("The profile on P%d card contains tampered data.",pn+1) ); SCREENMAN->SystemMessage( ssprintf("The profile on P%d card contains corrupt or tampered data.",pn+1) );
*PROFILEMAN->GetMachineProfile() = backup; *PROFILEMAN->GetMachineProfile() = backup;
break; break;
default: default:
ASSERT(0); ASSERT(0);
} }
MEMCARDMAN->UnmountCard(pn);
break; break;
} }
stepmania/src/MemoryCardManager.cpp
-14
View File
@@ -233,20 +233,6 @@ void MemoryCardManager::UnlockCards()
m_pDriver->SetMountThreadState( MemoryCardDriver::detect_and_mount ); m_pDriver->SetMountThreadState( MemoryCardDriver::detect_and_mount );
} }
/* Used by TransferStatsFromMachine, TransferStatsToMachine, and PlayersFinalized()
* just before reading the profile. Should block. */
void MemoryCardManager::TryMountAllCards()
{
FOREACH_EnabledPlayer( p )
{
if( m_Device[p].IsBlank() ) // they don't have an assigned card
continue;
MountCard( p );
}
}
/* Called in EndGame just before writing the profile. Should block. */ /* Called in EndGame just before writing the profile. Should block. */
void MemoryCardManager::MountUsedCard( PlayerNumber pn ) void MemoryCardManager::MountUsedCard( PlayerNumber pn )
{ {
stepmania/src/MemoryCardManager.h
-1
View File
@@ -21,7 +21,6 @@ public:
void LockCards(); // prevent removing or changing of memory cards void LockCards(); // prevent removing or changing of memory cards
void UnlockCards(); void UnlockCards();
void TryMountAllCards();
void MountUsedCard( PlayerNumber pn ); void MountUsedCard( PlayerNumber pn );
void MountCard( PlayerNumber pn ); void MountCard( PlayerNumber pn );
void UnmountCard( PlayerNumber pn ); void UnmountCard( PlayerNumber pn );