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

summaryrefslogtreecommitdiff
path: root/source/game/scripting/StarLuaGameConverters.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/scripting/StarLuaGameConverters.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/scripting/StarLuaGameConverters.cpp')
-rw-r--r--source/game/scripting/StarLuaGameConverters.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/scripting/StarLuaGameConverters.cpp b/source/game/scripting/StarLuaGameConverters.cpp
index e5f8811..64415e6 100644
--- a/source/game/scripting/StarLuaGameConverters.cpp
+++ b/source/game/scripting/StarLuaGameConverters.cpp
@@ -65,7 +65,7 @@ Maybe<CollisionSet> LuaConverter<CollisionSet>::to(LuaEngine& engine, LuaValue c
CollisionSet result;
bool failed = false;
table->iterate([&result, &failed, &engine](LuaValue, LuaValue value) {
- if (auto k = engine.luaMaybeTo<CollisionKind>(move(value))) {
+ if (auto k = engine.luaMaybeTo<CollisionKind>(std::move(value))) {
result.insert(*k);
return true;
} else {
@@ -96,7 +96,7 @@ LuaValue LuaConverter<PlatformerAStar::Path>::from(LuaEngine& engine, Platformer
edgeTable.set("jumpVelocity", edge.jumpVelocity);
edgeTable.set("source", convertNode(edge.source));
edgeTable.set("target", convertNode(edge.target));
- pathTable.set(pathTableIndex++, move(edgeTable));
+ pathTable.set(pathTableIndex++, std::move(edgeTable));
}
return pathTable;
}
@@ -328,7 +328,7 @@ LuaValue LuaConverter<StatModifier>::from(LuaEngine& engine, StatModifier const&
}
Maybe<StatModifier> LuaConverter<StatModifier>::to(LuaEngine& engine, LuaValue v) {
- auto json = engine.luaMaybeTo<Json>(move(v));
+ auto json = engine.luaMaybeTo<Json>(std::move(v));
if (!json)
return {};