From 7f390c98c4b86d8ed18abb4405b6ec9f4ccbb443 Mon Sep 17 00:00:00 2001 From: MatusGuy <85036874+MatusGuy@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:38:36 +0100 Subject: [PATCH] Format if statements --- src/object/brick.cpp | 4 +--- src/object/player.cpp | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/object/brick.cpp b/src/object/brick.cpp index f25fedc79e3..72cb89573f1 100644 --- a/src/object/brick.cpp +++ b/src/object/brick.cpp @@ -67,9 +67,7 @@ HitResponse Brick::collision(GameObject& other, const CollisionHit& hit) { auto player = dynamic_cast (&other); - if (player) { - if (player->m_does_buttjump) try_break(player); - } + if (player && player->m_does_buttjump) try_break(player); auto badguy = dynamic_cast (&other); if (badguy) { diff --git a/src/object/player.cpp b/src/object/player.cpp index 9a50effc4f8..c2d4e246311 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -751,14 +751,12 @@ Player::update(float dt_sec) downbox.set_bottom(get_bbox().get_bottom() + 16.f); for (auto& brick : Sector::get().get_objects_by_type()) { // stoneform breaks through any kind of bricks - if (downbox.contains(brick.get_bbox()) && (m_stone || !dynamic_cast(&brick))) { + if (downbox.contains(brick.get_bbox()) && (m_stone || !dynamic_cast(&brick))) brick.try_break(this, is_big()); - } } for (auto& badguy : Sector::get().get_objects_by_type()) { - if (downbox.contains(badguy.get_bbox()) && badguy.is_snipable()) { + if (downbox.contains(badguy.get_bbox()) && badguy.is_snipable()) badguy.kill_fall(); - } } } @@ -768,9 +766,8 @@ Player::update(float dt_sec) Rectf topbox = get_bbox().grown(-1.f); topbox.set_top(get_bbox().get_top() - 16.f); for (auto& brick : Sector::get().get_objects_by_type()) { - if (topbox.contains(brick.get_bbox())) { + if (topbox.contains(brick.get_bbox())) brick.try_break(this, is_big()); - } } }