From ce41421dbb81c855e2cea774862017192b77dc73 Mon Sep 17 00:00:00 2001 From: stiffly Date: Wed, 9 Dec 2015 10:37:40 +0100 Subject: [PATCH] Added a "StartNetwork" bool to DefaultConfig. --- resources/DefaultConfig.ini | 10 +++++++++- src/Game/Game.cpp | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/resources/DefaultConfig.ini b/resources/DefaultConfig.ini index ac7e9ec2..9b81923e 100644 --- a/resources/DefaultConfig.ini +++ b/resources/DefaultConfig.ini @@ -1,8 +1,16 @@ [Debug] + LogLevel=1 + [Video] + Fullscreen=false + VSYNC=false + Width=1280 -Height=720 \ No newline at end of file + +Height=720 +[Networking] +StartNetwork=false \ No newline at end of file diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index d21e64ea..2f63e294 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -38,9 +38,10 @@ Game::Game(int argc, char* argv[]) // Create a TEST WORLD m_World = new HardcodedTestWorld(); - // TEMP: Invoke network - - boost::thread workerThread(&Game::NetworkFunction, this); + + // Invoke network + if(m_Config->Get("Networking.StartNetwork", false) == true) + boost::thread workerThread(&Game::NetworkFunction, this); m_LastTime = glfwGetTime(); }