summaryrefslogtreecommitdiff
path: root/src/collision.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/collision.cpp')
-rw-r--r--src/collision.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/collision.cpp b/src/collision.cpp
index ccc3a058d..be135a225 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -153,7 +153,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Z + speed.Z * time, staticbox.MaxEdge.Z)
- std::min(movingbox.MinEdge.Z + speed.Z * time, staticbox.MinEdge.Z)
- relbox.MinEdge.Z < 0)
- )
+ )
return COLLISION_AXIS_X;
}
} else {
@@ -180,7 +180,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Y + speed.Y * time, staticbox.MaxEdge.Y)
- std::min(movingbox.MinEdge.Y + speed.Y * time, staticbox.MinEdge.Y)
- relbox.MinEdge.Y < 0)
- )
+ )
return COLLISION_AXIS_Z;
}
}