cpp/openttd-patchpack/source Changeset - r6130:441db4eef51a

Changeset - r6130:441db4eef51a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

KUDr - 17 years ago 2007-02-23 21:36:43
kudr@openttd.org

(svn r8867) -Fix(r8866): revert yapf_costrail.hpp commited by mistake, helpers.hpp had wrong line ending

2 files changed with 7 insertions and 7 deletions:

src/helpers.hpp

src/yapf/yapf_costrail.hpp

0 comments (0 inline, 0 general)

src/helpers.hpp

➞

Show inline comments

@@ @@ -78,16 +78,16 @@ template <typename T> static inline T de @@
 	FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);}
 /** Informative template class exposing basic enumeration properties used by several
  *  other templates below. Here we have only forward declaration. For each enum type
  *  we will create specialization derived from MakeEnumPropsT<>.
  *  i.e.:
  *    template <> struct EnumPropsT<Track> : MakeEnumPropsT<Track, byte, TRACK_BEGIN, TRACK_END, INVALID_TRACK> {};
  *  followed by:
  *    typedef TinyEnumT<Track> TrackByte;
  *  i.e.:
  *    template <> struct EnumPropsT<Track> : MakeEnumPropsT<Track, byte, TRACK_BEGIN, TRACK_END, INVALID_TRACK> {};
  *  followed by:
  *    typedef TinyEnumT<Track> TrackByte;
  */
 template <typename Tenum_t> struct EnumPropsT;
 /** Helper template class that makes basic properties of given enumeration type visible
  *  from outsize. It is used as base class of several EnumPropsT specializations each
  *  dedicated to one of commonly used enumeration types.

src/yapf/yapf_costrail.hpp

➞

Show inline comments

@@ @@ -63,13 +63,13 @@ public: @@
 			cost += Yapf().PfGetSettings().rail_curve45_penalty;
+		}
 		return cost;
+	}
 	/** return one tile cost. If tile is a tunnel entry, it is moved to the end of tunnel */
-	FORCEINLINE int OneTileCost(TileIndex prev_tile, TileIndex& tile, Trackdir trackdir)
 	FORCEINLINE int OneTileCost(TileIndex& tile, Trackdir trackdir)
+	{
 		int cost = 0;
 		// set base cost
 		if (IsDiagonalTrackdir(trackdir)) {
 			cost += YAPF_TILE_LENGTH;
 			switch (GetTileType(tile)) {
@@ @@ -78,13 +78,13 @@ public: @@
 					if (IsLevelCrossing(tile))
 						cost += Yapf().PfGetSettings().rail_crossing_penalty;
 					break;
 				case MP_STATION:
 					// penalty for passing station tiles
-					cost += Yapf().PfGetSettings().rail_station_penalty * DistanceManhattan(prev_tile, tile);
 					cost += Yapf().PfGetSettings().rail_station_penalty;
 					break;
 				default:
 					break;
+			}
 		} else {
@@ @@ -199,13 +199,13 @@ public: @@
 		RailType rail_type = GetTileRailType(tile, TrackdirToTrack(trackdir));
 		bool target_seen = Yapf().PfDetectDestination(tile, trackdir);
 		while (true) {
-			segment_cost += Yapf().OneTileCost(prev_tile, tile, trackdir);
 			segment_cost += Yapf().OneTileCost(tile, trackdir);
 			segment_cost += Yapf().CurveCost(prev_trackdir, trackdir);
 			segment_cost += Yapf().SlopeCost(tile, trackdir);
 			segment_cost += Yapf().SignalCost(n, tile, trackdir);
 			if (n.m_segment->flags_u.flags_s.m_end_of_line) {
 				break;
+			}

0 comments (0 inline, 0 general)