[Performous-commit] Alvaro Fernando García : Return drum button constants to input.hh

[rainbyte <rai...@us...>]

Author: Alvaro Fernando García <alv...@gm...>
Date:   Mon Jul  9 00:41:11 2012 -0300

Return drum button constants to input.hh

---

 game/input.hh           |    7 +++++++
 game/input_mididrums.hh |   10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/game/input.hh b/game/input.hh
index 88f6bc8..c97cb1d 100644
--- a/game/input.hh
+++ b/game/input.hh
@@ -30,6 +30,13 @@ namespace input {
 	static const int ORANGE_FRET_BUTTON = 4;
 	static const int GODMODE_BUTTON = 5;
 	static const int WHAMMY_BUTTON = 6;
+	// Drums buttons
+	static const int KICK_BUTTON = 0;
+	static const int RED_TOM_BUTTON = 1;
+	static const int YELLOW_TOM_BUTTON = 2;
+	static const int BLUE_TOM_BUTTON = 3;
+	static const int GREEN_TOM_BUTTON = 4;
+	static const int ORANGE_TOM_BUTTON = 5;
 	// Keyboard buttons
 	static const int C_BUTTON = 0;
 	static const int D_BUTTON = 1;
diff --git a/game/input_mididrums.hh b/game/input_mididrums.hh
index c467659..67702fa 100644
--- a/game/input_mididrums.hh
+++ b/game/input_mididrums.hh
@@ -26,13 +26,3 @@
 	private:
 	};
 #endif
-
-namespace input {
-	// Drums buttons
-	static const int KICK_BUTTON = 0;
-	static const int RED_TOM_BUTTON = 1;
-	static const int YELLOW_TOM_BUTTON = 2;
-	static const int BLUE_TOM_BUTTON = 3;
-	static const int GREEN_TOM_BUTTON = 4;
-	static const int ORANGE_TOM_BUTTON = 5;
-}