eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-04 19:59:25 +01:00
Code Issues 156 Wiki Activity

Fix the calls of track_rails path functions hidden by the TTrack members of the same names

Browse Source
This commit is contained in:
Hirek
2026-10-31 20:09:22 +01:00
parent 1ad6d8b2bd
commit 60f34fd6bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
world/RailCrossings.cpp
View File

@@ -751,13 +751,13 @@ track_rails::check_rail_set TTrack::check_rails( std::vector<rail_crossing> cons
continue; continue;
} }
crossers.push_back( entry.track ); crossers.push_back( entry.track );
for( int otherpath = 0; otherpath < path_count( *entry.track ); ++otherpath ) { for( int otherpath = 0; otherpath < track_rails::path_count( *entry.track ); ++otherpath ) {
for( auto const side : { -1.0, 1.0 } ) { for( auto const side : { -1.0, 1.0 } ) {
crossing.push_back( make_gauge_line( path_segment( *entry.track, otherpath ), side * 0.5 * std::abs( entry.track->fTrackWidth ), 0.0 ) ); crossing.push_back( make_gauge_line( track_rails::path_segment( *entry.track, otherpath ), side * 0.5 * std::abs( entry.track->fTrackWidth ), 0.0 ) );
} }
} }
} }
for( int path = 0; path < path_count( *this ); ++path ) { for( int path = 0; path < track_rails::path_count( *this ); ++path ) {
for( int right = 0; right < 2; ++right ) { for( int right = 0; right < 2; ++right ) {
auto &checks { plans[ path ][ right ] }; auto &checks { plans[ path ][ right ] };
if( checks.empty() ) { if( checks.empty() ) {

2
world/RailLayer.cpp
View File

@@ -629,7 +629,7 @@ TTrack::rail_layer::rail_layer( TTrack &Track, rail_layout const &Layout, rail_d
m_openend { Openend }, m_openend { Openend },
m_geometry { Geometry }, m_geometry { Geometry },
m_cuts { Cuts }, m_cuts { Cuts },
m_segment { path_segment( Track, Path ) }, m_segment { track_rails::path_segment( Track, Path ) },
m_length { m_segment.GetLength() }, m_length { m_segment.GetLength() },
m_guardoffset { -( flangeway + Drawing.size.head ) }, m_guardoffset { -( flangeway + Drawing.size.head ) },
m_rise { track_sleepers::wing_rise( Track ) }, m_rise { track_sleepers::wing_rise( Track ) },