[Performous-commit] Felix Bertram : fix detection of Wii instruments (guitar, drums)

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 999d4941623f91d57b53df3fc1b1e99506ff8fe3

Author: Felix Bertram <fl...@be...>
Date:   Sun Jul 25 14:40:21 2010 -0700

fix detection of Wii instruments (guitar, drums)

---

 game/joystick.cc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 35f192f..bccd247 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -386,8 +386,8 @@ void input::SDL::init() {
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_XB360);
 			} else if (name.find("Nintendo") != std::string::npos) {
 				// "Licensed by Nintendo of America  Harmonix Guitar Controller for Nintendo Wii"
-				std::cout << "  Detected as: RockBand Drums PS3 (Wii Guitar)" << std::endl;
-				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
+				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Guitar)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Guitar PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
@@ -399,8 +399,8 @@ void input::SDL::init() {
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_XB360);
 			} else if (name.find("Nintendo") != std::string::npos) {
 				// Licensed by Nintendo of America  Harmonix Drum Controller for Nintendo Wii
-				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Drums)" << std::endl;
-				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
+				std::cout << "  Detected as: RockBand Drums PS3 (Wii Drums)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Drums PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);