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

rename Notes to Steps

Browse Source
This commit is contained in:
Chris Danford
2003-08-03 00:13:55 +00:00
parent 579c975638
commit bf02bfddf4
69 changed files with 269 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ArrowEffects.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
*/
#include "ArrowEffects.h"
#include "Notes.h"
#include "Steps.h"
#include "GameConstantsAndTypes.h"
#include "GameManager.h"
#include "GameState.h"
stepmania/src/Course.cpp
+3 -3
View File
@@ -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<Course::Info> &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<Course::Info> &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;
}
stepmania/src/Course.h
+3 -3
View File
@@ -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<Info> &ci, int Difficult = -1 ) const;
int GetEstimatedNumStages() const { return m_entries.size(); }
stepmania/src/CourseContentsList.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "SongManager.h"
#include <math.h>
#include "ThemeManager.h"
#include "Notes.h"
#include "Steps.h"
#include "GameState.h"
#include "StyleDef.h"
stepmania/src/CourseContentsList.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include "CourseEntryDisplay.h"
class Course;
class Song;
class Notes;
class Steps;
const int MAX_VISIBLE_CONTENTS = 5;
stepmania/src/CourseEntryDisplay.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "SongManager.h"
#include <math.h>
#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) );
stepmania/src/CourseEntryDisplay.h
+2 -2
View File
@@ -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 );
stepmania/src/DifficultyIcon.cpp
+2 -2
View File
@@ -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 )
{
stepmania/src/DifficultyIcon.h
+2 -2
View File
@@ -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
stepmania/src/DifficultyMeter.cpp
+2 -2
View File
@@ -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 )
{
stepmania/src/DifficultyMeter.h
+3 -3
View File
@@ -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();
stepmania/src/EditMenu.cpp
+3 -3
View File
@@ -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);
}
stepmania/src/EditMenu.h
+3 -3
View File
@@ -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];
stepmania/src/GameState.cpp
+2 -2
View File
@@ -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<Song*>&
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;
stepmania/src/GameState.h
+2 -2
View File
@@ -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;
stepmania/src/GrooveGraph.cpp
+2 -2
View File
@@ -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; i<NUM_DIFFICULTIES; i++ )
{
Notes* pNotes = pSong->GetNotes( 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<NUM_RADAR_CATEGORIES; j++ )
fValues[j][i] = fRadarValues ? fRadarValues[j] : 0;
stepmania/src/GrooveRadar.cpp
+2 -2
View File
@@ -16,7 +16,7 @@
#include "RageBitmapTexture.h"
#include "GameConstantsAndTypes.h"
#include "ThemeManager.h"
#include "Notes.h"
#include "Steps.h"
#include "RageDisplay.h"
#include "RageMath.h"
#include <math.h>
@@ -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;
stepmania/src/GrooveRadar.h
+3 -3
View File
@@ -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();
stepmania/src/LifeMeterBattery.cpp
+1 -1
View File
@@ -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 };
stepmania/src/MusicBannerWheel.cpp
+1 -1
View File
@@ -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()
stepmania/src/MusicWheel.cpp
+8 -9
View File
@@ -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<Song*> &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<apAllSongs.size(); i++ )
{
Song* pSong = apAllSongs[i];
@@ -329,7 +328,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
if( so!=SORT_ROULETTE && GAMESTATE->m_pUnlockingSys->SongIsLocked(pSong) )
continue;
vector<Notes*> arraySteps;
vector<Steps*> 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<WheelItemData> &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";
stepmania/src/MusicWheelItem.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "GameState.h"
#include <math.h>
#include "ThemeManager.h"
#include "Notes.h"
#include "Steps.h"
#include "song.h"
#include "Course.h"
stepmania/src/NoteDisplay.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "NoteDisplay.h"
#include "Notes.h"
#include "Steps.h"
#include "PrefsManager.h"
#include "GameState.h"
#include "NoteSkinManager.h"
stepmania/src/NotesLoaderBMS.cpp
+7 -7
View File
@@ -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 <BASIC>')
// extract the Steps description (looks like 'Music <BASIC>')
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<arrayBMSFileNames.size(); i++ )
{
Notes* pNewNotes = new Notes;
Steps* pNewNotes = new Steps;
const bool ok = LoadFromBMSFile( out.GetSongDir() + arrayBMSFileNames[i], *pNewNotes );
if( ok )
@@ -325,7 +325,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
// handle the data
if( value_name == "#title" )
{
// strip Notes type out of description leaving only song title - looks like 'B4U <BASIC>'
// strip Steps type out of description leaving only song title - looks like 'B4U <BASIC>'
unsigned iIndex = value_data.find_last_of('<');
if( iIndex == value_data.npos )
iIndex = value_data.find_last_of('(');
stepmania/src/NotesLoaderBMS.h
+2 -2
View File
@@ -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:
stepmania/src/NotesLoaderDWI.cpp
+3 -3
View File
@@ -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],
stepmania/src/NotesLoaderDWI.h
+3 -3
View File
@@ -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 );
stepmania/src/NotesLoaderKSF.cpp
+4 -4
View File
@@ -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; i<arrayKSFFileNames.size(); i++ )
{
Notes* pNewNotes = new Notes;
Steps* pNewNotes = new Steps;
if(!LoadFromKSFFile( out.GetSongDir() + arrayKSFFileNames[i], *pNewNotes, out ))
{
delete pNewNotes;
stepmania/src/NotesLoaderKSF.h
+2 -2
View File
@@ -2,11 +2,11 @@
#define NOTES_LOADER_KSF_H
#include "song.h"
#include "Notes.h"
#include "Steps.h"
#include "NotesLoader.h"
class KSFLoader: public NotesLoader {
bool LoadFromKSFFile( const CString &sPath, Notes &out, const Song &song );
bool LoadFromKSFFile( const CString &sPath, Steps &out, const Song &song );
bool LoadGlobalData( const CString &sPath, Song &out );
void RemoveHoles( NoteData &out, const Song &song );
void LoadTags( const CString &str, Song &out );
stepmania/src/NotesLoaderSM.cpp
+3 -3
View File
@@ -14,7 +14,7 @@ void SMLoader::LoadFromSMTokens(
CString sMeter,
CString sRadarValues,
CString sNoteData,
Notes &out
Steps &out
)
{
TrimLeft(sNotesType);
@@ -25,7 +25,7 @@ void SMLoader::LoadFromSMTokens(
TrimRight(sDifficulty);
// LOG->Trace( "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 );
stepmania/src/NotesLoaderSM.h
+2 -2
View File
@@ -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;
stepmania/src/NotesWriterDWI.cpp
+3 -3
View File
@@ -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( &notedata );
@@ -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 )
{
stepmania/src/NotesWriterDWI.h
+3 -3
View File
@@ -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 );
stepmania/src/NotesWriterSM.cpp
+4 -4
View File
@@ -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; i<out.m_apNotes.size(); i++ )
{
Notes* pNotes = out.m_apNotes[i];
Steps* pNotes = out.m_apNotes[i];
if( pNotes->IsAutogen() )
continue; /* don't write autogen notes */
stepmania/src/NotesWriterSM.h
+1 -1
View File
@@ -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 );
stepmania/src/Player.cpp
+1 -1
View File
@@ -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;
stepmania/src/ScoreKeeper.h
+2 -2
View File
@@ -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;
stepmania/src/ScoreKeeperMAX2.cpp
+4 -4
View File
@@ -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<Notes*>& apNotes_, PlayerNumber pn_ ):
ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, PlayerNumber pn_ ):
ScoreKeeper(pn_), apNotes(apNotes_)
{
//
@@ -38,7 +38,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Notes*>& 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( &notedata );
@@ -74,7 +74,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Notes*>& 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
stepmania/src/ScoreKeeperMAX2.h
+4 -4
View File
@@ -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<Notes*>& apNotes;
const vector<Steps*>& apNotes;
void AddScore( TapNoteScore score );
public:
ScoreKeeperMAX2( const vector<Notes*>& apNotes, PlayerNumber pn);
ScoreKeeperMAX2( const vector<Steps*>& 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 );
stepmania/src/ScoreKeeperRave.cpp
+1 -1
View File
@@ -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 )
{
}
stepmania/src/ScoreKeeperRave.h
+1 -1
View File
@@ -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; };
stepmania/src/ScreenEdit.cpp
+11 -11
View File
@@ -28,7 +28,7 @@
#include "SDL_keysym.h" // for SDLKeys
#include "ScreenMiniMenu.h"
#include "NoteSkinManager.h"
#include "Notes.h"
#include "Steps.h"
#include <utility>
#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;
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -52,7 +52,7 @@ protected:
EditMode m_EditMode;
Song* m_pSong;
Notes* m_pNotes;
Steps* m_pNotes;
BGAnimation m_BGAnimation;
stepmania/src/ScreenEditMenu.cpp
+13 -13
View File
@@ -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();
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -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"
stepmania/src/ScreenEz2SelectMusic.cpp
+3 -3
View File
@@ -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 );
}
stepmania/src/ScreenEz2SelectMusic.h
+1 -1
View File
@@ -77,7 +77,7 @@ protected:
MenuElements m_Menu;
DifficultyRating m_DifficultyRating;
// DifficultyMeter m_DifficultyMeter[NUM_PLAYERS];
vector<Notes*> m_arrayNotes[NUM_PLAYERS];
vector<Steps*> m_arrayNotes[NUM_PLAYERS];
int m_iSelection[NUM_PLAYERS];
bool m_bGoToOptions;
stepmania/src/ScreenGameplay.h
+1 -1
View File
@@ -89,7 +89,7 @@ protected:
NUM_DANCING_STATES
} m_DancingState;
vector<Song*> m_apSongsQueue; // size may be >1 if playing a course
vector<Notes*> m_apNotesQueue[NUM_PLAYERS]; // size may be >1 if playing a course
vector<Steps*> 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;
stepmania/src/ScreenJukebox.cpp
+3 -3
View File
@@ -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<Notes*> vNotes;
vector<Steps*> vNotes;
pSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
if( vNotes.size() > 0 )
pNotes = vNotes[rand()%vNotes.size()];
stepmania/src/ScreenPlayerOptions.cpp
+4 -4
View File
@@ -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<Notes*> vNotes;
vector<Steps*> vNotes;
GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
SortNotesArrayByDifficulty( vNotes );
for( unsigned i=0; i<vNotes.size(); i++ )
@@ -225,7 +225,7 @@ void ScreenPlayerOptions::ImportOptions()
}
else
{
vector<Notes*> vNotes;
vector<Steps*> vNotes;
GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
SortNotesArrayByDifficulty( vNotes );
for( unsigned i=0; i<vNotes.size(); i++ )
@@ -337,7 +337,7 @@ void ScreenPlayerOptions::ExportOptions()
}
else
{
vector<Notes*> vNotes;
vector<Steps*> vNotes;
GAMESTATE->m_pCurSong->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
SortNotesArrayByDifficulty( vNotes );
GAMESTATE->m_pCurNotes[p] = vNotes[ m_iSelectedOption[p][PO_STEP] ];
stepmania/src/ScreenSelect.cpp
+4 -2
View File
@@ -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();
stepmania/src/ScreenSelect.h
+1 -1
View File
@@ -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
{
stepmania/src/ScreenSelectCourse.cpp
+2 -2
View File
@@ -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<NUM_PLAYERS; p++ )
stepmania/src/ScreenSelectMusic.cpp
+4 -4
View File
@@ -29,7 +29,7 @@
#include <math.h>
#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;
stepmania/src/ScreenSelectMusic.h
+2 -2
View File
@@ -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<Notes*> m_arrayNotes;
vector<Steps*> m_arrayNotes;
int m_iSelection[NUM_PLAYERS];
MenuElements m_Menu;
stepmania/src/Song.cpp
+33 -33
View File
@@ -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; i<m_apNotes.size(); i++ )
{
Notes* pNotes = m_apNotes[i];
Steps* pNotes = m_apNotes[i];
NoteData tempNoteData;
pNotes->GetNoteData( &tempNoteData );
@@ -829,9 +829,9 @@ void Song::ReCalculateRadarValuesAndLastBeat()
}
}
void Song::GetNotes( vector<Notes*>& arrayAddTo, NotesType nt, Difficulty dc, int iMeterLow, int iMeterHigh, CString sDescription, bool bIncludeAutoGen ) const
void Song::GetNotes( vector<Steps*>& arrayAddTo, NotesType nt, Difficulty dc, int iMeterLow, int iMeterHigh, CString sDescription, bool bIncludeAutoGen ) const
{
for( unsigned i=0; i<m_apNotes.size(); i++ ) // for each of the Song's Notes
for( unsigned i=0; i<m_apNotes.size(); i++ ) // for each of the Song's Steps
{
if( m_apNotes[i]->m_NotesType != nt ) continue;
if( dc != DIFFICULTY_INVALID && dc != m_apNotes[i]->GetDifficulty() )
@@ -848,9 +848,9 @@ void Song::GetNotes( vector<Notes*>& 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<Notes*> vNotes;
vector<Steps*> 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<Notes*> vNotes;
vector<Steps*> 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<Notes*> vNotes;
vector<Steps*> 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<Notes*>& arrayAddTo, NotesType nt, bool bIncludeAutoGen ) const
void Song::GetEdits( vector<Steps*>& 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<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
{
vector<Notes*> apNotes;
vector<Steps*> 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; j<m_apNotes.size(); j++ )
{
Notes* pOriginalNotes = m_apNotes[j];
Steps* pOriginalNotes = m_apNotes[j];
if( pOriginalNotes->m_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<Notes*> aNotes;
vector<Steps*> 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; i<aNotes.size(); i++ )
{
const Notes* pNotes = aNotes[i];
const Steps* pNotes = aNotes[i];
if( pNotes->GetDifficulty() == 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<Notes*> vpNotes;
vector<Steps*> vpNotes;
this->GetEdits( vpNotes, nt );
return vpNotes.size() > 0;
}
@@ -1181,7 +1181,7 @@ void SortSongPointerArrayByTitle( vector<Song*> &arraySongPointers )
static int GetSongSortDifficulty(const Song *pSong)
{
vector<Notes*> aNotes;
vector<Steps*> 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<Notes*> vNotes;
vector<Steps*> vNotes;
this->GetNotes( vNotes, GAMESTATE->GetCurrentStyleDef()->m_NotesType );
for( unsigned j=0; j<vNotes.size(); j++ )
if( vNotes[j]->m_MemCardScores[MEMORY_CARD_MACHINE].grade == g )
stepmania/src/SongManager.cpp
+17 -17
View File
@@ -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<Notes*> vNotes = pSong->m_apNotes;
vector<Steps*> 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; i<vNotes.size(); i++ )
{
Notes* pNotes = vNotes[i];
Steps* pNotes = vNotes[i];
ASSERT(pNotes);
fprintf(fp, "%d %d\n%s\n",
@@ -653,7 +653,7 @@ RageColor SongManager::GetSongColor( const Song* pSong )
// const NotesType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
for( unsigned i=0; i<pSong->m_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; n<pSong->m_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<Course*> &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<Song*> apSongs;
SONGMAN->GetSongs( apSongs, sGroup );
@@ -961,11 +961,11 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd,
{
Song* pSong = apSongs[s];
vector<Notes*> apNotes;
vector<Steps*> apNotes;
pSong->GetNotes( apNotes, sd->m_NotesType );
for( unsigned n=0; n<apNotes.size(); n++ ) // foreach Notes
for( unsigned n=0; n<apNotes.size(); n++ ) // foreach Steps
{
Notes* pNotes = apNotes[n];
Steps* pNotes = apNotes[n];
if( pExtra1Notes == NULL || CompareNotesPointersForExtra(pExtra1Notes,pNotes) ) // pNotes is harder than pHardestNotes
{
@@ -973,7 +973,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd,
pExtra1Notes = pNotes;
}
// for extra 2, we don't want to choose the hardest notes possible. So, we'll disgard Notes with meter > 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 );
stepmania/src/SongManager.h
+5 -5
View File
@@ -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<Course*> &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 );
stepmania/src/StepMania.dsp
+35 -27
View File
@@ -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"
stepmania/src/StepMania.vcproj
+6 -6
View File
@@ -650,12 +650,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="NoteTypes.h">
</File>
<File
RelativePath="Notes.cpp">
</File>
<File
RelativePath="Notes.h">
</File>
<File
RelativePath="NotesLoader.cpp">
</File>
@@ -764,6 +758,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="StageStats.h">
</File>
<File
RelativePath="Steps.cpp">
</File>
<File
RelativePath="Steps.h">
</File>
<File
RelativePath="Style.h">
</File>
stepmania/src/StyleDef.h
+2 -2
View File
@@ -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
stepmania/src/arch/arch_default.h
+1 -1
View File
@@ -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"
stepmania/src/arch/arch_linux.h
+2
View File
@@ -11,6 +11,8 @@
#ifdef HAVE_GTK
#include "LoadingWindow/LoadingWindow_Gtk.h"
#elif
#include "LoadingWindow/LoadingWindow_SDL.h"
#endif
#include "ArchHooks/ArchHooks_Unix.h"
stepmania/src/pcre/get.c
+1 -1
View File
@@ -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 <ph10@cam.ac.uk>
stepmania/src/pcre/internal.h
+1 -1
View File
@@ -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 <ph10@cam.ac.uk>
stepmania/src/pcre/maketables.c
+1 -1
View File
@@ -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.
*/
stepmania/src/pcre/pcre.c
+1 -1
View File
@@ -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 <ph10@cam.ac.uk>
stepmania/src/pcre/study.c
+1 -1
View File
@@ -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 <ph10@cam.ac.uk>
stepmania/src/song.h
+11 -11
View File
@@ -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<Notes*> m_apNotes;
vector<Steps*> m_apNotes;
bool SongCompleteForStyle( const StyleDef *st ) const;
bool SongHasNotesType( NotesType nt ) const;
bool SongHasNotesTypeAndDifficulty( NotesType nt, Difficulty dc ) const;
void GetNotes( vector<Notes*>& 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<Notes*>& arrayAddTo, NotesType nt, bool bIncludeAutoGen = true ) const;
void GetNotes( vector<Steps*>& 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<Steps*>& 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 );