mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-04 12:41:31 +00:00
Merge branch 'uniq' into 'master'
Use make_unique instead of unique_ptr+new See merge request OpenMW/openmw!960
This commit is contained in:
commit
4f956a0b88
1 changed files with 7 additions and 7 deletions
|
@ -178,49 +178,49 @@ namespace AiSequence
|
|||
{
|
||||
case Ai_Wander:
|
||||
{
|
||||
std::unique_ptr<AiWander> ptr (new AiWander());
|
||||
std::unique_ptr<AiWander> ptr = std::make_unique<AiWander>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Travel:
|
||||
{
|
||||
std::unique_ptr<AiTravel> ptr (new AiTravel());
|
||||
std::unique_ptr<AiTravel> ptr = std::make_unique<AiTravel>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Escort:
|
||||
{
|
||||
std::unique_ptr<AiEscort> ptr (new AiEscort());
|
||||
std::unique_ptr<AiEscort> ptr = std::make_unique<AiEscort>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Follow:
|
||||
{
|
||||
std::unique_ptr<AiFollow> ptr (new AiFollow());
|
||||
std::unique_ptr<AiFollow> ptr = std::make_unique<AiFollow>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Activate:
|
||||
{
|
||||
std::unique_ptr<AiActivate> ptr (new AiActivate());
|
||||
std::unique_ptr<AiActivate> ptr = std::make_unique<AiActivate>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Combat:
|
||||
{
|
||||
std::unique_ptr<AiCombat> ptr (new AiCombat());
|
||||
std::unique_ptr<AiCombat> ptr = std::make_unique<AiCombat>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
}
|
||||
case Ai_Pursue:
|
||||
{
|
||||
std::unique_ptr<AiPursue> ptr (new AiPursue());
|
||||
std::unique_ptr<AiPursue> ptr = std::make_unique<AiPursue>();
|
||||
ptr->load(esm);
|
||||
mPackages.back().mPackage = ptr.release();
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue