From 984b43385831a756554e7a1e519c8a6a64706c00 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 16 Nov 2002 20:21:00 +0000
Subject: [PATCH] signs, headers, for scoping

---
 stepmania/src/SDL_dither.cpp             |  8 ++++----
 stepmania/src/ScreenGameplay.cpp         |  9 ++++++---
 stepmania/src/ScreenGraphicOptions.h     |  2 +-
 stepmania/src/ScreenMachineOptions.h     |  2 +-
 stepmania/src/ScreenManager.cpp          |  2 +-
 stepmania/src/ScreenOptions.cpp          | 11 +++++++----
 stepmania/src/ScreenPlayerOptions.h      |  2 +-
 stepmania/src/ScreenSandbox.cpp          |  2 +-
 stepmania/src/ScreenSelectDifficulty.cpp | 19 ++++++++++---------
 stepmania/src/ScreenSelectGame.cpp       |  5 +++--
 stepmania/src/ScreenSelectStyle5th.cpp   | 10 ++++++----
 stepmania/src/ScreenSongOptions.h        |  2 +-
 stepmania/src/ScreenStage.cpp            |  3 ++-
 13 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/stepmania/src/SDL_dither.cpp b/stepmania/src/SDL_dither.cpp
index bfbe4e17bf..a1bb41ebc4 100644
--- a/stepmania/src/SDL_dither.cpp
+++ b/stepmania/src/SDL_dither.cpp
@@ -9,10 +9,10 @@
 /* Fractions, 0/16 to 15/16:  */
 static const int DitherMat[DitherMatDim][DitherMatDim] =
 {
-     0,  8,  2, 10,
-    12,  4, 14,  6,
-     3, 11,  1,  9,
-    15,  7, 13,  5
+	{  0,  8,  2, 10 },
+	{ 12,  4, 14,  6 },
+	{  3, 11,  1,  9 },
+	{ 15,  7, 13,  5 }
 };
 
 static int DitherMatCalc[DitherMatDim][DitherMatDim];
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 24b8289036..6878f1e8d9 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -101,7 +101,8 @@ ScreenGameplay::ScreenGameplay()
 {
 	LOG->Trace( "ScreenGameplay::ScreenGameplay()" );
 
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	int p;
+	for( p=0; p<NUM_PLAYERS; p++ )
 	{
 		m_pLifeMeter[p] = NULL;
 		m_pScoreDisplay[p] = NULL;
@@ -527,7 +528,8 @@ void ScreenGameplay::LoadNextSong( bool bFirstLoad )
 	case PLAY_MODE_ONI:
 	case PLAY_MODE_ENDLESS:
 		{
-			for( int p=0; p<NUM_PLAYERS; p++ )
+			int p;
+			for( p=0; p<NUM_PLAYERS; p++ )
 			{
 				m_textCourseSongNumber[p].SetText( ssprintf("%d", GAMESTATE->m_iSongsBeforeFail[p]+1) );
 				// If it's the first song, record the options the player selected for later.
@@ -1143,7 +1145,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 			}
 			
 			// save any statistics
-			for( int p=0; p<NUM_PLAYERS; p++ )
+			int p;
+			for( p=0; p<NUM_PLAYERS; p++ )
 			{
 				if( GAMESTATE->IsPlayerEnabled(p) )
 				{
diff --git a/stepmania/src/ScreenGraphicOptions.h b/stepmania/src/ScreenGraphicOptions.h
index cd54a523fb..4eb647695b 100644
--- a/stepmania/src/ScreenGraphicOptions.h
+++ b/stepmania/src/ScreenGraphicOptions.h
@@ -29,4 +29,4 @@ private:
 	void GoToPrevState();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/ScreenMachineOptions.h b/stepmania/src/ScreenMachineOptions.h
index b6c9e734af..0e1978f740 100644
--- a/stepmania/src/ScreenMachineOptions.h
+++ b/stepmania/src/ScreenMachineOptions.h
@@ -26,4 +26,4 @@ private:
 	void GoToPrevState();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 2de74929ea..4a304ca1ad 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -337,4 +337,4 @@ void ScreenManager::RefreshCreditsMessages()
 		else if( GAMESTATE->m_bPlayersCanJoin )	m_textCreditInfo[p].SetText( "PRESS START" );
 		else									m_textCreditInfo[p].SetText( "CREDIT(S) 0 / 0" );
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index eb21f9c5a9..bf3fb3e7ee 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -74,7 +74,7 @@ ScreenOptions::ScreenOptions( CString sBackgroundPath, CString sPagePath, CStrin
 	{
 		m_iCurrentRow[p] = 0;
 
-		for( int l=0; l<MAX_OPTION_LINES; l++ )
+		for( unsigned l=0; l<MAX_OPTION_LINES; l++ )
 			m_iSelectedOption[p][l] = 0;
 	}
 
@@ -102,7 +102,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRowData[], int iNumO
 	this->ImportOptions();
 	if( m_InputMode == INPUTMODE_BOTH )
 	{
-		for( int l=0; l<MAX_OPTION_LINES; l++ )
+		for( unsigned l=0; l<MAX_OPTION_LINES; l++ )
 			m_iSelectedOption[PLAYER_2][l] = m_iSelectedOption[PLAYER_1][l];
 	}
 
@@ -127,6 +127,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRowData[], int iNumO
 	}
 
 	// init text
+	int i;
 	for( int i=0; i<m_iNumOptionRows; i++ )		// foreach line
 	{
 		m_framePage.AddChild( &m_sprLineArrows[i] );
@@ -178,7 +179,8 @@ void ScreenOptions::InitOptionsText()
 	const float fLineGap = ITEMS_SPACING_Y - max(0, (m_iNumOptionRows-10)*2);
 
 	// init m_textOptions from optionLines
-	for( int i=0; i<m_iNumOptionRows; i++ )	// foreach options line
+	int i;
+	for( i=0; i<m_iNumOptionRows; i++ )	// foreach options line
 	{
 		OptionRowData &optline = m_OptionRowData[i];
 
@@ -358,7 +360,8 @@ void ScreenOptions::UpdateEnabledDisabled()
 	RageColor colorNotSelected = COLOR_NOT_SELECTED;
 
 	// init text
-	for( int i=0; i<m_iNumOptionRows; i++ )		// foreach line
+	int i;
+	for( i=0; i<m_iNumOptionRows; i++ )		// foreach line
 	{
 		bool bThisRowIsSelected = false;
 		for( int p=0; p<NUM_PLAYERS; p++ )
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index 3c31722812..ed67881f6d 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -29,4 +29,4 @@ private:
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index ac30867046..8a1c0eaf19 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -86,4 +86,4 @@ void ScreenSandbox::HandleScreenMessage( const ScreenMessage SM )
 	case SM_DoneOpeningWipingRight:
 		break;
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 919372dec3..81c24c32ab 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -86,7 +86,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
 	GAMESTATE->m_PlayMode = PLAY_MODE_INVALID;
 
 
-	int p;
+	unsigned p;
 	
 	m_Menu.Load(
 		THEME->GetPathTo("BGAnimations","select difficulty"), 
@@ -96,7 +96,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
 	this->AddChild( &m_Menu );
 
 
-	for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
+	for( unsigned d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
 	{
 		CString sHeaderFile;
 		CString sPictureFile;
@@ -303,9 +303,9 @@ void ScreenSelectDifficulty::MenuRight( PlayerNumber pn )
 
 bool ScreenSelectDifficulty::IsItemOnPage2( int iItemIndex )
 {
-	ASSERT( iItemIndex >= 0  &&  iItemIndex < NUM_DIFFICULTY_ITEMS );
+	ASSERT( iItemIndex >= 0  &&  iItemIndex < unsigned(NUM_DIFFICULTY_ITEMS) );
 
-	return iItemIndex >= NUM_ITEMS_ON_PAGE_1;
+	return iItemIndex >= unsigned(NUM_ITEMS_ON_PAGE_1);
 }
 
 bool ScreenSelectDifficulty::SelectedSomethingOnPage2()
@@ -327,7 +327,8 @@ void ScreenSelectDifficulty::ChangeTo( PlayerNumber pn, int iSelectionWas, int i
 	bool bSelectedSomethingOnPage2 = iSelectionIs >= 3;
 
 	bool bSomeoneMadeAChoice = false;
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	int p;
+	for( p=0; p<NUM_PLAYERS; p++ )
 		if( GAMESTATE->IsPlayerEnabled(p) && m_bChosen[p] )
 			bSomeoneMadeAChoice = true;
 
@@ -392,7 +393,7 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
 		return;
 	m_bChosen[pn] = true;
 
-	for( int page=0; page<NUM_PAGES; page++ )
+	for( unsigned page=0; page<NUM_PAGES; page++ )
 		m_sprMoreArrows[page].FadeOff( 0, "fade", 0.5f );
 
 
@@ -489,7 +490,7 @@ void ScreenSelectDifficulty::TweenOffScreen()
 		m_sprJoinMessagehadow[p].SetTweenDiffuse( RageColor(0,0,0,0) );
 	}
 
-	for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
+	for( unsigned d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
 	{
 		if( SelectedSomethingOnPage2() != IsItemOnPage2(d) )	// item isn't on selected page
 			continue;	// don't tween
@@ -518,7 +519,7 @@ void ScreenSelectDifficulty::TweenOffScreen()
 
 void ScreenSelectDifficulty::TweenOnScreen() 
 {
-	int p;
+	unsigned p;
 
 	for( p=0; p<NUM_PAGES; p++ )
 	{
@@ -557,7 +558,7 @@ void ScreenSelectDifficulty::TweenOnScreen()
 		m_sprJoinMessagehadow[p].SetTweenDiffuse( colorOriginal );
 	}
 
-	for( int d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
+	for( unsigned d=0; d<NUM_DIFFICULTY_ITEMS; d++ )
 	{
 		const float fPauseTime = d*0.2f;
 
diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp
index ed67fe4a64..b927f2f083 100644
--- a/stepmania/src/ScreenSelectGame.cpp
+++ b/stepmania/src/ScreenSelectGame.cpp
@@ -28,7 +28,7 @@ enum {
 
 OptionRowData g_SelectGameLines[NUM_SELECT_GAME_LINES] = 
 {
-	"Game",	0, { "" }
+	{	"Game",	0, { "" } }
 };
 
 
@@ -44,7 +44,8 @@ ScreenSelectGame::ScreenSelectGame() :
 	/* populate g_SelectGameLines */
 	CArray<Game,Game> aGames;
 	GAMEMAN->GetEnabledGames( aGames );
-	for( unsigned i=0; i<aGames.size(); i++ )
+	unsigned i;
+	for( i=0; i<aGames.size(); i++ )
 	{
 		Game game = aGames[i];
 		CString sGameName = GAMEMAN->GetGameDefForGame(game)->m_szName;
diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp
index 03be5cd186..f0ee256ced 100644
--- a/stepmania/src/ScreenSelectStyle5th.cpp
+++ b/stepmania/src/ScreenSelectStyle5th.cpp
@@ -120,8 +120,8 @@ ScreenSelectStyle5th::ScreenSelectStyle5th()
 
 	m_iSelection = 0;	// single
 
-
-	for( int i=0; i<NUM_STYLE_PADS; i++ )
+	int i;
+	for( i=0; i<NUM_STYLE_PADS; i++ )
 	{
 		m_sprPad[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style pad game %d style %d",GAMESTATE->m_CurGame,i)) );
 //		m_sprPad[i].SetXY( PAD_X[i], PAD_Y[i] );
@@ -398,7 +398,8 @@ void ScreenSelectStyle5th::AfterChange()
 
 void ScreenSelectStyle5th::TweenOffScreen()
 {
-	for( int i=0; i<NUM_STYLE_DANCERS; i++ )
+	int i;
+	for( i=0; i<NUM_STYLE_DANCERS; i++ )
 	{
 		m_sprDancer[i].BeginTweening( MENU_ELEMENTS_TWEEN_TIME );
 		m_sprDancer[i].SetTweenZoomY( 0 );
@@ -423,7 +424,8 @@ void ScreenSelectStyle5th::TweenOffScreen()
 
 void ScreenSelectStyle5th::TweenOnScreen() 
 {
-	for(int i=0; i<NUM_STYLE_DANCERS; i++ )
+	int i;
+	for(i=0; i<NUM_STYLE_DANCERS; i++ )
 	{
 		float fOrigDancerZoomY = m_sprDancer[i].GetZoomY();
 		m_sprDancer[i].SetZoomY( 0 );
diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h
index 5f4cf13fd4..42f26d373d 100644
--- a/stepmania/src/ScreenSongOptions.h
+++ b/stepmania/src/ScreenSongOptions.h
@@ -25,4 +25,4 @@ private:
 	void GoToPrevState();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 03004a5d22..83b714f885 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -104,7 +104,8 @@ ScreenStage::ScreenStage()
 	this->AddChild( &m_sprSongBackground );	// add background first so it draws bottom-most
 	//this->AddChild( &m_quadMask );	// add quad mask before stage so that it will block out the stage sprites
 	
-	for( int i=0; i<4; i++ )
+	int i;
+	for( i=0; i<4; i++ )
 	{
 		m_sprNumbers[i].Load( THEME->GetPathTo("Graphics","stage parts 5x3") );