fix HandleSongTimer not reset

This commit is contained in:
Glenn Maynard
2006-03-16 07:35:47 +00:00
parent 3699674088
commit e0c8a8ebc7
2 changed files with 14 additions and 3 deletions
+11 -3
View File
@@ -819,6 +819,17 @@ ScreenEdit::~ScreenEdit()
m_soundMusic.StopPlaying(); m_soundMusic.StopPlaying();
} }
void ScreenEdit::BeginScreen()
{
/* We do this ourself. */
SOUND->HandleSongTimer( false );
}
void ScreenEdit::EndScreen()
{
SOUND->HandleSongTimer( true );
}
// play assist ticks // play assist ticks
void ScreenEdit::PlayTicks() void ScreenEdit::PlayTicks()
{ {
@@ -2581,9 +2592,6 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
} }
else if( SM == SM_GainFocus ) else if( SM == SM_GainFocus )
{ {
/* We do this ourself. */
SOUND->HandleSongTimer( false );
/* When another screen comes up, RageSounds takes over the sound timer. When we come /* When another screen comes up, RageSounds takes over the sound timer. When we come
* back, put the timer back to where it was. */ * back, put the timer back to where it was. */
GAMESTATE->m_fSongBeat = m_fTrailingBeat; GAMESTATE->m_fSongBeat = m_fTrailingBeat;
+3
View File
@@ -165,6 +165,9 @@ class ScreenEdit : public ScreenWithMenuElements
{ {
public: public:
virtual void Init(); virtual void Init();
virtual void BeginScreen();
virtual void EndScreen();
virtual ~ScreenEdit(); virtual ~ScreenEdit();
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives(); virtual void DrawPrimitives();