diff options
Diffstat (limited to 'source/game/StarPlayer.cpp')
-rw-r--r-- | source/game/StarPlayer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/game/StarPlayer.cpp b/source/game/StarPlayer.cpp index 3969646..ebadf20 100644 --- a/source/game/StarPlayer.cpp +++ b/source/game/StarPlayer.cpp @@ -274,7 +274,7 @@ ClientContextPtr Player::clientContext() const { } void Player::setClientContext(ClientContextPtr clientContext) { - m_clientContext = move(clientContext); + m_clientContext = std::move(clientContext); if (m_clientContext) m_universeMap->setServerUuid(m_clientContext->serverUuid()); } @@ -380,7 +380,7 @@ List<Drawable> Player::drawables() const { drawable.imagePart().addDirectives(*directives, true); } } - drawables.append(move(drawable)); + drawables.append(std::move(drawable)); } } drawables.appendAll(m_techController->frontDrawables()); @@ -1079,14 +1079,14 @@ void Player::render(RenderCallback* renderCallback) { auto landingNoise = make_shared<AudioInstance>(*footstepAudio); landingNoise->setPosition(position() + feetOffset()); landingNoise->setVolume(m_landingVolume); - renderCallback->addAudio(move(landingNoise)); + renderCallback->addAudio(std::move(landingNoise)); } if (m_footstepPending) { auto stepNoise = make_shared<AudioInstance>(*footstepAudio); stepNoise->setPosition(position() + feetOffset()); stepNoise->setVolume(1 - Random::randf(0, m_footstepVolumeVariance)); - renderCallback->addAudio(move(stepNoise)); + renderCallback->addAudio(std::move(stepNoise)); } } else { m_footstepTimer = m_config->footstepTiming; @@ -1105,7 +1105,7 @@ void Player::render(RenderCallback* renderCallback) { audio->setVolume(get<1>(p)); audio->setPitchMultiplier(get<2>(p)); audio->setPosition(position()); - renderCallback->addAudio(move(audio)); + renderCallback->addAudio(std::move(audio)); } auto loungeAnchor = as<LoungeAnchor>(m_movementController->entityAnchor()); @@ -1594,7 +1594,7 @@ pair<ByteArray, uint64_t> Player::writeNetState(uint64_t fromVersion) { } void Player::readNetState(ByteArray data, float interpolationTime) { - m_netGroup.readNetState(move(data), interpolationTime); + m_netGroup.readNetState(std::move(data), interpolationTime); } void Player::enableInterpolation(float) { @@ -2003,7 +2003,7 @@ ShipUpgrades Player::shipUpgrades() { } void Player::setShipUpgrades(ShipUpgrades shipUpgrades) { - m_shipUpgrades = move(shipUpgrades); + m_shipUpgrades = std::move(shipUpgrades); } void Player::applyShipUpgrades(Json const& upgrades) { @@ -2133,7 +2133,7 @@ HumanoidIdentity const& Player::identity() const { } void Player::setIdentity(HumanoidIdentity identity) { - m_identity = move(identity); + m_identity = std::move(identity); updateIdentity(); } @@ -2258,7 +2258,7 @@ Json Player::diskStore() { for (auto& p : m_genericScriptContexts) { auto scriptStorage = p.second->getScriptStorage(); if (!scriptStorage.empty()) - genericScriptStorage[p.first] = move(scriptStorage); + genericScriptStorage[p.first] = std::move(scriptStorage); } return JsonObject{ @@ -2580,7 +2580,7 @@ Json Player::getSecretProperty(String const& name, Json defaultValue) const { { Logger::error("Exception reading secret player property '{}': {}", name, e.what()); } } - return move(defaultValue); + return defaultValue; } void Player::setSecretProperty(String const& name, Json const& value) { |