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

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
+2 -2
View File
@@ -418,7 +418,7 @@ static bool GetValueFromMap( const map<U, V> &m, const U &key, V &val )
return true;
}
bool ScreenDebugOverlay::OverlayInput( const InputEventPlus &input )
bool ScreenDebugOverlay::Input( const InputEventPlus &input )
{
if( input.DeviceI == g_Mappings.holdForDebug1 ||
input.DeviceI == g_Mappings.holdForDebug2 )
@@ -498,7 +498,7 @@ bool ScreenDebugOverlay::OverlayInput( const InputEventPlus &input )
}
}
return Screen::OverlayInput(input);
return Screen::Input(input);
}