24 files changed, 85 insertions, 73 deletions

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")
diff --git a/SetFlags.cmake b/SetFlags.cmake
index 0d1bd99b3..b05585f7d 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -263,6 +263,10 @@ macro(set_exe_flags)
 				# flags introduced in 3.2
 				add_flags_cxx("-Wno-documentation")
 			endif()
+			if ("${CLANG_VERSION}" VERSION_GREATER 3.5)
+				# Use this flag to ignore error for a reserved macro problem in sqlite 3
+				add_flags_cxx("-Wno-reserved-id-macro")
+			endif()
 		endif()
 	endif()
 
diff --git a/src/Bindings/ManualBindings_World.cpp b/src/Bindings/ManualBindings_World.cpp
index 3ee5ca498..5becbba92 100644
--- a/src/Bindings/ManualBindings_World.cpp
+++ b/src/Bindings/ManualBindings_World.cpp
@@ -530,7 +530,7 @@ static int tolua_cWorld_TryGetHeight(lua_State * tolua_S)
 	// Call the implementation:
 	int Height = 0;
 	bool res = self->TryGetHeight(BlockX, BlockZ, Height);
-	L.Push(res ? 1 : 0);
+	L.Push(res);
 	if (res)
 	{
 		L.Push(Height);
diff --git a/src/Bindings/PluginLua.h b/src/Bindings/PluginLua.h
index 29f0319ab..a763cdfdf 100644
--- a/src/Bindings/PluginLua.h
+++ b/src/Bindings/PluginLua.h
@@ -179,7 +179,7 @@ public:
 	bool CanAddOldStyleHook(int a_HookType);
 	
 	// cWebPlugin overrides
-	virtual const AString GetWebTitle(void) const {return GetName(); }
+	virtual const AString GetWebTitle(void) const override {return GetName(); }
 	virtual AString HandleWebRequest(const HTTPRequest & a_Request) override;
 
 	/** Adds a new web tab to webadmin.
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 740dbca51..30a09bc02 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -76,7 +76,7 @@ protected:
 	cItemGrid m_Contents;
 	
 	// cItemGrid::cListener overrides:
-	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
+	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override
 	{
 		UNUSED(a_SlotNum);
 		ASSERT(a_Grid == &m_Contents);
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index d3f85e9d2..f350ef4c4 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -52,7 +52,7 @@ public:
 	virtual void UsedBy(cPlayer * a_Player) override;
 	virtual void SendTo(cClientHandle &) override {}
 	
-	virtual void SetRedstonePower(bool a_Value)
+	virtual void SetRedstonePower(bool a_Value) override
 	{
 		if (a_Value)
 		{
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h
index 00d7a69b8..3d06a8223 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVine.h
@@ -177,7 +177,7 @@ public:
 	}
 	
 
-	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ)
+	virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
 	{
 		UNUSED(a_ChunkInterface);
 		UNUSED(a_WorldInterface);
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index d1736e9b9..05eaf16e9 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -135,7 +135,7 @@ protected:
 	virtual void Destroyed() override;
 
 	// cItemGrid::cListener overrides:
-	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
+	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override
 	{
 		UNUSED(a_SlotNum);
 		ASSERT(a_Grid == &m_Contents);
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 4ed5ef8a3..b5a48d9bf 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1212,6 +1212,15 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
 		SetCanFly(false);
 	}
 
+	if (IsGameModeSpectator() && IsVisible())
+	{
+		SetVisible(false);
+	}
+	else if (!IsVisible())
+	{
+		SetVisible(true);
+	}
+
 	m_World->BroadcastPlayerListUpdateGameMode(*this);
 }
 
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index a0cd9b1d6..579eb8748 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -483,11 +483,11 @@ public:
 	bool PlaceBlocks(const sSetBlockVector & a_Blocks);
 
 	// cEntity overrides:
-	virtual bool IsCrouched (void) const { return m_IsCrouched; }
-	virtual bool IsSprinting(void) const { return m_IsSprinting; }
-	virtual bool IsRclking  (void) const { return IsEating() || IsChargingBow(); }
+	virtual bool IsCrouched (void) const override { return m_IsCrouched; }
+	virtual bool IsSprinting(void) const override { return m_IsSprinting; }
+	virtual bool IsRclking  (void) const override { return IsEating() || IsChargingBow(); }
 
-	virtual void Detach(void);
+	virtual void Detach(void) override;
 
 	/** Called by cClientHandle when the client is being destroyed.
 	The player removes its m_ClientHandle ownership so that the ClientHandle gets deleted. */
@@ -642,7 +642,7 @@ protected:
 	void ResolvePermissions(void);
 	void ResolveGroups(void);
 
-	virtual void Destroyed(void);
+	virtual void Destroyed(void) override;
 
 	/** Filters out damage for creative mode / friendly fire */
 	virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;
diff --git a/src/Generating/TwoHeights.cpp b/src/Generating/TwoHeights.cpp
index e75c301de..06c474458 100644
--- a/src/Generating/TwoHeights.cpp
+++ b/src/Generating/TwoHeights.cpp
@@ -69,7 +69,7 @@ public:
 	}
 
 
