[Orxonox-commit 2813] r7516 - in code/branches/ois_update/src/external/ois: . mac

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-09 16:12:02 +0200 (Sat, 09 Oct 2010)
New Revision: 7516

Modified:
   code/branches/ois_update/src/external/ois/changes_orxonox.diff
   code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp
Log:
Fixed wrong code in MacHIDManager (OIS).

Modified: code/branches/ois_update/src/external/ois/changes_orxonox.diff
===================================================================
--- code/branches/ois_update/src/external/ois/changes_orxonox.diff	2010-10-09 14:05:15 UTC (rev 7515)
+++ code/branches/ois_update/src/external/ois/changes_orxonox.diff	2010-10-09 14:12:02 UTC (rev 7516)
@@ -9,6 +9,8 @@
  #			undef _OISExport
  			//Ignorable Dll interface warning...
  #           if !defined(OIS_MINGW_COMPILER)
+
+
 --- linux/EventHelpers.cpp	(revision 5668)
 +++ linux/EventHelpers.cpp	(working copy)
 @@ -35,6 +35,20 @@
@@ -44,3 +46,23 @@
  
  #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;

Modified: code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp
===================================================================
--- code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp	2010-10-09 14:05:15 UTC (rev 7515)
+++ code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp	2010-10-09 14:12:02 UTC (rev 7516)
@@ -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;