diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp index 2fe17069f8..ee697d877d 100644 --- a/src/ScreenDebugOverlay.cpp +++ b/src/ScreenDebugOverlay.cpp @@ -630,12 +630,6 @@ class DebugLineAutoplay : public IDebugLine FOREACH_MultiPlayer(p) GAMESTATE->m_pMultiPlayerState[p]->m_PlayerController = GamePreferences::m_AutoPlay; - // Hide Autoplay if Alt is held down - bool bHoldingAlt = - INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT) ) || - INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT) ); - ScreenSyncOverlay::SetShowAutoplay( !bHoldingAlt ); - IDebugLine::DoAndLog( sMessageOut ); } }; diff --git a/src/ScreenSyncOverlay.cpp b/src/ScreenSyncOverlay.cpp index 8c268379ba..eb0c7e3c27 100644 --- a/src/ScreenSyncOverlay.cpp +++ b/src/ScreenSyncOverlay.cpp @@ -42,12 +42,6 @@ void ScreenSyncOverlay::Update( float fDeltaTime ) UpdateText(); } -bool g_bShowAutoplay = true; -void ScreenSyncOverlay::SetShowAutoplay( bool b ) -{ - g_bShowAutoplay = b; -} - static LocalizedString AUTO_PLAY ( "ScreenSyncOverlay", "AutoPlay" ); static LocalizedString AUTO_PLAY_CPU ( "ScreenSyncOverlay", "AutoPlayCPU" ); static LocalizedString AUTO_SYNC_SONG ( "ScreenSyncOverlay", "AutoSync Song" ); @@ -62,17 +56,14 @@ void ScreenSyncOverlay::UpdateText() // Update Status vector vs; - if( g_bShowAutoplay ) + PlayerController pc = GamePreferences::m_AutoPlay.Get(); + switch( pc ) { - PlayerController pc = GamePreferences::m_AutoPlay.Get(); - switch( pc ) - { case PC_HUMAN: break; case PC_AUTOPLAY: vs.push_back(AUTO_PLAY); break; case PC_CPU: vs.push_back(AUTO_PLAY_CPU); break; default: FAIL_M(ssprintf("Invalid PlayerController: %i", pc)); - } } AutosyncType type = GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType; diff --git a/src/ScreenSyncOverlay.h b/src/ScreenSyncOverlay.h index 111f7de900..bac6c03c18 100644 --- a/src/ScreenSyncOverlay.h +++ b/src/ScreenSyncOverlay.h @@ -10,10 +10,8 @@ public: virtual void Init(); bool Input( const InputEventPlus &input ); - void Update( float fDeltaTime ); - static void SetShowAutoplay( bool b ); private: void UpdateText(); void ShowHelp();