(#207) Remove wavy_rect_overlaps

diff --git a/src/game/level/lava.c b/src/game/level/lava.c
index 561f42a91f0a6cc48b259067d1652c6148a21117..0f58b33ce823fbdf7beee524d43e0dcf83c5336b 100644 (file)
--- a/src/game/level/lava.c
+++ b/src/game/level/lava.c
@@ -93,7 +93,7 @@ bool lava_overlaps_rect(const lava_t *lava,
     assert(lava);
 
     for (size_t i = 0; i < lava->rects_count; ++i) {
-        if (wavy_rect_overlaps(lava->rects[i], rect)) {
+        if (rects_overlap(wavy_rect_hitbox(lava->rects[i]), rect)) {
             return true;
         }
     }

diff --git a/src/game/level/lava/wavy_rect.c b/src/game/level/lava/wavy_rect.c
index 3cc3eb2c61c8ac1f71b022e66d2b4b4b93ffd896..7111f855023253e758ae1dd963ca6730ae2dd9ce 100644 (file)
--- a/src/game/level/lava/wavy_rect.c
+++ b/src/game/level/lava/wavy_rect.c
@@ -107,10 +107,3 @@ rect_t wavy_rect_hitbox(const wavy_rect_t *wavy_rect)
 {
     return wavy_rect->rect;
 }
-
-int wavy_rect_overlaps(const wavy_rect_t *wavy_rect,
-                       rect_t rect)
-{
-    assert(wavy_rect);
-    return rects_overlap(wavy_rect->rect, rect);
-}

diff --git a/src/game/level/lava/wavy_rect.h b/src/game/level/lava/wavy_rect.h
index c6a9c2448e2aacc2cf841ba4c3dfd31cfc5c216b..634d6bda3a895219f72b8adf95fc465d5bbfab39 100644 (file)
--- a/src/game/level/lava/wavy_rect.h
+++ b/src/game/level/lava/wavy_rect.h
@@ -18,9 +18,6 @@ int wavy_rect_render(const wavy_rect_t *wavy_rect,
 int wavy_rect_update(wavy_rect_t *wavy_rect,
                      float delta_time);
 
-int wavy_rect_overlaps(const wavy_rect_t *wavy_rect,
-                       rect_t rect);
-
 rect_t wavy_rect_hitbox(const wavy_rect_t *wavy_rect);
 
 #endif  // WAVY_RECT_H_