Allow the "cancel" button to be configured to an action button as well
Now the only way to cancel out of input config when it's waiting for a
key/button press is for another player to press "cancel".
@@ -38198,13 +38198,6 @@ void keyboard_setup(int player)
_menutextm((selector == OPTIONS_NUM), ++voffset, 0, Tr("Default"));
update((level != NULL), 0);
- if(setting > -1)
- {
- if(bothnewkeys & FLAG_ESC)
- {
- sound_play_sample(SAMPLE_BEEP2, 0, savedata.effectvol, savedata.effectvol, 50);
- setting = -1;
- }
if(setting > -1)
{
k = control_getremappedkey();
@@ -38219,6 +38212,10 @@ void keyboard_setup(int player)
setting = -1;
control_remapdevice(-1);
}
+ else if (bothnewkeys & FLAG_ESC)
+ {
+ sound_play_sample(SAMPLE_BEEP2, 0, savedata.effectvol, savedata.effectvol, 50);
+ setting = -1;
}
}
else
