fix event mode + battle bug

stepmania/src/ScreenEvaluation.cpp

@@ -865,19 +865,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )
 
 	if( PREFSMAN->m_bEventMode )
 	{
-		switch( GAMESTATE->m_PlayMode )
-		{
-		case PLAY_MODE_ARCADE:
-			m_Menu.StartTransitioning( SM_GoToNextScreen );
-			break;
-		case PLAY_MODE_NONSTOP:
-		case PLAY_MODE_ONI:
-		case PLAY_MODE_ENDLESS:
-			m_Menu.StartTransitioning( SM_GoToSelectCourse );
-			break;
-		default:
-			ASSERT(0);
-		}
+		m_Menu.StartTransitioning( SM_GoToNextScreen );
 	}
 	else	// not event mode
 	{

stepmania/src/SongManager.cpp

@@ -759,9 +759,11 @@ void SongManager::CleanData()
 {
 	for( unsigned i=0; i<m_pSongs.size(); i++ )
 	{
-		for( unsigned n=0; n<m_pSongs[i]->m_apNotes.size(); n++ )
-		{	
-			m_pSongs[i]->m_apNotes[n]->Compress();
+		Song* pSong = m_pSongs[i];
+		for( unsigned n=0; n<pSong->m_apNotes.size(); n++ )
+		{
+			Notes* pNotes = pSong->m_apNotes[n];
+			pNotes->Compress();
 		}
 	}
 }