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

Refactor ride->entrances and ride->exits

Browse Source
This commit is contained in:
Michael Steenbeek
2018-03-07 19:10:50 +01:00
committed by GitHub
parent ab54d6c370
commit 1fa2fa8f80
25 changed files with 453 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/ride/TrackPaint.cpp
View File

@@ -28,6 +28,7 @@
#include "TrackData.h"
#include "RideData.h"
#include "TrackPaint.h"
#include "Station.h"
// clang-format off
/* rct2: 0x007667AC */
@@ -225,11 +226,15 @@ bool track_paint_util_has_fence(
break;
}
uint16 entranceLoc = ((position.x / 32) + offset.x) | (((position.y / 32) + offset.y) * (1 << 8));
sint32 entranceX = (position.x / 32) + offset.x;
sint32 entranceY = (position.y / 32) + offset.y;
sint32 entranceId = tile_element_get_station(tileElement);
const TileCoordsXYZD entrance = ride_get_entrance_location(ride, entranceId);
const TileCoordsXYZD exit = ride_get_exit_location(ride, entranceId);
return (ride->entrances[entranceId].xy != entranceLoc && ride->exits[entranceId].xy != entranceLoc);
return ((entrance.x != entranceX || entrance.y != entranceY) &&
(exit.x != entranceX || exit.y != entranceY));
}
void track_paint_util_paint_floor(paint_session * session, uint8 edges, uint32 colourFlags, uint16 height,