1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

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.
This commit is contained in:
Misa 2020-05-05 11:26:26 -07:00 committed by Ethan Lee
parent 27a5d1fa4f
commit 3c80d136e4

View file

@ -256,7 +256,7 @@ void gamelogic()
map.bypos = 0; map.bypos = 0;
map.bscroll = 0; map.bscroll = 0;
} }
if (map.minitowermode) if (map.towermode && map.minitowermode)
{ {
if (map.ypos >= 568) if (map.ypos >= 568)
{ {
@ -963,7 +963,7 @@ void gamelogic()
} }
//Right so! Screenwraping for tower: //Right so! Screenwraping for tower:
if (map.minitowermode) if (map.towermode && map.minitowermode)
{ {
if (map.scrolldir == 1) if (map.scrolldir == 1)
{ {