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

GameBottomToolbar: use constants for balloon/umbrella/hat sprites

This commit is contained in:
Aaron van Geffen 2024-05-07 23:00:46 +02:00
parent 73c592b137
commit 779e65d8b2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include <openrct2/management/Finance.h> #include <openrct2/management/Finance.h>
#include <openrct2/management/NewsItem.h> #include <openrct2/management/NewsItem.h>
#include <openrct2/peep/PeepAnimationData.h> #include <openrct2/peep/PeepAnimationData.h>
#include <openrct2/peep/PeepSpriteIds.h>
#include <openrct2/sprites.h> #include <openrct2/sprites.h>
#include <openrct2/world/Park.h> #include <openrct2/world/Park.h>
@ -296,15 +297,18 @@ static Widget window_game_bottom_toolbar_widgets[] =
auto* guest = peep->As<Guest>(); auto* guest = peep->As<Guest>();
if (guest != nullptr) if (guest != nullptr)
{ {
if (image_id_base >= 0x2A1D && image_id_base < 0x2A3D) if (image_id_base >= kPeepSpriteBalloonStateWatchRideId
&& image_id_base < kPeepSpriteBalloonStateSittingIdleId + 4)
{ {
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->BalloonColour), clipCoords); GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->BalloonColour), clipCoords);
} }
else if (image_id_base >= 0x2BBD && image_id_base < 0x2BDD) if (image_id_base >= kPeepSpriteUmbrellaStateNoneId
&& image_id_base < kPeepSpriteUmbrellaStateSittingIdleId + 4)
{ {
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->UmbrellaColour), clipCoords); GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->UmbrellaColour), clipCoords);
} }
else if (image_id_base >= 0x29DD && image_id_base < 0x29FD) if (image_id_base >= kPeepSpriteHatStateWatchRideId
&& image_id_base < kPeepSpriteHatStateSittingIdleId + 4)
{ {
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->HatColour), clipCoords); GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->HatColour), clipCoords);
} }