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

pre-merge syncs

This commit is contained in:
tmj-fstate
2018-02-03 17:37:46 +01:00
parent b3e7b88bbc
commit e8bb25454e
20 changed files with 53 additions and 82 deletions

View File

@@ -596,8 +596,7 @@ void TWorld::OnKeyDown(int cKey) {
{ // i potwierdzenie
if( cKey == GLFW_KEY_Y ) {
// flaga wyjścia z programu
::PostQuitMessage( 0 );
// Global.iTextMode = -1;
glfwSetWindowShouldClose( window, 1 );
}
return; // nie przekazujemy do pociągu
}
@@ -1921,7 +1920,7 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic)
double at{ 0.0 };
double shift{ 0.0 };
#ifdef _WINDOWS
#ifdef _WIN32
std::string searchpattern( "*.*" );