From 0c91ed9bddd412ac781e0293675d2e5e00faf34f Mon Sep 17 00:00:00 2001
From: Duncan <duncans_pumpkin@hotmail.co.uk>
Date: Wed, 13 Jan 2021 17:29:30 +0000
Subject: [PATCH] Fix #13755. Regression causing entity position corruption
 (#13828)

When switching from variable frame to fixed frame the entity positions could become corrupted. This would cause to end up being stuck inside of tiles that they could not path out of. When switching from normal speed to hyperspeed the rendering switches from variable to fixed frame. Therefore entitys could end up corrupted when enabling hyperspeed. Due to the way the corruption occured a hang or crash could also occur.
---
 src/openrct2/Context.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 9dbe537c38..152d7f2e6f 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -951,6 +951,12 @@ namespace OpenRCT2
             {
                 _lastTick = 0;
                 _variableFrame = useVariableFrame;
+
+                // Switching from variable to fixed frame requires reseting
+                // of entity positions back to end of tick positions
+                auto& tweener = EntityTweener::Get();
+                tweener.Restore();
+                tweener.Reset();
             }
 
             if (useVariableFrame)