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

Merge pull request #14129 from ZehMatt/refactor/UpdateSwingingCar 

Refactor UpdateSwingingCar function
This commit is contained in:
ζeh Matt 2021-02-21 09:58:15 +02:00 committed by GitHub
parent 12ffca22a7 a232749b2f
commit d3cae77230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6943,6 +6943,41 @@ int32_t Vehicle::GetSwingAmount() const
return 0;
}
static uint8_t GetSwingSprite(int16_t swingPosition)
{
if (swingPosition < -10012)
return 11;
else if (swingPosition > 10012)
return 12;
if (swingPosition < -8191)
return 9;
else if (swingPosition > 8191)
return 10;
if (swingPosition < -6371)
return 7;
else if (swingPosition > 6371)
return 8;
if (swingPosition < -4550)
return 5;
else if (swingPosition > 4550)
return 6;
if (swingPosition < -2730)
return 3;
else if (swingPosition > 2730)
return 4;
if (swingPosition < -910)
return 1;
else if (swingPosition > 910)
return 2;
return 0;
}
/**
*
* rct2: 0x006D6776
@ -7014,68 +7049,20 @@ void Vehicle::UpdateSwingingCar()
SwingPosition += SwingSpeed;
SwingSpeed -= SwingSpeed >> 5;
int16_t ax = SwingPosition;
if (ax > dx)
if (SwingPosition > dx)
{
ax = dx;
SwingPosition = dx;
SwingSpeed = 0;
}
if (ax < cx)
if (SwingPosition < cx)
{
ax = cx;
SwingPosition = cx;
SwingSpeed = 0;
}
SwingPosition = ax;
uint8_t swingSprite = 11;
if (ax >= -10012)
{
swingSprite = 12;
if (ax <= 10012)
{
swingSprite = 9;
if (ax >= -8191)
{
swingSprite = 10;
if (ax <= 8191)
{
swingSprite = 7;
if (ax >= -6371)
{
swingSprite = 8;
if (ax <= 6371)
{
swingSprite = 5;
if (ax >= -4550)
{
swingSprite = 6;
if (ax <= 4550)
{
swingSprite = 3;
if (ax >= -2730)
{
swingSprite = 4;
if (ax <= 2730)
{
swingSprite = 1;
if (ax >= -910)
{
swingSprite = 2;
if (ax <= 910)
{
swingSprite = 0;
}
}
}
}
}
}
}
}
}
}
}
}
uint8_t swingSprite = GetSwingSprite(SwingPosition);
if (swingSprite != SwingSprite)
{
SwingSprite = swingSprite;