Changeset 7516 for code

Timestamp:

Oct 9, 2010, 4:12:02 PM (14 years ago)

Author:

rgrieder

Message:

Fixed wrong code in MacHIDManager (OIS).

Location:

code/branches/ois_update/src/external/ois

Files:

• changes_orxonox.diff (modified) (2 diffs)
• mac/MacHIDManager.cpp (modified) (2 diffs)

code/branches/ois_update/src/external/ois/changes_orxonox.diff

@@ -10 +10 @@
                         //Ignorable Dll interface warning...
  #           if !defined(OIS_MINGW_COMPILER)
+
+
 --- linux/EventHelpers.cpp      (revision 5668)
 +++ linux/EventHelpers.cpp      (working copy)
@@ -45 +47 @@
  #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
    #include <iostream>
+
+
+--- mac/MacHIDManager.cpp
++++ mac/MacHIDManager.cpp
+@@ -406,6 +406,7 @@
+                        switch(iType)
+                        {
+                                case OISJoyStick:
++                {
+                                        int totalDevs = totalDevices(iType);
+                                        int freeDevs = freeDevices(iType);
+                                        int devID = totalDevs - freeDevs;
+@@ -413,6 +414,7 @@
+                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
+                                        (*it)->inUse = true;
+                                        return obj;
++                }
+                                case OISTablet:
+                                        //Create MacTablet
+                                        break;

code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp

@@ -407 +407 @@
                         {
                                 case OISJoyStick:
+                {
                                         int totalDevs = totalDevices(iType);
                                         int freeDevs = freeDevices(iType);
@@ -414 +415 @@
                                         (*it)->inUse = true;
                                         return obj;
+                }
                                 case OISTablet:
                                         //Create MacTablet