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

Allow TileCoordsXYZ conversion to CoordsXYZ

This commit is contained in:
Tulio Leao 2019-12-05 21:43:20 -03:00
parent d9348cf562
commit aca4d39107
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/ride/Ride.cpp
View File

@ -2899,7 +2899,8 @@ static void ride_music_update(Ride* ride)
return;
}
CoordsXYZ rideCoords{ ride->stations[0].Start.x * 32, ride->stations[0].Start.y * 32, ride->stations[0].Height * 8 };
TileCoordsXYZ rideTileCoords{ ride->stations[0].Start.x, ride->stations[0].Start.y, ride->stations[0].Height };
CoordsXYZ rideCoords{rideTileCoords.ToCoordsXYZ()};
rideCoords = { rideCoords.ToTileCentre(), rideCoords.z };
int32_t sampleRate = 22050;

5
src/openrct2/world/Location.hpp
View File

@ -273,6 +273,11 @@ struct TileCoordsXYZ
return !(*this == other);
}
CoordsXYZ ToCoordsXYZ()
{
return { x * 32, y * 32, z * 8 };
}
int32_t x = 0, y = 0, z = 0;
};