Slightly better variable name.
Going to try to allow for general copying of timing segments.
This commit is contained in:
+4
-4
@@ -908,7 +908,7 @@ void ScreenEdit::Init()
|
|||||||
|
|
||||||
m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
||||||
|
|
||||||
clipboardTiming = GAMESTATE->m_pCurSong->m_SongTiming; // always have a backup.
|
clipboardFullTiming = GAMESTATE->m_pCurSong->m_SongTiming; // always have a backup.
|
||||||
|
|
||||||
m_bHasUndo = false;
|
m_bHasUndo = false;
|
||||||
m_Undo.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
m_Undo.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
||||||
@@ -4667,18 +4667,18 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice
|
|||||||
}
|
}
|
||||||
case copy_timing:
|
case copy_timing:
|
||||||
{
|
{
|
||||||
clipboardTiming = GetAppropriateTiming();
|
clipboardFullTiming = GetAppropriateTiming();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case paste_timing:
|
case paste_timing:
|
||||||
{
|
{
|
||||||
if (GAMESTATE->m_bIsUsingStepTiming)
|
if (GAMESTATE->m_bIsUsingStepTiming)
|
||||||
{
|
{
|
||||||
GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = clipboardTiming;
|
GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = clipboardFullTiming;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GAMESTATE->m_pCurSong->m_SongTiming = clipboardTiming;
|
GAMESTATE->m_pCurSong->m_SongTiming = clipboardFullTiming;
|
||||||
}
|
}
|
||||||
SetDirty(true);
|
SetDirty(true);
|
||||||
break;
|
break;
|
||||||
|
|||||||
+2
-4
@@ -277,10 +277,8 @@ protected:
|
|||||||
TimingData backupStepTiming;
|
TimingData backupStepTiming;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Have a backup of the TimingData of the player's choice.
|
* @brief Allow for copying and pasting a song's (or steps's) full Timing Data. */
|
||||||
*
|
TimingData clipboardFullTiming;
|
||||||
* This will be used for copying and pasting as required. */
|
|
||||||
TimingData clipboardTiming;
|
|
||||||
|
|
||||||
/** @brief The current TapNote that would be inserted. */
|
/** @brief The current TapNote that would be inserted. */
|
||||||
TapNote m_selectedTap;
|
TapNote m_selectedTap;
|
||||||
|
|||||||
Reference in New Issue
Block a user