From e2c84f81f8c434f51887e30f5a08dfbeafcbc554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 7 Oct 2016 23:05:08 +0200 Subject: [PATCH] Fold condition and remove self-assignment --- src/ride/track_design.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ride/track_design.c b/src/ride/track_design.c index 0a560e4d70..c090daf4b7 100644 --- a/src/ride/track_design.c +++ b/src/ride/track_design.c @@ -619,11 +619,10 @@ static int track_design_place_scenery(rct_td6_scenery_element *scenery_start, ui uint8 bh = rotation | (quadrant << 6) | MAP_ELEMENT_TYPE_SCENERY; rct_scenery_entry* small_scenery = get_small_scenery_entry(entry_index); - if (!(small_scenery->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE) && - (small_scenery->small_scenery.flags & SMALL_SCENERY_FLAG9)){ - bh = bh; - } - else if (small_scenery->small_scenery.flags & (SMALL_SCENERY_FLAG9 | SMALL_SCENERY_FLAG24 | SMALL_SCENERY_FLAG25)){ + if (!(!(small_scenery->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE) && + (small_scenery->small_scenery.flags & SMALL_SCENERY_FLAG9)) && + (small_scenery->small_scenery.flags & (SMALL_SCENERY_FLAG9 | SMALL_SCENERY_FLAG24 | SMALL_SCENERY_FLAG25))) + { bh &= 0x3F; }