mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply clang-format.

This commit is contained in:
Aaron van Geffen 2018-08-22 12:18:27 +02:00
parent dcc4827833
commit a22ff5f8ea
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/world/Fountain.cpp
View File

@ -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;
}

12
src/openrct2/world/Sprite.h
View File

@ -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);