mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix binding menu allowing you to lock yourself out of the game 

Or well, lock yourself out if you don't have (easy) access to a
keyboard, like on Steam Deck.

In 2.3, this problem used to be much worse, since you could bind any
button to "menu" - which is actually also "return" in menus - and that
button could then no longer be bound to any other action, because
exiting the bindings menu had priority over assigning a different
binding. The result would be that people could have all their buttons
bound to "escape" with no way of undoing it or using their controllers
at all other than manually going into their config file to change it.

In 2.4, the most important bugs in the bindings menu are fixed, but
it's still possible to remove all your bindings from the "flip"
(confirm) action, meaning you can't navigate the menus anymore with a
controller to fix your bindings or even do anything.

There is one interesting part to all this: if an action has no buttons
bound to it at all when the game is started, then that action is
populated with the default button for that action. This is done for
each action separately, without accounting for the case where the
default button was already bound to another action which was not empty.
(This is something that the binding menu does try to prevent).
Therefore, having no buttons bound to "flip" while having A and B bound
to "menu", would result in A being bound to "flip" and A and B bound to
"menu".

That would still make you unable to enter the gamepad menu, since both
"confirm" and "return" are pressed in a row.

This commit fixes the specific situation where flip/confirm buttons are
also bound to menu/return, by removing all buttons that are in the flip
button list from the menu list. This means that, on Steam Deck, you can
still go to your bindings menu.
This commit is contained in:
Dav999 2023-12-09 22:15:21 +01:00 committed by Misa Elizabeth Kai
parent 9782b450ef
commit 66ba557c4d
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_version/src/Game.cpp
View File

@ -386,6 +386,22 @@ void Game::setdefaultcontrollerbuttons(void)
{
controllerButton_interact.push_back(SDL_CONTROLLER_BUTTON_X);
}
/* If one of the arrays was empty, and others weren't, we might now have conflicts...
* A crucial one is if the ACTION button is also "ESC", because then you can't
* fix it with just a controller anymore, which might make the game unplayable.
* This is similar to updatebuttonmappings() in Input.cpp, except less... complete? */
for (size_t f = 0; f < controllerButton_flip.size(); f++)
{
for (size_t e = 0; e < controllerButton_esc.size(); e++)
{
if (controllerButton_flip[f] == controllerButton_esc[e])
{
controllerButton_esc.erase(controllerButton_esc.begin() + e);
break;
}
}
}
}
void Game::lifesequence(void)