1 files changed, 18 insertions, 21 deletions

diff --git a/game/shared/chunk_aabb.cc b/game/shared/chunk_aabb.cc
index b4e5b82..5f23ea9 100644
--- a/game/shared/chunk_aabb.cc
+++ b/game/shared/chunk_aabb.cc
@@ -1,55 +1,52 @@
 #include "shared/pch.hh"
+
 #include "shared/chunk_aabb.hh"
 
-void ChunkAABB::set_bounds(const chunk_pos &min, const chunk_pos &max)
+void ChunkAABB::set_bounds(const chunk_pos& min, const chunk_pos& max)
 {
     this->min = min;
     this->max = max;
 }
 
-void ChunkAABB::set_offset(const chunk_pos &base, const chunk_pos &size)
+void ChunkAABB::set_offset(const chunk_pos& base, const chunk_pos& size)
 {
     this->min = base;
     this->max = base + size;
 }
 
-bool ChunkAABB::contains(const chunk_pos &point) const
+bool ChunkAABB::contains(const chunk_pos& point) const
 {
-    if((point.x < min.x) || (point.x > max.x))
-        return false;
-    if((point.y < min.y) || (point.y > max.y))
-        return false;
-    if((point.z < min.z) || (point.z > max.z))
-        return false;
-    return true;
+    auto result = true;
+    result = result && (point.x >= min.x) && (point.x <= max.x);
+    result = result && (point.y >= min.y) && (point.y <= max.y);
+    result = result && (point.z >= min.z) && (point.z <= max.z);
+    return result;
 }
 
-bool ChunkAABB::intersect(const ChunkAABB &other_box) const
+bool ChunkAABB::intersect(const ChunkAABB& other_box) const
 {
-    if((min.x >= other_box.max.x) || (max.x <= other_box.min.x))
-        return false;
-    if((min.y >= other_box.max.y) || (max.y <= other_box.min.y))
-        return false;
-    if((min.z >= other_box.max.z) || (max.z <= other_box.min.z))
-        return false;
-    return true;
+    auto result = true;
+    result = result && (min.x < other_box.max.x) && (max.x > other_box.min.x);
+    result = result && (min.y < other_box.max.y) && (max.y > other_box.min.y);
+    result = result && (min.z < other_box.max.z) && (max.z > other_box.min.z);
+    return result;
 }
 
-ChunkAABB ChunkAABB::combine_with(const ChunkAABB &other_box) const
+ChunkAABB ChunkAABB::combine_with(const ChunkAABB& other_box) const
 {
     ChunkAABB result;
     result.set_bounds(min, other_box.max);
     return result;
 }
 
-ChunkAABB ChunkAABB::multiply_with(const ChunkAABB &other_box) const
+ChunkAABB ChunkAABB::multiply_with(const ChunkAABB& other_box) const
 {
     ChunkAABB result;
     result.set_bounds(other_box.min, max);
     return result;
 }
 
-ChunkAABB ChunkAABB::push(const chunk_pos &vector) const
+ChunkAABB ChunkAABB::push(const chunk_pos& vector) const
 {
     ChunkAABB result;
     result.set_bounds(min + vector, max + vector);