|
From: Lasse Kärkkäi. <tr...@us...> - 2009-11-01 00:43:33
|
Module: performous
Branch: master
Commit: 7f743aa0dfc40ab9961c0ebdaca9f9d2fedec8a4
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Nov 1 02:35:07 2009 +0200
Make SELECT button quit from singing screen
---
game/screen_sing.cc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index b1bc46f..397b543 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -182,7 +182,11 @@ void ScreenSing::manageEvent(SDL_Event event) {
}
} else if (event.type == SDL_JOYBUTTONDOWN) {
int button = event.jbutton.button;
- if (button == 8 || button == 9) m_audio.togglePause();
+ if (button == 9 /* START */) m_audio.togglePause();
+ if (button == 8 /* SELECT */) {
+ ScreenManager::getSingletonPtr()->activateScreen("Songs");
+ return;
+ }
}
}
|