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/frontend/StarMerchantInterface.cpp | |
| parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
| parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) | |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/frontend/StarMerchantInterface.cpp')
| -rw-r--r-- | source/frontend/StarMerchantInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/frontend/StarMerchantInterface.cpp b/source/frontend/StarMerchantInterface.cpp index 17f4995..ec17391 100644 --- a/source/frontend/StarMerchantInterface.cpp +++ b/source/frontend/StarMerchantInterface.cpp @@ -23,8 +23,8 @@ namespace Star { MerchantPane::MerchantPane( WorldClientPtr worldClient, PlayerPtr player, Json const& settings, EntityId sourceEntityId) { - m_worldClient = move(worldClient); - m_player = move(player); + m_worldClient = std::move(worldClient); + m_player = std::move(player); m_sourceEntityId = sourceEntityId; auto assets = Root::singleton().assets(); |