dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12313) -Fix: YAPF and NTP did not apply penalty for uphill tracks on steep slopes.

Browse Source
This commit is contained in:
frosch
2008-02-28 17:34:34 +00:00
parent 86a4d377b1
commit 35fd0dfd4e
8 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/yapf/yapf_common.cpp
View File

@@ -1,31 +0,0 @@
/* $Id$ */
/** @file yapf_common.cpp */
#include "../stdafx.h"
#include "yapf.hpp"
#include "follow_track.hpp"
#include "yapf_node_rail.hpp"
#include "yapf_costbase.hpp"
#include "yapf_costcache.hpp"
/** translate tileh to the bitset of up-hill trackdirs */
const TrackdirBits CYapfCostBase::c_upwards_slopes[] = {
TRACKDIR_BIT_NONE , ///< no tileh
TRACKDIR_BIT_X_SW | TRACKDIR_BIT_Y_NW, ///< 1
TRACKDIR_BIT_X_SW | TRACKDIR_BIT_Y_SE, ///< 2
TRACKDIR_BIT_X_SW , ///< 3
TRACKDIR_BIT_X_NE | TRACKDIR_BIT_Y_SE, ///< 4
TRACKDIR_BIT_NONE , ///< 5
TRACKDIR_BIT_Y_SE , ///< 6
TRACKDIR_BIT_NONE , ///< 7
TRACKDIR_BIT_X_NE | TRACKDIR_BIT_Y_NW, ///< 8
TRACKDIR_BIT_Y_NW , ///< 9
TRACKDIR_BIT_NONE , ///< 10
TRACKDIR_BIT_NONE , ///< 11
TRACKDIR_BIT_X_NE , ///< 12
TRACKDIR_BIT_NONE , ///< 13
TRACKDIR_BIT_NONE , ///< 14
TRACKDIR_BIT_NONE , ///< 15
};

6
src/yapf/yapf_costbase.hpp
View File

@@ -4,8 +4,6 @@
#define YAPF_COSTBASE_HPP
struct CYapfCostBase {
static const TrackdirBits c_upwards_slopes[16];
FORCEINLINE static bool stSlopeCost(TileIndex tile, Trackdir td)
{
if (IsDiagonalTrackdir(td)) {
@@ -19,8 +17,8 @@ struct CYapfCostBase {
} else {
// not bridge ramp
if (IsTunnelTile(tile)) return false; // tunnel entry/exit doesn't slope
uint tile_slope = GetTileSlope(tile, NULL) & 0x0F;
if ((c_upwards_slopes[tile_slope] & TrackdirToTrackdirBits(td)) != 0) return true; // slopes uphill => apply penalty
Slope tile_slope = GetTileSlope(tile, NULL);
return IsUphillTrackdir(tile_slope, td); // slopes uphill => apply penalty
}
}
return false;