From d6cbbdafe670a951dedc99da2606db04f3033670 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 5 May 2003 04:13:39 +0000
Subject: [PATCH] fix event mode + battle bug

---
 stepmania/src/ScreenEvaluation.cpp | 14 +-------------
 stepmania/src/SongManager.cpp      |  8 +++++---
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index c1cec39f57..917df2c754 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/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
 	{
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 5024bbccdd..6e57d17790 100644
--- a/stepmania/src/SongManager.cpp
+++ b/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();
 		}
 	}
 }