From 128c1993c109a808976a78db02791737a07d6359 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 13 May 2020 23:16:43 -0300 Subject: [PATCH] Rename Peep::balloon_colour to BalloonColour --- src/openrct2-ui/windows/GameBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 4 ++-- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2/GameStateSnapshots.cpp | 2 +- src/openrct2/actions/SetCheatAction.hpp | 2 +- src/openrct2/paint/sprite/Paint.Peep.cpp | 2 +- src/openrct2/peep/Guest.cpp | 4 ++-- src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/peep/Peep.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 4 ++-- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index cac2b83890..4ae4dd95d7 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -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); } diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 941b624bac..2511e3fa04 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -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); diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index e0b1e7bb93..b87d07245f 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -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); } diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 3691b5f8b2..00a78c63f5 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -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); diff --git a/src/openrct2/actions/SetCheatAction.hpp b/src/openrct2/actions/SetCheatAction.hpp index 190a514948..9fb9d84815 100644 --- a/src/openrct2/actions/SetCheatAction.hpp +++ b/src/openrct2/actions/SetCheatAction.hpp @@ -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: diff --git a/src/openrct2/paint/sprite/Paint.Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp index 7307ed9620..a478c65c4b 100644 --- a/src/openrct2/paint/sprite/Paint.Peep.cpp +++ b/src/openrct2/paint/sprite/Paint.Peep.cpp @@ -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; } diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 3c588b64b5..00204785e9 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -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; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index b0d43b040b..390107e0f3 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -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(); } diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index a2fc75d9fa..6748cac002 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -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; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 790ffe200a..d744c79f95 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -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; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 9cd9b846e6..8d25a61995 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -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; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 118d62b483..1faa524015 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -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; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 75f0284cfb..5de5c13265 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -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);