From 6d7865eb3eaacd941efcb01916dad8b4d0895a1a Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 13 Feb 2004 08:15:05 +0000
Subject: [PATCH] fix sign warnings

---
 stepmania/src/ScreenSelect.cpp | 71 +++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index f2b695dde1..e24da67e6f 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -44,45 +44,54 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
 
 	m_sName = sClassName;
 
-	// Instead of using NUM_CHOICES, use a comma-separated list of choices.  Each
-	// element in the list is a choice name.  This level of indirection 
-	// makes it easier to add or remove items without having to change a bunch
-	// of indices.
-	CStringArray asChoiceNames;
-	split( CHOICE_NAMES, ",", asChoiceNames, true );
-
-	int c;
-	for( c=0; c<asChoiceNames.size(); c++ )
+	//
+	// Load choices
+	//
 	{
-		CString sChoiceName = asChoiceNames[c];
-		CString sChoice = CHOICE(sChoiceName);
+		// Instead of using NUM_CHOICES, use a comma-separated list of choices.  Each
+		// element in the list is a choice name.  This level of indirection 
+		// makes it easier to add or remove items without having to change a bunch
+		// of indices.
+		CStringArray asChoiceNames;
+		split( CHOICE_NAMES, ",", asChoiceNames, true );
 
-		ModeChoice mc;
-		mc.m_sName = sChoiceName;
-		mc.Load( c, sChoice );
-		m_aModeChoices.push_back( mc );
-	
-		CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true);	// true="optional"
-		if( sBGAnimationDir == "" )
-			sBGAnimationDir = THEME->GetPathToB(m_sName+" background");
-		BGAnimation *pBGA = new BGAnimation;
-		m_vpBGAnimations.push_back( pBGA );
+		for( unsigned c=0; c<asChoiceNames.size(); c++ )
+		{
+			CString sChoiceName = asChoiceNames[c];
+			CString sChoice = CHOICE(sChoiceName);
+
+			ModeChoice mc;
+			mc.m_sName = sChoiceName;
+			mc.Load( c, sChoice );
+			m_aModeChoices.push_back( mc );
+		
+			CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true);	// true="optional"
+			if( sBGAnimationDir == "" )
+				sBGAnimationDir = THEME->GetPathToB(m_sName+" background");
+			BGAnimation *pBGA = new BGAnimation;
+			m_vpBGAnimations.push_back( pBGA );
+		}
 	}
 
 	m_Menu.Load( sClassName );
 	this->AddChild( &m_Menu );
 
-	for( c=0; c<NUM_CODES; c++ )
+	//
+	// Load codes
+	//
 	{
-		CodeItem code;
-		if( !code.Load( CODE(c) ) )
-			continue;
+		for( int c=0; c<NUM_CODES; c++ )
+		{
+			CodeItem code;
+			if( !code.Load( CODE(c) ) )
+				continue;
 
-		m_aCodes.push_back( code );
-		m_aCodeActions.push_back( CODE_ACTION(c) );
-		ModeChoice mc;
-		mc.Load( c, CODE_ACTION(c) );
-		m_aCodeChoices.push_back( mc );
+			m_aCodes.push_back( code );
+			m_aCodeActions.push_back( CODE_ACTION(c) );
+			ModeChoice mc;
+			mc.Load( c, CODE_ACTION(c) );
+			m_aCodeChoices.push_back( mc );
+		}
 	}
 }
 
@@ -90,7 +99,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
 ScreenSelect::~ScreenSelect()
 {
 	LOG->Trace( "ScreenSelect::~ScreenSelect()" );
-	for( int i=0; i<m_vpBGAnimations.size(); i++ )
+	for( unsigned i=0; i<m_vpBGAnimations.size(); i++ )
 		SAFE_DELETE( m_vpBGAnimations[i] );
 	m_vpBGAnimations.clear();
 }