From 801ac995e2cbd8f082a7c6ffd7f58d78014c1d17 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 22 Apr 2021 15:47:57 -0700 Subject: [PATCH] Fix VVVVVV-Man not warping horizontally To exclude gravitron squares, the game excluded all entities whose `size` was 12 or higher. The `size` of the player when they transform into VVVVVV-Man is 13. We have already inadvertently fixed VVVVVV-Man not warping vertically in 2.2. This was done with the previous room transition/warping code refactors; the gravitron square conditionals were simply excluded from the vertical warp code, because there's no situation where there would ever be a gravitron square outside the screen vertically. As with making rescuable crewmates warpable, I have yet to ever see people use VVVVVV-Man in a custom level. It's not like they would want to use it anyway; VVVVVV-Man is really, really buggy. And it's probably better to make it less buggy, starting with this commit. That being said, VVVVVV-Man's collision when warping horizontally is really janky, so I still wouldn't use it. --- desktop_version/src/Logic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 77464c95..e01885f0 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -963,7 +963,7 @@ void gamelogic(void) { if ((obj.entities[i].type >= 51 && obj.entities[i].type <= 54) /* Don't warp warp lines */ - || obj.entities[i].size >= 12) /* Don't warp gravitron squares */ + || obj.entities[i].size == 12) /* Don't warp gravitron squares */ { continue; }