16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00

Merge remote-tracking branch 'tmj/master' into sim

This commit is contained in:
milek7
2020-10-18 23:35:14 +02:00
244 changed files with 54164 additions and 11636 deletions

View File

@@ -74,7 +74,7 @@ private:
TDynamicObject const *controlled;
TCamera const *camera;
TDynamicObject const *vehicle;
TMoverParameters const *mover;
TMoverParameters *mover;
TController const *mechanik;
};
// methods
@@ -93,6 +93,8 @@ private:
std::string update_vehicle_brake() const;
// renders provided lines, under specified collapsing header
bool render_section( std::string const &Header, std::vector<text_line> const &Lines );
bool render_section_scenario();
bool render_section_settings();
// members
std::array<char, 1024> m_buffer;
input_data m_input;