From fed148648c23add4d8576a285458ad817cb98b56 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Tue, 28 Apr 2020 07:45:58 +0100 Subject: [PATCH] Use IsPeep in more places --- src/openrct2-ui/windows/TitleCommandEditor.cpp | 2 +- src/openrct2/paint/sprite/Paint.Sprite.cpp | 2 +- src/openrct2/peep/Guest.cpp | 7 +++---- src/openrct2/peep/Peep.cpp | 6 +++--- src/openrct2/world/Footpath.cpp | 2 +- src/openrct2/world/MapAnimation.cpp | 2 +- src/openrct2/world/Sprite.cpp | 2 +- src/openrct2/world/Sprite.h | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index f9255ed08d..b9539764c1 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -620,7 +620,7 @@ static void window_title_command_editor_tool_down( uint16_t spriteIndex = info.sprite->generic.sprite_index; uint16_t spriteIdentifier = info.sprite->generic.sprite_identifier; bool validSprite = false; - if (spriteIdentifier == SPRITE_IDENTIFIER_PEEP) + if (info.sprite->IsPeep()) { validSprite = true; auto peep = GET_PEEP(spriteIndex); diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp index 36fbbff70e..17a7553df3 100644 --- a/src/openrct2/paint/sprite/Paint.Sprite.cpp +++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp @@ -56,7 +56,7 @@ void sprite_paint_setup(paint_session* session, const uint16_t x, const uint16_t if (highlightPathIssues) { - if (spr->generic.sprite_identifier == SPRITE_IDENTIFIER_PEEP) + if (spr->IsPeep()) { Peep* peep = (Peep*)spr; if (!(peep->type == PEEP_TYPE_STAFF && peep->staff_type == STAFF_TYPE_HANDYMAN)) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index e226a3b9dd..9de72c660b 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -5482,7 +5482,7 @@ void Guest::UpdateWalking() { sprite = get_sprite(sprite_id); - if (sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_PEEP) + if (!sprite->IsPeep()) continue; if (sprite->peep.state != PEEP_STATE_WATCHING) @@ -6068,7 +6068,7 @@ bool Guest::UpdateWalkingFindBench() { sprite = get_sprite(sprite_id); - if (sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_PEEP) + if (!sprite->IsPeep()) continue; if (sprite->peep.state != PEEP_STATE_SITTING) @@ -6262,8 +6262,7 @@ static void peep_update_walking_break_scenery(Peep* peep) { sprite = get_sprite(sprite_id); - if ((sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_PEEP) || (sprite->peep.state != PEEP_STATE_SITTING) - || (peep->z != sprite->peep.z)) + if (!sprite->IsPeep() || (sprite->peep.state != PEEP_STATE_SITTING) || (peep->z != sprite->peep.z)) { continue; } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 8f1a328963..6dc6c606a0 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -324,7 +324,7 @@ const bool gSpriteTypeToSlowWalkMap[] = { // clang-format on -bool rct_sprite::IsPeep() +bool rct_sprite::IsPeep() const { return peep.sprite_identifier == SPRITE_IDENTIFIER_PEEP; } @@ -388,7 +388,7 @@ Peep* try_get_guest(uint16_t spriteIndex) rct_sprite* sprite = try_get_sprite(spriteIndex); if (sprite == nullptr) return nullptr; - if (sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_PEEP) + if (!sprite->IsPeep()) return nullptr; if (sprite->peep.type != PEEP_TYPE_GUEST) return nullptr; @@ -2693,7 +2693,7 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle for (rct_sprite* sprite; sprite_id != SPRITE_INDEX_NULL; sprite_id = sprite->generic.next_in_quadrant) { sprite = get_sprite(sprite_id); - if (sprite->generic.sprite_identifier == SPRITE_IDENTIFIER_PEEP) + if (sprite->IsPeep()) { Peep* other_peep = reinterpret_cast(sprite); if (other_peep->state != PEEP_STATE_WALKING) diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 2660622aca..8c9fd33a82 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -419,7 +419,7 @@ void footpath_interrupt_peeps(const CoordsXYZ& footpathPos) { auto* entity = get_sprite(spriteIndex); uint16_t nextSpriteIndex = entity->generic.next_in_quadrant; - if (entity->generic.sprite_identifier == SPRITE_IDENTIFIER_PEEP) + if (entity->IsPeep()) { Peep* peep = &entity->peep; if (peep->state == PEEP_STATE_SITTING || peep->state == PEEP_STATE_WATCHING) diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index e5d23fa794..61105e3bc3 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -202,7 +202,7 @@ static bool map_animation_invalidate_small_scenery(const CoordsXYZ& loc) for (; spriteIdx != SPRITE_INDEX_NULL; spriteIdx = sprite->generic.next_in_quadrant) { sprite = get_sprite(spriteIdx); - if (sprite->generic.sprite_identifier != SPRITE_IDENTIFIER_PEEP) + if (!sprite->IsPeep()) continue; peep = &sprite->peep; diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index d608bf8140..4d7235fbd6 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -268,7 +268,7 @@ rct_sprite_checksum sprite_checksum() break; } - if (copy.generic.sprite_identifier == SPRITE_IDENTIFIER_PEEP) + if (copy.IsPeep()) { // Name is pointer and will not be the same across clients copy.peep.name = {}; diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index 5981854de6..b30ffa8612 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -133,7 +133,7 @@ union rct_sprite bool IsBalloon(); bool IsDuck(); bool IsMoneyEffect(); - bool IsPeep(); + bool IsPeep() const; Balloon* AsBalloon(); Duck* AsDuck(); MoneyEffect* AsMoneyEffect();