mirror of https://github.com/OpenTTD/OpenTTD
(svn r8899) -Fix
Remove the unused second parameter from GetTileRailType()release/0.6
parent
1ce43c1a37
commit
3ce4baa9fc
|
@ -594,7 +594,7 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
|
|||
|
||||
/* check correct rail type (mono, maglev, etc) */
|
||||
if (type == TRANSPORT_RAIL) {
|
||||
RailType dst_type = GetTileRailType(dst_tile, TrackdirToTrack(src_trackdir));
|
||||
RailType dst_type = GetTileRailType(dst_tile);
|
||||
if (!HASBIT(aystar->user_data[NPF_RAILTYPES], dst_type))
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ extern const Trackdir _dir_to_diag_trackdir[] = {
|
|||
};
|
||||
|
||||
|
||||
RailType GetTileRailType(TileIndex tile, Track track)
|
||||
RailType GetTileRailType(TileIndex tile)
|
||||
{
|
||||
switch (GetTileType(tile)) {
|
||||
case MP_RAILWAY:
|
||||
|
|
|
@ -261,12 +261,8 @@ static inline SignalState GetSignalStateByTrackdir(TileIndex tile, Trackdir trac
|
|||
|
||||
/**
|
||||
* Return the rail type of tile, or INVALID_RAILTYPE if this is no rail tile.
|
||||
* Note that there is no check if the given trackdir is actually present on
|
||||
* the tile!
|
||||
* The given trackdir is used when there are (could be) multiple rail types on
|
||||
* one tile.
|
||||
*/
|
||||
RailType GetTileRailType(TileIndex tile, Track track);
|
||||
RailType GetTileRailType(TileIndex tile);
|
||||
|
||||
|
||||
typedef enum RailGroundType {
|
||||
|
|
|
@ -2012,7 +2012,7 @@ static void HandleLocomotiveSmokeCloud(const Vehicle* v)
|
|||
if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue;
|
||||
|
||||
// No sparks for electric vehicles on nonelectrified tracks
|
||||
if (!HasPowerOnRail(v->u.rail.railtype, GetTileRailType(v->tile, TrackdirToTrack(GetVehicleTrackdir(v))))) continue;
|
||||
if (!HasPowerOnRail(v->u.rail.railtype, GetTileRailType(v->tile))) continue;
|
||||
|
||||
if (effect_type == 0) {
|
||||
// Use default effect type for engine class.
|
||||
|
@ -3019,7 +3019,7 @@ static void TrainController(Vehicle *v, bool update_image)
|
|||
if (!HASBIT(r, VETS_ENTERED_WORMHOLE)) {
|
||||
v->tile = gp.new_tile;
|
||||
|
||||
if (GetTileRailType(gp.new_tile, FindFirstTrack(chosen_track)) != GetTileRailType(gp.old_tile, FindFirstTrack(v->u.rail.track))) {
|
||||
if (GetTileRailType(gp.new_tile) != GetTileRailType(gp.old_tile)) {
|
||||
TrainPowerChanged(GetFirstVehicleInChain(v));
|
||||
}
|
||||
|
||||
|
|
|
@ -173,7 +173,7 @@ protected:
|
|||
|
||||
// rail transport is possible only on compatible rail types
|
||||
if (IsRailTT()) {
|
||||
RailType rail_type = GetTileRailType(m_new_tile, TrackdirToTrack(DiagdirToDiagTrackdir(m_exitdir)));
|
||||
RailType rail_type = GetTileRailType(m_new_tile);
|
||||
if (!HASBIT(m_veh->u.rail.compatible_railtypes, rail_type)) {
|
||||
// incompatible rail type
|
||||
return false;
|
||||
|
|
|
@ -192,7 +192,7 @@ public:
|
|||
Trackdir trackdir = n.m_key.m_td;
|
||||
TileType tile_type = GetTileType(tile);
|
||||
|
||||
RailType rail_type = GetTileRailType(tile, TrackdirToTrack(trackdir));
|
||||
RailType rail_type = GetTileRailType(tile);
|
||||
|
||||
bool target_seen = Yapf().PfDetectDestination(tile, trackdir);
|
||||
|
||||
|
@ -254,7 +254,7 @@ public:
|
|||
|
||||
// if tail type changes, finish segment (cached segment can't contain more rail types)
|
||||
{
|
||||
RailType new_rail_type = GetTileRailType(F.m_new_tile, TrackdirToTrack(FindFirstTrackdir(F.m_new_td_bits)));
|
||||
RailType new_rail_type = GetTileRailType(F.m_new_tile);
|
||||
if (new_rail_type != rail_type) {
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue