diff options
author | Mattes D <github@xoft.cz> | 2014-11-28 22:46:58 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-11-28 22:46:58 +0100 |
commit | 883230abbcc20a4a27e1d8909894be63dee75d43 (patch) | |
tree | ecbdc082281e820fc98a302add93400ba467dbd7 /src/CraftingRecipes.cpp | |
parent | CMake: Fixed linux builds. (diff) | |
parent | Chunk: Fixed same-name iterators. (diff) | |
download | cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.gz cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.bz2 cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.lz cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.xz cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.zst cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.zip |
Diffstat (limited to 'src/CraftingRecipes.cpp')
-rw-r--r-- | src/CraftingRecipes.cpp | 6 |
1 files changed, 3 insertions, 3 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; |