mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Consistent coords/tile definition order

Browse Source
This commit is contained in:
Hielke Morsink
2018-04-26 17:30:37 +02:00
committed by duncanspumpkin
parent afac7f6557
commit 278f67e627
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,11 +52,10 @@ assert_struct_size(LocationXYZ16, 6);
constexpr sint32 COORDS_NULL = -1;
/*
* Tile coordinates use 1 x/y increment per tile.
* Regular ('big', 'sprite') coordinates use 32 x/y increments per tile.
* */
/**
* Tile coordinates use 1 x/y increment per tile and 1 z increment per step.
* Regular ('big', 'sprite') coordinates use 32 x/y increments per tile and 8 z increments per step.
*/
struct CoordsXY
{
sint32 x, y;
@@ -95,14 +94,6 @@ struct TileCoordsXYZ
sint32 x = 0, y = 0, z = 0;
};
struct TileCoordsXYZD
{
sint32 x, y, z;
uint8 direction;
bool isNull() const { return x == COORDS_NULL; };
};
struct CoordsXYZD
{
sint32 x, y, z;
@@ -111,4 +102,10 @@ struct CoordsXYZD
bool isNull() const { return x == COORDS_NULL; };
};
struct TileCoordsXYZD
{
sint32 x, y, z;
uint8 direction;
bool isNull() const { return x == COORDS_NULL; };
};