From a233c21188ca2f42bf4cb2ecf80cd1ba5d92279a Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Sat, 4 Jun 2011 23:36:14 +0200 Subject: [PATCH] [loading window] Note to self: check if it compiles before commiting. --- src/ScreenReloadSongs.cpp | 6 +++--- src/ScreenReloadSongs.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ScreenReloadSongs.cpp b/src/ScreenReloadSongs.cpp index 0129f1a645..48d94907b0 100644 --- a/src/ScreenReloadSongs.cpp +++ b/src/ScreenReloadSongs.cpp @@ -56,12 +56,12 @@ void ScreenReloadSongs::Init() m_Loading.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); this->AddChild( &m_Loading ); - m_LoadingWindow = new ScreenReloadSongsLoadingWindow( m_Loading ); + pLoadingWindow = new ScreenReloadSongsLoadingWindow( m_Loading ); } ScreenReloadSongs::~ScreenReloadSongs() { - delete m_LoadingWindow; + delete pLoadingWindow; } @@ -75,7 +75,7 @@ void ScreenReloadSongs::Update( float fDeltaTime ) return; ASSERT( !IsFirstUpdate() ); - SONGMAN->Reload( false, m_LoadingWindow ); + SONGMAN->Reload( false ); SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 ); } diff --git a/src/ScreenReloadSongs.h b/src/ScreenReloadSongs.h index 860bdd28f7..908f61da72 100644 --- a/src/ScreenReloadSongs.h +++ b/src/ScreenReloadSongs.h @@ -14,7 +14,6 @@ public: private: int m_iUpdates; - LoadingWindow *m_LoadingWindow; BitmapText m_Loading; };