Some Ez2 Theme Changes

stepmania/src/Background.cpp

@@ -272,7 +272,7 @@ void Background::LoadFromSong( Song* pSong )
 				for( int i=arrayPossibleMovies.GetSize()-1; i>=0; i-- )
 					if( -1!=arrayPossibleMovies[i].Find("anger") )
 						arrayPossibleMovies.RemoveAt(i);
-				for( int i=0; i<4 && arrayPossibleMovies.GetSize()>0; i++ )
+				for( i=0; i<4 && arrayPossibleMovies.GetSize()>0; i++ )
 				{
 					int index = rand() % arrayPossibleMovies.GetSize();
 					pTempBGA = new BackgroundAnimation;

stepmania/src/ScreenEz2SelectPlayer.cpp

@@ -210,8 +210,8 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
 	m_sprControllers[pn].SetTweenZoomY( 0 );
 
 	bool bBothSidesJoined = true;
-	for( int pn=0; pn<NUM_PLAYERS; pn++ )
-		if( !GAMESTATE->m_bSideIsJoined[pn] )
+	for( int p=0; p<NUM_PLAYERS; p++ )
+		if( !GAMESTATE->m_bSideIsJoined[p] )
 			bBothSidesJoined = false;
 
 	if( bBothSidesJoined )

stepmania/src/ScreenEz2SelectStyle.cpp

@@ -194,14 +194,14 @@ void ScreenEz2SelectStyle::RefreshStylesAndList()
 
 		switch( GAMEMAN->GetStyleDefForStyle(style)->m_StyleType )
 		{
-		case StyleDef::ONE_PLAYER_ONE_CREDIT:	
-			if( iNumSidesJoined!=1 )
-				m_aPossibleStyles.RemoveAt( i );
+		case StyleDef::ONE_PLAYER_ONE_CREDIT: // if the current style is for 1player	
+			if( iNumSidesJoined!=1 ) // and we have two (or more) players
+				m_aPossibleStyles.RemoveAt( i ); // remove the element
 			break;
-		case StyleDef::ONE_PLAYER_TWO_CREDITS:
-		case StyleDef::TWO_PLAYERS_TWO_CREDITS:
-			if( iNumSidesJoined!=2 )
-				m_aPossibleStyles.RemoveAt( i );
+		case StyleDef::ONE_PLAYER_TWO_CREDITS: // if the current style is for 1player on both sides
+		case StyleDef::TWO_PLAYERS_TWO_CREDITS: // if the current style for 2players
+			if( iNumSidesJoined!=2 ) // and we don't have two players
+				m_aPossibleStyles.RemoveAt( i ); // remove the element
 			break;
 		default:	ASSERT(0);
 		}

stepmania/src/ScreenPlayerOptions.cpp

@@ -40,7 +40,7 @@ OptionRowData g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
 	{ "Speed",	9, {"x0.5","x0.75","x1","x1.5","x2","x3","x4","x5","x8"} },	
 	{ "Boost",  2, {"OFF","ON"} },	
 	{ "Effect", 8, {"OFF","WAVE", "DRUNK", "DIZZY","SPACE","MINI","FLIP","TORNADO"} },	
-	{ "Appear\nance", 4, {"VISIBLE","HIDDEN","SUDDEN","STEALTH"} },	
+	{ "Appear\nance", 5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH", "BLINK"} },	
 	{ "Turn",	5, {"OFF","MIRROR","LEFT","RIGHT","SHUFFLE"} },	
 	{ "Little", 2, {"OFF","ON"} },	
 	{ "Scroll", 2, {"STANDARD","REVERSE"} },	

stepmania/src/StepMania.cpp

@@ -221,7 +221,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR CmdLine, int nCmdShow
 		//
 		CStringArray asPackagePaths;
 		GetDirListing( "AutoInstall\\*.smzip", asPackagePaths, false, true );
-		for( int i=0; i<asPackagePaths.GetSize(); i++ )
+		for( i=0; i<asPackagePaths.GetSize(); i++ )
 		{
 			CString sCommandLine = ssprintf( "smpackage.exe %s", asPackagePaths[i] );