summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-26 12:04:16 +0000
committerrubidium <rubidium@openttd.org>2013-11-26 12:04:16 +0000
commitb12205697be112c0a03d8ff0128467cfdd734dbd (patch)
tree4d4a49677e34c6465c3469c108f1bf1627f85de2
parentf6691015603cc931fb7f61d0bd3d05ebef226ed5 (diff)
downloadopenttd-b12205697be112c0a03d8ff0128467cfdd734dbd.tar.xz
(svn r26118) -Fix-ish?: comparing the old Direction to the possibly new state containing a TrackDir... well comparing apples and pears. Occasionally they would be the same and occasionally not; at least without any logic behind it.
Since the occasions that the false branch was taken never resulted in a bug report, I highly doubt that removing it completely affects anything... except the visual speed of cornering in a numer of corners (<50%) and visual speed in an old style road stop.
-rw-r--r--src/roadveh_cmd.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index aa4791bf7..88bdb5622 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1407,14 +1407,6 @@ again:
if (new_dir != old_dir) {
v->direction = new_dir;
if (_settings_game.vehicle.roadveh_acceleration_model == AM_ORIGINAL) v->cur_speed -= v->cur_speed >> 2;
- if (old_dir != v->state) {
- /* The vehicle is in a road stop */
- v->UpdateInclination(false, true);
- /* Note, return here means that the frame counter is not incremented
- * for vehicles changing direction in a road stop. This causes frames to
- * be repeated. (XXX) Is this intended? */
- return true;
- }
}
/* If the vehicle is in a normal road stop and the frame equals the stop frame OR