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

merge code; make DeAutogen private

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-12 04:38:44 +00:00
parent 05bfda3f4b
commit 0955501855
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Steps.cpp
+6 -11
View File
@@ -65,14 +65,7 @@ void Steps::SetNoteData( const NoteData& noteDataNew )
{
ASSERT( noteDataNew.GetNumTracks() == GameManager::StepsTypeToNumTracks(m_StepsType) );
if( parent )
{
copy( parent->m_CachedRadarValues, parent->m_CachedRadarValues + NUM_PLAYERS, m_CachedRadarValues );
m_sDescription = parent->m_sDescription;
m_Difficulty = parent->m_Difficulty;
m_iMeter = parent->m_iMeter;
parent = NULL;
}
DeAutogen( false );
*m_pNoteData = noteDataNew;
m_bNoteDataIsFilled = true;
@@ -315,12 +308,13 @@ void Steps::Compress() const
/* Copy our parent's data. This is done when we're being changed from autogen
* to normal. (needed?) */
void Steps::DeAutogen()
void Steps::DeAutogen( bool bCopyNoteData )
{
if( !parent )
return; /* OK */
Decompress(); // fills in m_pNoteData with sliding window transform
if( bCopyNoteData )
Decompress(); // fills in m_pNoteData with sliding window transform
m_sDescription = Real()->m_sDescription;
m_Difficulty = Real()->m_Difficulty;
@@ -329,7 +323,8 @@ void Steps::DeAutogen()
parent = NULL;
Compress();
if( bCopyNoteData )
Compress();
}
void Steps::AutogenFrom( const Steps *parent_, StepsType ntTo )