-	virtual void InitializeShapeGen(cIniFile & a_IniFile)
+	virtual void InitializeShapeGen(cIniFile & a_IniFile) override
 	{
 		m_FrequencyX = static_cast<NOISE_DATATYPE>(a_IniFile.GetValueSetF("Generator", "TwoHeightsFrequencyX", 40));
 		m_FrequencyY = static_cast<NOISE_DATATYPE>(a_IniFile.GetValueSetF("Generator", "TwoHeightsFrequencyY", 40));
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index a3f8caa46..27146e757 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -259,13 +259,13 @@ protected:
 	
 	
 	// cPiecePool overrides:
-	virtual cPieces GetPiecesWithConnector(int a_ConnectorType)
+	virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override
 	{
 		return m_Prefabs.GetPiecesWithConnector(a_ConnectorType);
 	}
 	
 	
-	virtual cPieces GetStartingPieces(void)
+	virtual cPieces GetStartingPieces(void) override
 	{
 		return m_Prefabs.GetStartingPieces();
 	}
diff --git a/src/IniFile.h b/src/IniFile.h
index 861be3800..2a4113fb4 100644
--- a/src/IniFile.h
+++ b/src/IniFile.h
@@ -89,7 +89,7 @@ public:
 	void Clear(void);
 	
 	/** Returns true iff the specified value exists. */
-	bool HasValue(const AString & a_KeyName, const AString & a_ValueName) const;
+	bool HasValue(const AString & a_KeyName, const AString & a_ValueName) const override;
 
 	/// Returns index of specified key, or noID if not found
 	int FindKey(const AString & keyname) const;
@@ -101,7 +101,7 @@ public:
 	int GetNumKeys(void) const { return (int)keys.size(); }
 
 	/// Add a key name
-	int AddKeyName(const AString & keyname);
+	int AddKeyName(const AString & keyname) override;
 
 	// Returns key names by index.
 	AString GetKeyName(const int keyID) const;
@@ -117,7 +117,7 @@ public:
 	// Gets value of [keyname] valuename =.
 	// Overloaded to return string, int, and double.
 	// Returns defValue if key / value not found.
-	AString GetValue (const AString & keyname, const AString & valuename, const AString & defValue = "")    const;
+	AString GetValue (const AString & keyname, const AString & valuename, const AString & defValue = "")    const override;
 	AString GetValue (const int keyID,    const int valueID,    const AString & defValue = "")    const;
 	double  GetValueF(const AString & keyname, const AString & valuename, const double    defValue = 0)     const;
 	int     GetValueI(const AString & keyname, const AString & valuename, const int       defValue = 0)     const;
@@ -127,18 +127,18 @@ public:
 	}
 	
 	// Gets the value; if not found, write the default to the INI file
