From 46398f4671012a0d913bd7bc0c70ffdc2645f2ac Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sat, 1 Aug 2020 20:18:03 +0200 Subject: Replaced cpp14::make_unique<> with std::make_unique<>. --- src/Items/ItemBow.h | 2 +- src/Items/ItemFishingRod.h | 2 +- src/Items/ItemItemFrame.h | 2 +- src/Items/ItemPainting.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Items') diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h index b7a9ef638..636df5753 100644 --- a/src/Items/ItemBow.h +++ b/src/Items/ItemBow.h @@ -70,7 +70,7 @@ public: } // Create the arrow entity: - auto Arrow = cpp14::make_unique(*a_Player, Force * 2); + auto Arrow = std::make_unique(*a_Player, Force * 2); auto ArrowPtr = Arrow.get(); if (!ArrowPtr->Initialize(std::move(Arrow), *a_Player->GetWorld())) { diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h index 8817c8c38..008ecd01e 100644 --- a/src/Items/ItemFishingRod.h +++ b/src/Items/ItemFishingRod.h @@ -88,7 +88,7 @@ public: // Cast a hook: auto & Random = GetRandomProvider(); auto CountDownTime = Random.RandInt(100, 900) - static_cast(a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchLure) * 100); - auto Floater = cpp14::make_unique( + auto Floater = std::make_unique( a_Player->GetEyePosition(), a_Player->GetLookVector() * 15, a_Player->GetUniqueID(), CountDownTime diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h index 2c191a003..f1f687461 100644 --- a/src/Items/ItemItemFrame.h +++ b/src/Items/ItemItemFrame.h @@ -49,7 +49,7 @@ public: } // Place the item frame: - auto ItemFrame = cpp14::make_unique(a_ClickedBlockFace, PlacePos); + auto ItemFrame = std::make_unique(a_ClickedBlockFace, PlacePos); auto ItemFramePtr = ItemFrame.get(); if (!ItemFramePtr->Initialize(std::move(ItemFrame), *a_World)) { diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h index cc1d02ac4..78d9f040a 100644 --- a/src/Items/ItemPainting.h +++ b/src/Items/ItemPainting.h @@ -85,7 +85,7 @@ public: }; auto PaintingTitle = gPaintingTitlesList[a_World->GetTickRandomNumber(ARRAYCOUNT(gPaintingTitlesList) - 1)]; - auto Painting = cpp14::make_unique(PaintingTitle, a_ClickedBlockFace, PlacePos); + auto Painting = std::make_unique(PaintingTitle, a_ClickedBlockFace, PlacePos); auto PaintingPtr = Painting.get(); if (!PaintingPtr->Initialize(std::move(Painting), *a_World)) { -- cgit v1.2.3