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

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-07-04 20:46:26 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-07-04 20:46:26 +1000
commit5df9adcd0ecbf09ae2ba426b3eeab78296d370c4 (patch)
tree932b64c1ca5b0dedc14645f680f6c5de377ec123
parentbf7418073d727e70a6564d9b2d79a1430cdc75ac (diff)
Fix input bind priority
-rw-r--r--source/game/StarInput.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/game/StarInput.cpp b/source/game/StarInput.cpp
index 7943ff5..7c50d4b 100644
--- a/source/game/StarInput.cpp
+++ b/source/game/StarInput.cpp
@@ -57,10 +57,16 @@ KeyMod keyModsFromJson(Json const& json, uint8_t* priority = nullptr) {
if (!json.isType(Json::Type::Array))
return mod;
+ uint8_t modPriority = 0;
for (Json const& jMod : json.toArray()) {
- if (mod != (mod |= KeyModNames.getLeft(jMod.toString())) && priority)
- ++*priority;
+ KeyMod changedMod = mod | KeyModNames.getLeft(jMod.toString());
+ if (mod != changedMod) {
+ mod = changedMod;
+ ++modPriority;
+ }
}
+ if (priority)
+ *priority = modPriority;
return mod;
}