summaryrefslogtreecommitdiff
path: root/src/train_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-09-24 23:25:24 +0000
committerrubidium <rubidium@openttd.org>2008-09-24 23:25:24 +0000
commit86f1a98ac846d82e09918f2a7f843160eaaad886 (patch)
tree55ef97f884a427b5807de2b489c5f2659cf4caa0 /src/train_cmd.cpp
parentb907ffec97d4080935ce975b42d9f8475f7c5509 (diff)
downloadopenttd-86f1a98ac846d82e09918f2a7f843160eaaad886.tar.xz
(svn r14397) -Fix: possible buffer overrun, wrong parameter type passed to printf and && where || is meant. Found by MSVC's code analysis (Darkvater)
Diffstat (limited to 'src/train_cmd.cpp')
-rw-r--r--src/train_cmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 7a21aa82f..7fcccb42c 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2747,7 +2747,7 @@ static PBSTileInfo ExtendTrainReservation(const Vehicle *v, TrackBits *new_track
if (!TryReserveRailTrack(tile, TrackdirToTrack(cur_td))) break;
}
- if (ft.m_err == CFollowTrackRail::EC_OWNER && ft.m_err == CFollowTrackRail::EC_NO_WAY) {
+ if (ft.m_err == CFollowTrackRail::EC_OWNER || ft.m_err == CFollowTrackRail::EC_NO_WAY) {
/* End of line, path valid and okay. */
return PBSTileInfo(ft.m_old_tile, ft.m_old_td, true);
}