mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-02-03 07:45:31 +03:00
Revert "Fix glitchy y-position when colliding with a conveyor"
This reverts commit 942217f871.
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.
This commit is contained in:
@@ -826,7 +826,6 @@ void gamelogic()
|
|||||||
if (INBOUNDS_VEC(i, obj.entities) && j > -1000)
|
if (INBOUNDS_VEC(i, obj.entities) && j > -1000)
|
||||||
{
|
{
|
||||||
obj.entities[i].newxp = obj.entities[i].xp + j;
|
obj.entities[i].newxp = obj.entities[i].xp + j;
|
||||||
obj.entities[i].newyp = obj.entities[i].yp;
|
|
||||||
obj.entitymapcollision(i);
|
obj.entitymapcollision(i);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -835,7 +834,6 @@ void gamelogic()
|
|||||||
if (INBOUNDS_VEC(i, obj.entities) && j > -1000)
|
if (INBOUNDS_VEC(i, obj.entities) && j > -1000)
|
||||||
{
|
{
|
||||||
obj.entities[i].newxp = obj.entities[i].xp + j;
|
obj.entities[i].newxp = obj.entities[i].xp + j;
|
||||||
obj.entities[i].newyp = obj.entities[i].yp;
|
|
||||||
obj.entitymapcollision(i);
|
obj.entitymapcollision(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user