From 3ce442459e5a3eede24e08639655c86ea3be95a3 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Wed, 4 Nov 2020 00:42:42 -0800
Subject: [PATCH] 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...
---
 desktop_version/src/Entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 985c06f8..a0404ec9 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -4674,7 +4674,7 @@ void entityclass::collisioncheck(int i, int j, bool scm /*= false*/)
         }
         break;
     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
             break;