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

merge OverlayInput into Input. overlay screens can still intercept input if they want.

Browse Source
This commit is contained in:
Devin J. Pohly
2013-01-12 23:19:44 -05:00
parent 9c9e2f995f
commit 2cf9262afc
9 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSyncOverlay.cpp
+4 -4
View File
@@ -152,13 +152,13 @@ void ScreenSyncOverlay::UpdateText()
static LocalizedString CANT_SYNC_WHILE_PLAYING_A_COURSE ("ScreenSyncOverlay","Can't sync while playing a course.");
static LocalizedString SYNC_CHANGES_REVERTED ("ScreenSyncOverlay","Sync changes reverted.");
bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
bool ScreenSyncOverlay::Input( const InputEventPlus &input )
{
if( !IsGameplay() )
return Screen::OverlayInput(input);
return Screen::Input(input);
if( input.DeviceI.device != DEVICE_KEYBOARD )
return Screen::OverlayInput(input);
return Screen::Input(input);
enum Action
{
@@ -186,7 +186,7 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
break;
default:
return Screen::OverlayInput(input);
return Screen::Input(input);
}
if( GAMESTATE->IsCourseMode() && a != ChangeGlobalOffset )