From b65a22fc1f0e5e95be234d6d94388091f74704a9 Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Fri, 16 Nov 2012 16:03:56 +0000
Subject: Fixed boolean comparison. Don't compare booleans to false / true, use
 them directly.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1048 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Blocks/BlockVine.h              | 6 +++---
 source/ClientHandle.cpp                | 2 +-
 source/Root.cpp                        | 2 +-
 source/Simulator/RedstoneSimulator.cpp | 8 ++++----
 source/WebAdmin.cpp                    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source')

diff --git a/source/Blocks/BlockVine.h b/source/Blocks/BlockVine.h
index cdef18520..791b01a79 100644
--- a/source/Blocks/BlockVine.h
+++ b/source/Blocks/BlockVine.h
@@ -36,11 +36,11 @@ public:
 		}
 		
 		BLOCKTYPE TopBlock = a_World->GetBlock( a_BlockX, a_BlockY + 1, a_BlockZ);
-		if (g_BlockIsSolid[TopBlock] || TopBlock==E_BLOCK_LEAVES)
+		if (g_BlockIsSolid[TopBlock] || (TopBlock == E_BLOCK_LEAVES))
 		{
 			AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true );
 			BLOCKTYPE BaseBlock = a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ);
-			if (g_BlockIsSolid[BaseBlock] == false && BaseBlock!=E_BLOCK_LEAVES)
+			if (!g_BlockIsSolid[BaseBlock] && (BaseBlock != E_BLOCK_LEAVES))
 			{
 				AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, false );
 				a_World->SetBlock( a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_VINES, 0);
@@ -50,7 +50,7 @@ public:
 
 		AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true );
 		BLOCKTYPE BaseBlock = a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ);
-		return g_BlockIsSolid[BaseBlock] || BaseBlock==E_BLOCK_LEAVES;
+		return (g_BlockIsSolid[BaseBlock] || (BaseBlock == E_BLOCK_LEAVES));
 	}
 
 
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 5967421df..c25a482ca 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -908,7 +908,7 @@ void cClientHandle::HandleUseEntity(int a_TargetEntityID, bool a_IsLeftClick)
 	{
 		virtual bool Item(cEntity * a_Entity) override
 		{
-			if (a_Entity->GetWorld()->IsPVPEnabled() == false)
+			if (!a_Entity->GetWorld()->IsPVPEnabled())
 			{
 				// PVP is disabled
 				if (a_Entity->IsA("cPlayer") && Instigator->IsA("cPlayer"))
diff --git a/source/Root.cpp b/source/Root.cpp
index 1e901739f..52a0f46ce 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -127,7 +127,7 @@ void cRoot::Start(void)
 		cIniFile WebIniFile("webadmin.ini");
 		if( WebIniFile.ReadFile() )
 		{
-			if( WebIniFile.GetValueB("WebAdmin", "Enabled", false ) == true )
+			if (WebIniFile.GetValueB("WebAdmin", "Enabled", false ))
 			{
 				LOG("Creating WebAdmin...");
 				m_WebAdmin = new cWebAdmin(8080);
diff --git a/source/Simulator/RedstoneSimulator.cpp b/source/Simulator/RedstoneSimulator.cpp
index 1c30be324..66b92f724 100644
--- a/source/Simulator/RedstoneSimulator.cpp
+++ b/source/Simulator/RedstoneSimulator.cpp
@@ -56,12 +56,12 @@ void cRedstoneSimulator::Simulate( float a_Dt )
 		if( (*itr).Ticks <= 0 )
 		{
 			char Block = m_World->GetBlock( (*itr).Position );
-			if( (*itr).bPowerOn == true && Block == E_BLOCK_REDSTONE_REPEATER_OFF )
+			if ((*itr).bPowerOn && (Block == E_BLOCK_REDSTONE_REPEATER_OFF))
 			{
 				m_World->FastSetBlock( (*itr).Position.x, (*itr).Position.y, (*itr).Position.z, E_BLOCK_REDSTONE_REPEATER_ON, m_World->GetBlockMeta( (*itr).Position ) );
 				m_Blocks.push_back( (*itr).Position );
 			}
-			else if( (*itr).bPowerOn == false && Block == E_BLOCK_REDSTONE_REPEATER_ON )
+			else if (!(*itr).bPowerOn && (Block == E_BLOCK_REDSTONE_REPEATER_ON))
 			{
 				m_World->FastSetBlock( (*itr).Position.x, (*itr).Position.y, (*itr).Position.z, E_BLOCK_REDSTONE_REPEATER_OFF, m_World->GetBlockMeta( (*itr).Position ) );
 				m_Blocks.push_back( (*itr).Position );
@@ -860,11 +860,11 @@ void cRedstoneSimulator::SetRepeater( const Vector3i & a_Position, int a_Ticks,
 		sRepeaterChange & Change = *itr;
 		if( Change.Position.Equals( a_Position ) )
 		{
-			if( Change.bPowerOn && a_bPowerOn == false )
+			if (Change.bPowerOn && !a_bPowerOn)
 			{
 				Change.bPowerOffNextTime = true;
 			}
-			if( a_bPowerOn == true )
+			if (a_bPowerOn)
 			{
 				Change.bPowerOffNextTime = false;
 			}
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index 7543f409b..f78e5b82a 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -196,7 +196,7 @@ void cWebAdmin::Request_Handler(webserver::http_request* r)
 					cWebPlugin* WebPlugin = *itr;
 					FoundPlugin = WebPlugin->GetName();
 					AString TabName = WebPlugin->GetTabNameForRequest( &Request ).first;
-					if( TabName.empty() == false )
+					if (!TabName.empty())
 					{
 						FoundPlugin += " - " + TabName;
 					}
@@ -239,7 +239,7 @@ void cWebAdmin::Request_Handler(webserver::http_request* r)
 
 		
 
-		if (bDontShowTemplate == false && Split.size() > 1)
+		if (!bDontShowTemplate && (Split.size() > 1))
 		{
 			Content += "\n<p><a href='" + BaseURL + "'>Go back</a></p>";
 		}
-- 
cgit v1.2.3