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

[splittiming] BG stuff in Song Timing only.

Browse Source 
Alright...let's see how badly I broke this.
This commit is contained in:
Jason Felds
2011-05-12 23:25:50 -04:00
parent 64a6abc12b
commit 72690b8c70
2 changed files with 92 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+1 -1
View File
@@ -1947,7 +1947,7 @@ Decrease/increase music offset=Decrease/increase music offset
Decrease/increase sample music start=Decrease/increase sample music start Decrease/increase sample music start=Decrease/increase sample music start
Decrease/increase sample music length=Decrease/increase sample music length Decrease/increase sample music length=Decrease/increase sample music length
Play sample music=Play sample music Play sample music=Play sample music
Add/Edit Background Change=Add/Edit Background Change Add/Edit Background Change=Add/Edit Background Change (Song Timing Only)
Insert beat and shift down=Insert beat and shift down Insert beat and shift down=Insert beat and shift down
Shift BPM changes and stops down one beat=Shift BPM changes and stops down one beat Shift BPM changes and stops down one beat=Shift BPM changes and stops down one beat
Delete beat and shift up=Delete beat and shift up Delete beat and shift up=Delete beat and shift up
src/ScreenEdit.cpp
+4 -1
View File
@@ -1798,6 +1798,8 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
break; break;
case EDIT_BUTTON_OPEN_BGCHANGE_LAYER1_MENU: case EDIT_BUTTON_OPEN_BGCHANGE_LAYER1_MENU:
case EDIT_BUTTON_OPEN_BGCHANGE_LAYER2_MENU: case EDIT_BUTTON_OPEN_BGCHANGE_LAYER2_MENU:
if( !GAMESTATE->m_bIsEditorStepTiming )
{
switch( EditB ) switch( EditB )
{ {
DEFAULT_FAIL( EditB ); DEFAULT_FAIL( EditB );
@@ -1894,6 +1896,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
EditMiniMenu( &g_BackgroundChange, SM_BackFromBGChange ); EditMiniMenu( &g_BackgroundChange, SM_BackFromBGChange );
} }
}
break; break;
case EDIT_BUTTON_OPEN_COURSE_MENU: case EDIT_BUTTON_OPEN_COURSE_MENU:
@@ -2718,7 +2721,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
else if ( SM == SM_BackFromLabelChange ) else if ( SM == SM_BackFromLabelChange )
{ {
RString sLabel = ScreenTextEntry::s_sLastAnswer; RString sLabel = ScreenTextEntry::s_sLastAnswer;
if ( !m_pSteps->m_Timing.DoesLabelExist(sLabel) ) if ( !GetAppropriateTiming().DoesLabelExist(sLabel) )
{ {
sLabel.Replace("=", "_"); sLabel.Replace("=", "_");
sLabel.Replace(",", "_"); sLabel.Replace(",", "_");