-	AString GetValueSet (const AString & keyname, const AString & valuename, const AString & defValue = "");
+	AString GetValueSet (const AString & keyname, const AString & valuename, const AString & defValue = "") override;
 	double  GetValueSetF(const AString & keyname, const AString & valuename, const double    defValue = 0.0);
-	int     GetValueSetI(const AString & keyname, const AString & valuename, const int       defValue = 0);
-	Int64   GetValueSetI(const AString & keyname, const AString & valuename, const Int64     defValue = 0);
-	bool    GetValueSetB(const AString & keyname, const AString & valuename, const bool      defValue = false)
+	int     GetValueSetI(const AString & keyname, const AString & valuename, const int       defValue = 0) override;
+	Int64   GetValueSetI(const AString & keyname, const AString & valuename, const Int64     defValue = 0) override;
+	bool    GetValueSetB(const AString & keyname, const AString & valuename, const bool      defValue = false) override
 	{
 		return (GetValueSetI(keyname, valuename, defValue ? 1 : 0) != 0);
 	}
 
 	// Adds a new value to the specified key.
 	// If a value of the same name already exists, creates another one (non-standard INI file)
-	void AddValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value);
+	void AddValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value) override;
 	void AddValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value);
 	void AddValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value)
 	{
@@ -151,8 +151,8 @@ public:
 	// Returns true if value set, false otherwise.
 	// Overloaded to accept string, int, and double.
 	bool SetValue (const int keyID, const int valueID, const AString & value);
-	bool SetValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists = true);
-	bool SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists = true);
+	bool SetValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists = true) override;
+	bool SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists = true) override;
 	bool SetValueI(const AString & a_Keyname, const AString & a_ValueName, const Int64 a_Value, const bool a_CreateIfNotExists = true);
 	bool SetValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value, const bool a_CreateIfNotExists = true)
 	{
@@ -163,7 +163,7 @@ public:
 	// Deletes specified value.
 	// Returns true if value existed and deleted, false otherwise.
 	bool DeleteValueByID(const int keyID, const int valueID);
-	bool DeleteValue(const AString & keyname, const AString & valuename);
+	bool DeleteValue(const AString & keyname, const AString & valuename) override;
 
 	// Deletes specified key and all values contained within.
 	// Returns true if key existed and deleted, false otherwise.
@@ -204,15 +204,15 @@ public:
 	bool AddKeyComment(const int keyID, const AString & comment);
 
 	/// Add a key comment
-	bool AddKeyComment(const AString & keyname, const AString & comment);
+	bool AddKeyComment(const AString & keyname, const AString & comment) override;
 	
 	/// Return a key comment
 	AString GetKeyComment(const int keyID, const int commentID) const;
-	AString GetKeyComment(const AString & keyname, const int commentID) const;
+	AString GetKeyComment(const AString & keyname, const int commentID) const override;
 	
 	// Delete a key comment.
 	bool DeleteKeyComment(const int keyID, const int commentID);
-	bool DeleteKeyComment(const AString & keyname, const int commentID);
+	bool DeleteKeyComment(const AString & keyname, const int commentID) override;
 	
 	// Delete all comments for a key.
 	bool DeleteKeyComments(const int keyID);
diff --git a/src/Items/ItemSign.h b/src/Items/ItemSign.h
index dabbdbba1..3da93e2f1 100644
--- a/src/Items/ItemSign.h
+++ b/src/Items/ItemSign.h
@@ -25,7 +25,7 @@ public:
 		cWorld & a_World, cPlayer & a_Player, const cItem & a_EquippedItem,
 		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
 		int a_CursorX, int a_CursorY, int a_CursorZ
-	)
+	) override
 	{
 		// If the regular placement doesn't work, do no further processing:
 		if (!super::OnPlayerPlace(a_World, a_Player, a_EquippedItem, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ))
diff --git a/src/Mobs/Horse.h b/src/Mobs/Horse.h
index be283705e..27168ebae 100644
--- a/src/Mobs/Horse.h
+++ b/src/Mobs/Horse.h
@@ -26,7 +26,7 @@ public:
 	bool IsEating       (void) const  {return m_bIsEating; }
 	bool IsRearing      (void) const  {return m_bIsRearing; }
 	bool IsMthOpen      (void) const  {return m_bIsMouthOpen; }
-	bool IsTame         (void) const  {return m_bIsTame; }
+	bool IsTame         (void) const override {return m_bIsTame; }
 	int  GetHorseType   (void) const  {return m_Type; }
 	int  GetHorseColor  (void) const  {return m_Color; }
 	int  GetHorseStyle  (void) const  {return m_Style; }
diff --git a/src/Mobs/Wolf.h b/src/Mobs/Wolf.h
index 73ffb55c2..5de83acd8 100644
--- a/src/Mobs/Wolf.h
+++ b/src/Mobs/Wolf.h
@@ -25,8 +25,8 @@ public:
 	virtual void Attack(std::chrono::milliseconds a_Dt) override;
 
 	// Get functions
-	bool    IsSitting     (void) const { return m_IsSitting; }
-	bool    IsTame        (void) const { return m_IsTame; }
+	bool    IsSitting     (void) const override { return m_IsSitting; }
+	bool    IsTame        (void) const override { return m_IsTame; }
 	bool    IsBegging     (void) const { return m_IsBegging; }
 	bool    IsAngry       (void) const { return m_IsAngry; }
 	AString GetOwnerName  (void) const { return m_OwnerName; }
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);
 	}
 }
 
