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

Rename Peep::balloon_colour to BalloonColour

This commit is contained in:
Tulio Leao 2020-05-13 23:16:43 -03:00
parent 6c57f33dc9
commit 128c1993c1
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -635,7 +635,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rc
if (image_id_base >= 0x2A1D && image_id_base < 0x2A3D)
{
image_id_base += 32;
image_id_base |= SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour);
image_id_base |= SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour);
gfx_draw_sprite(&cliped_dpi, image_id_base, clip_x, clip_y, 0);
}

4
src/openrct2-ui/windows/Guest.cpp
View File

@ -894,7 +894,7 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp
if (animationFrame >= 0x2A1D && animationFrame < 0x2A3D)
{
animationFrame += 32;
animationFrame |= SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour);
animationFrame |= SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour);
gfx_draw_sprite(&clip_dpi, animationFrame, x, y, 0);
}
@ -1943,7 +1943,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
switch (item)
{
case SHOP_ITEM_BALLOON:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour) | ShopItems[item].Image);
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_PHOTO:
ride = get_ride(peep->photo1_ride_ref);

2
src/openrct2-ui/windows/Staff.cpp
View File

@ -1048,7 +1048,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (ebx >= 0x2A1D && ebx < 0x2A3D)
{
ebx += 32;
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->balloon_colour);
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour);
gfx_draw_sprite(&clip_dpi, ebx, x, y, 0);
}

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -308,7 +308,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, angriness);
COMPARE_FIELD(Peep, time_lost);
COMPARE_FIELD(Peep, days_in_queue);
COMPARE_FIELD(Peep, balloon_colour);
COMPARE_FIELD(Peep, BalloonColour);
COMPARE_FIELD(Peep, UmbrellaColour);
COMPARE_FIELD(Peep, HatColour);
COMPARE_FIELD(Peep, FavouriteRide);

2
src/openrct2/actions/SetCheatAction.hpp
View File

@ -637,7 +637,7 @@ private:
break;
case OBJECT_BALLOON:
peep->ItemStandardFlags |= PEEP_ITEM_BALLOON;
peep->balloon_colour = scenario_rand_max(COLOUR_COUNT - 1);
peep->BalloonColour = scenario_rand_max(COLOUR_COUNT - 1);
peep->UpdateSpriteType();
break;
case OBJECT_UMBRELLA:

2
src/openrct2/paint/sprite/Paint.Peep.cpp
View File

@ -94,7 +94,7 @@ void peep_paint(paint_session* session, const Peep* peep, int32_t imageDirection
if (baseImageId >= 10781 && baseImageId < 10813)
{
imageId = (baseImageId + 32) | peep->balloon_colour << 19 | IMAGE_TYPE_REMAP;
imageId = (baseImageId + 32) | peep->BalloonColour << 19 | IMAGE_TYPE_REMAP;
sub_98199C(session, imageId, 0, 0, 1, 1, 11, peep->z, 0, 0, peep->z + 5);
return;
}

4
src/openrct2/peep/Guest.cpp
View File

@ -1659,7 +1659,7 @@ loc_69B221:
HatColour = ride->track_colour[0].main;
if (shopItem == SHOP_ITEM_BALLOON)
balloon_colour = ride->track_colour[0].main;
BalloonColour = ride->track_colour[0].main;
if (shopItem == SHOP_ITEM_UMBRELLA)
UmbrellaColour = ride->track_colour[0].main;
@ -6853,7 +6853,7 @@ void Guest::UpdateSpriteType()
isBalloonPopped = true;
audio_play_sound_at_location(SoundId::BalloonPop, { x, y, z });
}
create_balloon(x, y, z + 9, balloon_colour, isBalloonPopped);
create_balloon(x, y, z + 9, BalloonColour, isBalloonPopped);
}
ItemStandardFlags &= ~PEEP_ITEM_BALLOON;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;

2
src/openrct2/peep/Peep.cpp
View File

@ -3398,7 +3398,7 @@ static void peep_release_balloon(Guest* peep, int16_t spawn_height)
if (peep->sprite_type == PEEP_SPRITE_TYPE_BALLOON && peep->x != LOCATION_NULL)
{
create_balloon(peep->x, peep->y, spawn_height, peep->balloon_colour, false);
create_balloon(peep->x, peep->y, spawn_height, peep->BalloonColour, false);
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep->UpdateSpriteType();
}

2
src/openrct2/peep/Peep.h
View File

@ -742,7 +742,7 @@ struct Peep : SpriteBase
uint8_t angriness;
uint8_t time_lost; // the time the peep has been lost when it reaches 254 generates the lost thought
uint8_t days_in_queue;
uint8_t balloon_colour;
uint8_t BalloonColour;
uint8_t UmbrellaColour;
uint8_t HatColour;
uint8_t FavouriteRide;

4
src/openrct2/rct1/S4Importer.cpp
View File

@ -1436,11 +1436,11 @@ private:
// Balloons were always blue in RCT1 without AA/LL
if (_gameVersion == FILE_VERSION_RCT1)
{
dst->balloon_colour = COLOUR_LIGHT_BLUE;
dst->BalloonColour = COLOUR_LIGHT_BLUE;
}
else
{
dst->balloon_colour = RCT1::GetColour(src->balloon_colour);
dst->BalloonColour = RCT1::GetColour(src->balloon_colour);
}
dst->destination_x = src->destination_x;

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -1235,7 +1235,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->angriness = src->angriness;
dst->time_lost = src->time_lost;
dst->days_in_queue = src->days_in_queue;
dst->balloon_colour = src->balloon_colour;
dst->balloon_colour = src->BalloonColour;
dst->umbrella_colour = src->UmbrellaColour;
dst->hat_colour = src->HatColour;
dst->favourite_ride = src->FavouriteRide;

2
src/openrct2/rct2/S6Importer.cpp
View File

@ -1500,7 +1500,7 @@ public:
dst->angriness = src->angriness;
dst->time_lost = src->time_lost;
dst->days_in_queue = src->days_in_queue;
dst->balloon_colour = src->balloon_colour;
dst->BalloonColour = src->balloon_colour;
dst->UmbrellaColour = src->umbrella_colour;
dst->HatColour = src->hat_colour;
dst->FavouriteRide = src->favourite_ride;

2
test/tests/S6ImportExportTests.cpp
View File

@ -261,7 +261,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(angriness);
COMPARE_FIELD(time_lost);
COMPARE_FIELD(days_in_queue);
COMPARE_FIELD(balloon_colour);
COMPARE_FIELD(BalloonColour);
COMPARE_FIELD(UmbrellaColour);
COMPARE_FIELD(HatColour);
COMPARE_FIELD(FavouriteRide);