dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework z position

Browse Source
This commit is contained in:
HackaLittleBit
2018-02-04 12:47:30 +00:00
committed by Jonathan G Rennison
parent 64c8985cd7
commit 80500f8f08
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ship_cmd.cpp
View File

@@ -513,8 +513,8 @@ static const byte _ship_subcoord[4][6][3] = {
struct ShipCollideChecker { struct ShipCollideChecker {
TrackBits track_bits; ///< Pathfinder chosen track converted to trackbits, or is v->state of requesting ship. (one bit set) TrackBits track_bits; ///< Pathfinder chosen track converted to trackbits, or is v->state of requesting ship. (one bit set)
TileIndex tile; ///< Tile where ship was found, used to determine distance between ships. TileIndex tile; ///< The tile that we really want to check.
int32 z_pos; ///< z_pos of requesting ship. Ship *v; ///< Ship we are testing for collision.
}; };
/** Helper function for collision avoidance. */ /** Helper function for collision avoidance. */
@@ -529,7 +529,7 @@ static Vehicle *FindShipOnTile(Vehicle *v, void *data)
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) return NULL; if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) return NULL;
/* Don't detect ships passing on aquaduct. */ /* Don't detect ships passing on aquaduct. */
if (abs(v->z_pos - scc->z_pos) >= 8) return NULL; if (abs(v->z_pos - scc->v->z_pos) >= 8) return NULL;
scc->tile = v->tile; scc->tile = v->tile;
@@ -563,7 +563,7 @@ static void CheckDistanceBetweenShips(TileIndex tile, Ship *v, TrackBits tracks,
if (!IsValidTile(tile_plus_two)) tile_plus_two = tile_plus_one; if (!IsValidTile(tile_plus_two)) tile_plus_two = tile_plus_one;
ShipCollideChecker scc; ShipCollideChecker scc;
scc.z_pos = v->z_pos; scc.v = v;
scc.track_bits = track_bits; scc.track_bits = track_bits;
bool found = HasVehicleOnPos(tile, &scc, FindShipOnTile); bool found = HasVehicleOnPos(tile, &scc, FindShipOnTile);