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

summaryrefslogtreecommitdiff
path: root/source/game/StarDamageDatabase.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/StarDamageDatabase.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarDamageDatabase.cpp')
-rw-r--r--source/game/StarDamageDatabase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarDamageDatabase.cpp b/source/game/StarDamageDatabase.cpp
index 9982a35..8248295 100644
--- a/source/game/StarDamageDatabase.cpp
+++ b/source/game/StarDamageDatabase.cpp
@@ -15,7 +15,7 @@ DamageDatabase::DamageDatabase() {
for (auto particle : p.second.getObject("damageNumberParticles")) {
type.damageNumberParticles.set(HitTypeNames.getLeft(particle.first), particle.second.toString());
}
- m_elementalTypes.set(p.first, move(type));
+ m_elementalTypes.set(p.first, std::move(type));
}
auto files = assets->scanExtension("damage");
@@ -43,7 +43,7 @@ DamageDatabase::DamageDatabase() {
if (!m_elementalTypes.contains(kind.elementalType))
throw StarException(strf("Undefined elemental type {} in damage kind {}", kind.elementalType, name));
- m_damageKinds.set(name, move(kind));
+ m_damageKinds.set(name, std::move(kind));
}
}