From 5a8c158dcaa94bc9fa71fd461093ecb0875d2dc0 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 27 Feb 2017 17:48:26 +0100 Subject: [PATCH] =?UTF-8?q?przywr=C3=B3cenie=20auto=20iconify,=20fix=20f1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 1 - World.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index d3516074..2ddaf4da 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -152,7 +152,6 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); - glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); GLFWwindow *window = diff --git a/World.cpp b/World.cpp index 9cf8263b..3ec2d46a 100644 --- a/World.cpp +++ b/World.cpp @@ -675,8 +675,8 @@ void TWorld::OnKeyDown(int cKey) GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); } } - if( (Global::ctrlState) - && (Global::shiftState) ) { + if( (!Global::ctrlState) + && (!Global::shiftState) ) { // czas i relacja if( Global::iTextMode == cKey ) { // wyłączenie napisów, chyba że pauza @@ -789,7 +789,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if (cKey == 3) //[Ctrl]+[Break] + else if (Global::ctrlState && GLFW_KEY_PAUSE) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos);