2 files changed, 31 insertions, 24 deletions

diff --git a/source/game/StarInput.cpp b/source/game/StarInput.cpp
index 20e6f18..7577936 100644
--- a/source/game/StarInput.cpp
+++ b/source/game/StarInput.cpp
@@ -391,30 +391,37 @@ List<std::pair<InputEvent, bool>> const& Input::inputEventsThisFrame() const {
 
 
 
-void Input::reset() {
+void Input::reset(bool clear) {
   m_inputEvents.clear();
-  auto eraseCond = [](auto& p) {
-    if (p.second.held)
-      p.second.reset();
-    return !p.second.held;
-  };
-
-  eraseWhere(m_keyStates,        eraseCond);
-  eraseWhere(m_mouseStates,      eraseCond);
-  eraseWhere(m_controllerStates, eraseCond);
-  eraseWhere(m_bindStates, [&](auto& p) {
-    if (p.second.held)
-      p.second.reset();
-    else {
-      for (auto& tag : p.first->tags) {
-        auto find = m_activeTags.find(tag);
-        if (find != m_activeTags.end() && !--find->second)
-            m_activeTags.erase(find);
+  if (clear) {
+    m_keyStates.clear();
+    m_mouseStates.clear();
+    m_controllerStates.clear();
+    m_bindStates.clear();
+  } else {
+    auto eraseCond = [](auto& p) {
+      if (p.second.held)
+        p.second.reset();
+      return !p.second.held;
+    };
+
+    eraseWhere(m_keyStates,        eraseCond);
+    eraseWhere(m_mouseStates,      eraseCond);
+    eraseWhere(m_controllerStates, eraseCond);
+    eraseWhere(m_bindStates, [&](auto& p) {
+      if (p.second.held)
+        p.second.reset();
+      else {
+        for (auto& tag : p.first->tags) {
+          auto find = m_activeTags.find(tag);
+          if (find != m_activeTags.end() && !--find->second)
+              m_activeTags.erase(find);
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
-  });
+      return false;
+    });
+  }
 }
 
 void Input::update() {
@@ -516,7 +523,7 @@ bool Input::handleInput(InputEvent const& input, bool gameProcessed) {
 }
 
 void Input::rebuildMappings() {
-  reset();
+  reset(true);
   m_bindMappings.clear();
 
   for (auto& category : m_bindCategories) {
diff --git a/source/game/StarInput.hpp b/source/game/StarInput.hpp
index 90a1e05..f13885c 100644
--- a/source/game/StarInput.hpp
+++ b/source/game/StarInput.hpp
@@ -146,7 +146,7 @@ public:
   List<std::pair<InputEvent, bool>> const& inputEventsThisFrame() const;
 
   // Clears input state. Should be done at the very start or end of the client loop.
-  void reset();
+  void reset(bool clear = false);
 
   void update();