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

Rename Peep::umbrella_colour to UmbrellaColour

This commit is contained in:
Tulio Leao 2020-05-13 23:14:45 -03:00
parent 222f8df6cb
commit 6c57f33dc9
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,7 +642,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rc
else if (image_id_base >= 0x2BBD && image_id_base < 0x2BDD)
{
image_id_base += 32;
image_id_base |= SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour);
image_id_base |= SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour);
gfx_draw_sprite(&cliped_dpi, image_id_base, clip_x, clip_y, 0);
}

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

@ -902,7 +902,7 @@ static void window_guest_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dp
if (animationFrame >= 0x2BBD && animationFrame < 0x2BDD)
{
animationFrame += 32;
animationFrame |= SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour);
animationFrame |= SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour);
gfx_draw_sprite(&clip_dpi, animationFrame, x, y, 0);
}
@ -1951,7 +1951,7 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
ride->FormatNameTo(gCommonFormatArgs + 6);
break;
case SHOP_ITEM_UMBRELLA:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour) | ShopItems[item].Image);
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_VOUCHER:
switch (peep->voucher_type)

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

@ -1056,7 +1056,7 @@ void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (ebx >= 0x2BBD && ebx < 0x2BDD)
{
ebx += 32;
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->umbrella_colour);
ebx |= SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour);
gfx_draw_sprite(&clip_dpi, ebx, x, y, 0);
}

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -309,7 +309,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, time_lost);
COMPARE_FIELD(Peep, days_in_queue);
COMPARE_FIELD(Peep, balloon_colour);
COMPARE_FIELD(Peep, umbrella_colour);
COMPARE_FIELD(Peep, UmbrellaColour);
COMPARE_FIELD(Peep, HatColour);
COMPARE_FIELD(Peep, FavouriteRide);
COMPARE_FIELD(Peep, FavouriteRideRating);

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

@ -642,7 +642,7 @@ private:
break;
case OBJECT_UMBRELLA:
peep->ItemStandardFlags |= PEEP_ITEM_UMBRELLA;
peep->umbrella_colour = scenario_rand_max(COLOUR_COUNT - 1);
peep->UmbrellaColour = scenario_rand_max(COLOUR_COUNT - 1);
peep->UpdateSpriteType();
break;
}

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

@ -101,7 +101,7 @@ void peep_paint(paint_session* session, const Peep* peep, int32_t imageDirection
if (baseImageId >= 11197 && baseImageId < 11229)
{
imageId = (baseImageId + 32) | peep->umbrella_colour << 19 | IMAGE_TYPE_REMAP;
imageId = (baseImageId + 32) | peep->UmbrellaColour << 19 | IMAGE_TYPE_REMAP;
sub_98199C(session, imageId, 0, 0, 1, 1, 11, peep->z, 0, 0, peep->z + 5);
return;
}

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

@ -1662,7 +1662,7 @@ loc_69B221:
balloon_colour = ride->track_colour[0].main;
if (shopItem == SHOP_ITEM_UMBRELLA)
umbrella_colour = ride->track_colour[0].main;
UmbrellaColour = ride->track_colour[0].main;
if (shopItem == SHOP_ITEM_MAP)
peep_reset_pathfind_goal(this);

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

@ -743,7 +743,7 @@ struct Peep : SpriteBase
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 umbrella_colour;
uint8_t UmbrellaColour;
uint8_t HatColour;
uint8_t FavouriteRide;
uint8_t FavouriteRideRating;

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

@ -1430,7 +1430,7 @@ private:
dst->tshirt_colour = RCT1::GetColour(src->tshirt_colour);
dst->trousers_colour = RCT1::GetColour(src->trousers_colour);
dst->umbrella_colour = RCT1::GetColour(src->umbrella_colour);
dst->UmbrellaColour = RCT1::GetColour(src->umbrella_colour);
dst->HatColour = RCT1::GetColour(src->hat_colour);
// Balloons were always blue in RCT1 without AA/LL

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

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

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

@ -1501,7 +1501,7 @@ public:
dst->time_lost = src->time_lost;
dst->days_in_queue = src->days_in_queue;
dst->balloon_colour = src->balloon_colour;
dst->umbrella_colour = src->umbrella_colour;
dst->UmbrellaColour = src->umbrella_colour;
dst->HatColour = src->hat_colour;
dst->FavouriteRide = src->favourite_ride;
dst->FavouriteRideRating = src->favourite_ride_rating;

2
test/tests/S6ImportExportTests.cpp
View File

@ -262,7 +262,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(time_lost);
COMPARE_FIELD(days_in_queue);
COMPARE_FIELD(balloon_colour);
COMPARE_FIELD(umbrella_colour);
COMPARE_FIELD(UmbrellaColour);
COMPARE_FIELD(HatColour);
COMPARE_FIELD(FavouriteRide);
COMPARE_FIELD(FavouriteRideRating);