|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:25
|
Module: performous
Branch: dance
Commit: 44b7b85c331364dbbb4f7e5543ec05361a2b4c6b
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 03:36:33 2009 +0200
Avoid hardcoded selection number for quit too
---
game/screen_intro.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 2c5c6d5..a11cc9b 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -34,8 +34,8 @@ void ScreenIntro::manageEvent(SDL_Event event) {
else if (key == SDLK_DOWN) ++selected;
else if (key == SDLK_UP) --selected;
else if (key == SDLK_RETURN) {
- if (selected != 3) sm->activateScreen(m_menuOptions[selected].screen);
- else sm->finished();
+ std::string screen = m_menuOptions[selected].screen;
+ if (screen.empty()) sm->finished(); else sm->activateScreen(screen);
} else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
// Normalize selected to [0, size)
selected = (m_menuOptions.size() + selected) % m_menuOptions.size();
|