mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-26 06:28:30 +02:00
Code Issues Releases Wiki Activity

Re-add playtesting passthrough code block for non-separate interact

Browse Source 
This fixes a regression where you're unable to activate activity zones
in in-editor playtesting if your interact button is not separate from
the map button.

When I originally did #743, I didn't have an option to set the bind to
be non-separate, so I removed this logic without adding a
game.separate_interact check. But when I added the option, I overlooked
this code, and so this regression happened. Whoops.
This commit is contained in:
Misa 2021-06-17 23:25:27 -07:00 committed by Ethan Lee
parent 43e8d31aa9
commit 571f6a7098
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desktop_version/src/Input.cpp
View File

@ -1960,8 +1960,18 @@ void gameinput(void)
{
if ((game.press_map || key.isDown(27)) && !game.mapheld)
{
game.returntoeditor();
game.mapheld = true;
if (!game.separate_interact
&& game.press_map
&& (INBOUNDS_VEC(game.activeactivity, obj.blocks)
|| (game.activetele && game.readytotele > 20)))
{
/* Pass, let code block below handle it */
}
else
{
game.returntoeditor();
game.mapheld = true;
}
}
}
#endif