diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/frontend/StarNameplatePainter.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/frontend/StarNameplatePainter.cpp')
-rw-r--r-- | source/frontend/StarNameplatePainter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/frontend/StarNameplatePainter.cpp b/source/frontend/StarNameplatePainter.cpp index fe9d829..4637232 100644 --- a/source/frontend/StarNameplatePainter.cpp +++ b/source/frontend/StarNameplatePainter.cpp @@ -44,7 +44,7 @@ void NameplatePainter::update(float dt, WorldClientPtr const& world, WorldCamera if (!m_entitiesWithNametags.contains(entity->entityId())) { Nametag nametag = {entity->name(), entity->statusText(), entity->nametagColor(), 1.0f, entity->entityId()}; RectF boundBox = determineBoundBox(Vec2F(), nametag); - m_nametags.addBubble(Vec2F(), boundBox, move(nametag)); + m_nametags.addBubble(Vec2F(), boundBox, std::move(nametag)); } } @@ -69,7 +69,7 @@ void NameplatePainter::update(float dt, WorldClientPtr const& world, WorldCamera } }); - m_entitiesWithNametags = move(foundEntities); + m_entitiesWithNametags = std::move(foundEntities); m_nametags.update(dt); } |