diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index 02453e7fc3..adef2dba7d 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -1036,13 +1036,13 @@ void BrightnessOverlay::FadeToActualBrightness() -Background::Background() { m_pImpl = new BackgroundImpl; this->AddChild(m_pImpl); } -Background::~Background() { SAFE_DELETE( m_pImpl ); } -void Background::Init() { m_pImpl->Init(); } -void Background::LoadFromSong( const Song *pSong ) { m_pImpl->LoadFromSong(pSong); } -void Background::Unload() { m_pImpl->Unload(); } -void Background::FadeToActualBrightness() { m_pImpl->FadeToActualBrightness(); } -void Background::SetBrightness( float fBrightness ) { m_pImpl->SetBrightness(fBrightness); } +Background::Background() { m_pImpl = new BackgroundImpl; this->AddChild(m_pImpl); } +Background::~Background() { SAFE_DELETE( m_pImpl ); } +void Background::Init() { m_pImpl->Init(); } +void Background::LoadFromSong( const Song *pSong ) { m_pImpl->LoadFromSong(pSong); } +void Background::Unload() { m_pImpl->Unload(); } +void Background::FadeToActualBrightness() { m_pImpl->FadeToActualBrightness(); } +void Background::SetBrightness( float fBrightness ) { m_pImpl->SetBrightness(fBrightness); } DancingCharacters* Background::GetDancingCharacters() { return m_pImpl->GetDancingCharacters(); } void Background::GetLoadedBackgroundChanges( vector *pBackgroundChangesOut[NUM_BackgroundLayer] ) { m_pImpl->GetLoadedBackgroundChanges(pBackgroundChangesOut); } diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index d7455fb5b1..5606cd2461 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -11,11 +11,11 @@ #include "ActorUtil.h" #include "InputEventPlus.h" -#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") -#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") -#define PREPARE_SCREENS THEME->GetMetric (m_sName,"PrepareScreens") -#define PERSIST_SCREENS THEME->GetMetric (m_sName,"PersistScreens") -#define GROUPED_SCREENS THEME->GetMetric (m_sName,"GroupedScreens") +#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") +#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") +#define PREPARE_SCREENS THEME->GetMetric (m_sName,"PrepareScreens") +#define PERSIST_SCREENS THEME->GetMetric (m_sName,"PersistScreens") +#define GROUPED_SCREENS THEME->GetMetric (m_sName,"GroupedScreens") void Screen::InitScreen( Screen *pScreen ) {