From 3b6218fa6773764aa1e7d5ba0a7afe4322180f7d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 5 Mar 2020 23:15:21 -0500 Subject: [PATCH] CThardus: Make use of std::make_unique where applicable Same thing, but more straightforward. --- Runtime/MP1/World/CThardus.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/MP1/World/CThardus.cpp b/Runtime/MP1/World/CThardus.cpp index 09ee9d12b..b01b35d17 100644 --- a/Runtime/MP1/World/CThardus.cpp +++ b/Runtime/MP1/World/CThardus.cpp @@ -836,15 +836,15 @@ void CThardus::_SetupCollisionActorMaterials(const std::unique_ptr list; _BuildSphereJointList(skDamageableSphereJointInfoList1, 7, list); - x5f0_rockColliders.reset(new CCollisionActorManager(mgr, GetUniqueId(), GetAreaIdAlways(), list, true)); + x5f0_rockColliders = std::make_unique(mgr, GetUniqueId(), GetAreaIdAlways(), list, true); _SetupCollisionActorMaterials(x5f0_rockColliders, mgr); list.clear(); _BuildSphereJointList(skDamageableSphereJointInfoList2, 5, list); - x5f4_.reset(new CCollisionActorManager(mgr, GetUniqueId(), GetAreaIdAlways(), list, true)); + x5f4_ = std::make_unique(mgr, GetUniqueId(), GetAreaIdAlways(), list, true); _SetupCollisionActorMaterials(x5f4_, mgr); list.clear(); _BuildAABoxJointList(skFootCollision, 2, list); - x5f8_.reset(new CCollisionActorManager(mgr, GetUniqueId(), GetAreaIdAlways(), list, true)); + x5f8_ = std::make_unique(mgr, GetUniqueId(), GetAreaIdAlways(), list, true); _SetupCollisionActorMaterials(x5f8_, mgr); list.clear(); x634_nonDestroyableActors.reserve(x5f4_->GetNumCollisionActors() + x5f0_rockColliders->GetNumCollisionActors() +