From 3c80d136e409ca743b947b8fe9c6e12da8177e60 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 5 May 2020 11:26:26 -0700
Subject: [PATCH] Add towermode checks to minitowermode screen transitions

Apparently, the game just leaves minitowermode on, which can cause
issues if you're in a horizontal warping room (and not any other room
type, due to how frame ordering works). This would manifest itself as a
wrong warp to (20,20) because the game is trying to apply the hardcoded
minitower screen transitions when it shouldn't be.
---
 desktop_version/src/Logic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 34ca6d3a..fe58d269 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -256,7 +256,7 @@ void gamelogic()
             map.bypos = 0;
             map.bscroll = 0;
         }
-        if (map.minitowermode)
+        if (map.towermode && map.minitowermode)
         {
             if (map.ypos >= 568)
             {
@@ -963,7 +963,7 @@ void gamelogic()
         }
 
         //Right so! Screenwraping for tower:
-        if (map.minitowermode)
+        if (map.towermode && map.minitowermode)
         {
             if (map.scrolldir == 1)
             {