[Performous-commit] Lasse Karkkainen : Prevent RB guitar orientation sensor from being detected as green fret.

[knittl <kn...@us...>]

Module: performous
Branch: master
Commit: 6dbbb2f9f27d4cabccbcefdea5e3927b363e3eff

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Aug  3 02:59:27 2009 +0300

Prevent RB guitar orientation sensor from being detected as green fret.

---

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

diff --git a/game/joystick.cc b/game/joystick.cc
index 514fcc4..89e7f3e 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -8,11 +8,11 @@ static const unsigned SDL_BUTTONS = 6;
 int buttonFromSDL(input::Private::Type _type, unsigned int _sdl_button) {
 	static const int inputmap[4][SDL_BUTTONS] = {
 		//G  R  Y  B  O       // for guitars
-		{ 2, 0, 1, 3, 4, 0 }, // Guitar Hero guitar
-		{ 3, 0, 1, 2, 4, 0 }, // Rock Band guitar
+		{ 2, 0, 1, 3, 4, -1 }, // Guitar Hero guitar
+		{ 3, 0, 1, 2, 4, -1 }, // Rock Band guitar
 		//K  R  Y  B  G  O    // for drums
 		{ 3, 4, 1, 2, 0, 4 }, // Guitar Hero drums
-		{ 3, 4, 1, 2, 0, 0 }  // Rock Band drums
+		{ 3, 4, 1, 2, 0, -1 }  // Rock Band drums
 	};
 	if( _sdl_button >= SDL_BUTTONS ) return -1;
 	switch(_type) {
@@ -235,7 +235,7 @@ bool input::pushEvent(SDL_Event _e) {
 		case SDL_JOYBUTTONDOWN:
 			joy_id = _e.jbutton.which;
 			button = buttonFromSDL(devices[joy_id].type(),_e.jbutton.button);
-			if( button == -1 ) break;
+			if( button == -1 ) return false;
 			for( unsigned int i = 0 ; i < BUTTONS ; ++i ) {
 				event.pressed[i] = devices[joy_id].pressed(i);
 			}
@@ -247,7 +247,7 @@ bool input::pushEvent(SDL_Event _e) {
 		case SDL_JOYBUTTONUP:
 			joy_id = _e.jbutton.which;
 			button = buttonFromSDL(devices[joy_id].type(),_e.jbutton.button);
-			if( button == -1 ) break;
+			if( button == -1 ) return false;
 			for( unsigned int i = 0 ; i < BUTTONS ; ++i ) {
 				event.pressed[i] = devices[joy_id].pressed(i);
 			}