Make ScreenMapControllers obey lockinput

This commit is contained in:
Colby Klein
2012-01-07 16:44:13 -08:00
parent 1dc4cbe8b4
commit 92a9aace94
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -2744,7 +2744,7 @@ Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsService" NextScreen="ScreenOptionsService"
HelpText=Screen.String("HelpTextMapControllers") HelpText=Screen.String("HelpTextMapControllers")
# #
ScreenOnCommand=%function(self) MESSAGEMAN:Broadcast("KeyConfigRequestStall"); end; ScreenOnCommand=%function(self) MESSAGEMAN:Broadcast("KeyConfigRequestStall"); self:lockinput(5); end;
# #
DevicesX=SCREEN_CENTER_X DevicesX=SCREEN_CENTER_X
DevicesY=SCREEN_TOP+24 DevicesY=SCREEN_TOP+24
+3
View File
@@ -230,6 +230,9 @@ static bool IsAxis( const DeviceInput& DeviceI )
void ScreenMapControllers::Input( const InputEventPlus &input ) void ScreenMapControllers::Input( const InputEventPlus &input )
{ {
if( m_fLockInputSecs > 0 )
return;
if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT ) if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT )
return; // ignore return; // ignore
if( IsTransitioning() ) if( IsTransitioning() )