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

Fix crashes with GAMESTATE->m_iCoins.

Browse Source
This commit is contained in:
Steve Checkoway
2008-09-22 04:39:22 +00:00
parent f4b1e3e72b
commit b7b3e88a9f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+1 -1
View File
@@ -634,7 +634,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
int iNumCreditsOwed = iNumCreditsRequired - iNumCreditsPaid; int iNumCreditsOwed = iNumCreditsRequired - iNumCreditsPaid;
GAMESTATE->m_iCoins.Set( GAMESTATE->m_iCoins - iNumCreditsOwed * PREFSMAN->m_iCoinsPerCredit ); GAMESTATE->m_iCoins.Set( GAMESTATE->m_iCoins - iNumCreditsOwed * PREFSMAN->m_iCoinsPerCredit );
LOG->Trace( "Deducted %i coins, %i remaining", LOG->Trace( "Deducted %i coins, %i remaining",
iNumCreditsOwed * PREFSMAN->m_iCoinsPerCredit, GAMESTATE->m_iCoins ); iNumCreditsOwed * PREFSMAN->m_iCoinsPerCredit, GAMESTATE->m_iCoins.Get() );
} }
stepmania/src/ScreenAttract.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
switch( GAMESTATE->GetCoinMode() ) switch( GAMESTATE->GetCoinMode() )
{ {
case CoinMode_Pay: case CoinMode_Pay:
LOG->Trace("ScreenAttract::AttractInput: COIN_PAY (%i/%i, %i)", GAMESTATE->m_iCoins, PREFSMAN->m_iCoinsPerCredit.Get(), GAMESTATE->GetNumSidesJoined() ); LOG->Trace("ScreenAttract::AttractInput: COIN_PAY (%i/%i, %i)", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get(), GAMESTATE->GetNumSidesJoined() );
if( GAMESTATE->m_iCoins < PREFSMAN->m_iCoinsPerCredit && GAMESTATE->GetNumSidesJoined() == 0 ) if( GAMESTATE->m_iCoins < PREFSMAN->m_iCoinsPerCredit && GAMESTATE->GetNumSidesJoined() == 0 )
break; // don't fall through break; // don't fall through
// fall through // fall through
stepmania/src/StepMania.cpp
+4 -2
View File
@@ -1200,7 +1200,7 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping )
if( bMaxCredits ) if( bMaxCredits )
GAMESTATE->m_iCoins.Set( MAX_NUM_CREDITS * PREFSMAN->m_iCoinsPerCredit ); GAMESTATE->m_iCoins.Set( MAX_NUM_CREDITS * PREFSMAN->m_iCoinsPerCredit );
LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins, PREFSMAN->m_iCoinsPerCredit.Get() ); LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get() );
if( iNumCoinsOld != GAMESTATE->m_iCoins ) if( iNumCoinsOld != GAMESTATE->m_iCoins )
SCREENMAN->PlayCoinSound(); SCREENMAN->PlayCoinSound();
else else
@@ -1230,7 +1230,7 @@ void StepMania::InsertCredit()
void StepMania::ClearCredits() void StepMania::ClearCredits()
{ {
LOG->Trace("%i coins cleared", GAMESTATE->m_iCoins ); LOG->Trace("%i coins cleared", GAMESTATE->m_iCoins.Get() );
GAMESTATE->m_iCoins.Set( 0 ); GAMESTATE->m_iCoins.Set( 0 );
SCREENMAN->PlayInvalidSound(); SCREENMAN->PlayInvalidSound();
@@ -1324,7 +1324,9 @@ bool HandleGlobalInputs( const InputEventPlus &input )
{ {
// If holding LShift save uncompressed, else save compressed // If holding LShift save uncompressed, else save compressed
bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) ); bool bSaveCompressed = !INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT) );
RageTimer timer;
StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false ); StepMania::SaveScreenshot( "Screenshots/", bSaveCompressed, false );
LOG->Trace( "Screenshot took %f seconds.", timer.GetDeltaTime() );
return true; // handled return true; // handled
} }