From 7ed19aafaf3fc3da8cd37c2d147283dacf956fae Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 26 Jul 2011 12:21:31 -0400 Subject: [PATCH] Slightly better variable name. Going to try to allow for general copying of timing segments. --- src/ScreenEdit.cpp | 8 ++++---- src/ScreenEdit.h | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 88a96de91b..a4f1f55625 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -908,7 +908,7 @@ void ScreenEdit::Init() 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_Undo.SetNumTracks( m_NoteDataEdit.GetNumTracks() ); @@ -4667,18 +4667,18 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice } case copy_timing: { - clipboardTiming = GetAppropriateTiming(); + clipboardFullTiming = GetAppropriateTiming(); break; } case paste_timing: { if (GAMESTATE->m_bIsUsingStepTiming) { - GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = clipboardTiming; + GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = clipboardFullTiming; } else { - GAMESTATE->m_pCurSong->m_SongTiming = clipboardTiming; + GAMESTATE->m_pCurSong->m_SongTiming = clipboardFullTiming; } SetDirty(true); break; diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index f2e8c66212..bb26d05321 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -277,10 +277,8 @@ protected: TimingData backupStepTiming; /** - * @brief Have a backup of the TimingData of the player's choice. - * - * This will be used for copying and pasting as required. */ - TimingData clipboardTiming; + * @brief Allow for copying and pasting a song's (or steps's) full Timing Data. */ + TimingData clipboardFullTiming; /** @brief The current TapNote that would be inserted. */ TapNote m_selectedTap;