eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 09:19:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-04-19 23:08:39 +02:00
parent 5d717575db 430ab99f8e
commit c248b5bdf4
20 changed files with 1498 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Driver.h
View File

@@ -304,6 +304,7 @@ private:
bool IncSpeed();
bool DecSpeed(bool force = false);
void SpeedSet();
void SpeedCntrl(double DesiredSpeed);
void Doors(bool const Open, int const Side = 0);
// returns true if any vehicle in the consist has an open door
bool doors_open() const;
@@ -318,6 +319,7 @@ private:
void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm);
bool PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason = stopComm );
void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę
bool UpdateHeating();
// procedury dotyczace rozkazow dla maszynisty
// uaktualnia informacje o prędkości
void SetVelocity(double NewVel, double NewVelNext, TStopReason r = stopNone);