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

Introduce BoatHireSubState enum

This commit is contained in:
Rik Smeets 2024-04-07 19:02:11 +02:00
parent 58249538eb
commit 2a78399418
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/ride/Vehicle.cpp
View File

@ -3771,7 +3771,7 @@ void Vehicle::UpdateMotionBoatHire()
return;
bool do_Loc6DAA97 = false;
if (sub_state != 1)
if (sub_state != BoatHireSubState::EnteringReturnPosition)
{
do_Loc6DAA97 = true;
}
@ -3908,12 +3908,12 @@ void Vehicle::UpdateBoatLocation()
if (location.ToTileStart() == returnPosition.ToCoordsXY())
{
sub_state = 1;
sub_state = BoatHireSubState::EnteringReturnPosition;
BoatLocation = location.ToTileStart();
return;
}
sub_state = 0;
sub_state = BoatHireSubState::Normal;
uint8_t curDirection = ((Orientation + 19) >> 3) & 3;
uint8_t randDirection = ScenarioRand() & 3;

6
src/openrct2/ride/Vehicle.h
View File

@ -425,6 +425,12 @@ enum class MiniGolfAnimation : uint8_t
Putt,
};
enum BoatHireSubState : uint8_t
{
Normal,
EnteringReturnPosition,
};
namespace VehicleFlags
{
constexpr uint32_t OnLiftHill = (1 << 0);