InputSystem|Client: Re-initialize InputDevices during a game change

Todo: Could observe App::GameChange?
skyjake · Nov 2, 2014 · a4132cf · a4132cf
1 parent 3cc8fae
commit a4132cf
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 19 deletions.
diff --git a/doomsday/client/include/ui/inputsystem.h b/doomsday/client/include/ui/inputsystem.h
@@ -60,6 +60,8 @@ class InputSystem : public de::System
      */
     de::LoopResult forAllDevices(std::function<de::LoopResult (InputDevice &)> func) const;
 
+    void initAllDevices();
+
     /**
      * Returns @c true if the shift key of the keyboard is thought to be down.
      * @todo: Refactor away

diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -1551,6 +1551,10 @@ bool App_ChangeGame(Game &game, bool allowReload)
 
         R_InitSvgs();
 
+#ifdef __CLIENT__
+        ClientApp::inputSystem().initAllDevices();
+#endif
+
 #ifdef __CLIENT__
         R_InitViewWindow();
 #endif

diff --git a/doomsday/client/src/ui/inputsystem.cpp b/doomsday/client/src/ui/inputsystem.cpp
@@ -307,31 +307,20 @@ DENG2_PIMPL(InputSystem)
 
         // Initialize system APIs.
         I_InitInterfaces();
-
-        // Initialize devices.
-        addDevice(makeKeyboard("key", "Keyboard"))->activate(); // A keyboard is assumed to always be present.
-
-        addDevice(makeMouse("mouse", "Mouse"))->activate(Mouse_IsPresent()); // A mouse may not be present.
-
-        addDevice(makeJoystick("joy", "Joystick"))->activate(Joystick_IsPresent()); // A joystick may not be present.
-
-        /// @todo: Add support for multiple joysticks (just some generics, for now).
-        addDevice(new InputDevice("joy2"));
-        addDevice(new InputDevice("joy3"));
-        addDevice(new InputDevice("joy4"));
-
-        addDevice(makeHeadTracker("head", "Head Tracker")); // Head trackers are activated later.
-
-        // Register console variables for the controls of all devices.
-        for(InputDevice *device : devices) device->consoleRegister();
     }
 
     ~Instance()
     {
-        qDeleteAll(devices);
+        clearAllDevices();
         I_ShutdownInterfaces();
     }
 
+    void clearAllDevices()
+    {
+        qDeleteAll(devices);
+        devices.clear();
+    }
+
     /**
      * @param device  InputDevice to add.
      * @return  Same as @a device for caller convenience.
@@ -705,7 +694,9 @@ DENG2_PIMPL(InputSystem)
 };
 
 InputSystem::InputSystem() : d(new Instance(this))
-{}
+{
+    initAllDevices();
+}
 
 void InputSystem::timeChanged(Clock const &)
 {}
@@ -742,6 +733,28 @@ LoopResult InputSystem::forAllDevices(std::function<LoopResult (InputDevice &)>
     return LoopContinue;
 }
 
+void InputSystem::initAllDevices()
+{
+    d->clearAllDevices();
+
+    // Initialize devices.
+    d->addDevice(makeKeyboard("key", "Keyboard"))->activate(); // A keyboard is assumed to always be present.
+
+    d->addDevice(makeMouse("mouse", "Mouse"))->activate(Mouse_IsPresent()); // A mouse may not be present.
+
+    d->addDevice(makeJoystick("joy", "Joystick"))->activate(Joystick_IsPresent()); // A joystick may not be present.
+
+    /// @todo: Add support for multiple joysticks (just some generics, for now).
+    d->addDevice(new InputDevice("joy2"));
+    d->addDevice(new InputDevice("joy3"));
+    d->addDevice(new InputDevice("joy4"));
+
+    d->addDevice(makeHeadTracker("head", "Head Tracker")); // Head trackers are activated later.
+
+    // Register console variables for the controls of all devices.
+    for(InputDevice *device : d->devices) device->consoleRegister();
+}
+
 void InputSystem::trackEvent(ddevent_t *ev)
 {
     DENG2_ASSERT(ev);