Reverse the order. Get some implementation.
Upon editing, the new TimeSignature doesn't show. Still more to do.
This commit is contained in:
+9
-8
@@ -2580,7 +2580,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
int iNum = atoi( ScreenTextEntry::s_sLastAnswer );
|
int iNum = atoi( ScreenTextEntry::s_sLastAnswer );
|
||||||
if( iNum > 0 )
|
if( iNum > 0 )
|
||||||
{
|
{
|
||||||
|
m_pSong->m_Timing.SetTimeSignatureAtBeat( GAMESTATE->m_fSongBeat, iNum, 99 );
|
||||||
}
|
}
|
||||||
SetDirty( true );
|
SetDirty( true );
|
||||||
}
|
}
|
||||||
@@ -2589,7 +2589,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
int iDen = atoi( ScreenTextEntry::s_sLastAnswer );
|
int iDen = atoi( ScreenTextEntry::s_sLastAnswer );
|
||||||
if( iDen > 0)
|
if( iDen > 0)
|
||||||
{
|
{
|
||||||
|
m_pSong->m_Timing.SetTimeSignatureDenominatorAtBeat( GAMESTATE->m_fSongBeat, iDen );
|
||||||
}
|
}
|
||||||
SetDirty( true );
|
SetDirty( true );
|
||||||
}
|
}
|
||||||
@@ -3118,18 +3118,19 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
|
|||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case edit_time_signature:
|
case edit_time_signature:
|
||||||
ScreenTextEntry::TextEntry(
|
// These need to be in reverse order due to the stack nature.
|
||||||
SM_BackFromTimeSignatureNumeratorChange,
|
|
||||||
ENTER_TIME_SIGNATURE_NUMERATOR_VALUE,
|
|
||||||
ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iNumerator ),
|
|
||||||
3
|
|
||||||
);
|
|
||||||
ScreenTextEntry::TextEntry(
|
ScreenTextEntry::TextEntry(
|
||||||
SM_BackFromTimeSignatureDenominatorChange,
|
SM_BackFromTimeSignatureDenominatorChange,
|
||||||
ENTER_TIME_SIGNATURE_DENOMINATOR_VALUE,
|
ENTER_TIME_SIGNATURE_DENOMINATOR_VALUE,
|
||||||
ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iDenominator ),
|
ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iDenominator ),
|
||||||
3
|
3
|
||||||
);
|
);
|
||||||
|
ScreenTextEntry::TextEntry(
|
||||||
|
SM_BackFromTimeSignatureNumeratorChange,
|
||||||
|
ENTER_TIME_SIGNATURE_NUMERATOR_VALUE,
|
||||||
|
ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iNumerator ),
|
||||||
|
3
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
case play_preview_music:
|
case play_preview_music:
|
||||||
PlayPreviewMusic();
|
PlayPreviewMusic();
|
||||||
|
|||||||
Reference in New Issue
Block a user