diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-18 11:56:28 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-18 11:56:28 +0200 |
| commit | 2691e8daed826e944ca38f4787c77273edbf9404 (patch) | |
| tree | 3f9fca349df2253c2c314abf2e0c22e8af7f9604 /source/cFurnaceEntity.cpp | |
| parent | Added Core files to the VC2008 project (so that they can be opened from the IDE there, nothing more) (diff) | |
| download | cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar.gz cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar.bz2 cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar.lz cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar.xz cuberite-2691e8daed826e944ca38f4787c77273edbf9404.tar.zst cuberite-2691e8daed826e944ca38f4787c77273edbf9404.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cFurnaceEntity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/cFurnaceEntity.cpp b/source/cFurnaceEntity.cpp index 6fe1936e9..2373b3555 100644 --- a/source/cFurnaceEntity.cpp +++ b/source/cFurnaceEntity.cpp @@ -120,7 +120,7 @@ bool cFurnaceEntity::Tick( float a_Dt ) if ((m_CookingItem != NULL) && ((m_TimeBurned < m_BurnTime) || (m_TimeCooked + a_Dt >= m_CookTime))) { - if (m_CookingItem->Equals(m_Items[2]) || m_Items[2].IsEmpty()) + if (m_CookingItem->IsEqual(m_Items[2]) || m_Items[2].IsEmpty()) { m_TimeCooked += a_Dt; if ( m_TimeCooked >= m_CookTime ) @@ -201,9 +201,9 @@ bool cFurnaceEntity::StartCooking(void) if( (m_TimeBurned < m_BurnTime) || BurnTime > 0.f ) // burnable material { const cFurnaceRecipe::Recipe* R = FR->GetRecipeFrom( m_Items[0] ); - if( R ) // cook able ingredient + if (R != NULL) // cook able ingredient { - if( m_Items[2].Equals( *R->Out ) || m_Items[2].IsEmpty() ) + if (m_Items[2].IsEqual(*R->Out) || m_Items[2].IsEmpty()) { // good to go @@ -241,7 +241,7 @@ bool cFurnaceEntity::ContinueCooking(void) const cFurnaceRecipe::Recipe * R = FR->GetRecipeFrom( m_Items[0] ); if (R != NULL) // cook able ingredient { - if (m_Items[2].Equals(*R->Out) || m_Items[2].IsEmpty()) + if (m_Items[2].IsEqual(*R->Out) || m_Items[2].IsEmpty()) { // good to go if (m_CookingItem == NULL) // Only cook new item if not already cooking |