diff options
author | Mattes D <github@xoft.cz> | 2014-12-04 22:04:16 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-12-04 22:04:16 +0100 |
commit | c014f5624c1eda400c08c305978bbcef3f554ff3 (patch) | |
tree | fd15deecb2e9afa17443f9b8a8c51676ad6e0145 /src/CraftingRecipes.cpp | |
parent | Fixed indent. (diff) | |
parent | Merge pull request #1645 from jonfabe/SpectatorModeFixes (diff) | |
download | cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar.gz cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar.bz2 cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar.lz cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar.xz cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.tar.zst cuberite-c014f5624c1eda400c08c305978bbcef3f554ff3.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; |