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/game/StarTechController.cpp | |
| parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
| parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) | |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarTechController.cpp')
| -rw-r--r-- | source/game/StarTechController.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarTechController.cpp b/source/game/StarTechController.cpp index f99a718..4ead428 100644 --- a/source/game/StarTechController.cpp +++ b/source/game/StarTechController.cpp @@ -277,7 +277,7 @@ List<Drawable> TechController::backDrawables() { if (animator->isVisible()) { for (auto& piece : animator->animator.drawablesWithZLevel(m_movementController->position())) { if (piece.second < 0.0f) - drawables.append(move(piece.first)); + drawables.append(std::move(piece.first)); } } } @@ -292,7 +292,7 @@ List<Drawable> TechController::frontDrawables() { if (animator->isVisible()) { for (auto& piece : animator->animator.drawablesWithZLevel(m_movementController->position())) { if (piece.second >= 0.0f) - drawables.append(move(piece.first)); + drawables.append(std::move(piece.first)); } } } @@ -346,7 +346,7 @@ Maybe<Json> TechController::receiveMessage(String const& message, bool localMess } TechController::TechAnimator::TechAnimator(Maybe<String> ac) { - animationConfig = move(ac); + animationConfig = std::move(ac); animator = animationConfig ? NetworkedAnimator(*animationConfig) : NetworkedAnimator(); netGroup.addNetElement(&animator); netGroup.addNetElement(&visible); @@ -511,7 +511,7 @@ LuaCallbacks TechController::makeTechCallbacks(TechModule& techModule) { DirectivesGroup newParentDirectives; for (auto& module : m_techModules) newParentDirectives.append(module.parentDirectives); - m_parentDirectives.set(move(newParentDirectives)); + m_parentDirectives.set(std::move(newParentDirectives)); }); callbacks.registerCallback("setParentHidden", [this](bool hidden) { |