cpp/openttd-patchpack/source Changeset - r4407:2bcfe0f5013d

Changeset - r4407:2bcfe0f5013d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

KUDr - 18 years ago 2006-08-26 22:24:32
kudr@openttd.org

(svn r6160) -Fix [ 1519167 ] Bus trying to service in depot of other company (mart3p)
thanks Darkvater for hotfix (r5897)

2 files changed with 6 insertions and 3 deletions:

yapf/follow_track.hpp

yapf/yapf_road.cpp

0 comments (0 inline, 0 general)

yapf/follow_track.hpp

➞

Show inline comments

@@ @@ -138,6 +138,10 @@ protected: @@
 			DiagDirection exitdir = GetRoadDepotDirection(m_new_tile);
 			if (ReverseDiagDir(exitdir) != m_exitdir)
 				return false;
 			// don't try to enter other player's depots
 			if (GetTileOwner(m_new_tile) != m_veh->owner) {
 				return false;
+			}
+		}
 		if (IsRailTT() && IsTileDepotType(m_new_tile, TT())) {
 			DiagDirection exitdir = GetRailDepotDirection(m_new_tile);

yapf/yapf_road.cpp

➞

Show inline comments

@@ @@ -83,7 +83,7 @@ public: @@
+			}
 			// if there are no reachable trackdirs on new tile, we have end of road
 			TrackFollower F;
+			TrackFollower F(Yapf().GetVehicle());
 			if (!F.Follow(tile, trackdir)) break;
 			// if there are more trackdirs available & reachable, we are at the end of segment
@@ @@ -235,7 +235,7 @@ public: @@
 	*   and adds it to the open list by calling Yapf().AddNewNode(n) */
 	inline void PfFollowNode(Node& old_node)
+	{
 		TrackFollower F;
+		TrackFollower F(Yapf().GetVehicle());
 		if (F.Follow(old_node.m_segment_last_tile, old_node.m_segment_last_td))
 			Yapf().AddMultipleNodes(&old_node, F.m_new_tile, F.m_new_td_bits);
+	}
@@ @@ -365,7 +365,6 @@ public: @@
 		Node& n = Yapf().GetBestNode();
 		TileIndex depot_tile = n.m_segment_last_tile;
 		assert(IsTileDepotType(depot_tile, TRANSPORT_ROAD));
 		if (!IsTileOwner(depot_tile, (Owner)v->owner)) return false;
 		Depot* ret = GetDepotByTile(depot_tile);
 		return ret;
+	}

0 comments (0 inline, 0 general)