diff --git a/src/PolarSSL++/BlockingSslClientSocket.cpp b/src/PolarSSL++/BlockingSslClientSocket.cpp
index 821125b31..f5ad2f08c 100644
--- a/src/PolarSSL++/BlockingSslClientSocket.cpp
+++ b/src/PolarSSL++/BlockingSslClientSocket.cpp
@@ -54,19 +54,19 @@ class cBlockingSslClientSocketLinkCallbacks:
 	}
 
 
-	virtual void OnReceivedData(const char * a_Data, size_t a_Length)
+	virtual void OnReceivedData(const char * a_Data, size_t a_Length) override
 	{
 		m_Socket.OnReceivedData(a_Data, a_Length);
 	}
 
 
-	virtual void OnRemoteClosed(void)
+	virtual void OnRemoteClosed(void) override
 	{
 		m_Socket.OnDisconnected();
 	}
 
 
-	virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg)
+	virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg) override
 	{
 		m_Socket.OnDisconnected();
 	}
diff --git a/src/RCONServer.h b/src/RCONServer.h
index 81b019516..ecd936eeb 100644
--- a/src/RCONServer.h
+++ b/src/RCONServer.h
@@ -61,7 +61,7 @@ protected:
 		
 
 		// cTCPLink::cCallbacks overrides:
-		virtual void OnLinkCreated(cTCPLinkPtr a_Link);
+		virtual void OnLinkCreated(cTCPLinkPtr a_Link) override;
 		virtual void OnReceivedData(const char * a_Data, size_t a_Length) override;
 		virtual void OnRemoteClosed(void) override;
 		virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg) override;
diff --git a/src/Server.cpp b/src/Server.cpp
index 01d5a176a..fd3188b18 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -72,7 +72,7 @@ class cServerListenCallbacks:
 
 	virtual void OnAccepted(cTCPLink & a_Link) override {}
 
