From 48a71461bf906df7bf63b9c418ea17c3c51fb4dd Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sun, 22 Sep 2024 16:18:41 +0200 Subject: [PATCH] Rename PeepAnimationType::StaffCheckboard to StaffCheckBoard --- src/openrct2/entity/Peep.cpp | 2 +- src/openrct2/entity/Peep.h | 4 ++-- src/openrct2/entity/Staff.cpp | 2 +- src/openrct2/peep/PeepAnimationData.cpp | 4 ++-- src/openrct2/peep/PeepSpriteIds.h | 2 +- src/openrct2/scripting/bindings/entity/ScStaff.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 81429285a6..2623d340bd 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -98,7 +98,7 @@ static PeepAnimationType PeepActionToSpriteTypeMap[] = { PeepAnimationType::Drowning, PeepAnimationType::StaffAnswerCall, PeepAnimationType::StaffAnswerCall2, - PeepAnimationType::StaffCheckboard, + PeepAnimationType::StaffCheckBoard, PeepAnimationType::StaffFix, PeepAnimationType::StaffFix2, PeepAnimationType::StaffFixGround, diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index 44cef90904..3cc58435bc 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -129,7 +129,7 @@ enum class PeepActionType : uint8_t Drowning = 11, StaffAnswerCall = 12, StaffAnswerCall2 = 13, - StaffCheckboard = 14, + StaffCheckBoard = 14, StaffFix = 15, StaffFix2 = 16, StaffFixGround = 17, @@ -173,7 +173,7 @@ enum class PeepAnimationType : uint8_t Drowning = 17, StaffAnswerCall = 18, StaffAnswerCall2 = 19, - StaffCheckboard = 20, + StaffCheckBoard = 20, StaffFix = 21, StaffFix2 = 22, StaffFixGround = 23, diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index a1aa97bf17..5c9dc3e885 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -2238,7 +2238,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun) if (!firstRun) { Orientation = PeepDirection << 3; - Action = PeepActionType::StaffCheckboard; + Action = PeepActionType::StaffCheckBoard; AnimationFrameNum = 0; AnimationImageIdOffset = 0; diff --git a/src/openrct2/peep/PeepAnimationData.cpp b/src/openrct2/peep/PeepAnimationData.cpp index 0657ac9517..8aa0bebe5c 100644 --- a/src/openrct2/peep/PeepAnimationData.cpp +++ b/src/openrct2/peep/PeepAnimationData.cpp @@ -108,7 +108,7 @@ namespace OpenRCT2 static constexpr std::array kPeepAnimationSequenceMechanicDrowning = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 4, 5, 6, 7 }; static constexpr std::array kPeepAnimationSequenceMechanicStaffAnswerCall = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 17, 18, 18, 18, 18, 18, 18, 18, 17, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 15, 16, 15, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; static constexpr std::array kPeepAnimationSequenceMechanicStaffAnswerCall2 = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 16, 15, 14, 14, 14, 14, 14, 14, 19, 20, 20, 20, 19, 14, 14, 14, 14, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; - static constexpr std::array kPeepAnimationSequenceMechanicStaffCheckboard = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 9, 8, 14, 15, 15, 15, 16, 17, 17, 17, 14, 11, 12, 13, 12, 13, 12, 11, 9, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; + static constexpr std::array kPeepAnimationSequenceMechanicStaffCheckBoard = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 9, 8, 14, 15, 15, 15, 16, 17, 17, 17, 14, 11, 12, 13, 12, 13, 12, 11, 9, 10, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; static constexpr std::array kPeepAnimationSequenceMechanicStaffFix = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; static constexpr std::array kPeepAnimationSequenceMechanicStaffFix2 = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 18, 19, 20, 21, 22, 21, 20, 21, 22, 21, 20, 21, 22, 20, 21, 22, 21, 20, 19, 18, 0, 0, 23, 24, 25, 26, 27, 28, 28, 26, 24, 29, 30, 31, 32, 31, 30, 31, 32, 31, 30, 31, 32, 31, 30, 29, 0 }; static constexpr std::array kPeepAnimationSequenceMechanicStaffFixGround = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 16, 17, 18, 19, 18, 17, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }; @@ -123,7 +123,7 @@ namespace OpenRCT2 pag[PeepAnimationType::Drowning] = { kMechanicSpriteStateDrowningId, { 9, 15, 6 }, kPeepAnimationSequenceMechanicDrowning }; pag[PeepAnimationType::StaffAnswerCall] = { kMechanicSpriteStateStaffAnswerCallId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffAnswerCall }; pag[PeepAnimationType::StaffAnswerCall2] = { kMechanicSpriteStateStaffAnswerCallId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffAnswerCall2 }; - pag[PeepAnimationType::StaffCheckboard] = { kMechanicSpriteStateStaffCheckboardId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffCheckboard }; + pag[PeepAnimationType::StaffCheckBoard] = { kMechanicSpriteStateStaffCheckBoardId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffCheckBoard }; pag[PeepAnimationType::StaffFix] = { kMechanicSpriteStateStaffFixId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffFix }; pag[PeepAnimationType::StaffFix2] = { kMechanicSpriteStateStaffFixId, { 13, 22, 7 }, kPeepAnimationSequenceMechanicStaffFix2 }; pag[PeepAnimationType::StaffFixGround] = { kMechanicSpriteStateStaffFixGroundId, { 19, 16, 16 }, kPeepAnimationSequenceMechanicStaffFixGround }; diff --git a/src/openrct2/peep/PeepSpriteIds.h b/src/openrct2/peep/PeepSpriteIds.h index 0086a52968..c9868bae66 100644 --- a/src/openrct2/peep/PeepSpriteIds.h +++ b/src/openrct2/peep/PeepSpriteIds.h @@ -52,7 +52,7 @@ namespace OpenRCT2 kMechanicSpriteStateUiId = 11469, kMechanicSpriteStateDrowningId = 11481, kMechanicSpriteStateStaffAnswerCallId = 11513, - kMechanicSpriteStateStaffCheckboardId = 11597, + kMechanicSpriteStateStaffCheckBoardId = 11597, kMechanicSpriteStateStaffFixId = 11669, kMechanicSpriteStateStaffFixGroundId = 11801, diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 3c0e356318..e6e7d02c47 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -35,7 +35,7 @@ namespace OpenRCT2::Scripting { "drowning", PeepAnimationType::Drowning }, { "staffAnswerCall", PeepAnimationType::StaffAnswerCall }, { "staffAnswerCall2", PeepAnimationType::StaffAnswerCall2 }, - { "staffCheckBoard", PeepAnimationType::StaffCheckboard }, + { "staffCheckBoard", PeepAnimationType::StaffCheckBoard }, { "staffFix", PeepAnimationType::StaffFix }, { "staffFix2", PeepAnimationType::StaffFix2 }, { "staffFixGround", PeepAnimationType::StaffFixGround },