From b95af30f3a57a4a60715e7035d1bb720e5ec686c Mon Sep 17 00:00:00 2001 From: VB Date: Fri, 3 Mar 2017 17:03:34 +0100 Subject: [PATCH] =?UTF-8?q?ups,=20ctrl=20w=C5=82=C4=85cza=C5=82=20radiosto?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Globals.cpp | 4 +--- World.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 879847b9..54095bcd 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -487,10 +487,8 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> token; -/* + Global::bUseVBO = (token == "yes"); -*/ - Global::bUseVBO = false; // temporarily disabled until render paths are sorted out } else if (token == "feedbackmode") { diff --git a/World.cpp b/World.cpp index 183068ea..83c67230 100644 --- a/World.cpp +++ b/World.cpp @@ -753,7 +753,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if (Global::ctrlState && GLFW_KEY_PAUSE) //[Ctrl]+[Break] + else if (Global::ctrlState && cKey == GLFW_KEY_PAUSE) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos);