summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoan Josep <juanjo.ng.83@gmail.com>2019-02-16 21:52:49 +0100
committerIngo von Borstel <github@planetmaker.de>2019-02-16 21:52:49 +0100
commit4919c8db139c0ee626ae92f8ed5fc2106229791f (patch)
treeb92def0d978d1503093b84979f9c8ca9ad3fefbd /src
parent5dc377244d74cfffffc98830cbfd009d6cb9cffa (diff)
downloadopenttd-4919c8db139c0ee626ae92f8ed5fc2106229791f.tar.xz
Codechange: Re-arrange VehicleEnter_Track in rail_cmd. (#7239)
Diffstat (limited to 'src')
-rw-r--r--src/rail_cmd.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index f4b26c092..3230d9bf2 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -2912,48 +2912,48 @@ int TicksToLeaveDepot(const Train *v)
*/
static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int x, int y)
{
- /* this routine applies only to trains in depot tiles */
+ /* This routine applies only to trains in depot tiles. */
if (u->type != VEH_TRAIN || !IsRailDepotTile(tile)) return VETSB_CONTINUE;
- Train *v = Train::From(u);
-
- /* depot direction */
+ /* Depot direction. */
DiagDirection dir = GetRailDepotDirection(tile);
- /* Calculate the point where the following wagon should be activated. */
- int length = v->CalcNextVehicleOffset();
+ byte fract_coord = (x & 0xF) + ((y & 0xF) << 4);
- byte fract_coord_leave =
- ((_fractcoords_enter[dir] & 0x0F) + // x
- (length + 1) * _deltacoord_leaveoffset[dir]) +
- (((_fractcoords_enter[dir] >> 4) + // y
- ((length + 1) * _deltacoord_leaveoffset[dir + 4])) << 4);
+ /* Make sure a train is not entering the tile from behind. */
+ if (_fractcoords_behind[dir] == fract_coord) return VETSB_CANNOT_ENTER;
- byte fract_coord = (x & 0xF) + ((y & 0xF) << 4);
+ Train *v = Train::From(u);
- if (_fractcoords_behind[dir] == fract_coord) {
- /* make sure a train is not entering the tile from behind */
- return VETSB_CANNOT_ENTER;
- } else if (_fractcoords_enter[dir] == fract_coord) {
- if (DiagDirToDir(ReverseDiagDir(dir)) == v->direction) {
- /* enter the depot */
- v->track = TRACK_BIT_DEPOT,
- v->vehstatus |= VS_HIDDEN; // hide it
- v->direction = ReverseDir(v->direction);
- if (v->Next() == NULL) VehicleEnterDepot(v->First());
- v->tile = tile;
-
- InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
- return VETSB_ENTERED_WORMHOLE;
- }
- } else if (fract_coord_leave == fract_coord) {
- if (DiagDirToDir(dir) == v->direction) {
- /* leave the depot? */
+ /* Leaving depot? */
+ if (v->direction == DiagDirToDir(dir)) {
+ /* Calculate the point where the following wagon should be activated. */
+ int length = v->CalcNextVehicleOffset();
+
+ byte fract_coord_leave =
+ ((_fractcoords_enter[dir] & 0x0F) + // x
+ (length + 1) * _deltacoord_leaveoffset[dir]) +
+ (((_fractcoords_enter[dir] >> 4) + // y
+ ((length + 1) * _deltacoord_leaveoffset[dir + 4])) << 4);
+
+ if (fract_coord_leave == fract_coord) {
+ /* Leave the depot. */
if ((v = v->Next()) != NULL) {
v->vehstatus &= ~VS_HIDDEN;
v->track = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y);
}
}
+ } else if (_fractcoords_enter[dir] == fract_coord) {
+ /* Entering depot. */
+ assert(DiagDirToDir(ReverseDiagDir(dir)) == v->direction);
+ v->track = TRACK_BIT_DEPOT,
+ v->vehstatus |= VS_HIDDEN;
+ v->direction = ReverseDir(v->direction);
+ if (v->Next() == NULL) VehicleEnterDepot(v->First());
+ v->tile = tile;
+
+ InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
+ return VETSB_ENTERED_WORMHOLE;
}
return VETSB_CONTINUE;