Merge branch 'main' into small-fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/source/game/StarDamageManager.cpp b/source/game/StarDamageManager.cpp
index 8c95a4f..dadaafb 100644
--- a/source/game/StarDamageManager.cpp
+++ b/source/game/StarDamageManager.cpp
@@ -117,7 +117,7 @@ void DamageManager::update(float dt) {
           addHitRequest({causingEntity->entityId(), targetEntity->entityId(), damageRequest});
 
           if (damageSource.damageType != NoDamage)
-            addDamageRequest({causingEntity->entityId(), targetEntity->entityId(), move(damageRequest)});
+            addDamageRequest({causingEntity->entityId(), targetEntity->entityId(), std::move(damageRequest)});
         }
       }
     }
@@ -144,7 +144,7 @@ void DamageManager::pushRemoteDamageRequest(RemoteDamageRequest const& remoteDam
   if (auto targetEntity = m_world->entity(remoteDamageRequest.targetEntityId)) {
     starAssert(targetEntity->isMaster());
     for (auto& damageNotification : targetEntity->applyDamage(remoteDamageRequest.damageRequest))
-      addDamageNotification({remoteDamageRequest.damageRequest.sourceEntityId, move(damageNotification)});
+      addDamageNotification({remoteDamageRequest.damageRequest.sourceEntityId, std::move(damageNotification)});
   }
 }
 
@@ -155,7 +155,7 @@ void DamageManager::pushRemoteDamageNotification(RemoteDamageNotification remote
       sourceEntity->damagedOther(remoteDamageNotification.damageNotification);
   }
 
-  m_pendingNotifications.append(move(remoteDamageNotification.damageNotification));
+  m_pendingNotifications.append(std::move(remoteDamageNotification.damageNotification));
 }
 
 List<RemoteHitRequest> DamageManager::pullRemoteHitRequests() {
@@ -251,14 +251,14 @@ void DamageManager::addHitRequest(RemoteHitRequest const& remoteHitRequest) {
 
 void DamageManager::addDamageRequest(RemoteDamageRequest remoteDamageRequest) {
   if (remoteDamageRequest.destinationConnection() == m_connectionId)
-    pushRemoteDamageRequest(move(remoteDamageRequest));
+    pushRemoteDamageRequest(std::move(remoteDamageRequest));
   else
-    m_pendingRemoteDamageRequests.append(move(remoteDamageRequest));
+    m_pendingRemoteDamageRequests.append(std::move(remoteDamageRequest));
 }
 
 void DamageManager::addDamageNotification(RemoteDamageNotification remoteDamageNotification) {
   pushRemoteDamageNotification(remoteDamageNotification);
-  m_pendingRemoteNotifications.append(move(remoteDamageNotification));
+  m_pendingRemoteNotifications.append(std::move(remoteDamageNotification));
 }
 
 }