summaryrefslogtreecommitdiffstats
path: root/src/FurnaceRecipe.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
committerHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
commit72bb299a4a4f74840c3b368c6669ddc3d32006ee (patch)
tree748fee756010b1f36aa95162f762e21ee0d19c0a /src/FurnaceRecipe.cpp
parentMerge branch 'master' into ChunkLoader (diff)
parentFixed a crash in redstone simulator. (diff)
downloadcuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.gz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.bz2
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.lz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.xz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.zst
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.zip
Diffstat (limited to 'src/FurnaceRecipe.cpp')
-rw-r--r--src/FurnaceRecipe.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp
index d200ef3d7..9b3b2ecbe 100644
--- a/src/FurnaceRecipe.cpp
+++ b/src/FurnaceRecipe.cpp
@@ -43,7 +43,7 @@ cFurnaceRecipe::~cFurnaceRecipe()
{
ClearRecipes();
delete m_pState;
- m_pState = NULL;
+ m_pState = nullptr;
}
@@ -247,9 +247,9 @@ void cFurnaceRecipe::ClearRecipes(void)
{
cRecipe Recipe = *itr;
delete Recipe.In;
- Recipe.In = NULL;
+ Recipe.In = nullptr;
delete Recipe.Out;
- Recipe.Out = NULL;
+ Recipe.Out = nullptr;
}
m_pState->Recipes.clear();
@@ -257,7 +257,7 @@ void cFurnaceRecipe::ClearRecipes(void)
{
cFuel Fuel = *itr;
delete Fuel.In;
- Fuel.In = NULL;
+ Fuel.In = nullptr;
}
m_pState->Fuel.clear();
}