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

summaryrefslogtreecommitdiff
path: root/source/game/scripting/StarLuaComponents.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/StarLuaComponents.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/scripting/StarLuaComponents.cpp')
-rw-r--r--source/game/scripting/StarLuaComponents.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/scripting/StarLuaComponents.cpp b/source/game/scripting/StarLuaComponents.cpp
index 2d7c819..9a1b1c4 100644
--- a/source/game/scripting/StarLuaComponents.cpp
+++ b/source/game/scripting/StarLuaComponents.cpp
@@ -17,14 +17,14 @@ StringList const& LuaBaseComponent::scripts() const {
}
void LuaBaseComponent::setScript(String script) {
- setScripts({move(script)});
+ setScripts({std::move(script)});
}
void LuaBaseComponent::setScripts(StringList scripts) {
if (initialized())
throw LuaComponentException("Cannot call LuaWorldComponent::setScripts when LuaWorldComponent is initialized");
- m_scripts = move(scripts);
+ m_scripts = std::move(scripts);
}
void LuaBaseComponent::addCallbacks(String groupName, LuaCallbacks callbacks) {
@@ -58,7 +58,7 @@ void LuaBaseComponent::setAutoReInit(bool autoReInit) {
}
void LuaBaseComponent::setLuaRoot(LuaRootPtr luaRoot) {
- m_luaRoot = move(luaRoot);
+ m_luaRoot = std::move(luaRoot);
}
LuaRootPtr const& LuaBaseComponent::luaRoot() {
@@ -140,7 +140,7 @@ void LuaBaseComponent::contextShutdown() {}
void LuaBaseComponent::setError(String error) {
m_context.reset();
- m_error = move(error);
+ m_error = std::move(error);
}
bool LuaBaseComponent::checkInitialization() {