From 30dd7ab9b2d6ad3071ee011b2e0d36a8199d7322 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Aug 2002 08:28:44 +0000 Subject: [PATCH] Two different pieces of code in the editor were initializing a "new" song, and they were both being triggered. Only do it in the ctor, since we need the information that's being initialized elsewhere in the editor. --- stepmania/src/ScreenEdit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 53b82a571b..311932039a 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -178,6 +178,8 @@ ScreenEdit::ScreenEdit() // want to extract the NotesType for a (NEW) sequence. m_pSong->m_apNotes.Add( m_pNotes ); + + GAMESTATE->m_pCurNotes[PLAYER_1] = m_pNotes; } NoteData noteData; @@ -580,6 +582,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ Song* pSong = GAMESTATE->m_pCurSong; Notes* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; + ASSERT( pNotes ); +/* if( pNotes == NULL ) { // allocate a new Notes @@ -589,7 +593,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ pNotes->m_sDescription = "Untitled"; pNotes->m_iMeter = 1; } - +*/ pNotes->SetNoteData( (NoteData*)&m_NoteFieldEdit ); switch( DeviceI.button ) {