From a406b99f4b068b1a470501a735a8a52eb29636e4 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 1 Feb 2021 16:09:13 -0800 Subject: [PATCH] Revert "Fix glitchy y-position when colliding with a conveyor" This reverts commit 942217f871bf1182ded3a915b8c26b90c04d561a. This fix (of a regression of a fix) has a regression where immediately flipping off of horizontally-moving platforms or conveyors will no longer provide you with a "boost" given certain vertical pixel alignments. The regression that this fix fixed will be fixed another way. Fixes #606. --- desktop_version/src/Logic.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 58774079..d1c097e9 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -826,7 +826,6 @@ void gamelogic() if (INBOUNDS_VEC(i, obj.entities) && j > -1000) { obj.entities[i].newxp = obj.entities[i].xp + j; - obj.entities[i].newyp = obj.entities[i].yp; obj.entitymapcollision(i); } else @@ -835,7 +834,6 @@ void gamelogic() if (INBOUNDS_VEC(i, obj.entities) && j > -1000) { obj.entities[i].newxp = obj.entities[i].xp + j; - obj.entities[i].newyp = obj.entities[i].yp; obj.entitymapcollision(i); } }