diff options
| author | tron <tron@openttd.org> | 2007-02-25 10:25:25 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2007-02-25 10:25:25 +0000 |
| commit | 696b895b776ce8a990260d1a6829a93e675aa6c7 (patch) | |
| tree | abc5191717ba01b74c3935c96421507302feb34d /src/train_cmd.cpp | |
| parent | 1864d28cb8bfd85130e9f837424bba6d8876aa67 (diff) | |
| download | openttd-696b895b776ce8a990260d1a6829a93e675aa6c7.tar.xz | |
(svn r8896) -Fix
Most (i.e. 13 of 15) callers of GetNewVehiclePos() do not care for the return and the others can figure it out by inspecting the information returned in struct GetNewVehiclePosResult.
Therefore remove the return value.
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 9a0e8c702..a952f732a 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2887,9 +2887,10 @@ static void TrainController(Vehicle *v, bool update_image) BeginVehicleMove(v); GetNewVehiclePosResult gp; + GetNewVehiclePos(v, &gp); if (v->u.rail.track != TRACK_BIT_WORMHOLE) { /* Not inside tunnel */ - if (GetNewVehiclePos(v, &gp)) { + if (gp.old_tile == gp.new_tile) { /* Staying in the old tile */ if (v->u.rail.track == TRACK_BIT_DEPOT) { /* Inside depot */ @@ -3039,8 +3040,6 @@ static void TrainController(Vehicle *v, bool update_image) } } else { /* In tunnel or on a bridge */ - GetNewVehiclePos(v, &gp); - if (!(v->vehstatus & VS_HIDDEN)) { v->cur_speed = min(v->cur_speed, GetBridge(GetBridgeType(v->tile))->speed); |