mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8899) -Fix 

Remove the unused second parameter from GetTileRailType()
release/0.6
tron 2007-02-25 11:36:19 +00:00
parent 1ce43c1a37
commit 3ce4baa9fc
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/npf.cpp
View File

@ -594,7 +594,7 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
/* check correct rail type (mono, maglev, etc) */ /* check correct rail type (mono, maglev, etc) */
if (type == TRANSPORT_RAIL) { 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)) if (!HASBIT(aystar->user_data[NPF_RAILTYPES], dst_type))
return; return;
} }

2
src/rail.cpp
View File

@ -102,7 +102,7 @@ extern const Trackdir _dir_to_diag_trackdir[] = {
}; };
RailType GetTileRailType(TileIndex tile, Track track) RailType GetTileRailType(TileIndex tile)
{ {
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_RAILWAY: case MP_RAILWAY:

6
src/rail_map.h
View File

@ -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. * 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 { typedef enum RailGroundType {

4
src/train_cmd.cpp
View File

@ -2012,7 +2012,7 @@ static void HandleLocomotiveSmokeCloud(const Vehicle* v)
if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue; if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue;
// No sparks for electric vehicles on nonelectrified tracks // 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) { if (effect_type == 0) {
// Use default effect type for engine class. // 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)) { if (!HASBIT(r, VETS_ENTERED_WORMHOLE)) {
v->tile = gp.new_tile; 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)); TrainPowerChanged(GetFirstVehicleInChain(v));
} }

2
src/yapf/follow_track.hpp
View File

@ -173,7 +173,7 @@ protected:
// rail transport is possible only on compatible rail types // rail transport is possible only on compatible rail types
if (IsRailTT()) { 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)) { if (!HASBIT(m_veh->u.rail.compatible_railtypes, rail_type)) {
// incompatible rail type // incompatible rail type
return false; return false;

4
src/yapf/yapf_costrail.hpp
View File

@ -192,7 +192,7 @@ public:
Trackdir trackdir = n.m_key.m_td; Trackdir trackdir = n.m_key.m_td;
TileType tile_type = GetTileType(tile); TileType tile_type = GetTileType(tile);
RailType rail_type = GetTileRailType(tile, TrackdirToTrack(trackdir)); RailType rail_type = GetTileRailType(tile);
bool target_seen = Yapf().PfDetectDestination(tile, trackdir); 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) // 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) { if (new_rail_type != rail_type) {
break; break;
} }