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

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-07-29 12:53:12 +02:00
12 changed files with 148 additions and 99 deletions

View File

@@ -234,12 +234,7 @@ ui_layer::render() {
ImGui::SetNextWindowSize(ImVec2(0, 0));
ImGui::Begin("Vehicle info", &basic_info_active, ImGuiWindowFlags_NoResize);
auto const &time = simulation::Time.data();
uitextline1 =
"Time: "
+ to_string( time.wHour ) + ":"
+ ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":"
+ ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond );
uitextline1 = "Time: " + std::string( simulation::Time );
if( Global.iPause ) {
uitextline1 += " (paused)";
}