From a22ff5f8ea08f51cc04f28ed2406196925932707 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Wed, 22 Aug 2018 12:18:27 +0200 Subject: [PATCH] Apply clang-format. --- src/openrct2/world/Fountain.cpp | 4 ++-- src/openrct2/world/Sprite.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp index dbf4afb145..bc8422c4b3 100644 --- a/src/openrct2/world/Fountain.cpp +++ b/src/openrct2/world/Fountain.cpp @@ -143,7 +143,7 @@ void jumping_fountain_create(int32_t type, int32_t x, int32_t y, int32_t z, int3 jumpingFountain->sprite_identifier = SPRITE_IDENTIFIER_MISC; sprite_move(x, y, z, (rct_sprite*)jumpingFountain); jumpingFountain->type = type == JUMPING_FOUNTAIN_TYPE_SNOW ? SPRITE_MISC_JUMPING_FOUNTAIN_SNOW - : SPRITE_MISC_JUMPING_FOUNTAIN_WATER; + : SPRITE_MISC_JUMPING_FOUNTAIN_WATER; jumpingFountain->num_ticks_alive = 0; jumpingFountain->frame = 0; } @@ -193,7 +193,7 @@ void jumping_fountain_update(rct_jumping_fountain* jumpingFountain) static int32_t jumping_fountain_get_type(const rct_jumping_fountain* jumpingFountain) { int32_t type = jumpingFountain->type == SPRITE_MISC_JUMPING_FOUNTAIN_SNOW ? JUMPING_FOUNTAIN_TYPE_SNOW - : JUMPING_FOUNTAIN_TYPE_WATER; + : JUMPING_FOUNTAIN_TYPE_WATER; return type; } diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index f6c24ffc17..eed4bf90de 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -41,7 +41,7 @@ enum SPRITE_LIST struct rct_sprite_common { uint8_t sprite_identifier; // 0x00 - uint8_t type; // 0x01 + uint8_t type; // 0x01 uint16_t next_in_quadrant; // 0x02 uint16_t next; // 0x04 uint16_t previous; // 0x06 @@ -84,7 +84,7 @@ struct rct_balloon : rct_sprite_common uint16_t popped; // 0x24 uint8_t time_to_move; // 0x26 - uint8_t frame; // 0x27 + uint8_t frame; // 0x27 uint8_t pad_28[4]; uint8_t colour; // 0x2C @@ -144,8 +144,8 @@ assert_struct_size(rct_money_effect, 0x48); struct rct_crashed_vehicle_particle : rct_sprite_common { - uint16_t time_to_live; // 0x24 - uint16_t frame; // 0x26 + uint16_t time_to_live; // 0x24 + uint16_t frame; // 0x26 uint8_t pad_28[4]; uint8_t colour[2]; uint16_t crashed_sprite_base; // 0x2E @@ -168,8 +168,8 @@ assert_struct_size(rct_crash_splash, 0x28); struct rct_steam_particle : rct_sprite_common { - uint16_t time_to_move; // 0x24 Moves +1 z every 3 ticks after intitial 4 ticks - uint16_t frame; // 0x26 + uint16_t time_to_move; // 0x24 Moves +1 z every 3 ticks after intitial 4 ticks + uint16_t frame; // 0x26 }; assert_struct_size(rct_steam_particle, 0x28);