From 28565b370de297a233115df4171716e3460b8be1 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 19 Jan 2020 17:19:45 +0000 Subject: [PATCH] Fix clang format --- src/openrct2/GameStateSnapshots.cpp | 3 +-- src/openrct2/world/Sprite.cpp | 6 ++---- test/tests/S6ImportExportTests.cpp | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 9b48d2de2e..b5d19a1170 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -381,8 +381,7 @@ struct GameStateSnapshots : public IGameStateSnapshots COMPARE_FIELD(Vehicle, target_seat_rotation); } - void CompareSpriteDataLitter( - const Litter& spriteBase, const Litter& spriteCmp, GameStateSpriteChange_t& changeData) const + void CompareSpriteDataLitter(const Litter& spriteBase, const Litter& spriteCmp, GameStateSpriteChange_t& changeData) const { COMPARE_FIELD(Litter, creationTick); } diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index a46714e7c6..c1428f98d0 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -108,9 +108,7 @@ static void invalidate_sprite_max_zoom(SpriteBase* sprite, int32_t maxZoom) rct_viewport* viewport = &g_viewport_list[i]; if (viewport->width != 0 && viewport->zoom <= maxZoom) { - viewport_invalidate( - viewport, sprite->sprite_left, sprite->sprite_top, sprite->sprite_right, - sprite->sprite_bottom); + viewport_invalidate(viewport, sprite->sprite_left, sprite->sprite_top, sprite->sprite_right, sprite->sprite_bottom); } } } @@ -457,7 +455,7 @@ void move_sprite_to_list(SpriteBase* sprite, SPRITE_LIST newListIndex) sprite->previous = SPRITE_INDEX_NULL; // We become the new head of the target list, so there's no previous sprite sprite->linked_list_index = newListIndex; - sprite->next = gSpriteListHead[newListIndex]; // This sprite's next sprite is the old head, since we're the new head + sprite->next = gSpriteListHead[newListIndex]; // This sprite's next sprite is the old head, since we're the new head gSpriteListHead[newListIndex] = sprite->sprite_index; // Store this sprite's index as head of its new list if (sprite->next != SPRITE_INDEX_NULL) diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 2958676295..25b8da1740 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -363,8 +363,7 @@ static void CompareSpriteDataMoneyEffect(const MoneyEffect& left, const MoneyEff COMPARE_FIELD(wiggle); } -static void CompareSpriteDataCrashedVehicleParticle( - const VehicleCrashParticle& left, const VehicleCrashParticle& right) +static void CompareSpriteDataCrashedVehicleParticle(const VehicleCrashParticle& left, const VehicleCrashParticle& right) { COMPARE_FIELD(time_to_live); for (size_t i = 0; i < std::size(left.colour); i++)