mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-09 09:04:31 +00:00
Merge branch 'emp' into 'master'
Use an emplace instead of an insert See merge request OpenMW/openmw!1144
This commit is contained in:
commit
873e16ae93
1 changed files with 1 additions and 1 deletions
|
|
@ -1609,7 +1609,7 @@ namespace MWMechanics
|
||||||
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
|
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
|
||||||
if (!anim)
|
if (!anim)
|
||||||
return;
|
return;
|
||||||
mActors.insert(std::make_pair(ptr, new Actor(ptr, anim)));
|
mActors.emplace(ptr, new Actor(ptr, anim));
|
||||||
|
|
||||||
CharacterController* ctrl = mActors[ptr]->getCharacterController();
|
CharacterController* ctrl = mActors[ptr]->getCharacterController();
|
||||||
if (updateImmediately)
|
if (updateImmediately)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue