From a93bdd314fd84b90b751c6f16bedc0014386643a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 21 Aug 2002 03:30:04 +0000 Subject: [PATCH] Fix assertion failure when starting pump double. Merge duplicate cases. --- stepmania/src/ScreenSelectStyle.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 8c8474cc5b..293c3f9c54 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -259,13 +259,14 @@ void ScreenSelectStyle::MenuStart( const PlayerNumber p ) AnnouncerElement ae; switch( GAMESTATE->m_CurStyle ) { + case STYLE_PUMP_SINGLE: case STYLE_DANCE_SINGLE: ae = ANNOUNCER_SELECT_STYLE_COMMENT_SINGLE; break; - case STYLE_DANCE_VERSUS: ae = ANNOUNCER_SELECT_STYLE_COMMENT_VERSUS; break; + case STYLE_PUMP_VERSUS: + case STYLE_DANCE_VERSUS: ae = ANNOUNCER_SELECT_STYLE_COMMENT_VERSUS; break; + case STYLE_PUMP_DOUBLE: case STYLE_DANCE_DOUBLE: ae = ANNOUNCER_SELECT_STYLE_COMMENT_DOUBLE; break; case STYLE_DANCE_COUPLE: ae = ANNOUNCER_SELECT_STYLE_COMMENT_COUPLE; break; case STYLE_DANCE_SOLO: ae = ANNOUNCER_SELECT_STYLE_COMMENT_SOLO; break; - case STYLE_PUMP_SINGLE: ae = ANNOUNCER_SELECT_STYLE_COMMENT_SINGLE; break; - case STYLE_PUMP_VERSUS: ae = ANNOUNCER_SELECT_STYLE_COMMENT_VERSUS; break; default: ASSERT(0); break; // invalid Style } SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ae) );