Merge branch 'main' into small-fixes

1 files changed, 10 insertions, 10 deletions

diff --git a/source/game/StarProjectile.cpp b/source/game/StarProjectile.cpp
index 7355135..57d8ca8 100644
--- a/source/game/StarProjectile.cpp
+++ b/source/game/StarProjectile.cpp
@@ -142,7 +142,7 @@ pair<ByteArray, uint64_t> Projectile::writeNetState(uint64_t fromVersion) {
 }
 
 void Projectile::readNetState(ByteArray data, float interpolationTime) {
-  m_netGroup.readNetState(move(data), interpolationTime);
+  m_netGroup.readNetState(std::move(data), interpolationTime);
 }
 
 void Projectile::enableInterpolation(float extrapolationHint) {
@@ -371,7 +371,7 @@ void Projectile::render(RenderCallback* renderCallback) {
   }
   drawable.fullbright = m_config->fullbright;
   drawable.translate(position());
-  renderCallback->addDrawable(move(drawable), m_config->renderLayer);
+  renderCallback->addDrawable(std::move(drawable), m_config->renderLayer);
 }
 
 void Projectile::renderLightSources(RenderCallback* renderCallback) {
@@ -468,7 +468,7 @@ List<PhysicsForceRegion> Projectile::forceRegions() const {
     if (p.second.enabled.get()) {
       PhysicsForceRegion forceRegion = p.second.forceRegion;
       forceRegion.call([pos = position()](auto& fr) { fr.translate(pos); });
-      forces.append(move(forceRegion));
+      forces.append(std::move(forceRegion));
     }
   }
   return forces;
@@ -512,7 +512,7 @@ List<Particle> Projectile::sparkBlock(World* world, Vec2I const& position, Vec2F
       particle.finalVelocity = 0.5f * (particle.finalVelocity + Vec2F(Random::randf() - 0.5f, -20.0f + Random::randf()));
       particle.trail = true;
 
-      result.append(move(particle));
+      result.append(std::move(particle));
     }
   }
   return result;
@@ -733,7 +733,7 @@ void Projectile::processAction(Json const& action) {
       particle.finalVelocity = 0.5f * (particle.finalVelocity + Vec2F(Random::randf() - 0.5f, -20.0f + Random::randf()));
       particle.trail = true;
 
-      m_pendingRenderables.append(move(particle));
+      m_pendingRenderables.append(std::move(particle));
     }
 
   } else if (command == "particle") {
@@ -748,7 +748,7 @@ void Projectile::processAction(Json const& action) {
     }
     particle.translate(position());
     particle.velocity += m_referenceVelocity.value();
-    m_pendingRenderables.append(move(particle));
+    m_pendingRenderables.append(std::move(particle));
 
   } else if (command == "explosion") {
     if (isSlave())
@@ -796,7 +796,7 @@ void Projectile::processAction(Json const& action) {
       Particle particle(parameters.getObject("particle"));
       particle.translate(position());
       particle.velocity += m_referenceVelocity.value();
-      m_pendingRenderables.append(move(particle));
+      m_pendingRenderables.append(std::move(particle));
     }
 
   } else if (command == "item") {
@@ -816,7 +816,7 @@ void Projectile::processAction(Json const& action) {
 
     AudioInstancePtr sound = make_shared<AudioInstance>(*Root::singleton().assets()->audio(Random::randValueFrom(parameters.getArray("options")).toString()));
     sound->setPosition(position());
-    m_pendingRenderables.append(move(sound));
+    m_pendingRenderables.append(std::move(sound));
 
   } else if (command == "light") {
     if (!world()->isClient())
@@ -904,10 +904,10 @@ void Projectile::setup() {
     auto begin = processing.utf8().find_first_of('?');
     if (begin == NPos) {
       m_imageDirectives = "";
-      m_imageSuffix = move(processing);
+      m_imageSuffix = std::move(processing);
     }
     else if (begin == 0) {
-      m_imageDirectives = move(processing);
+      m_imageDirectives = std::move(processing);
       m_imageSuffix = "";
     }
     else {