summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-27 21:27:03 +0100
committerMattes D <github@xoft.cz>2014-11-27 21:27:03 +0100
commit186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2 (patch)
tree6cfc06853e5dd420a21b71fd924a93d6045173a3
parentCompoGenBiomal: Fixed signed vs unsigned comparison. (diff)
downloadcuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar.gz
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar.bz2
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar.lz
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar.xz
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.tar.zst
cuberite-186b2f3bd06a5f1c34f2cfb3f21ed4ee1f32d0f2.zip
-rw-r--r--src/CraftingRecipes.cpp6
-rw-r--r--src/FurnaceRecipe.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 64fb21181..2c2b02a69 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -289,7 +289,7 @@ void cCraftingRecipes::GetRecipe(cPlayer & a_Player, cCraftingGrid & a_CraftingG
}
// Built-in recipes:
- std::auto_ptr<cRecipe> Recipe(FindRecipe(a_CraftingGrid.GetItems(), a_CraftingGrid.GetWidth(), a_CraftingGrid.GetHeight()));
+ std::unique_ptr<cRecipe> Recipe(FindRecipe(a_CraftingGrid.GetItems(), a_CraftingGrid.GetWidth(), a_CraftingGrid.GetHeight()));
a_Recipe.Clear();
if (Recipe.get() == nullptr)
{
@@ -377,7 +377,7 @@ void cCraftingRecipes::AddRecipeLine(int a_LineNum, const AString & a_RecipeLine
return;
}
- std::auto_ptr<cCraftingRecipes::cRecipe> Recipe(new cCraftingRecipes::cRecipe);
+ std::unique_ptr<cCraftingRecipes::cRecipe> Recipe(new cCraftingRecipes::cRecipe);
// Parse the result:
AStringVector ResultSplit = StringSplit(Sides[0], ",");
@@ -758,7 +758,7 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::MatchRecipe(const cItem * a_Crafti
} // for y, for x
// The recipe has matched. Create a copy of the recipe and set its coords to match the crafting grid:
- std::auto_ptr<cRecipe> Recipe(new cRecipe);
+ std::unique_ptr<cRecipe> Recipe(new cRecipe);
Recipe->m_Result = a_Recipe->m_Result;
Recipe->m_Width = a_Recipe->m_Width;
Recipe->m_Height = a_Recipe->m_Height;
diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp
index 9b3b2ecbe..112aa8146 100644
--- a/src/FurnaceRecipe.cpp
+++ b/src/FurnaceRecipe.cpp
@@ -115,7 +115,7 @@ void cFurnaceRecipe::AddFuelFromLine(const AString & a_Line, unsigned int a_Line
Line.erase(Line.begin()); // Remove the beginning "!"
Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end());
- std::auto_ptr<cItem> Item(new cItem);
+ std::unique_ptr<cItem> Item(new cItem);
int BurnTime;
const AStringVector & Sides = StringSplit(Line, "=");
@@ -157,8 +157,8 @@ void cFurnaceRecipe::AddRecipeFromLine(const AString & a_Line, unsigned int a_Li
Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end());
int CookTime = 200;
- std::auto_ptr<cItem> InputItem(new cItem());
- std::auto_ptr<cItem> OutputItem(new cItem());
+ std::unique_ptr<cItem> InputItem(new cItem());
+ std::unique_ptr<cItem> OutputItem(new cItem());
const AStringVector & Sides = StringSplit(Line, "=");
if (Sides.size() != 2)