logic change
This commit is contained in:
@@ -63,11 +63,7 @@ void DeleteCurSteps( void* pThrowAway )
|
|||||||
Song* pSong = GAMESTATE->m_pCurSong;
|
Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1];
|
Steps* pStepsToDelete = GAMESTATE->m_pCurSteps[PLAYER_1];
|
||||||
pSong->RemoveSteps( pStepsToDelete );
|
pSong->RemoveSteps( pStepsToDelete );
|
||||||
if( HOME_EDIT_MODE )
|
if( !HOME_EDIT_MODE )
|
||||||
{
|
|
||||||
SCREENMAN->AddNewScreenToTop( "ScreenMemcardSaveEditsAfterDeleteSteps", SM_None );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
pSong->Save();
|
pSong->Save();
|
||||||
SCREENMAN->ZeroNextUpdate();
|
SCREENMAN->ZeroNextUpdate();
|
||||||
@@ -90,6 +86,14 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
case SM_GoToNextScreen:
|
case SM_GoToNextScreen:
|
||||||
SCREENMAN->SetNewScreen( "ScreenEdit" );
|
SCREENMAN->SetNewScreen( "ScreenEdit" );
|
||||||
break;
|
break;
|
||||||
|
case SM_Success:
|
||||||
|
LOG->Trace( "Delete successful; deleting steps from memory" );
|
||||||
|
g_pScreenEditMenu = this;
|
||||||
|
DeleteCurSteps( NULL );
|
||||||
|
break;
|
||||||
|
case SM_Failure:
|
||||||
|
LOG->Trace( "Delete failed; not deleting steps" );
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -178,8 +182,15 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
|
|||||||
break;
|
break;
|
||||||
case EDIT_MENU_ACTION_DELETE:
|
case EDIT_MENU_ACTION_DELETE:
|
||||||
ASSERT( pSteps );
|
ASSERT( pSteps );
|
||||||
SCREENMAN->Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO, DeleteCurSteps );
|
if( HOME_EDIT_MODE )
|
||||||
g_pScreenEditMenu = this;
|
{
|
||||||
|
SCREENMAN->AddNewScreenToTop( "ScreenEditMenuDeleteSteps", SM_None );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
g_pScreenEditMenu = this;
|
||||||
|
SCREENMAN->Prompt( SM_RefreshSelector, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO, DeleteCurSteps );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case EDIT_MENU_ACTION_COPY:
|
case EDIT_MENU_ACTION_COPY:
|
||||||
case EDIT_MENU_ACTION_AUTOGEN:
|
case EDIT_MENU_ACTION_AUTOGEN:
|
||||||
|
|||||||
Reference in New Issue
Block a user