mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Rename PeepAnimationType::StaffCheckboard to StaffCheckBoard

Browse Source
This commit is contained in:
Aaron van Geffen
2024-09-22 16:18:41 +02:00
parent b70aaea31e
commit 48a71461bf
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/entity/Peep.cpp
View File

@@ -98,7 +98,7 @@ static PeepAnimationType PeepActionToSpriteTypeMap[] = {
PeepAnimationType::Drowning,
PeepAnimationType::StaffAnswerCall,
PeepAnimationType::StaffAnswerCall2,
PeepAnimationType::StaffCheckboard,
PeepAnimationType::StaffCheckBoard,
PeepAnimationType::StaffFix,
PeepAnimationType::StaffFix2,
PeepAnimationType::StaffFixGround,

4
src/openrct2/entity/Peep.h
View File

@@ -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,

2
src/openrct2/entity/Staff.cpp
View File

@@ -2238,7 +2238,7 @@ bool Staff::UpdateFixingFixStationEnd(bool firstRun)
if (!firstRun)
{
Orientation = PeepDirection << 3;
Action = PeepActionType::StaffCheckboard;
Action = PeepActionType::StaffCheckBoard;
AnimationFrameNum = 0;
AnimationImageIdOffset = 0;

4
src/openrct2/peep/PeepAnimationData.cpp
View File

@@ -108,7 +108,7 @@ namespace OpenRCT2
static constexpr std::array<uint8_t, 65> 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<uint8_t, 85> 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<uint8_t, 59> 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<uint8_t, 43> 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<uint8_t, 43> 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<uint8_t, 53> 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<uint8_t, 99> 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<uint8_t, 61> 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 };

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

@@ -52,7 +52,7 @@ namespace OpenRCT2
kMechanicSpriteStateUiId = 11469,
kMechanicSpriteStateDrowningId = 11481,
kMechanicSpriteStateStaffAnswerCallId = 11513,
kMechanicSpriteStateStaffCheckboardId = 11597,
kMechanicSpriteStateStaffCheckBoardId = 11597,
kMechanicSpriteStateStaffFixId = 11669,
kMechanicSpriteStateStaffFixGroundId = 11801,

2
src/openrct2/scripting/bindings/entity/ScStaff.cpp
View File

@@ -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 },