Changeset 5668 for code/branches/resource2/src/ois/win32/Win32InputManager.cpp

Timestamp:

Aug 22, 2009, 11:16:34 PM (15 years ago)

Author:

rgrieder

Message:

Updated OIS library (still 1.2, but CVS version).
There have been some little fixes and support for force feedback on Linux (but this doesn't concern us for now…)

File:

• code/branches/resource2/src/ois/win32/Win32InputManager.cpp (modified) (3 diffs)

code/branches/resource2/src/ois/win32/Win32InputManager.cpp

@@ -75 +75 @@
         hInst = GetModuleHandle(0);
 
-        //Create the device
+        //Create the input system
         hr = DirectInput8Create( hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (VOID**)&mDirectInput, NULL );
     if (FAILED(hr))     
@@ -82 +82 @@
         //Ok, now we have DirectInput, parse whatever extra settings were sent to us
         _parseConfigSettings( paramList );
+
+        // Enumerate devices ...
         _enumerateDevices();
 }
@@ -116 +118 @@
 {
         //Enumerate all attached devices
-        mDirectInput->EnumDevices(NULL, _DIEnumKbdCallback, this, DIEDFL_ATTACHEDONLY); 
-}
-
-//--------------------------------------------------------------------------------//
-BOOL CALLBACK Win32InputManager::_DIEnumKbdCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+        mDirectInput->EnumDevices(NULL , _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY); 
+}
+
+//--------------------------------------------------------------------------------//
+BOOL CALLBACK Win32InputManager::_DIEnumDevCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
 {
         Win32InputManager *_this_ = static_cast<Win32InputManager*>(pvRef);
+
+        // Register only game devices (keyboard and mouse are managed differently).
         if( GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_JOYSTICK ||
                 GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_GAMEPAD ||