From 7c196ffde665a673e6e864754219b0e2c74001ac Mon Sep 17 00:00:00 2001 From: tycho Date: Mon, 18 May 2015 18:50:29 +0100 Subject: Move commlog arguments over to TCLAP --- src/main.cpp | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8a237b8ee..fdc3c7872 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -374,6 +374,12 @@ std::unique_ptr parseArguments(int argc, char **argv) TCLAP::MultiArg portsArg("p", "port", "The port number the server should listen to", false, "port", cmd); + TCLAP::SwitchArg commLogArg("", "log-comm", "Log server client communications to file", cmd); + + TCLAP::SwitchArg commLogInArg("", "log-comm-in", "Log inbound server client communications to file", cmd); + + TCLAP::SwitchArg commLogOutArg("", "log-comm-out", "Log outbound server client communications to file", cmd); + cmd.parse(argc, argv); auto repo = cpp14::make_unique(); @@ -396,6 +402,17 @@ std::unique_ptr parseArguments(int argc, char **argv) } } + if (commLogArg.getValue()) + { + g_ShouldLogCommIn = true; + g_ShouldLogCommOut = true; + } + else + { + g_ShouldLogCommIn = commLogInArg.getValue(); + g_ShouldLogCommOut = commLogOutArg.getValue(); + } + repo->SetReadOnly(); return repo; @@ -473,31 +490,7 @@ int main(int argc, char **argv) for (int i = 0; i < argc; i++) { AString Arg(argv[i]); - if ( - (NoCaseCompare(Arg, "/commlog") == 0) || - (NoCaseCompare(Arg, "/logcomm") == 0) - ) - { - g_ShouldLogCommIn = true; - g_ShouldLogCommOut = true; - } - else if ( - (NoCaseCompare(Arg, "/commlogin") == 0) || - (NoCaseCompare(Arg, "/comminlog") == 0) || - (NoCaseCompare(Arg, "/logcommin") == 0) - ) - { - g_ShouldLogCommIn = true; - } - else if ( - (NoCaseCompare(Arg, "/commlogout") == 0) || - (NoCaseCompare(Arg, "/commoutlog") == 0) || - (NoCaseCompare(Arg, "/logcommout") == 0) - ) - { - g_ShouldLogCommOut = true; - } - else if (NoCaseCompare(Arg, "nooutbuf") == 0) + if (NoCaseCompare(Arg, "nooutbuf") == 0) { setvbuf(stdout, nullptr, _IONBF, 0); } -- cgit v1.2.3 From d9d4adc2a590768de544dc9d694e0a6550f9dab5 Mon Sep 17 00:00:00 2001 From: tycho Date: Mon, 18 May 2015 18:57:16 +0100 Subject: Moved no buffering command line argument to tclap --- src/main.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fdc3c7872..5cd057278 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -380,6 +380,8 @@ std::unique_ptr parseArguments(int argc, char **argv) TCLAP::SwitchArg commLogOutArg("", "log-comm-out", "Log outbound server client communications to file", cmd); + TCLAP::SwitchArg noBufArg("", "no-output-buffering", "Disable output buffering", cmd); + cmd.parse(argc, argv); auto repo = cpp14::make_unique(); @@ -413,6 +415,11 @@ std::unique_ptr parseArguments(int argc, char **argv) g_ShouldLogCommOut = commLogOutArg.getValue(); } + if (noBufArg.getValue()) + { + setvbuf(stdout, nullptr, _IONBF, 0); + } + repo->SetReadOnly(); return repo; @@ -490,11 +497,7 @@ int main(int argc, char **argv) for (int i = 0; i < argc; i++) { AString Arg(argv[i]); - if (NoCaseCompare(Arg, "nooutbuf") == 0) - { - setvbuf(stdout, nullptr, _IONBF, 0); - } - else if (NoCaseCompare(Arg, "/service") == 0) + if (NoCaseCompare(Arg, "/service") == 0) { cRoot::m_RunAsService = true; } -- cgit v1.2.3 From 906288c6eb007c7cd71ada3b5793fb373d722484 Mon Sep 17 00:00:00 2001 From: b33duck Date: Fri, 22 May 2015 12:25:16 -0700 Subject: Fixed players head visible when in spectator mode --- src/Entities/Player.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 607a663de..1dab952c5 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1205,6 +1205,15 @@ void cPlayer::SetGameMode(eGameMode a_GameMode) SetCanFly(false); } + if (IsGameModeSpectator() && IsVisible()) + { + SetVisible(false); + } + else if (!IsVisible()) + { + SetVisible(true); + } + m_World->BroadcastPlayerListUpdateGameMode(*this); } -- cgit v1.2.3 From 26c9c347806cc7c0afcbf2368dbb5fd5a4b43719 Mon Sep 17 00:00:00 2001 From: worktycho Date: Sat, 23 May 2015 11:12:18 +0100 Subject: Fixed wrong copy/paste Fixes CID 110962 --- src/OverridesSettingsRepository.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OverridesSettingsRepository.cpp b/src/OverridesSettingsRepository.cpp index 6defdd6b5..e63f2c44c 100644 --- a/src/OverridesSettingsRepository.cpp +++ b/src/OverridesSettingsRepository.cpp @@ -260,7 +260,7 @@ bool cOverridesSettingsRepository::DeleteValue(const AString & a_KeyName, const } else { - return m_Overrides->DeleteValue(a_KeyName, a_ValueName); + return m_Main->DeleteValue(a_KeyName, a_ValueName); } } -- cgit v1.2.3 From 2b844e368022f47544a343d809b153557d886624 Mon Sep 17 00:00:00 2001 From: tycho Date: Sat, 23 May 2015 06:36:45 -0700 Subject: Add build_tools and Self_test as cache options, so that CLion can detect them --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bb780eba..ae83662c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,9 @@ if(MSVC OR MSVC_IDE) endif() endif() +set(BUILD_TOOLS OFF CACHE BOOL "") +set(SELF_TEST OFF CACHE BOOL "") + # This has to be done before any flags have been set up. if(${BUILD_TOOLS}) message("Building tools") -- cgit v1.2.3