From 0fd9e1f140b229d2d727fa4129ecdf01564d0efe Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 25 Mar 2004 22:20:40 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenDemonstration.cpp | 10 ---------- stepmania/src/ScreenDemonstration.h | 2 -- stepmania/src/ScreenJukebox.cpp | 9 --------- stepmania/src/ScreenJukebox.h | 2 -- 4 files changed, 23 deletions(-) diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 9a8bd56a69..8b16b6d625 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -80,15 +80,6 @@ ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW ); } -ScreenDemonstration::~ScreenDemonstration() -{ -} - -void ScreenDemonstration::Update( float fDeltaTime ) -{ - ScreenGameplay::Update( fDeltaTime ); -} - void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM ) { switch( SM ) @@ -105,7 +96,6 @@ void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM ) break; case SM_LoseFocus: - LOG->Trace("XXX: lose foc"); SOUNDMAN->SetPrefs( PREFSMAN->m_fSoundVolume ); // turn volume back on break; diff --git a/stepmania/src/ScreenDemonstration.h b/stepmania/src/ScreenDemonstration.h index bfc01e80be..a2e8831dc7 100644 --- a/stepmania/src/ScreenDemonstration.h +++ b/stepmania/src/ScreenDemonstration.h @@ -16,9 +16,7 @@ class ScreenDemonstration : public ScreenJukebox { public: ScreenDemonstration( CString sName ); - ~ScreenDemonstration(); - virtual void Update( float fDeltaTime ); virtual void HandleScreenMessage( const ScreenMessage SM ); protected: diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index b4c5ea1a96..5e976057bd 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -160,15 +160,6 @@ ScreenJukebox::ScreenJukebox( CString sName, bool bDemonstration ) : ScreenGamep m_DancingState = STATE_DANCING; } -ScreenJukebox::~ScreenJukebox() -{ -} - -void ScreenJukebox::Update( float fDeltaTime ) -{ - ScreenGameplay::Update( fDeltaTime ); -} - void ScreenJukebox::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { //LOG->Trace( "ScreenJukebox::Input()" ); diff --git a/stepmania/src/ScreenJukebox.h b/stepmania/src/ScreenJukebox.h index 14241dbe6f..e1df398e48 100644 --- a/stepmania/src/ScreenJukebox.h +++ b/stepmania/src/ScreenJukebox.h @@ -19,9 +19,7 @@ class ScreenJukebox : public ScreenGameplay { public: ScreenJukebox( CString sName, bool bDemonstration = false ); - ~ScreenJukebox(); - virtual void Update( float fDeltaTime ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM );