eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-12 00:38:12 +01:00
Code Issues 139 Wiki Activity

Merge master into fix/ai-braking-split

Browse Source 
Resolve the conflicts with the merged nested ifs (#194) in
control_tractive_force() and control_braking_force(): the conditions keep
the new flattened form, with this branch's changes carried into them.
This commit is contained in:
pwarszawski
2026-10-02 15:22:39 +02:00
parent 4f2dfd9318 76a39af8c2
commit ac47e3a261
44 changed files with 2352 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vehicle/Driver.h
View File

@@ -550,8 +550,9 @@ private:
double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze
TTrack *tLast = nullptr; // ostatni analizowany tor
basic_event *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu
std::size_t SemNextIndex{ std::size_t( -1 ) };
std::size_t SemNextStopIndex{ std::size_t( -1 ) };
static constexpr std::size_t npos{ std::size_t( -1 ) };
std::size_t SemNextIndex{ npos };
std::size_t SemNextStopIndex{ npos };
double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki
basic_event *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2]
neighbour_data Obstacle; // nearest vehicle detected ahead on current route
@@ -630,7 +631,6 @@ private:
// logs
// methods
void PhysicsLog();
void CloseLog();
// members
std::ofstream LogFile; // zapis parametrow fizycznych
double LastUpdatedTime = 0.0; // czas od ostatniego logu