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);