actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

re-sync messages, so the jukebox continues at end of song

Browse Source 
fix assert failure
This commit is contained in:
Glenn Maynard
2003-03-17 04:56:47 +00:00
parent f04507a017
commit bbb416d615
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenDemonstration.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#define NEXT_SCREEN THEME->GetMetric("ScreenDemonstration","NextScreen") #define NEXT_SCREEN THEME->GetMetric("ScreenDemonstration","NextScreen")
const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+101); // MUST be same as in ScreenGameplay const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); // MUST be same as in ScreenGameplay
bool PrepareForDemonstration() // always return true. bool PrepareForDemonstration() // always return true.
stepmania/src/ScreenJukebox.cpp
+5 -3
View File
@@ -20,7 +20,7 @@
const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+101); // MUST be same as in ScreenGameplay const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); // MUST be same as in ScreenGameplay
bool PrepareForJukebox() // always return true. bool PrepareForJukebox() // always return true.
@@ -155,6 +155,8 @@ void ScreenJukebox::Input( const DeviceInput& DeviceI, const InputEventType type
{ {
//LOG->Trace( "ScreenJukebox::Input()" ); //LOG->Trace( "ScreenJukebox::Input()" );
if( type != IET_FIRST_PRESS )
return; /* ignore */
if( MenuI.IsValid() ) if( MenuI.IsValid() )
{ {
@@ -196,8 +198,8 @@ void ScreenJukebox::HandleScreenMessage( const ScreenMessage SM )
switch( SM ) switch( SM )
{ {
case SM_NotesEnded: case SM_NotesEnded:
if( m_Out.IsTransitioning() ) if( m_Out.IsTransitioning() || m_Out.IsFinished() )
return; // ignore - we're already fading return; // ignore - we're already fading or faded
m_Out.StartTransitioning( SM_GoToNextScreen ); m_Out.StartTransitioning( SM_GoToNextScreen );
return; return;
case SM_GoToNextScreen: case SM_GoToNextScreen: