Mercurial > hg > openttd

changeset 11270:a5db358c2ada draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15619) -Fix [FS#2701]: When trying to reserve a self-crossing path the failed reservation was sometimes not cleared completely.
author michi_cc <michi_cc@openttd.org>
date Thu, 05 Mar 2009 16:14:56 +0000
parents 9fc6ae841a4d
children 6e85a72b0103
files src/yapf/yapf_rail.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/yapf/yapf_rail.cpp
+++ b/src/yapf/yapf_rail.cpp
@@ -81,7 +81,7 @@
 			}
 		}
 
-		return tile != m_res_dest;
+		return tile != m_res_dest || td != m_res_dest_td;
 	}
 
 	/** Unreserve a single track/platform. Stops when the previous failer is reached. */
@@ -97,7 +97,7 @@
 		} else if (tile != m_res_fail_tile || td != m_res_fail_td) {
 			UnreserveRailTrack(tile, TrackdirToTrack(td));
 		}
-		return tile != m_res_dest && (tile != m_res_fail_tile || td != m_res_fail_td);
+		return (tile != m_res_dest || td != m_res_dest_td) && (tile != m_res_fail_tile || td != m_res_fail_td);
 	}
 
 public: