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

Fix conveyor check in collisioncheck() always being true

cppcheck said: "Logical disjunction always evaluates to true".

Yes. Yes it does. Whoops. I learned how to specify ranges like this in
high school math and still screw it up...
This commit is contained in:
Misa 2020-11-04 00:42:42 -08:00 committed by Ethan Lee
parent 3434ad8777
commit 3ce442459e

View file

@ -4674,7 +4674,7 @@ void entityclass::collisioncheck(int i, int j, bool scm /*= false*/)
} }
break; break;
case 2: //Moving platforms case 2: //Moving platforms
if (entities[j].behave >= 8 || entities[j].behave < 10) if (entities[j].behave >= 8 && entities[j].behave < 10)
{ {
//We don't want conveyors, moving platforms only //We don't want conveyors, moving platforms only
break; break;