Revert "Round 2-2 of this."

This reverts commit 0ae4183f7b.
2013-06-04 23:47:22 -04:00
parent fa91154082
commit 1220dbe085
43 changed files with 1214 additions and 12 deletions
@@ -82,6 +82,7 @@ bool ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 				break;
 			// fall through
 		case GAME_BUTTON_START:
+		case GAME_BUTTON_COIN:
 			switch( GAMESTATE->GetCoinMode() )
 			{
 				case CoinMode_Home:
@@ -89,6 +90,10 @@ bool ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 					if( pScreen->IsTransitioning() )
 						return false;

+					// HandleGlobalInputs() already played the coin sound. Don't play it again.
+					if( input.MenuI != GAME_BUTTON_COIN )
+						SCREENMAN->PlayStartSound();
+
 					pScreen->Cancel( SM_GoToStartScreen );
 					return true;
 				default: FAIL_M("Invalid Coin Mode! Aborting...");