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

merge MountUsedCard and MountCard

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-28 00:12:09 +00:00
parent f8a00af09f
commit ed3bec750b
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+2 -2
View File
@@ -633,7 +633,7 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
continue; // skip continue; // skip
MEMCARDMAN->MountUsedCard(pn); MEMCARDMAN->MountCard(pn);
bTriedToSave = true; bTriedToSave = true;
@@ -664,7 +664,7 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
continue; // skip continue; // skip
MEMCARDMAN->MountUsedCard(pn); MEMCARDMAN->MountCard(pn);
bTriedToLoad = true; bTriedToLoad = true;
stepmania/src/GameState.cpp
+2 -2
View File
@@ -235,7 +235,7 @@ void GameState::PlayersFinalized()
// apply saved default modifiers if any // apply saved default modifiers if any
FOREACH_HumanPlayer( pn ) FOREACH_HumanPlayer( pn )
{ {
MEMCARDMAN->MountUsedCard( pn ); MEMCARDMAN->MountCard( pn );
PROFILEMAN->LoadFirstAvailableProfile( pn ); // load full profile PROFILEMAN->LoadFirstAvailableProfile( pn ); // load full profile
@@ -358,7 +358,7 @@ void GameState::EndGame()
continue; continue;
if( PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn) ) if( PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn) )
MEMCARDMAN->MountUsedCard( pn ); MEMCARDMAN->MountCard( pn );
PROFILEMAN->SaveProfile( pn ); PROFILEMAN->SaveProfile( pn );
MEMCARDMAN->UnmountCard( pn ); MEMCARDMAN->UnmountCard( pn );
stepmania/src/MemoryCardManager.cpp
+3 -12
View File
@@ -233,21 +233,12 @@ void MemoryCardManager::UnlockCards()
m_pDriver->SetMountThreadState( MemoryCardDriver::detect_and_mount ); m_pDriver->SetMountThreadState( MemoryCardDriver::detect_and_mount );
} }
/* Called in EndGame just before writing the profile. Should block. */ /* Called just before reading or writing to the memory card. Should block. */
void MemoryCardManager::MountUsedCard( PlayerNumber pn )
{
if( m_Device[pn].IsBlank() ) // they don't have an assigned card
return;
MountCard( pn );
}
void MemoryCardManager::MountCard( PlayerNumber pn ) void MemoryCardManager::MountCard( PlayerNumber pn )
{ {
ASSERT( !m_Device[pn].IsBlank() ); if( GetCardState(pn) != MEMORY_CARD_STATE_READY )
if( !m_Device[pn].bWriteTestSucceeded || m_bTooLate[pn] )
return; return;
ASSERT( !m_Device[pn].IsBlank() );
/* Pause the mounting thread when we mount the first drive. */ /* Pause the mounting thread when we mount the first drive. */
bool bStartingMemoryCardAccess = true; bool bStartingMemoryCardAccess = true;
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 MountUsedCard( PlayerNumber pn );
void MountCard( PlayerNumber pn ); void MountCard( PlayerNumber pn );
void UnmountCard( PlayerNumber pn ); void UnmountCard( PlayerNumber pn );