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

summaryrefslogtreecommitdiff
path: root/source/game
diff options
context:
space:
mode:
Diffstat (limited to 'source/game')
-rw-r--r--source/game/StarInput.cpp8
-rw-r--r--source/game/scripting/StarInputLuaBindings.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/source/game/StarInput.cpp b/source/game/StarInput.cpp
index 8dcf8e9..3a2fa9f 100644
--- a/source/game/StarInput.cpp
+++ b/source/game/StarInput.cpp
@@ -172,7 +172,7 @@ Json Input::bindToJson(Bind const& bind) {
}; // don't want empty mods to exist as null entry
if (auto mods = keyModsToJson(keyBind->mods))
obj.emplace("mods", std::move(mods));
- return std::move(obj);
+ return obj;
}
else if (auto mouseBind = bind.ptr<MouseBind>()) {
auto obj = JsonObject{
@@ -181,7 +181,7 @@ Json Input::bindToJson(Bind const& bind) {
};
if (auto mods = keyModsToJson(mouseBind->mods))
obj.emplace("mods", std::move(mods));
- return std::move(obj);
+ return obj;
}
else if (auto controllerBind = bind.ptr<ControllerBind>()) {
return JsonObject{
@@ -577,7 +577,7 @@ Json Input::getDefaultBinds(String const& categoryId, String const& bindId) {
for (Bind const& bind : bindEntry(categoryId, bindId).defaultBinds)
array.emplace_back(bindToJson(bind));
- return std::move(array);
+ return array;
}
Json Input::getBinds(String const& categoryId, String const& bindId) {
@@ -585,7 +585,7 @@ Json Input::getBinds(String const& categoryId, String const& bindId) {
for (Bind const& bind : bindEntry(categoryId, bindId).customBinds)
array.emplace_back(bindToJson(bind));
- return std::move(array);
+ return array;
}
void Input::setBinds(String const& categoryId, String const& bindId, Json const& jBinds) {
diff --git a/source/game/scripting/StarInputLuaBindings.cpp b/source/game/scripting/StarInputLuaBindings.cpp
index 9d710d4..9a99c4a 100644
--- a/source/game/scripting/StarInputLuaBindings.cpp
+++ b/source/game/scripting/StarInputLuaBindings.cpp
@@ -49,7 +49,7 @@ LuaCallbacks LuaBindings::makeInputCallbacks() {
result.emplace_back(jEvent.set("processed", pair.second));
}
- return std::move(result);
+ return result;
});
callbacks.registerCallbackWithSignature<Vec2I>("mousePosition", bind(mem_fn(&Input::mousePosition), input));