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

Fix several annoying edit mode bugs, mostly by fixing the Song copy

Browse Source 
operator and the various uses of it.

- revert file from disk: keeps old BPM.  The BPMS on disk are added to
  the existing BPM information!
- edit mode turns X stepcharts into 2X when reverting
- sometimes edit mode loses an entire stepchart: open a stepchart,
  change to a new stepchart, exit without going back, original chart gone
- edit a chart, make a change in a different chart, exit from the first chart:
  change made in different chart doesn't revert
- normally, when you create a stepchart and don't save it after editting it,
  it is deleted.  however, if you create a stepchart, don't save it, and exit
  edit mode while looking at a different chart, the chart isn't deleted.

Some existing bugs are not fixed, though:
- delete the last stepchart for a step type.  CTD.
- Edit one of the fake doubles stepcharts for a song that doesn't have
  real doubles stepcharts.  Exit without doing anything.  CTD.  This is
  probably the same problem as the previous bug.
- delete a song or a steps that happens to be part of a trail.  Trail is now
  broken.  Some other edits should affect a trail as well, but don't.
This commit is contained in:
John Bauer
2006-11-10 07:02:27 +00:00
parent 00b40c7468
commit c3e39e12a3
8 changed files with 175 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+46 -25
View File
@@ -769,9 +769,6 @@ void ScreenEdit::Init()
ScreenEdit::~ScreenEdit()
{
// UGLY: Don't delete the Song's steps.
m_songLastSave.DetachSteps();
LOG->Trace( "ScreenEdit::~ScreenEdit()" );
m_soundMusic.StopPlaying();
}
@@ -2580,7 +2577,6 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
else if( SM == SM_SaveSuccessful )
{
LOG->Trace( "Save successful." );
m_pSteps->SetSavedToDisk( true );
CopyToLastSave();
SetDirty( false );
@@ -2602,17 +2598,24 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
// IMPORTANT: CopyFromLastSave before deleting the Steps below
CopyFromLastSave();
// If these steps have never been saved, then we should delete them.
// If the user created them in the edit menu and never bothered
// to save them, then they aren't wanted.
Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
if( !pSteps->GetSavedToDisk() )
// We have to scroll through the entire Steps array because the user
// may have changed to a different stepchart after starting the edit.
vector<Steps*> vStepsToDelete;
for( vector<Steps*>::const_iterator it = GAMESTATE->m_pCurSong->GetAllSteps().begin();
it != GAMESTATE->m_pCurSong->GetAllSteps().end(); ++it )
{
Song* pSong = GAMESTATE->m_pCurSong;
pSong->DeleteSteps( pSteps );
m_pSteps = NULL;
GAMESTATE->m_pCurSteps[PLAYER_1].Set( NULL );
}
Steps *pSteps = *it;
if( !pSteps->GetSavedToDisk() && !pSteps->IsAutogen() )
{
vStepsToDelete.push_back( pSteps );
if( pSteps == GAMESTATE->m_pCurSteps[PLAYER_1] )
GAMESTATE->m_pCurSteps[PLAYER_1].Set( NULL );
if( pSteps == m_pSteps )
m_pSteps = NULL;
}
}
FOREACH( Steps*, vStepsToDelete, pSteps )
GAMESTATE->m_pCurSong->DeleteSteps( *pSteps );
m_Out.StartTransitioning( SM_GoToNextScreen );
}
@@ -3429,16 +3432,23 @@ void ScreenEdit::SetupCourseAttacks()
void ScreenEdit::CopyToLastSave()
{
m_songLastSave = *GAMESTATE->m_pCurSong;
if( GAMESTATE->m_pCurSteps[PLAYER_1] )
m_stepsLastSave = *GAMESTATE->m_pCurSteps[PLAYER_1];
m_SongLastSave.DeepCopy( *GAMESTATE->m_pCurSong );
}
void ScreenEdit::CopyFromLastSave()
{
*GAMESTATE->m_pCurSong = m_songLastSave;
if( GAMESTATE->m_pCurSteps[PLAYER_1] )
*GAMESTATE->m_pCurSteps[PLAYER_1] = m_stepsLastSave;
// We have to make sure the new m_pCurSteps pointer points to the correct Steps
// object. The Song copy destroys all of the old pointers.
StepsID id;
if( GAMESTATE->m_pCurSteps[PLAYER_1] )
id.FromSteps( GAMESTATE->m_pCurSteps[PLAYER_1] );
GAMESTATE->m_pCurSong->DeepCopy( m_SongLastSave );
if( id.IsValid() ) {
GAMESTATE->m_pCurSteps[PLAYER_1].Set( id.ToSteps( GAMESTATE->m_pCurSong, false ) );
m_pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
}
}
void ScreenEdit::RevertFromDisk()
@@ -3448,14 +3458,25 @@ void ScreenEdit::RevertFromDisk()
id.FromSteps( GAMESTATE->m_pCurSteps[PLAYER_1] );
RString sSongDir = GAMESTATE->m_pCurSong->GetSongDir();
GAMESTATE->m_pCurSong->LoadFromSongDir( sSongDir );
GAMESTATE->m_pCurSong->ReloadFromSongDir( sSongDir );
if( id.IsValid() )
GAMESTATE->m_pCurSteps[PLAYER_1].Set( id.ToSteps( GAMESTATE->m_pCurSong, false ) );
{
Steps *pChosenSteps = id.ToSteps( GAMESTATE->m_pCurSong, true );
if( pChosenSteps == NULL )
{
// This can happen in a couple ways. For example, the user might be editting a new
// stepchart and revert from disk.
pChosenSteps = new Steps();
pChosenSteps->CreateBlank( id.GetStepsType() );
pChosenSteps->SetDifficultyAndDescription( id.GetDifficulty(), id.GetDescription() );
GAMESTATE->m_pCurSong->AddSteps( pChosenSteps );
}
GAMESTATE->m_pCurSteps[PLAYER_1].Set( pChosenSteps );
m_pSteps = pChosenSteps;
}
m_songLastSave = *GAMESTATE->m_pCurSong;
if( GAMESTATE->m_pCurSteps[PLAYER_1] )
m_stepsLastSave = *GAMESTATE->m_pCurSteps[PLAYER_1];
CopyToLastSave();
SetDirty(false);
}