-	virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg)
+	virtual void OnError(int a_ErrorCode, const AString & a_ErrorMsg) override
 	{
 		LOGWARNING("Cannot listen on port %d: %d (%s).", m_Port, a_ErrorCode, a_ErrorMsg.c_str());
 	}
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index f6a9972d6..664c6502c 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -239,7 +239,7 @@ public:
 
 	// cSlotAreaTemporary overrides:
 	virtual void Clicked        (cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
-	virtual void DblClicked     (cPlayer & a_Player, int a_SlotNum);
+	virtual void DblClicked     (cPlayer & a_Player, int a_SlotNum) override;
 	virtual void OnPlayerRemoved(cPlayer & a_Player) override;
 	virtual void SetSlot        (int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) override;
 	
diff --git a/src/World.cpp b/src/World.cpp
index 7f0e3070a..3c39de317 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -150,7 +150,7 @@ protected:
 	int m_LastReportChunkCount;
 
 	// cChunkCoordCallback override:
-	virtual void Call(int a_ChunkX, int a_ChunkZ)
+	virtual void Call(int a_ChunkX, int a_ChunkZ) override
 	{
 		// Check if this was the last chunk:
 		m_NumPrepared += 1;
diff --git a/src/World.h b/src/World.h
index 6c0548ae6..2ecdd519c 100644
--- a/src/World.h
+++ b/src/World.h
@@ -203,10 +203,10 @@ public:
 	
 	bool VillagersShouldHarvestCrops(void) const { return m_VillagersShouldHarvestCrops; }
 
-	virtual eDimension GetDimension(void) const { return m_Dimension; }
+	virtual eDimension GetDimension(void) const override { return m_Dimension; }
 
 	/** Returns the world height at the specified coords; waits for the chunk to get loaded / generated */
-	virtual int GetHeight(int a_BlockX, int a_BlockZ);
+	virtual int GetHeight(int a_BlockX, int a_BlockZ) override;
 	
 	// tolua_end
 
@@ -253,7 +253,7 @@ public:
 	void BroadcastScoreboardObjective        (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode);
 	void BroadcastScoreUpdate                (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode);
 	void BroadcastDisplayObjective           (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display);
-	void BroadcastSoundEffect                (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = nullptr);   // tolua_export
+	void BroadcastSoundEffect                (const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = nullptr) override;  // tolua_export
 	void BroadcastSoundParticleEffect        (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = nullptr);  // tolua_export
 	void BroadcastSpawnEntity                (cEntity & a_Entity, const cClientHandle * a_Exclude = nullptr);
 	void BroadcastTeleportEntity             (const cEntity & a_Entity, const cClientHandle * a_Exclude = nullptr);
@@ -788,7 +788,7 @@ public:
 	bool IsWeatherWet(void) const { return !IsWeatherSunny(); }
 	
 	/** Returns true if it is raining, stormy or snowing at the specified location. This takes into account biomes. */
-	virtual bool IsWeatherWetAt(int a_BlockX, int a_BlockZ)
+	virtual bool IsWeatherWetAt(int a_BlockX, int a_BlockZ) override
 	{
 		return (IsWeatherWet() && !IsBiomeNoDownfall(GetBiomeAt(a_BlockX, a_BlockZ)));
 	}
diff --git a/src/main.cpp b/src/main.cpp
index 8a237b8ee..5cd057278 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -374,6 +374,14 @@ std::unique_ptr<cMemorySettingsRepository> parseArguments(int argc, char **argv)
 
 		TCLAP::MultiArg<int> 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);
+
+		TCLAP::SwitchArg noBufArg("", "no-output-buffering", "Disable output buffering", cmd);
+
 		cmd.parse(argc, argv);
 
 		auto repo = cpp14::make_unique<cMemorySettingsRepository>();
@@ -396,6 +404,22 @@ std::unique_ptr<cMemorySettingsRepository> parseArguments(int argc, char **argv)
 			}
 		}
 
+		if (commLogArg.getValue())
+		{
+			g_ShouldLogCommIn = true;
+			g_ShouldLogCommOut = true;
+		}
+		else
+		{
+			g_ShouldLogCommIn = commLogInArg.getValue();
+			g_ShouldLogCommOut = commLogOutArg.getValue();
+		}
+
+		if (noBufArg.getValue())
+		{
+			setvbuf(stdout, nullptr, _IONBF, 0);
+		}
+
 		repo->SetReadOnly();
 
 		return repo;
@@ -473,35 +497,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)
-		{
-			setvbuf(stdout, nullptr, _IONBF, 0);
-		}
-		else if (NoCaseCompare(Arg, "/service") == 0)
+		if (NoCaseCompare(Arg, "/service") == 0)
 		{
 			cRoot::m_RunAsService = true;
 		}