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

Merge branch 'master' of https://github.com/eu07/maszyna

Browse Source
This commit is contained in:
milek7
2018-01-29 11:07:47 +01:00
parent c631f4beed a593b6097f
commit fa431fd1fe
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EU07.cpp
View File

@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
} }
#endif #endif
Global::asVersion = "NG"; Global::asVersion = "M7 18.01";
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
{ {
@@ -439,5 +439,7 @@ int main(int argc, char *argv[])
glfwDestroyWindow(window); glfwDestroyWindow(window);
glfwTerminate(); glfwTerminate();
_exit(0); // skip destructors, there are ordering errors which causes segfaults
return 0; return 0;
} }

2
Train.cpp
View File

@@ -831,7 +831,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co
Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep * Command.time_delta ); Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep * Command.time_delta );
} }
else { else {
Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global::fBrakeStep * Command.time_delta ); Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global::fBrakeStep * Command.time_delta );
} }
} }
else if (Command.action == GLFW_RELEASE) { else if (Command.action == GLFW_RELEASE) {