From bf02bfddf4bc4a5026e35aab87ed09308fbbde59 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 3 Aug 2003 00:13:55 +0000 Subject: [PATCH] rename Notes to Steps --- stepmania/src/ArrowEffects.cpp | 2 +- stepmania/src/Course.cpp | 6 +-- stepmania/src/Course.h | 6 +-- stepmania/src/CourseContentsList.cpp | 2 +- stepmania/src/CourseContentsList.h | 2 +- stepmania/src/CourseEntryDisplay.cpp | 4 +- stepmania/src/CourseEntryDisplay.h | 4 +- stepmania/src/DifficultyIcon.cpp | 4 +- stepmania/src/DifficultyIcon.h | 4 +- stepmania/src/DifficultyMeter.cpp | 4 +- stepmania/src/DifficultyMeter.h | 6 +-- stepmania/src/EditMenu.cpp | 6 +-- stepmania/src/EditMenu.h | 6 +-- stepmania/src/GameState.cpp | 4 +- stepmania/src/GameState.h | 4 +- stepmania/src/GrooveGraph.cpp | 4 +- stepmania/src/GrooveRadar.cpp | 4 +- stepmania/src/GrooveRadar.h | 6 +-- stepmania/src/LifeMeterBattery.cpp | 2 +- stepmania/src/MusicBannerWheel.cpp | 2 +- stepmania/src/MusicWheel.cpp | 17 ++++--- stepmania/src/MusicWheelItem.cpp | 2 +- stepmania/src/NoteDisplay.cpp | 2 +- stepmania/src/NotesLoaderBMS.cpp | 14 +++--- stepmania/src/NotesLoaderBMS.h | 4 +- stepmania/src/NotesLoaderDWI.cpp | 6 +-- stepmania/src/NotesLoaderDWI.h | 6 +-- stepmania/src/NotesLoaderKSF.cpp | 8 ++-- stepmania/src/NotesLoaderKSF.h | 4 +- stepmania/src/NotesLoaderSM.cpp | 6 +-- stepmania/src/NotesLoaderSM.h | 4 +- stepmania/src/NotesWriterDWI.cpp | 6 +-- stepmania/src/NotesWriterDWI.h | 6 +-- stepmania/src/NotesWriterSM.cpp | 8 ++-- stepmania/src/NotesWriterSM.h | 2 +- stepmania/src/Player.cpp | 2 +- stepmania/src/ScoreKeeper.h | 4 +- stepmania/src/ScoreKeeperMAX2.cpp | 8 ++-- stepmania/src/ScoreKeeperMAX2.h | 8 ++-- stepmania/src/ScoreKeeperRave.cpp | 2 +- stepmania/src/ScoreKeeperRave.h | 2 +- stepmania/src/ScreenEdit.cpp | 22 ++++----- stepmania/src/ScreenEdit.h | 2 +- stepmania/src/ScreenEditMenu.cpp | 26 +++++----- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenEz2SelectMusic.cpp | 6 +-- stepmania/src/ScreenEz2SelectMusic.h | 2 +- stepmania/src/ScreenGameplay.h | 2 +- stepmania/src/ScreenJukebox.cpp | 6 +-- stepmania/src/ScreenPlayerOptions.cpp | 8 ++-- stepmania/src/ScreenSelect.cpp | 6 ++- stepmania/src/ScreenSelect.h | 2 +- stepmania/src/ScreenSelectCourse.cpp | 4 +- stepmania/src/ScreenSelectMusic.cpp | 8 ++-- stepmania/src/ScreenSelectMusic.h | 4 +- stepmania/src/Song.cpp | 66 +++++++++++++------------- stepmania/src/SongManager.cpp | 34 ++++++------- stepmania/src/SongManager.h | 10 ++-- stepmania/src/StepMania.dsp | 62 +++++++++++++----------- stepmania/src/StepMania.vcproj | 12 ++--- stepmania/src/StyleDef.h | 4 +- stepmania/src/arch/arch_default.h | 2 +- stepmania/src/arch/arch_linux.h | 2 + stepmania/src/pcre/get.c | 2 +- stepmania/src/pcre/internal.h | 2 +- stepmania/src/pcre/maketables.c | 2 +- stepmania/src/pcre/pcre.c | 2 +- stepmania/src/pcre/study.c | 2 +- stepmania/src/song.h | 22 ++++----- 69 files changed, 269 insertions(+), 258 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index 60e0624490..d9556a9a65 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -11,7 +11,7 @@ */ #include "ArrowEffects.h" -#include "Notes.h" +#include "Steps.h" #include "GameConstantsAndTypes.h" #include "GameManager.h" #include "GameState.h" diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index cde272cca5..81f312d99a 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -22,7 +22,7 @@ #include "SongOptions.h" #include "RageUtil.h" #include "TitleSubstitution.h" -#include "Notes.h" +#include "Steps.h" #include "GameState.h" #include "BannerCache.h" #include "RageFile.h" @@ -488,7 +488,7 @@ void Course::GetCourseInfo( NotesType nt, vector &ci, int Difficul const Entry &e = entries[i]; Song* pSong = NULL; // fill this in - Notes* pNotes = NULL; // fill this in + Steps* pNotes = NULL; // fill this in /* This applies difficult mode for meter ranges. (If it's a difficulty * class, we'll do it below.) */ @@ -581,7 +581,7 @@ void Course::GetCourseInfo( NotesType nt, vector &ci, int Difficul if(dc < DIFFICULTY_CHALLENGE) { dc = Difficulty(dc + 1); - Notes* pNewNotes = pSong->GetNotes( nt, dc, PREFSMAN->m_bAutogenMissingTypes ); + Steps* pNewNotes = pSong->GetNotes( nt, dc, PREFSMAN->m_bAutogenMissingTypes ); if(pNewNotes) pNotes = pNewNotes; } diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h index e44453a067..589435cd8a 100644 --- a/stepmania/src/Course.h +++ b/stepmania/src/Course.h @@ -17,7 +17,7 @@ struct PlayerOptions; struct SongOptions; class Song; -class Notes; +class Steps; class Course { @@ -66,7 +66,7 @@ public: { Info(): pSong(NULL), pNotes(NULL), Random(false), Difficult(false) { } Song* pSong; - Notes* pNotes; + Steps* pNotes; CString Modifiers; bool Random; bool Mystery; @@ -75,7 +75,7 @@ public: int CourseIndex; }; - // Dereferences course_entries and returns only the playable Songs and Notes + // Dereferences course_entries and returns only the playable Songs and Steps void GetCourseInfo( NotesType nt, vector &ci, int Difficult = -1 ) const; int GetEstimatedNumStages() const { return m_entries.size(); } diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp index 5e155ff5e7..1eeec516cf 100644 --- a/stepmania/src/CourseContentsList.cpp +++ b/stepmania/src/CourseContentsList.cpp @@ -20,7 +20,7 @@ #include "SongManager.h" #include #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "GameState.h" #include "StyleDef.h" diff --git a/stepmania/src/CourseContentsList.h b/stepmania/src/CourseContentsList.h index bf5d06429a..c0d56444f7 100644 --- a/stepmania/src/CourseContentsList.h +++ b/stepmania/src/CourseContentsList.h @@ -19,7 +19,7 @@ #include "CourseEntryDisplay.h" class Course; class Song; -class Notes; +class Steps; const int MAX_VISIBLE_CONTENTS = 5; diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index 3083902117..18ce4ce613 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -20,7 +20,7 @@ #include "SongManager.h" #include #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "GameState.h" #include "StyleDef.h" @@ -76,7 +76,7 @@ CourseEntryDisplay::CourseEntryDisplay() } -void CourseEntryDisplay::LoadFromSongAndNotes( int iNum, Song* pSong, Notes* pNotes, CString sModifiers ) +void CourseEntryDisplay::LoadFromSongAndNotes( int iNum, Song* pSong, Steps* pNotes, CString sModifiers ) { m_textNumber.SetText( ssprintf("%d", iNum) ); diff --git a/stepmania/src/CourseEntryDisplay.h b/stepmania/src/CourseEntryDisplay.h index fdcc577668..615f0a526a 100644 --- a/stepmania/src/CourseEntryDisplay.h +++ b/stepmania/src/CourseEntryDisplay.h @@ -19,7 +19,7 @@ #include "GameConstantsAndTypes.h" class Course; class Song; -class Notes; +class Steps; class CourseEntryDisplay : public ActorFrame @@ -27,7 +27,7 @@ class CourseEntryDisplay : public ActorFrame public: CourseEntryDisplay(); - void LoadFromSongAndNotes( int iNum, Song* pSong, Notes* pNotes, CString sModifiers ); + void LoadFromSongAndNotes( int iNum, Song* pSong, Steps* pNotes, CString sModifiers ); void LoadFromDifficulty( int iNum, Difficulty dc, CString sModifiers ); void LoadFromMeterRange( int iNum, int iLow, int iHigh, CString sModifiers ); diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index 8abfd43a81..e650797a18 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -15,7 +15,7 @@ #include "GameConstantsAndTypes.h" #include "PrefsManager.h" #include "RageLog.h" -#include "Notes.h" +#include "Steps.h" #include "GameState.h" #include "RageDisplay.h" #include "arch/ArchHooks/ArchHooks.h" @@ -31,7 +31,7 @@ bool DifficultyIcon::Load( CString sPath ) return true; } -void DifficultyIcon::SetFromNotes( PlayerNumber pn, Notes* pNotes ) +void DifficultyIcon::SetFromNotes( PlayerNumber pn, Steps* pNotes ) { if( pNotes == NULL ) { diff --git a/stepmania/src/DifficultyIcon.h b/stepmania/src/DifficultyIcon.h index dba7c513c9..933f490034 100644 --- a/stepmania/src/DifficultyIcon.h +++ b/stepmania/src/DifficultyIcon.h @@ -13,7 +13,7 @@ #include "Sprite.h" #include "PlayerNumber.h" -class Notes; +class Steps; class DifficultyIcon : public Sprite @@ -21,7 +21,7 @@ class DifficultyIcon : public Sprite public: bool Load( CString sFilePath ); - void SetFromNotes( PlayerNumber pn, Notes* pNotes ); + void SetFromNotes( PlayerNumber pn, Steps* pNotes ); }; #endif diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 4949e423b5..41402ed093 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -16,7 +16,7 @@ #include "GameState.h" #include "PrefsManager.h" #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "Course.h" #include "SongManager.h" @@ -37,7 +37,7 @@ DifficultyMeter::DifficultyMeter() Unset(); } -void DifficultyMeter::SetFromNotes( Notes* pNotes ) +void DifficultyMeter::SetFromNotes( Steps* pNotes ) { if( pNotes == NULL ) { diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h index 527224a06f..a4583078ce 100644 --- a/stepmania/src/DifficultyMeter.h +++ b/stepmania/src/DifficultyMeter.h @@ -4,7 +4,7 @@ ----------------------------------------------------------------------------- Class: DifficultyMeter - Desc: A meter represention of how hard Notes is. + Desc: A meter represention of how hard Steps is. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Chris Danford @@ -13,7 +13,7 @@ #include "BitmapText.h" #include "PlayerNumber.h" -class Notes; +class Steps; class Course; @@ -23,7 +23,7 @@ public: DifficultyMeter(); void SetFromGameState( PlayerNumber pn ); - void SetFromNotes( Notes* pNotes ); + void SetFromNotes( Steps* pNotes ); void SetFromCourse( Course* pCourse ); void Unset(); diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 8e18d904aa..76631d1528 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -16,7 +16,7 @@ #include "GameState.h" #include "ThemeManager.h" #include "GameManager.h" -#include "Notes.h" +#include "Steps.h" #include "song.h" // @@ -312,12 +312,12 @@ void EditMenu::OnRowValueChanged( Row row ) } } -Notes* EditMenu::GetSelectedNotes() +Steps* EditMenu::GetSelectedNotes() { return GetSelectedSong()->GetNotes(GetSelectedNotesType(),GetSelectedDifficulty(), false); } -Notes* EditMenu::GetSelectedSourceNotes() +Steps* EditMenu::GetSelectedSourceNotes() { return GetSelectedSong()->GetNotes(GetSelectedSourceNotesType(),GetSelectedSourceDifficulty(), false); } diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h index 2496edaeb0..b8d1601fea 100644 --- a/stepmania/src/EditMenu.h +++ b/stepmania/src/EditMenu.h @@ -4,7 +4,7 @@ ----------------------------------------------------------------------------- Class: EditMenu - Desc: UI on Edit Menu screen. Create Notes, delete Notes, or launch Notes + Desc: UI on Edit Menu screen. Create Steps, delete Steps, or launch Steps in editor. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. @@ -96,8 +96,8 @@ public: Difficulty GetSelectedSourceDifficulty() { return (Difficulty)m_iSelection[ROW_SOURCE_DIFFICULTY]; } Action GetSelectedAction() { return m_Actions[m_iSelection[ROW_ACTION]]; } - Notes* GetSelectedNotes(); - Notes* GetSelectedSourceNotes(); + Steps* GetSelectedNotes(); + Steps* GetSelectedSourceNotes(); private: Sprite m_sprArrows[2]; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index c5bdb2d5f8..2898340350 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -20,7 +20,7 @@ #include "RageLog.h" #include "RageUtil.h" #include "SongManager.h" -#include "Notes.h" +#include "Steps.h" #include "NoteSkinManager.h" #include "ModeChoice.h" #include "NoteFieldPositioning.h" @@ -453,7 +453,7 @@ void GameState::GetFinalEvalStatsAndSongs( StageStats& statsOut, vector& statsOut = StageStats(); // Show stats only for the latest 3 normal songs + passed extra stages - int iNumPassedExtraStages = GAMESTATE->IsExtraStage ? 1 : (GAMESTATE->IsExtraStage2 ? 2 : 0); + int iNumPassedExtraStages = GAMESTATE->IsExtraStage() ? 1 : (GAMESTATE->IsExtraStage2() ? 2 : 0); int iNumPassedRegularSongs = GAMESTATE->m_vPassedStageStats.size() - iNumPassedExtraStages; int iNumSongsToShow = iNumPassedExtraStages + min( iNumPassedRegularSongs, 3 ); int iNumSongsToThrowAway = GAMESTATE->m_vPassedStageStats.size() - iNumSongsToShow; diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index b531ab203c..050eeb731f 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -20,7 +20,7 @@ #include "StageStats.h" class Song; -class Notes; +class Steps; class Course; class GameDef; class StyleDef; @@ -131,7 +131,7 @@ public: // State Info used during gameplay // Song* m_pCurSong; - Notes* m_pCurNotes[NUM_PLAYERS]; + Steps* m_pCurNotes[NUM_PLAYERS]; Course* m_pCurCourse; diff --git a/stepmania/src/GrooveGraph.cpp b/stepmania/src/GrooveGraph.cpp index dda7beca6d..78a9bb0584 100644 --- a/stepmania/src/GrooveGraph.cpp +++ b/stepmania/src/GrooveGraph.cpp @@ -16,7 +16,7 @@ #include "RageBitmapTexture.h" #include "GameConstantsAndTypes.h" #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "RageDisplay.h" #include "song.h" #include "GameState.h" @@ -65,7 +65,7 @@ void GrooveGraph::SetFromSong( Song* pSong ) { for( int i=0; iGetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, (Difficulty)i ); + Steps* pNotes = pSong->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, (Difficulty)i ); const float* fRadarValues = pNotes ? pNotes->GetRadarValues() : NULL; for( int j=0; j @@ -93,7 +93,7 @@ GrooveRadar::GrooveRadarValueMap::GrooveRadarValueMap() } } -void GrooveRadar::GrooveRadarValueMap::SetFromNotes( PlayerNumber pn, Notes* pNotes ) // NULL means no song +void GrooveRadar::GrooveRadarValueMap::SetFromNotes( PlayerNumber pn, Steps* pNotes ) // NULL means no song { if(DISABLE_RADAR == 1) // if the theme says not to disable it return; diff --git a/stepmania/src/GrooveRadar.h b/stepmania/src/GrooveRadar.h index 1392462ce1..727f943231 100644 --- a/stepmania/src/GrooveRadar.h +++ b/stepmania/src/GrooveRadar.h @@ -15,7 +15,7 @@ #include "Sprite.h" #include "PlayerNumber.h" #include "GameConstantsAndTypes.h" -class Notes; +class Steps; class GrooveRadar : public ActorFrame @@ -23,7 +23,7 @@ class GrooveRadar : public ActorFrame public: GrooveRadar(); - void SetFromNotes( PlayerNumber pn, Notes* pNotes ) // NULL means no Song + void SetFromNotes( PlayerNumber pn, Steps* pNotes ) // NULL means no Song { m_GrooveRadarValueMap.SetFromNotes( pn, pNotes ); } @@ -42,7 +42,7 @@ protected: virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); - void SetFromNotes( PlayerNumber pn, Notes* pNotes ); // NULL means no Song + void SetFromNotes( PlayerNumber pn, Steps* pNotes ); // NULL means no Song void TweenOnScreen(); void TweenOffScreen(); diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index 5b7b48b392..1ba9407c07 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -14,7 +14,7 @@ #include "PrefsManager.h" #include "GameState.h" #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" const float BATTERY_X[NUM_PLAYERS] = { -92, +92 }; diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index a2dab4fa3c..7fb9b24032 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -40,7 +40,7 @@ enum GOINGRIGHT }; -#define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection") +#define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Steps","DefaultScrollDirection") #define PREVIEWMUSICMODE THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode") MusicBannerWheel::MusicBannerWheel() diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 92bc4a6072..a0d14a6b52 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -29,7 +29,7 @@ #include "RageDisplay.h" #include "RageTextureManager.h" #include "Banner.h" -#include "Notes.h" +#include "Steps.h" #include "UnlockSystem.h" #include "ModeChoice.h" @@ -45,7 +45,6 @@ CachedThemeMetricF ITEM_CURVE_X ("MusicWheel","ItemCurveX"); CachedThemeMetricF ITEM_SPACING_Y ("MusicWheel","ItemSpacingY"); #define NUM_SECTION_COLORS THEME->GetMetricI("MusicWheel","NumSectionColors") #define SECTION_COLORS( i ) THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1)) -#define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection") #define SONG_REAL_EXTRA_COLOR THEME->GetMetricC("MusicWheel","SongRealExtraColor") #define SHOW_ROULETTE THEME->GetMetricB("MusicWheel","ShowRoulette") #define SHOW_RANDOM THEME->GetMetricB("MusicWheel","ShowRandom") @@ -132,7 +131,7 @@ MusicWheel::MusicWheel() } Song* pSong; - Notes* pNotes; + Steps* pNotes; PlayerOptions po; SongOptions so; SONGMAN->GetExtraStageInfo( @@ -308,7 +307,7 @@ void MusicWheel::GetSongList(vector &arraySongs, SongSortOrder so, CStrin // SONGMAN->GetSongs( apAllSongs, GAMESTATE->GetNumStagesLeft() ); SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() ); - // copy only songs that have at least one Notes for the current GameMode + // copy only songs that have at least one Steps for the current GameMode for( unsigned i=0; i &arraySongs, SongSortOrder so, CStrin if( so!=SORT_ROULETTE && GAMESTATE->m_pUnlockingSys->SongIsLocked(pSong) ) continue; - vector arraySteps; + vector arraySteps; pSong->GetNotes( arraySteps, GAMESTATE->GetCurrentStyleDef()->m_NotesType, DIFFICULTY_INVALID, -1, -1, "", PREFSMAN->m_bAutogenMissingTypes ); if( !arraySteps.empty() ) @@ -532,7 +531,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) { Song* pSong; - Notes* pNotes; + Steps* pNotes; PlayerOptions po; SongOptions so; SONGMAN->GetExtraStageInfo( GAMESTATE->IsExtraStage2(), GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); @@ -1423,21 +1422,21 @@ CString MusicWheel::GetSectionNameFromSongAndSort( const Song* pSong, SongSortOr } case SORT_EASY_METER: { - Notes* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_EASY); + Steps* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_EASY); if( pNotes ) return ssprintf("%02d", pNotes->GetMeter() ); return "N/A"; } case SORT_MEDIUM_METER: { - Notes* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_MEDIUM); + Steps* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_MEDIUM); if( pNotes ) return ssprintf("%02d", pNotes->GetMeter() ); return "N/A"; } case SORT_HARD_METER: { - Notes* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_HARD); + Steps* pNotes = pSong->GetNotes(GAMESTATE->GetCurrentStyleDef()->m_NotesType,DIFFICULTY_HARD); if( pNotes ) return ssprintf("%02d", pNotes->GetMeter() ); return "N/A"; diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 2556125c36..dc86e9feb3 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -23,7 +23,7 @@ #include "GameState.h" #include #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "song.h" #include "Course.h" diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index e34b37e196..730dc31f9d 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -14,7 +14,7 @@ #include "NoteDisplay.h" -#include "Notes.h" +#include "Steps.h" #include "PrefsManager.h" #include "GameState.h" #include "NoteSkinManager.h" diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index 86c783436c..3d1ee38176 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -58,9 +58,9 @@ void BMSLoader::mapBMSTrackToDanceNote( int iBMSTrack, int &iDanceColOut, char & } } -bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) +bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out ) { - LOG->Trace( "Notes::LoadFromBMSFile( '%s' )", sPath.c_str() ); + LOG->Trace( "Steps::LoadFromBMSFile( '%s' )", sPath.c_str() ); out.m_NotesType = NOTES_TYPE_INVALID; @@ -126,7 +126,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) { value_data.MakeLower(); - // extract the Notes description (looks like 'Music ') + // extract the Steps description (looks like 'Music ') int iPosOpenBracket = value_data.Find( "<" ); if( iPosOpenBracket == -1 ) iPosOpenBracket = value_data.Find( "(" ); @@ -136,7 +136,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out ) if( iPosOpenBracket != -1 && iPosCloseBracket != -1 ) value_data = value_data.substr( iPosOpenBracket+1, iPosCloseBracket-iPosOpenBracket-1 ); - LOG->Trace( "Notes description found to be '%s'", value_data.c_str() ); + LOG->Trace( "Steps description found to be '%s'", value_data.c_str() ); out.SetDescription(value_data); @@ -269,11 +269,11 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out ) * called to begin with. */ ASSERT( arrayBMSFileNames.size() ); - // load the Notes from the rest of the BMS files + // load the Steps from the rest of the BMS files unsigned i; for( i=0; i' + // strip Steps type out of description leaving only song title - looks like 'B4U ' unsigned iIndex = value_data.find_last_of('<'); if( iIndex == value_data.npos ) iIndex = value_data.find_last_of('('); diff --git a/stepmania/src/NotesLoaderBMS.h b/stepmania/src/NotesLoaderBMS.h index 2496c186a4..06c00ae6b6 100644 --- a/stepmania/src/NotesLoaderBMS.h +++ b/stepmania/src/NotesLoaderBMS.h @@ -2,11 +2,11 @@ #define NOTES_LOADER_BMS_H #include "song.h" -#include "Notes.h" +#include "Steps.h" #include "NotesLoader.h" class BMSLoader: public NotesLoader { - bool LoadFromBMSFile( const CString &sPath, Notes &out1 ); + bool LoadFromBMSFile( const CString &sPath, Steps &out1 ); void mapBMSTrackToDanceNote( int iBMSTrack, int &iDanceColOut, char &cNoteCharOut ); public: diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index 2671ae5a71..9ef0e22dc3 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -102,9 +102,9 @@ bool DWILoader::LoadFromDWITokens( CString sNumFeet, CString sStepData1, CString sStepData2, - Notes &out) + Steps &out) { - LOG->Trace( "Notes::LoadFromDWITokens()" ); + LOG->Trace( "Steps::LoadFromDWITokens()" ); out.m_NotesType = NOTES_TYPE_INVALID; @@ -448,7 +448,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out ) 0==stricmp(sValueName,"COUPLE") || 0==stricmp(sValueName,"SOLO")) { - Notes* pNewNotes = new Notes; + Steps* pNewNotes = new Steps; LoadFromDWITokens( sParams[0], sParams[1], diff --git a/stepmania/src/NotesLoaderDWI.h b/stepmania/src/NotesLoaderDWI.h index 9a877c94f6..9ad1857ed1 100644 --- a/stepmania/src/NotesLoaderDWI.h +++ b/stepmania/src/NotesLoaderDWI.h @@ -2,12 +2,12 @@ #define NOTES_LOADER_DWI_H #include "song.h" -#include "Notes.h" +#include "Steps.h" #include "GameInput.h" #include "NotesLoader.h" #include "song.h" -#include "Notes.h" +#include "Steps.h" /* Return NA if no files in the directory can be loaded by * this loader, OK on success, ERROR if an applicable file was found @@ -21,7 +21,7 @@ class DWILoader: public NotesLoader { bool LoadFromDWITokens( CString sMode, CString sDescription, CString sNumFeet, CString sStepData1, CString sStepData2, - Notes &out ); + Steps &out ); bool LoadFromDWIFile( CString sPath, Song &out ); diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index c7b0a2fa21..7ec6e49c20 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -61,9 +61,9 @@ void KSFLoader::RemoveHoles( NoteData &out, const Song &song ) } #endif -bool KSFLoader::LoadFromKSFFile( const CString &sPath, Notes &out, const Song &song ) +bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &song ) { - LOG->Trace( "Notes::LoadFromKSFFile( '%s' )", sPath.c_str() ); + LOG->Trace( "Steps::LoadFromKSFFile( '%s' )", sPath.c_str() ); MsdFile msd; if( !msd.ReadFile( sPath ) ) @@ -335,10 +335,10 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out ) if(!LoadGlobalData(out.GetSongDir() + arrayKSFFileNames[0], out)) return false; - // load the Notes from the rest of the KSF files + // load the Steps from the rest of the KSF files for( unsigned i=0; iTrace( "Notes::LoadFromSMTokens()" ); +// LOG->Trace( "Steps::LoadFromSMTokens()" ); out.m_NotesType = GameManager::StringToNotesType(sNotesType); out.SetDescription(sDescription); @@ -273,7 +273,7 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out ) else if( 0==stricmp(sValueName,"NOTES") ) { - Notes* pNewNotes = new Notes; + Steps* pNewNotes = new Steps; ASSERT( pNewNotes ); out.m_apNotes.push_back( pNewNotes ); diff --git a/stepmania/src/NotesLoaderSM.h b/stepmania/src/NotesLoaderSM.h index bbc5b86c27..a46b9b342c 100644 --- a/stepmania/src/NotesLoaderSM.h +++ b/stepmania/src/NotesLoaderSM.h @@ -2,7 +2,7 @@ #define NOTES_LOADER_SM_H #include "song.h" -#include "Notes.h" +#include "Steps.h" #include "NotesLoader.h" class SMLoader: public NotesLoader { @@ -13,7 +13,7 @@ class SMLoader: public NotesLoader { CString sMeter, CString sRadarValues, CString sNoteData, - Notes &out); + Steps &out); bool FromCache; diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp index cdf3da2972..c0f2f17458 100644 --- a/stepmania/src/NotesWriterDWI.cpp +++ b/stepmania/src/NotesWriterDWI.cpp @@ -177,7 +177,7 @@ CString NotesWriterDWI::OptimizeDWIString( CString holds, CString taps ) return ssprintf( "<%s>", ret.c_str() ); } -void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Notes &out, int start ) +void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Steps &out, int start ) { NoteData notedata; out.GetNoteData( ¬edata ); @@ -293,9 +293,9 @@ void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Notes &out, int start ) } } -bool NotesWriterDWI::WriteDWINotesTag( FILE* fp, const Notes &out ) +bool NotesWriterDWI::WriteDWINotesTag( FILE* fp, const Steps &out ) { - LOG->Trace( "Notes::WriteDWINotesTag" ); + LOG->Trace( "Steps::WriteDWINotesTag" ); switch( out.m_NotesType ) { diff --git a/stepmania/src/NotesWriterDWI.h b/stepmania/src/NotesWriterDWI.h index 90585a7945..de9ba32029 100644 --- a/stepmania/src/NotesWriterDWI.h +++ b/stepmania/src/NotesWriterDWI.h @@ -2,15 +2,15 @@ #define NOTES_WRITER_DWI_H #include "song.h" -#include "Notes.h" +#include "Steps.h" #include "NoteTypes.h" class NotesWriterDWI { CString NotesToDWIString( TapNote cNoteCol1, TapNote cNoteCol2, TapNote cNoteCol3, TapNote cNoteCol4, TapNote cNoteCol5, TapNote cNoteCol6 ); CString NotesToDWIString( TapNote cNoteCol1, TapNote cNoteCol2, TapNote cNoteCol3, TapNote cNoteCol4 ); - void WriteDWINotesField( FILE* fp, const Notes &out, int start ); - bool WriteDWINotesTag( FILE* fp, const Notes &out ); + void WriteDWINotesField( FILE* fp, const Steps &out, int start ); + bool WriteDWINotesTag( FILE* fp, const Steps &out ); CString NotesToDWIString( const TapNote cNoteCols[6] ); CString OptimizeDWIString( CString holds, CString taps ); char OptimizeDWIPair( char c1, char c2 ); diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp index 3b44b10be4..fe6102907d 100644 --- a/stepmania/src/NotesWriterSM.cpp +++ b/stepmania/src/NotesWriterSM.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "NotesWriterSM.h" -#include "Notes.h" +#include "Steps.h" #include "RageUtil.h" #include "GameManager.h" #include "RageLog.h" @@ -92,7 +92,7 @@ void NotesWriterSM::WriteGlobalTags(FILE *fp, const Song &out) } -void NotesWriterSM::WriteSMNotesTag( const Notes &in, FILE* fp ) +void NotesWriterSM::WriteSMNotesTag( const Steps &in, FILE* fp ) { fprintf( fp, "\n//---------------%s - %s----------------\n", GameManager::NotesTypeToString(in.m_NotesType).c_str(), in.GetDescription().c_str() ); @@ -128,11 +128,11 @@ bool NotesWriterSM::Write(CString sPath, const Song &out, bool bSavingCache) } // - // Save all Notes for this file + // Save all Steps for this file // for( i=0; iIsAutogen() ) continue; /* don't write autogen notes */ diff --git a/stepmania/src/NotesWriterSM.h b/stepmania/src/NotesWriterSM.h index f7ede3f0cd..0108e41260 100644 --- a/stepmania/src/NotesWriterSM.h +++ b/stepmania/src/NotesWriterSM.h @@ -6,7 +6,7 @@ class NotesWriterSM { void WriteGlobalTags(FILE *fp, const Song &out); - void WriteSMNotesTag( const Notes &in, FILE* fp ); + void WriteSMNotesTag( const Steps &in, FILE* fp ); public: bool Write( CString sPath, const Song &out, bool bSavingCache ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 76311f8e37..2bf2f309c3 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -584,7 +584,7 @@ void Player::OnRowCompletelyJudged( int iIndexThatWasSteppedOn ) void Player::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds ) { - //LOG->Trace( "Notes::UpdateTapNotesMissedOlderThan(%f)", fMissIfOlderThanThisBeat ); + //LOG->Trace( "Steps::UpdateTapNotesMissedOlderThan(%f)", fMissIfOlderThanThisBeat ); const float fEarliestTime = GAMESTATE->m_fMusicSeconds - fMissIfOlderThanSeconds; bool bFreeze; float fMissIfOlderThanThisBeat; diff --git a/stepmania/src/ScoreKeeper.h b/stepmania/src/ScoreKeeper.h index dc8ac465ca..4527127d00 100644 --- a/stepmania/src/ScoreKeeper.h +++ b/stepmania/src/ScoreKeeper.h @@ -23,7 +23,7 @@ #include "GameConstantsAndTypes.h" // for TapNoteScore and HoldNoteScore class NoteData; class Inventory; -class Notes; +class Steps; class ScoreKeeper: public Actor @@ -43,7 +43,7 @@ public: virtual void Update( float fDelta ) { } /* Note that pNoteData will include any transformations due to modifiers. */ - virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes, NoteData* pNoteData ) = 0; // before a song plays (called multiple times if course) + virtual void OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData ) = 0; // before a song plays (called multiple times if course) virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow ) = 0; virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ) = 0; diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp index 9875beb47b..8cf396d53b 100644 --- a/stepmania/src/ScoreKeeperMAX2.cpp +++ b/stepmania/src/ScoreKeeperMAX2.cpp @@ -12,7 +12,7 @@ #include "ScoreKeeperMAX2.h" #include "GameState.h" #include "PrefsManager.h" -#include "Notes.h" +#include "Steps.h" #include "PrefsManager.h" #include "ScreenManager.h" #include "ScreenGameplay.h" @@ -23,7 +23,7 @@ #include "SongManager.h" -ScoreKeeperMAX2::ScoreKeeperMAX2( const vector& apNotes_, PlayerNumber pn_ ): +ScoreKeeperMAX2::ScoreKeeperMAX2( const vector& apNotes_, PlayerNumber pn_ ): ScoreKeeper(pn_), apNotes(apNotes_) { // @@ -38,7 +38,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector& apNotes_, PlayerNumber p case PLAY_MODE_RAVE: { ASSERT( !apNotes.empty() ); - Notes* pNotes = apNotes[0]; + Steps* pNotes = apNotes[0]; GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong; GAMESTATE->m_CurStageStats.iMeter[pn_] = pNotes->GetMeter(); pNotes->GetNoteData( ¬edata ); @@ -74,7 +74,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector& apNotes_, PlayerNumber p m_bIsLastSongInCourse = false; } -void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Notes* pNotes, NoteData* pNoteData ) +void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData ) { /* http://www.aaroninjapan.com/ddr2.html diff --git a/stepmania/src/ScoreKeeperMAX2.h b/stepmania/src/ScoreKeeperMAX2.h index 5fe01033a1..508a718518 100644 --- a/stepmania/src/ScoreKeeperMAX2.h +++ b/stepmania/src/ScoreKeeperMAX2.h @@ -14,7 +14,7 @@ #include "ScoreKeeper.h" #include "NoteDataWithScoring.h" -class Notes; +class Steps; class ScoreKeeperMAX2: public ScoreKeeper { @@ -28,15 +28,15 @@ class ScoreKeeperMAX2: public ScoreKeeper int m_iCurToastyCombo; bool m_bIsLastSongInCourse; - const vector& apNotes; + const vector& apNotes; void AddScore( TapNoteScore score ); public: - ScoreKeeperMAX2( const vector& apNotes, PlayerNumber pn); + ScoreKeeperMAX2( const vector& apNotes, PlayerNumber pn); // before a song plays (called multiple times if course) - void OnNextSong( int iSongInCourseIndex, Notes* pNotes, NoteData* pNoteData ); + void OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData ); void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow ); void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ); diff --git a/stepmania/src/ScoreKeeperRave.cpp b/stepmania/src/ScoreKeeperRave.cpp index 53da6fb5c9..374ea84960 100644 --- a/stepmania/src/ScoreKeeperRave.cpp +++ b/stepmania/src/ScoreKeeperRave.cpp @@ -30,7 +30,7 @@ ScoreKeeperRave::ScoreKeeperRave(PlayerNumber pn) : ScoreKeeper(pn) m_soundAttackEnding.Load( THEME->GetPathToS(ssprintf("ScoreKeeperRave attack end p%d",pn+1)) ); } -void ScoreKeeperRave::OnNextSong( int iSongInCourseIndex, Notes* pNotes, NoteData* pNoteData ) +void ScoreKeeperRave::OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData ) { } diff --git a/stepmania/src/ScoreKeeperRave.h b/stepmania/src/ScoreKeeperRave.h index 5e1a1f1e41..2485b7e195 100644 --- a/stepmania/src/ScoreKeeperRave.h +++ b/stepmania/src/ScoreKeeperRave.h @@ -22,7 +22,7 @@ public: // Overrides ScoreKeeperRave(PlayerNumber pn); virtual void Update( float fDelta ); - virtual void OnNextSong( int iSongInCourseIndex, Notes* pNotes, NoteData* pNoteData ); // before a song plays (called multiple times if course) + virtual void OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData ); // before a song plays (called multiple times if course) virtual void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow ); virtual void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ); virtual int TapNoteScoreToDancePoints( TapNoteScore tns ) { return 0; }; diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index bf00ea31be..11a7adee0a 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -28,7 +28,7 @@ #include "SDL_keysym.h" // for SDLKeys #include "ScreenMiniMenu.h" #include "NoteSkinManager.h" -#include "Notes.h" +#include "Steps.h" #include #include "NoteFieldPositioning.h" #include "arch/arch.h" @@ -128,7 +128,7 @@ Menu g_KeyboardShortcuts Menu g_MainMenu ( "Main Menu", - MenuRow( "Edit Notes Statistics", true ), + MenuRow( "Edit Steps Statistics", true ), MenuRow( "Play Whole Song", true ), MenuRow( "Play Current Beat To End", true ), MenuRow( "Save", true ), @@ -167,8 +167,8 @@ Menu g_EditNotesStatistics MenuRow( "Difficulty", true, 0, "BEGINNER","EASY","MEDIUM","HARD","CHALLENGE" ), MenuRow( "Meter", true, 0, "1","2","3","4","5","6","7","8","9","10","11" ), MenuRow( "Description", true ), - MenuRow( "Tap Notes", false ), - MenuRow( "Hold Notes", false ), + MenuRow( "Tap Steps", false ), + MenuRow( "Hold Steps", false ), MenuRow( "Stream", false ), MenuRow( "Voltage", false ), MenuRow( "Air", false ), @@ -498,8 +498,8 @@ void ScreenEdit::UpdateTextInfo() sText += ssprintf( "Difficulty:\n %s\n", DifficultyToString( m_pNotes->GetDifficulty() ).c_str() ); sText += ssprintf( "Description:\n %s\n", GAMESTATE->m_pCurNotes[PLAYER_1] ? GAMESTATE->m_pCurNotes[PLAYER_1]->GetDescription().c_str() : "no description" ); sText += ssprintf( "Main title:\n %s\n", m_pSong->m_sMainTitle.c_str() ); - sText += ssprintf( "Tap Notes:\n %d\n", iNumTapNotes ); - sText += ssprintf( "Hold Notes:\n %d\n", iNumHoldNotes ); + sText += ssprintf( "Tap Steps:\n %d\n", iNumTapNotes ); + sText += ssprintf( "Hold Steps:\n %d\n", iNumHoldNotes ); sText += ssprintf( "Beat 0 Offset:\n %.3f secs\n", m_pSong->m_fBeat0OffsetInSeconds ); sText += ssprintf( "Preview Start:\n %.2f secs\n", m_pSong->m_fMusicSampleStartSeconds ); sText += ssprintf( "Preview Length:\n %.2f secs\n",m_pSong->m_fMusicSampleLengthSeconds ); @@ -1155,7 +1155,7 @@ void ScreenEdit::OnSnapModeChange() void ChangeDescription( CString sNew ) { - Notes* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; + Steps* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; pNotes->SetDescription(sNew); } @@ -1212,7 +1212,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers ) { case edit_notes_statistics: { - Notes* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; + Steps* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; float fMusicSeconds = m_soundMusic.GetLengthSeconds(); g_EditNotesStatistics.rows[difficulty].defaultChoice = pNotes->GetDifficulty(); @@ -1244,8 +1244,8 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers ) break; case save: { - // copy edit into current Notes - Notes* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; + // copy edit into current Steps + Steps* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; ASSERT( pNotes ); pNotes->SetNoteData( &m_NoteFieldEdit ); @@ -1544,7 +1544,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers ) void ScreenEdit::HandleEditNotesStatisticsChoice( EditNotesStatisticsChoice c, int* iAnswers ) { - Notes* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; + Steps* pNotes = GAMESTATE->m_pCurNotes[PLAYER_1]; Difficulty dc = (Difficulty)iAnswers[difficulty]; pNotes->SetDifficulty( dc ); int iMeter = iAnswers[meter]+1; diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index eee2b676cd..dfac56b7c9 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -52,7 +52,7 @@ protected: EditMode m_EditMode; Song* m_pSong; - Notes* m_pNotes; + Steps* m_pNotes; BGAnimation m_BGAnimation; diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 38a07fc8d3..3be701aaad 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -21,7 +21,7 @@ #include "GameState.h" #include "RageSounds.h" #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" // @@ -118,7 +118,7 @@ void ScreenEditMenu::MenuRight( PlayerNumber pn, const InputEventType type ) void DeleteCurNotes() { Song* pSong = GAMESTATE->m_pCurSong; - Notes* pNotesToDelete = GAMESTATE->m_pCurNotes[PLAYER_1]; + Steps* pNotesToDelete = GAMESTATE->m_pCurNotes[PLAYER_1]; pSong->RemoveNotes( pNotesToDelete ); pSong->Save(); } @@ -131,10 +131,10 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) Song* pSong = m_Selector.GetSelectedSong(); NotesType nt = m_Selector.GetSelectedNotesType(); Difficulty dc = m_Selector.GetSelectedDifficulty(); - Notes* pNotes = m_Selector.GetSelectedNotes(); + Steps* pNotes = m_Selector.GetSelectedNotes(); // NotesType soureNT = m_Selector.GetSelectedSourceNotesType(); // Difficulty sourceDiff = m_Selector.GetSelectedSourceDifficulty(); - Notes* pSourceNotes = m_Selector.GetSelectedSourceNotes(); + Steps* pSourceNotes = m_Selector.GetSelectedSourceNotes(); EditMenu::Action action = m_Selector.GetSelectedAction(); GAMESTATE->m_pCurSong = pSong; @@ -170,13 +170,13 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) ASSERT( pSourceNotes ); { // Yuck. Doing the memory allocation doesn't seem right since - // Song allocates all of the other Notes. - Notes* pNewNotes = new Notes; + // Song allocates all of the other Steps. + Steps* pNewNotes = new Steps; pNewNotes->CopyFrom( pSourceNotes, nt ); pNewNotes->SetDifficulty( dc ); pSong->AddNotes( pNewNotes ); - SCREENMAN->SystemMessage( "Notes created from copy." ); + SCREENMAN->SystemMessage( "Steps created from copy." ); SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); m_Selector.RefreshNotes(); pSong->Save(); @@ -187,14 +187,14 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) ASSERT( pSourceNotes ); { // Yuck. Doing the memory allocation doesn't seem right since - // Song allocates all of the other Notes. - Notes* pNewNotes = new Notes; + // Song allocates all of the other Steps. + Steps* pNewNotes = new Steps; pNewNotes->AutogenFrom( pSourceNotes, nt ); pNewNotes->DeAutogen(); pNewNotes->SetDifficulty( dc ); // override difficulty with the user's choice pSong->AddNotes( pNewNotes ); - SCREENMAN->SystemMessage( "Notes created from AutoGen." ); + SCREENMAN->SystemMessage( "Steps created from AutoGen." ); SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); m_Selector.RefreshNotes(); pSong->Save(); @@ -204,14 +204,14 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) ASSERT( !pNotes ); { // Yuck. Doing the memory allocation doesn't seem right since - // Song allocates all of the other Notes. - Notes* pNewNotes = new Notes; + // Song allocates all of the other Steps. + Steps* pNewNotes = new Steps; pNewNotes->CreateBlank( nt ); pNewNotes->SetDifficulty( dc ); pNewNotes->SetMeter( 1 ); pSong->AddNotes( pNewNotes ); - SCREENMAN->SystemMessage( "Blank Notes created." ); + SCREENMAN->SystemMessage( "Blank Steps created." ); SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); m_Selector.RefreshNotes(); pSong->Save(); diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 70a28bd87e..4cf86fa647 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -16,7 +16,7 @@ #include "GameManager.h" #include "RageUtil.h" #include "GameConstantsAndTypes.h" -#include "Notes.h" +#include "Steps.h" #include "PrefsManager.h" #include "RageLog.h" #include "AnnouncerManager.h" diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index f22098c43b..7d51df4cac 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -22,7 +22,7 @@ #include "StyleDef.h" #include "InputMapper.h" #include "CodeDetector.h" -#include "Notes.h" +#include "Steps.h" #include "RageTimer.h" #include "ActorUtil.h" #include "RageTextureManager.h" @@ -641,7 +641,7 @@ void ScreenEz2SelectMusic::AfterNotesChange( PlayerNumber pn ) m_iSelection[pn] = clamp( m_iSelection[pn], 0, int(m_arrayNotes[pn].size()-1) ); // bounds clamping - Notes* pNotes = m_arrayNotes[pn].empty()? NULL: m_arrayNotes[pn][m_iSelection[pn]]; + Steps* pNotes = m_arrayNotes[pn].empty()? NULL: m_arrayNotes[pn][m_iSelection[pn]]; GAMESTATE->m_pCurNotes[pn] = pNotes; @@ -655,7 +655,7 @@ void ScreenEz2SelectMusic::AfterNotesChange( PlayerNumber pn ) // GAMESTATE->m_pCurNotes[pn] = pNotes; -// Notes* m_pNotes = GAMESTATE->m_pCurNotes[pn]; +// Steps* m_pNotes = GAMESTATE->m_pCurNotes[pn]; // m_FootMeter[pn].SetFromNotes( pNotes ); } diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h index 2a6fea547a..0be61f6123 100644 --- a/stepmania/src/ScreenEz2SelectMusic.h +++ b/stepmania/src/ScreenEz2SelectMusic.h @@ -77,7 +77,7 @@ protected: MenuElements m_Menu; DifficultyRating m_DifficultyRating; // DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; - vector m_arrayNotes[NUM_PLAYERS]; + vector m_arrayNotes[NUM_PLAYERS]; int m_iSelection[NUM_PLAYERS]; bool m_bGoToOptions; diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 4a1ad13252..8c4e1bbc7a 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -89,7 +89,7 @@ protected: NUM_DANCING_STATES } m_DancingState; vector m_apSongsQueue; // size may be >1 if playing a course - vector m_apNotesQueue[NUM_PLAYERS]; // size may be >1 if playing a course + vector m_apNotesQueue[NUM_PLAYERS]; // size may be >1 if playing a course CStringArray m_asModifiersQueue[NUM_PLAYERS];// size may be >1 if playing a course bool m_bChangedOffsetOrBPM; diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index b5e56826ad..6a6ff3d696 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -34,7 +34,7 @@ bool ScreenJukebox::SetSong() SONGMAN->GetSongs( vSongs, GAMESTATE->m_sPreferredGroup ); // - // Search for a Song and Notes to play during the demo + // Search for a Song and Steps to play during the demo // for( int i=0; i<600; i++ ) { @@ -47,12 +47,12 @@ bool ScreenJukebox::SetSong() continue; // skip Difficulty dc = GAMESTATE->m_PreferredDifficulty[PLAYER_1]; - Notes* pNotes = NULL; + Steps* pNotes = NULL; if( dc != DIFFICULTY_INVALID ) pNotes = pSong->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, GAMESTATE->m_PreferredDifficulty[PLAYER_1] ); else // "all difficulties" { - vector vNotes; + vector vNotes; pSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); if( vNotes.size() > 0 ) pNotes = vNotes[rand()%vNotes.size()]; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index f578697c1a..0975ff68bb 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -22,7 +22,7 @@ #include "NoteFieldPositioning.h" #include "ScreenSongOptions.h" #include "Character.h" -#include "Notes.h" +#include "Steps.h" #include "Course.h" #define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenPlayerOptions","PrevScreen"+Capitalize(PlayModeToString(play_mode))) @@ -114,7 +114,7 @@ void ScreenPlayerOptions::ImportOptions() } else { - vector vNotes; + vector vNotes; GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); SortNotesArrayByDifficulty( vNotes ); for( unsigned i=0; i vNotes; + vector vNotes; GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); SortNotesArrayByDifficulty( vNotes ); for( unsigned i=0; i vNotes; + vector vNotes; GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); SortNotesArrayByDifficulty( vNotes ); GAMESTATE->m_pCurNotes[p] = vNotes[ m_iSelectedOption[p][PO_STEP] ]; diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 2445d723e3..1f4652b6c5 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -88,12 +88,14 @@ void ScreenSelect::Update( float fDelta ) } Screen::Update( fDelta ); - m_BGAnimations[ this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber) ].Update( fDelta ); + int iSelection = this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); + m_BGAnimations[iSelection].Update( fDelta ); } void ScreenSelect::DrawPrimitives() { - m_BGAnimations[ this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber) ].Draw(); + int iSelection = this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); + m_BGAnimations[iSelection].Draw(); m_Menu.DrawBottomLayer(); Screen::DrawPrimitives(); m_Menu.DrawTopLayer(); diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h index a80f5b7b5e..9435e978be 100644 --- a/stepmania/src/ScreenSelect.h +++ b/stepmania/src/ScreenSelect.h @@ -19,7 +19,7 @@ // Derived classes must send this when done const ScreenMessage SM_AllDoneChoosing = (ScreenMessage)(SM_User+123); // unique -#define MAX_CHOICES 10 +#define MAX_CHOICES 30 class ScreenSelect : public Screen { diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index f871bab17b..bfb2e467c9 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -326,7 +326,7 @@ void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM ) void ScreenSelectCourse::MenuStart( PlayerNumber pn ) { - // this needs to check whether valid Notes are selected! + // this needs to check whether valid Steps are selected! m_MusicWheel.Select(); switch( m_MusicWheel.GetSelectedType() ) @@ -376,7 +376,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn ) // by the course. // //Song* pSong; - //Notes* pNotes; + //Steps* pNotes; //CString sModifiers; //pCourse->GetFirstStageInfo( pSong, pNotes, sModifiers, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); //for( int p=0; p #include "GameConstantsAndTypes.h" #include "ThemeManager.h" -#include "Notes.h" +#include "Steps.h" #include "ActorUtil.h" #include "RageDisplay.h" #include "RageTextureManager.h" @@ -743,7 +743,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) } - // this needs to check whether valid Notes are selected! + // this needs to check whether valid Steps are selected! bool bResult = m_MusicWheel.Select(); /* If false, we don't have a selection just yet. */ @@ -835,7 +835,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) { /* Check if user selected the real extra stage. */ Song* pSong; - Notes* pNotes; + Steps* pNotes; PlayerOptions po; SongOptions so; SONGMAN->GetExtraStageInfo( false, GAMESTATE->GetCurrentStyleDef(), pSong, pNotes, po, so ); @@ -864,7 +864,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn ) m_iSelection[pn] = clamp( m_iSelection[pn], 0, int(m_arrayNotes.size()-1) ); // bounds clamping - Notes* pNotes = m_arrayNotes.empty()? NULL: m_arrayNotes[m_iSelection[pn]]; + Steps* pNotes = m_arrayNotes.empty()? NULL: m_arrayNotes[m_iSelection[pn]]; GAMESTATE->m_pCurNotes[pn] = pNotes; diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 7c9639330b..ed00d2d7c4 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- Class: ScreenSelectMusic - Desc: The screen in PLAY_MODE_ARCADE where you choose a Song and Notes. + Desc: The screen in PLAY_MODE_ARCADE where you choose a Song and Steps. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Chris Danford @@ -66,7 +66,7 @@ protected: void UpdateOptionsDisplays(); - vector m_arrayNotes; + vector m_arrayNotes; int m_iSelection[NUM_PLAYERS]; MenuElements m_Menu; diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index ba1b15c857..4c784b5625 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -12,7 +12,7 @@ */ #include "song.h" -#include "Notes.h" +#include "Steps.h" #include "RageUtil.h" #include "RageLog.h" #include "IniFile.h" @@ -48,7 +48,7 @@ #define CACHE_DIR BASE_PATH "Cache" SLASH -const int FILE_CACHE_VERSION = 127; // increment this when Song or Notes changes to invalidate cache +const int FILE_CACHE_VERSION = 127; // increment this when Song or Steps changes to invalidate cache const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f; @@ -795,7 +795,7 @@ void Song::ReCalculateRadarValuesAndLastBeat() // for( unsigned i=0; iGetNoteData( &tempNoteData ); @@ -829,9 +829,9 @@ void Song::ReCalculateRadarValuesAndLastBeat() } } -void Song::GetNotes( vector& arrayAddTo, NotesType nt, Difficulty dc, int iMeterLow, int iMeterHigh, CString sDescription, bool bIncludeAutoGen ) const +void Song::GetNotes( vector& arrayAddTo, NotesType nt, Difficulty dc, int iMeterLow, int iMeterHigh, CString sDescription, bool bIncludeAutoGen ) const { - for( unsigned i=0; im_NotesType != nt ) continue; if( dc != DIFFICULTY_INVALID && dc != m_apNotes[i]->GetDifficulty() ) @@ -848,9 +848,9 @@ void Song::GetNotes( vector& arrayAddTo, NotesType nt, Difficulty dc, in } } -Notes* Song::GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const +Steps* Song::GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const { - vector vNotes; + vector vNotes; GetNotes( vNotes, nt, dc, -1, -1, "", bIncludeAutoGen ); if( vNotes.size() == 0 ) return NULL; @@ -858,9 +858,9 @@ Notes* Song::GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const return vNotes[0]; } -Notes* Song::GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen ) const +Steps* Song::GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen ) const { - vector vNotes; + vector vNotes; GetNotes( vNotes, nt, DIFFICULTY_INVALID, iMeterLow, iMeterHigh, "", bIncludeAutoGen ); if( vNotes.size() == 0 ) return NULL; @@ -868,9 +868,9 @@ Notes* Song::GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bInclud return vNotes[0]; } -Notes* Song::GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen ) const +Steps* Song::GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen ) const { - vector vNotes; + vector vNotes; GetNotes( vNotes, nt, DIFFICULTY_INVALID, -1, -1, sDescription, bIncludeAutoGen ); if( vNotes.size() == 0 ) return NULL; @@ -879,10 +879,10 @@ Notes* Song::GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen } -Notes* Song::GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const +Steps* Song::GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const { Difficulty newDC = dc; - Notes* pNotes; + Steps* pNotes; pNotes = GetNotes( nt, newDC, bIncludeAutoGen ); if( pNotes ) return pNotes; @@ -907,7 +907,7 @@ Notes* Song::GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen return pNotes; } -void Song::GetEdits( vector& arrayAddTo, NotesType nt, bool bIncludeAutoGen ) const +void Song::GetEdits( vector& arrayAddTo, NotesType nt, bool bIncludeAutoGen ) const { } @@ -922,7 +922,7 @@ bool Song::SongCompleteForStyle( const StyleDef *st ) const bool Song::SongHasNotesType( NotesType nt ) const { - for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Notes + for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Steps if( m_apNotes[i]->m_NotesType == nt ) return true; return false; @@ -930,7 +930,7 @@ bool Song::SongHasNotesType( NotesType nt ) const bool Song::SongHasNotesTypeAndDifficulty( NotesType nt, Difficulty dc ) const { - for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Notes + for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Steps if( m_apNotes[i]->m_NotesType == nt && m_apNotes[i]->GetDifficulty() == dc ) return true; return false; @@ -1006,7 +1006,7 @@ void Song::AddAutoGenNotes() continue; - // missing Notes of this type + // missing Steps of this type int iNumTracksOfMissing = GAMEMAN->NotesTypeToNumTracks(ntMissing); // look for closest match @@ -1015,7 +1015,7 @@ void Song::AddAutoGenNotes() for( NotesType nt=(NotesType)0; nt apNotes; + vector apNotes; this->GetNotes( apNotes, nt ); if(apNotes.empty() || apNotes[0]->IsAutogen()) @@ -1041,10 +1041,10 @@ void Song::AutoGen( NotesType ntTo, NotesType ntFrom ) for( unsigned int j=0; jm_NotesType == ntFrom ) { - Notes* pNewNotes = new Notes; + Steps* pNewNotes = new Steps; pNewNotes->AutogenFrom(pOriginalNotes, ntTo); this->m_apNotes.push_back( pNewNotes ); } @@ -1067,7 +1067,7 @@ void Song::RemoveAutoGenNotes() Grade Song::GetGradeForDifficulty( const StyleDef *st, PlayerNumber pn, Difficulty dc ) const { // return max grade of notes in difficulty class - vector aNotes; + vector aNotes; this->GetNotes( aNotes, st->m_NotesType ); SortNotesArrayByDifficulty( aNotes ); @@ -1075,7 +1075,7 @@ Grade Song::GetGradeForDifficulty( const StyleDef *st, PlayerNumber pn, Difficul for( unsigned i=0; iGetDifficulty() == dc ) grade = max( grade, pNotes->m_MemCardScores[pn].grade ); } @@ -1090,9 +1090,9 @@ bool Song::IsNew() const bool Song::IsEasy( NotesType nt ) const { - Notes* pBeginnerNotes = GetNotes( nt, DIFFICULTY_BEGINNER ); - Notes* pEasyNotes = GetNotes( nt, DIFFICULTY_EASY ); - Notes* pHardNotes = GetNotes( nt, DIFFICULTY_HARD ); + Steps* pBeginnerNotes = GetNotes( nt, DIFFICULTY_BEGINNER ); + Steps* pEasyNotes = GetNotes( nt, DIFFICULTY_EASY ); + Steps* pHardNotes = GetNotes( nt, DIFFICULTY_HARD ); // HACK: Looks bizarre to see the easy mark by Legend of MAX. if( pHardNotes && pHardNotes->GetMeter() > 9 ) @@ -1125,7 +1125,7 @@ bool Song::IsEasy( NotesType nt ) const bool Song::HasEdits( NotesType nt ) const { - vector vpNotes; + vector vpNotes; this->GetEdits( vpNotes, nt ); return vpNotes.size() > 0; } @@ -1181,7 +1181,7 @@ void SortSongPointerArrayByTitle( vector &arraySongPointers ) static int GetSongSortDifficulty(const Song *pSong) { - vector aNotes; + vector aNotes; pSong->GetNotes( aNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); // sort by anything but beginner @@ -1390,8 +1390,8 @@ struct CompareSongByMeter CompareSongByMeter(Difficulty d): dc(d) { } bool operator() (const Song* pSong1, const Song* pSong2) { - Notes* pNotes1 = pSong1->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, dc ); - Notes* pNotes2 = pSong2->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, dc ); + Steps* pNotes1 = pSong1->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, dc ); + Steps* pNotes2 = pSong2->GetNotes( GAMESTATE->GetCurrentStyleDef()->m_NotesType, dc ); const int iMeter1 = pNotes1 ? pNotes1->GetMeter() : 0; const int iMeter2 = pNotes2 ? pNotes2->GetMeter() : 0; @@ -1545,14 +1545,14 @@ CString Song::GetFullTranslitTitle() const return Title; } -void Song::AddNotes( Notes* pNotes ) +void Song::AddNotes( Steps* pNotes ) { m_apNotes.push_back( pNotes ); } -void Song::RemoveNotes( Notes* pNotes ) +void Song::RemoveNotes( Steps* pNotes ) { - // Avoid any stale Note::parent pointers by removing all AutoGen'd Notes, + // Avoid any stale Note::parent pointers by removing all AutoGen'd Steps, // then adding them again. RemoveAutoGenNotes(); @@ -1573,7 +1573,7 @@ void Song::RemoveNotes( Notes* pNotes ) int Song::GetNumNotesWithGrade( Grade g ) const { int iCount = 0; - vector vNotes; + vector vNotes; this->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType ); for( unsigned j=0; jm_MemCardScores[MEMORY_CARD_MACHINE].grade == g ) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index f1e7ed992c..0009f747ee 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -295,7 +295,7 @@ void SongManager::ReadNoteScoresFromFile( CString fn, int c ) CString sDescription; getline(f, sDescription); - Notes* pNotes = NULL; + Steps* pNotes = NULL; if( pSong ) { if( dc==DIFFICULTY_INVALID ) @@ -523,7 +523,7 @@ void SongManager::SaveNoteScoresToFile( CString fn, int c ) Song* pSong = m_pSongs[s]; ASSERT(pSong); - vector vNotes = pSong->m_apNotes; + vector vNotes = pSong->m_apNotes; /* This prevents the play count from being saved for songs that havn't * been passed. Though, it seems we only increment this when it's * passed, anyway ... @@ -542,7 +542,7 @@ void SongManager::SaveNoteScoresToFile( CString fn, int c ) for( unsigned i=0; iGetCurrentStyleDef()->m_NotesType; for( unsigned i=0; im_apNotes.size(); i++ ) { - const Notes* pNotes = pSong->m_apNotes[i]; + const Steps* pNotes = pSong->m_apNotes[i]; if( pNotes->GetDifficulty() == DIFFICULTY_CHALLENGE ) continue; @@ -831,7 +831,7 @@ void SongManager::CleanData() Song* pSong = m_pSongs[i]; for( unsigned n=0; nm_apNotes.size(); n++ ) { - Notes* pNotes = pSong->m_apNotes[n]; + Steps* pNotes = pSong->m_apNotes[n]; pNotes->Compress(); } } @@ -870,7 +870,7 @@ void SongManager::GetEndlessCourses( vector &AddTo, bool bIncludeAutoge bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup, - Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) + Song*& pSongOut, Steps*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) { const CString sCourseSuffix = sPreferredGroup + SLASH + (bExtra2 ? "extra2" : "extra1") + ".crs"; CString sCoursePath = SONGS_DIR + sCourseSuffix; @@ -909,7 +909,7 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredG } /* Return true if n1 < n2. */ -bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2) +bool CompareNotesPointersForExtra(const Steps *n1, const Steps *n2) { /* Equate CHALLENGE to HARD. */ Difficulty d1 = min(n1->GetDifficulty(), DIFFICULTY_HARD); @@ -927,7 +927,7 @@ bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2) } void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, - Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) + Song*& pSongOut, Steps*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ) { CString sGroup = GAMESTATE->m_sPreferredGroup; if(sGroup == GROUP_ALL_MUSIC) @@ -950,10 +950,10 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, return; // Choose a hard song for the extra stage - Song* pExtra1Song = NULL; // the absolute hardest Song and Notes. Use this for extra stage 1. - Notes* pExtra1Notes = NULL; - Song* pExtra2Song = NULL; // a medium-hard Song and Notes. Use this for extra stage 2. - Notes* pExtra2Notes = NULL; + Song* pExtra1Song = NULL; // the absolute hardest Song and Steps. Use this for extra stage 1. + Steps* pExtra1Notes = NULL; + Song* pExtra2Song = NULL; // a medium-hard Song and Steps. Use this for extra stage 2. + Steps* pExtra2Notes = NULL; vector apSongs; SONGMAN->GetSongs( apSongs, sGroup ); @@ -961,11 +961,11 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, { Song* pSong = apSongs[s]; - vector apNotes; + vector apNotes; pSong->GetNotes( apNotes, sd->m_NotesType ); - for( unsigned n=0; n 8 + // for extra 2, we don't want to choose the hardest notes possible. So, we'll disgard Steps with meter > 8 if( bExtra2 && pNotes->GetMeter() > 8 ) continue; // skip if( pExtra2Notes == NULL || CompareNotesPointersForExtra(pExtra2Notes,pNotes) ) // pNotes is harder than pHardestNotes @@ -991,7 +991,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd, } // If there are any notes at all that match this NotesType, everything should be filled out. - // Also, it's guaranteed that there is at least one Notes that matches the NotesType because the player + // Also, it's guaranteed that there is at least one Steps that matches the NotesType because the player // had to play something before reaching the extra stage! ASSERT( pExtra2Song && pExtra1Song && pExtra2Notes && pExtra1Notes ); diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 8fa186c719..7a03b9ab88 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -4,8 +4,8 @@ ----------------------------------------------------------------------------- Class: SongManager - Desc: Holder for all Songs and Notes. Also keeps track of the current - Song and Notes, and loads/saves statistics. + Desc: Holder for all Songs and Steps. Also keeps track of the current + Song and Steps, and loads/saves statistics. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Chris Danford @@ -17,7 +17,7 @@ class LoadingWindow; class Song; class StyleDef; class Course; -class Notes; +class Steps; struct PlayerOptions; #include "RageTypes.h" @@ -81,7 +81,7 @@ public: void GetEndlessCourses( vector &AddTo, bool bIncludeAutogen ); // add to if set to REPEAT. void GetExtraStageInfo( bool bExtra2, const StyleDef *s, - Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ); + Song*& pSongOut, Steps*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ); Song* GetSongFromDir( CString sDir ); Course* GetCourseFromPath( CString sPath ); // path to .crs file, or path to song group dir @@ -112,7 +112,7 @@ protected: void LoadStepManiaSongDir( CString sDir, LoadingWindow *ld ); void LoadDWISongDir( CString sDir ); bool GetExtraStageInfoFromCourse( bool bExtra2, CString sPreferredGroup, - Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ); + Song*& pSongOut, Steps*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out ); void SanityCheckGroupDir( CString sDir ) const; void AddGroup( CString sDir, CString sGroupDirName ); diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 65778009a2..70e987dbba 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# Microsoft Developer Studio Generated Build File, Format Version 60000 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -62,10 +62,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\stepmania TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -98,7 +98,11 @@ XBCP=xbecopy.exe # ADD BASE XBCP /NOLOGO # ADD XBCP /NOLOGO # Begin Special Build Tool -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +IntDir=.\Debug +TargetDir=\stepmania\stepmania +TargetName=default +SOURCE="$(InputPath)" +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -135,10 +139,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\stepmania TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -170,12 +174,16 @@ LINK32=link.exe # SUBTRACT LINK32 /pdb:none /map /debug XBE=imagebld.exe # ADD BASE XBE /nologo /stack:0x10000 /debug -# ADD XBE /nologo /testid:"123456" /testname:"" /stack:0x10000 /debug /out:"../default.xbe" /titleinfo:"" +# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe" XBCP=xbecopy.exe # ADD BASE XBCP /NOLOGO # ADD XBCP /NOLOGO # Begin Special Build Tool -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +IntDir=.\StepMania___Xbox_Release +TargetDir=\stepmania\stepmania +TargetName=default +SOURCE="$(InputPath)" +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -1211,25 +1219,6 @@ SOURCE=.\NoteFieldPositioning.h # End Source File # Begin Source File -SOURCE=.\Notes.cpp - -!IF "$(CFG)" == "StepMania - Win32 Debug" - -!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" - -!ELSEIF "$(CFG)" == "StepMania - Win32 Release" - -!ELSEIF "$(CFG)" == "StepMania - Xbox Release" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\Notes.h -# End Source File -# Begin Source File - SOURCE=.\NotesLoader.cpp !IF "$(CFG)" == "StepMania - Win32 Debug" @@ -1534,6 +1523,25 @@ SOURCE=.\StageStats.h # End Source File # Begin Source File +SOURCE=.\Steps.cpp + +!IF "$(CFG)" == "StepMania - Win32 Debug" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" + +!ELSEIF "$(CFG)" == "StepMania - Win32 Release" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\Steps.h +# End Source File +# Begin Source File + SOURCE=.\StyleDef.cpp !IF "$(CFG)" == "StepMania - Win32 Debug" diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 8aa6058459..ba11b3c29a 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -650,12 +650,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - @@ -764,6 +758,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + diff --git a/stepmania/src/StyleDef.h b/stepmania/src/StyleDef.h index 98d8fea75b..165a981a4f 100644 --- a/stepmania/src/StyleDef.h +++ b/stepmania/src/StyleDef.h @@ -43,8 +43,8 @@ public: /* The name of the style. (This is currently unused.) */ char m_szName[60]; - /* Notes format used for each player. For example, "dance versus" reads - * the Notes with the tag "dance-single". */ + /* Steps format used for each player. For example, "dance versus" reads + * the Steps with the tag "dance-single". */ NotesType m_NotesType; enum StyleType diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h index d3388e945c..635ff88a86 100644 --- a/stepmania/src/arch/arch_default.h +++ b/stepmania/src/arch/arch_default.h @@ -29,8 +29,8 @@ /* Load default fallback drivers; some of these may be overridden by arch-specific * drivers. These are all singleton drivers--we never use more than one. */ -#include "LoadingWindow/LoadingWindow_SDL.h" /* XXX: null, none, Null--pick one */ +#include "LoadingWindow/LoadingWindow_Null.h" #include "ErrorDialog/ErrorDialog_null.h" #include "ArchHooks/ArchHooks_none.h" #include "Sound/RageSoundDriver_Null.h" diff --git a/stepmania/src/arch/arch_linux.h b/stepmania/src/arch/arch_linux.h index 06626d8a2e..5c16e9c09a 100644 --- a/stepmania/src/arch/arch_linux.h +++ b/stepmania/src/arch/arch_linux.h @@ -11,6 +11,8 @@ #ifdef HAVE_GTK #include "LoadingWindow/LoadingWindow_Gtk.h" +#elif +#include "LoadingWindow/LoadingWindow_SDL.h" #endif #include "ArchHooks/ArchHooks_Unix.h" diff --git a/stepmania/src/pcre/get.c b/stepmania/src/pcre/get.c index 55e736dc24..6f548482cf 100644 --- a/stepmania/src/pcre/get.c +++ b/stepmania/src/pcre/get.c @@ -5,7 +5,7 @@ /* This is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. See -the file Tech.Notes for some information on the internals. +the file Tech.Steps for some information on the internals. Written by: Philip Hazel diff --git a/stepmania/src/pcre/internal.h b/stepmania/src/pcre/internal.h index 15e1537293..f439af1914 100644 --- a/stepmania/src/pcre/internal.h +++ b/stepmania/src/pcre/internal.h @@ -5,7 +5,7 @@ /* This is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. See -the file Tech.Notes for some information on the internals. +the file Tech.Steps for some information on the internals. Written by: Philip Hazel diff --git a/stepmania/src/pcre/maketables.c b/stepmania/src/pcre/maketables.c index 01078f19e6..a9a0498d53 100644 --- a/stepmania/src/pcre/maketables.c +++ b/stepmania/src/pcre/maketables.c @@ -30,7 +30,7 @@ restrictions: supersede any condition above with which it is incompatible. ----------------------------------------------------------------------------- -See the file Tech.Notes for some information on the internals. +See the file Tech.Steps for some information on the internals. */ diff --git a/stepmania/src/pcre/pcre.c b/stepmania/src/pcre/pcre.c index 623fe94dce..ede8ca4b56 100644 --- a/stepmania/src/pcre/pcre.c +++ b/stepmania/src/pcre/pcre.c @@ -5,7 +5,7 @@ /* This is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. See -the file Tech.Notes for some information on the internals. +the file Tech.Steps for some information on the internals. Written by: Philip Hazel diff --git a/stepmania/src/pcre/study.c b/stepmania/src/pcre/study.c index f924543d21..6a8ce6351b 100644 --- a/stepmania/src/pcre/study.c +++ b/stepmania/src/pcre/study.c @@ -5,7 +5,7 @@ /* This is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. See -the file Tech.Notes for some information on the internals. +the file Tech.Steps for some information on the internals. Written by: Philip Hazel diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 5f2913f2bc..c9577a73b1 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -14,7 +14,7 @@ #include "PlayerNumber.h" #include "GameConstantsAndTypes.h" #include "Grade.h" -class Notes; +class Steps; class StyleDef; class NotesLoader; class LyricsLoader; @@ -95,7 +95,7 @@ public: CString GetCacheFilePath() const; void AddAutoGenNotes(); - void AutoGen( NotesType ntTo, NotesType ntFrom ); // create Notes of type ntTo from Notes of type ntFrom + void AutoGen( NotesType ntTo, NotesType ntFrom ); // create Steps of type ntTo from Steps of type ntFrom void RemoveAutoGenNotes(); /* Directory this song data came from: */ @@ -240,17 +240,17 @@ public: - vector m_apNotes; + vector m_apNotes; bool SongCompleteForStyle( const StyleDef *st ) const; bool SongHasNotesType( NotesType nt ) const; bool SongHasNotesTypeAndDifficulty( NotesType nt, Difficulty dc ) const; - void GetNotes( vector& arrayAddTo, NotesType nt, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, CString sDescription = "", bool bIncludeAutoGen = true ) const; - Notes* GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; - Notes* GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen = true ) const; - Notes* GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen = true ) const; - Notes* GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; - void GetEdits( vector& arrayAddTo, NotesType nt, bool bIncludeAutoGen = true ) const; + void GetNotes( vector& arrayAddTo, NotesType nt, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, CString sDescription = "", bool bIncludeAutoGen = true ) const; + Steps* GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; + Steps* GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen = true ) const; + Steps* GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen = true ) const; + Steps* GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen = true ) const; + void GetEdits( vector& arrayAddTo, NotesType nt, bool bIncludeAutoGen = true ) const; int GetNumTimesPlayed() const; bool IsNew() const; bool IsEasy( NotesType nt ) const; @@ -260,8 +260,8 @@ public: bool RouletteDisplayed() const; int GetNumNotesWithGrade( Grade g ) const; - void AddNotes( Notes* pNotes ); // we are responsible for deleting the memory pointed to by pNotes! - void RemoveNotes( Notes* pNotes ); + void AddNotes( Steps* pNotes ); // we are responsible for deleting the memory pointed to by pNotes! + void RemoveNotes( Steps* pNotes ); }; CString MakeSortString( CString s );