[ScreenTextEntry] Make it so only the keyboard's Enter key can finish the screen. Should fix issues with buttons whose secondary function is MenuStart.

This commit is contained in:
AJ Kelly
2011-06-13 15:47:11 -05:00
parent dbecbacc72
commit cd9c8e97d2
2 changed files with 4 additions and 1 deletions
+2
View File
@@ -10,6 +10,8 @@ StepMania 5.0 Preview 2 | 20110???
2011/06/13 2011/06/13
---------- ----------
* [ScreenTextEntry] Make it so only the keyboard's Enter key can finish the
screen. Should fix issues with buttons whose secondary function is MenuStart. [AJ]
* [InputMapper] Modify default mappings. Use the Hyphen key instead of the * [InputMapper] Modify default mappings. Use the Hyphen key instead of the
Numlock key for Player 2's GAME_BUTTON_BACK. This should address some Numlock key for Player 2's GAME_BUTTON_BACK. This should address some
issues with Player 2 being unable to back out if they use a laptop. issues with Player 2 being unable to back out if they use a laptop.
+2 -1
View File
@@ -258,7 +258,8 @@ void ScreenTextEntry::BackspaceInAnswer()
void ScreenTextEntry::MenuStart( const InputEventPlus &input ) void ScreenTextEntry::MenuStart( const InputEventPlus &input )
{ {
if( input.type==IET_FIRST_PRESS ) // HACK: Only allow the screen to end on the Enter key.-aj
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_ENTER) && input.type==IET_FIRST_PRESS )
End( false ); End( false );
} }