[Performous-commit] Tapio Vierros : Added documentation about Xbox RB instruments.

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

Module: performous
Branch: master
Commit: d5cd4beda68f17e20988f1c111174db3c741f442

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan 16 12:28:06 2010 +0200

Added documentation about Xbox RB instruments.

---

 docs/instruments.txt |   39 ++++++++++++++++++++++++++++++++++-----
 game/joystick.cc     |    2 +-
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/docs/instruments.txt b/docs/instruments.txt
index ab70bef..e3e5135 100644
--- a/docs/instruments.txt
+++ b/docs/instruments.txt
@@ -72,6 +72,23 @@ Ex: A5- => SDL axis 4 with negative value
  PICK DOWN:   A6+
  PICK UP:     A6-
 
+[Rock Band I] Xbox360 Guitar
+ SDL name: Controller (Harmonix Guitar for Xbox 360) (at least on Windows)
+ GREEN FRET:  B1
+ RED FRET:    B2
+ YELLOW FRET: B4
+ BLUE FRET:   B3
+ ORANGE FRET: B5
+ START:       B8
+ SELECT:      B7
+ MIC SWITCH:  A3
+ TILT:        A4
+ WHAMMY:      A5
+ UP:          HAT0: 4
+ DOWN:        HAT0: 1
+ LEFT:        HAT0: 8
+ RIGHT:       HAT0: 2
+
 [Guitar Hero X0] Guitar Hero X-plorer
  USB id: 1430:4748
  SDL name: Guitar Hero X-plorer
@@ -112,10 +129,10 @@ Ex: A5- => SDL axis 4 with negative value
 [Rock Band I] PS3 Drumkit
  USB id: 12ba:0210
  SDL name: Licensed by Sony Computer Entertainment America Harmonix Drum Kit for PlayStation(R)3
- RED FRET or CIRCLE:      B3
- YELLOW FRET or TRIANGLE: B4
- BLUE FRET or SQUARE:     B1
- GREEN FRET or CROSS:     B2
+ RED PAD or CIRCLE:       B3
+ YELLOW PAD or TRIANGLE:  B4
+ BLUE PAD or SQUARE:      B1
+ GREEN PAD or CROSS:      B2
  KICK:                    B5
  START:                   B10
  SELECT:                  B9
@@ -125,7 +142,19 @@ Ex: A5- => SDL axis 4 with negative value
  LEFT:                    A5-
  RIGHT:                   A5+
 
- 
+[Rock Band I] Xbox360 Drumkit
+ SDL name: Controller (Harmonix Drum Kit for Xbox 360) (at least on Windows)
+ RED PAD       B2
+ YELLOW PAD    B4
+ BLUE PAD      B3
+ GREEN PAD     B1
+ KICK:         B5
+ START:        B8
+ SELECT:       B7
+ UP:           HAT0: 1
+ DOWN:         HAT0: 4
+ LEFT:         HAT0: 8
+ RIGHT:        HAT0: 2
 
 Performous InputDev button numbers
 ----------------------------------
diff --git a/game/joystick.cc b/game/joystick.cc
index a282dca..6351766 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -43,7 +43,7 @@ int input::buttonFromSDL(input::Private::Type _type, unsigned int _sdl_button) {
 		{ 2, 0, 1, 3, 4, 5, -1, -1,  8,  9, -1, -1 }, // Guitar Hero guitar
 		{ 0, 1, 3, 2, 4,-1,  8,  9, -1, -1, -1, -1 }, // Guitar Hero X-plorer guitar
 		{ 3, 0, 1, 2, 4, 5, -1, -1,  8,  9, -1, -1 }, // Rock Band guitar PS3
-		{ 0, 1, 3, 2, 4, 5,  8,  9, -1, -1, -1, -1 }, // Rock Band guitar XBOX360
+		{ 0, 1, 3, 2, 4,-1,  8,  9, -1, -1, -1, -1 }, // Rock Band guitar XBOX360
 		//K  R  Y  B  G  O    // for drums
 		{ 3, 4, 1, 2, 0, 4, -1, -1,  8,  9, -1, -1 }, // Guitar Hero drums
 		{ 3, 4, 1, 2, 0,-1, -1, -1,  8,  9, -1, -1 }, // Rock Band drums PS3