Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarItemDescriptor.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-02-20 09:49:42 +1100
committerGitHub <noreply@github.com>2024-02-20 09:49:42 +1100
commitaa987a217779e71f97ee4c9cce531aec1c861bf8 (patch)
treee51fcce110306d93bf93870f13a5ff7d6b575427 /source/game/StarItemDescriptor.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarItemDescriptor.cpp')
-rw-r--r--source/game/StarItemDescriptor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarItemDescriptor.cpp b/source/game/StarItemDescriptor.cpp
index 81f1464..ecc7a59 100644
--- a/source/game/StarItemDescriptor.cpp
+++ b/source/game/StarItemDescriptor.cpp
@@ -8,7 +8,7 @@ namespace Star {
ItemDescriptor::ItemDescriptor() : m_count(0), m_parameters(JsonObject()) {}
ItemDescriptor::ItemDescriptor(String name, uint64_t count, Json parameters)
- : m_name(move(name)), m_count(count), m_parameters(move(parameters)) {
+ : m_name(std::move(name)), m_count(count), m_parameters(std::move(parameters)) {
if (m_parameters.isNull())
m_parameters = JsonObject();
if (!m_parameters.isType(Json::Type::Object))
@@ -122,7 +122,7 @@ Json ItemDescriptor::toJson() const {
}
ItemDescriptor::ItemDescriptor(String name, uint64_t count, Json parameters, Maybe<size_t> parametersHash)
- : m_name(move(name)), m_count(count), m_parameters(move(parameters)), m_parametersHash(parametersHash) {}
+ : m_name(std::move(name)), m_count(count), m_parameters(std::move(parameters)), m_parametersHash(parametersHash) {}
size_t ItemDescriptor::parametersHash() const {
if (!m_parametersHash)