From fc17a8cd12c9a04e79eb61439908890664c6f194 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 29 May 2004 04:06:57 +0000
Subject: [PATCH] refer to all elements by choice name, not number

---
 stepmania/src/ScreenSelectMaster.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 98fbceab0b..58fc059de7 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -22,6 +22,7 @@
 #include "ActorUtil.h"
 #include "RageLog.h"
 #include <set>
+#include "Foreach.h"
 
 #define NUM_ICON_PARTS							THEME->GetMetricI(m_sName,"NumIconParts")
 #define NUM_PREVIEW_PARTS						THEME->GetMetricI(m_sName,"NumPreviewParts")
@@ -38,7 +39,7 @@
 #define SCROLLER_SECONDS_PER_ITEM				THEME->GetMetricF(m_sName,"ScrollerSecondsPerItem")
 #define SCROLLER_SPACING_X						THEME->GetMetricF(m_sName,"ScrollerSpacingX")
 #define SCROLLER_SPACING_Y						THEME->GetMetricF(m_sName,"ScrollerSpacingY")
-#define DEFAULT_CHOICE							THEME->GetMetricI(m_sName,"DefaultChoice")
+#define DEFAULT_CHOICE							THEME->GetMetric (m_sName,"DefaultChoice")
 
 /* OptionOrderLeft=0:1,1:2,2:3,3:4 */
 const char *ScreenSelectMaster::dirs[NUM_DIRS] =
@@ -50,9 +51,21 @@ const ScreenMessage SM_PlayPostSwitchPage = (ScreenMessage)(SM_User+1);
 
 ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName )
 {
+	int iDefaultChoice = -1;
+	for( unsigned c=0; c<m_aModeChoices.size(); c++ )
+	{
+		const ModeChoice& mc = m_aModeChoices[c];
+		if( mc.m_sName == DEFAULT_CHOICE )
+		{
+			iDefaultChoice = c;
+			break;
+		}
+	}
+
+
 	FOREACH_PlayerNumber( p )
 	{
-		m_iChoice[p] = clamp( DEFAULT_CHOICE-1, 0, (int) m_aModeChoices.size() );
+		m_iChoice[p] = (iDefaultChoice!=-1) ? iDefaultChoice : 0;
 		m_bChosen[p] = false;
 	}