From 84928f8210ae1117bae5eaea82ed3162567624ca Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Fri, 5 Mar 2021 10:18:46 -0800
Subject: [PATCH] Fix regression being able to activate activity zones during
cutscenes
Since you're now allowed to bring up the map screen during cutscenes,
you've also been able to activate activity zones and teleporter prompts
during cutscenes. This only really affects custom levels; nowhere in the
main game can you overlap with an activity zone while in a cutscene.
To fix this, I've just added a script.running check to Enter keybind
processing.
---
desktop_version/src/Input.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index f1476639..199ed335 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1795,7 +1795,10 @@ void gameinput(void)
if (enter_pressed)
{
game.mapheld = true;
+ }
+ if (enter_pressed && !script.running)
+ {
if (game.activetele && game.readytotele > 20 && !game.intimetrial)
{
enter_already_processed = true;