From b65a22fc1f0e5e95be234d6d94388091f74704a9 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" 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/Simulator/RedstoneSimulator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/Simulator') 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; } -- cgit v1.2.3