1 files changed, 8 insertions, 6 deletions
diff --git a/source/game/StarSystemWorldServerThread.cpp b/source/game/StarSystemWorldServerThread.cpp
index fb5cea5..3ec26a7 100644
--- a/source/game/StarSystemWorldServerThread.cpp
+++ b/source/game/StarSystemWorldServerThread.cpp
@@ -5,9 +5,11 @@
 namespace Star {
 
 SystemWorldServerThread::SystemWorldServerThread(Vec3I const& location, SystemWorldServerPtr systemWorld, String storageFile)
-  : Thread(strf("SystemWorldServer: {}", location)), m_stop(false), m_storageFile(storageFile) {
-  m_systemLocation = location;
-  m_systemWorld = move(systemWorld);
+  : Thread(strf("SystemWorldServer: {}", location))
+  , m_systemLocation(location)
+  , m_systemWorld(move(systemWorld))
+  , m_storageFile(storageFile)
+{
 }
 
 SystemWorldServerThread::~SystemWorldServerThread() {
@@ -45,7 +47,7 @@ void SystemWorldServerThread::removeClient(ConnectionId clientId) {
 }
 
 void SystemWorldServerThread::setPause(shared_ptr<const atomic<bool>> pause) {
-  m_pause = move(pause);
+  m_pause = std::move(pause);
 }
 
 void SystemWorldServerThread::run() {
@@ -125,7 +127,7 @@ void SystemWorldServerThread::setClientDestination(ConnectionId clientId, System
 
 void SystemWorldServerThread::executeClientShipAction(ConnectionId clientId, ClientShipAction action) {
   WriteLocker locker(m_queueMutex);
-  m_clientShipActions.append({clientId, move(action)});
+  m_clientShipActions.append({clientId, std::move(action)});
 }
 
 SystemLocation SystemWorldServerThread::clientShipLocation(ConnectionId clientId) {
@@ -158,7 +160,7 @@ void SystemWorldServerThread::setUpdateAction(function<void(SystemWorldServerThr
 
 void SystemWorldServerThread::pushIncomingPacket(ConnectionId clientId, PacketPtr packet) {
   WriteLocker locker(m_queueMutex);
-  m_incomingPacketQueue.append({move(clientId), move(packet)});
+  m_incomingPacketQueue.append({std::move(clientId), std::move(packet)});
 }
 
 List<PacketPtr> SystemWorldServerThread::pullOutgoingPackets(ConnectionId clientId) {