From 4174ebf405c4cfbd0feef20b495e46551de02f04 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 5 Oct 2002 23:10:23 +0000 Subject: [PATCH] Fixed DWI writing bug, fixed player options interface bug, added more shorten group name presets. --- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/NoteData.cpp | 2 +- stepmania/src/NotesWriterDWI.cpp | 18 +++++++++--------- stepmania/src/ScreenPlayerOptions.cpp | 2 +- stepmania/src/SongManager.cpp | 22 +++++++++++++++++----- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 78b7e72288..85fc47ff9e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -220,7 +220,7 @@ OptionIconsP2Y=86 HelpText=! or " change music Hold ! and " then press START to change sort::## easier difficulty $$ harder difficulty::#$#$ to change sort TimerSeconds=60 ScoreConnectedToMusicWheel=1 -SampleMusicDelay=0.15 +SampleMusicDelay=0.25 [ScreenEz2SelectMusic] BannerX=320 // central banner diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 4cb83d098a..5552486269 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -882,7 +882,7 @@ void NoteData::LoadTransformedSlidingWindow( NoteData* pOriginal, int iNewNumTra this->m_TapNotes[iNewTrack][r] = pOriginal->m_TapNotes[iOldTrack][r]; } - if( r % (ROWS_PER_MEASURE*2) == 0 ) // adjust sliding window every two measures + if( r % (ROWS_PER_MEASURE*4) == 0 ) // adjust sliding window every 4 measures { // See if there is a hold crossing the beginning of this measure pOriginal->Convert4sToHoldNotes(); diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp index 2b3af98c49..7957221c6b 100644 --- a/stepmania/src/NotesWriterDWI.cpp +++ b/stepmania/src/NotesWriterDWI.cpp @@ -12,16 +12,16 @@ char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bC bool bCol[6]; } const lookup[] = { { '0', 0, 0, 0, 0, 0, 0 }, - { '1', 0, 1, 1, 0, 0, 0 }, + { '1', 1, 0, 1, 0, 0, 0 }, { '2', 0, 0, 1, 0, 0, 0 }, - { '3', 0, 0, 1, 0, 1, 0 }, - { '4', 0, 1, 0, 0, 0, 0 }, - { '6', 0, 0, 0, 0, 1, 0 }, - { '7', 0, 1, 0, 1, 0, 0 }, + { '3', 0, 0, 1, 0, 0, 1 }, + { '4', 1, 0, 0, 0, 0, 0 }, + { '6', 0, 0, 0, 0, 0, 1 }, + { '7', 1, 0, 0, 1, 0, 0 }, { '8', 0, 0, 0, 1, 0, 0 }, - { '9', 0, 0, 0, 1, 1, 0 }, + { '9', 0, 0, 0, 1, 0, 1 }, { 'A', 0, 0, 1, 1, 0, 0 }, - { 'B', 0, 1, 0, 0, 1, 0 }, + { 'B', 1, 0, 0, 0, 0, 1 }, { 'C', 0, 1, 0, 0, 0, 0 }, { 'D', 0, 0, 0, 0, 1, 0 }, { 'E', 1, 1, 0, 0, 0, 0 }, @@ -42,13 +42,13 @@ char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bC if( l.bCol[0]==bCol1 && l.bCol[1]==bCol2 && l.bCol[2]==bCol3 && l.bCol[3]==bCol4 && l.bCol[4]==bCol5 && l.bCol[5]==bCol6 ) return l.c; } - ASSERT(0); + ASSERT(0); // if we assert here, we didn't find the row in the DWI char lookup above. It must be missing an entry. return '0'; } char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bCol4 ) { - return NotesToDWIChar( 0, bCol1, bCol2, bCol3, bCol4, 0 ); + return NotesToDWIChar( bCol1, 0, bCol2, bCol3, 0, bCol4 ); } CString NotesWriterDWI::NotesToDWIString( char cNoteCol1, char cNoteCol2, char cNoteCol3, char cNoteCol4, char cNoteCol5, char cNoteCol6 ) diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index f3e768f699..dc9d928f54 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -85,7 +85,7 @@ void ScreenPlayerOptions::ImportOptions() for( int i=0; im_apNotes.GetSize(); i++ ) { - if( pSong->m_apNotes[i]->m_sDescription == szNotesName ) // match! + if( pSong->m_apNotes[i]->m_NotesType == notesType && + pSong->m_apNotes[i]->m_sDescription == szNotesDescription ) // match! { pNotes = pSong->m_apNotes[i]; break; @@ -345,7 +348,7 @@ void SongManager::SaveStatisticsToDisk() // Each value has the format "SongName::NotesName=TimesPlayed::TopGrade::TopScore::MaxCombo". - CString sName = ssprintf( "%s::%s", pSong->m_sSongDir, pNotes->m_sDescription ); + CString sName = ssprintf( "%s::%s::%s", pSong->m_sSongDir, GameManager::NotesTypeToString(pNotes->m_NotesType), pNotes->m_sDescription ); CString sValue = ssprintf( "%d::%s::%d::%d", pNotes->m_iNumTimesPlayed, @@ -425,6 +428,15 @@ CString SongManager::ShortenGroupName( const CString &sOrigGroupName ) sShortName.Replace( "Pump It Up", "PIU" ); sShortName.Replace( "pump it up", "PIU" ); sShortName.Replace( "PUMP IT UP", "PIU" ); + sShortName.Replace( "ParaParaParadise", "PPP" ); + sShortName.Replace( "paraparaparadise", "PPP" ); + sShortName.Replace( "PARAPARAPARADUSE", "PPP" ); + sShortName.Replace( "Para Para Paradise", "PPP" ); + sShortName.Replace( "para para paradise", "PPP" ); + sShortName.Replace( "PARA PARA PARADUSE", "PPP" ); + sShortName.Replace( "Dancing Stage", "DS" ); + sShortName.Replace( "Dancing Stage", "DS" ); + sShortName.Replace( "Dancing Stage", "DS" ); return sShortName; }