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

NotesType => StepsType

Browse Source
This commit is contained in:
Chris Danford
2003-08-07 06:16:17 +00:00
parent c48fcfa313
commit f5cd95b4f9
30 changed files with 183 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+6 -6
View File
@@ -409,7 +409,7 @@ void Course::AutogenNonstopFromGroup( CString sGroupName, vector<Song*> &apSongs
* play that song, even if we're on difficult and harder notes don't exist. (The
* exception is a static song entry with a meter range, but that's not very useful.)
*/
bool Course::HasDifficult( NotesType nt ) const
bool Course::HasDifficult( StepsType nt ) const
{
/* Check to see if any songs would change if difficult. */
@@ -447,7 +447,7 @@ bool Course::HasDifficult( NotesType nt ) const
return false;
}
bool Course::IsPlayableIn( NotesType nt ) const
bool Course::IsPlayableIn( StepsType nt ) const
{
vector<Info> ci;
GetCourseInfo( nt, ci );
@@ -455,7 +455,7 @@ bool Course::IsPlayableIn( NotesType nt ) const
}
static vector<Song*> GetFilteredBestSongs( NotesType nt )
static vector<Song*> GetFilteredBestSongs( StepsType nt )
{
vector<Song*> vSongsByMostPlayed = SONGMAN->GetBestSongs();
// filter out songs that don't have both medium and hard steps and long ver sons
@@ -472,7 +472,7 @@ static vector<Song*> GetFilteredBestSongs( NotesType nt )
return vSongsByMostPlayed;
}
void Course::GetCourseInfo( NotesType nt, vector<Course::Info> &ci, int Difficult ) const
void Course::GetCourseInfo( StepsType nt, vector<Course::Info> &ci, int Difficult ) const
{
vector<Entry> entries = m_entries;
@@ -701,7 +701,7 @@ void Course::GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHig
bool Course::GetTotalSeconds( float& fSecondsOut ) const
{
vector<Info> ci;
GetCourseInfo( NOTES_TYPE_DANCE_SINGLE, ci );
GetCourseInfo( STEPS_TYPE_DANCE_SINGLE, ci );
fSecondsOut = 0;
for( unsigned i=0; i<ci.size(); i++ )
@@ -730,7 +730,7 @@ struct RankingToInsert
}
};
void Course::AddScores( NotesType nt, bool bPlayerEnabled[NUM_PLAYERS], int iScore[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] )
void Course::AddScores( StepsType nt, bool bPlayerEnabled[NUM_PLAYERS], int iScore[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] )
{
vector<RankingToInsert> vHS;
for( int p=0; p<NUM_PLAYERS; p++ )
stepmania/src/Course.h
+4 -4
View File
@@ -76,11 +76,11 @@ public:
};
// Dereferences course_entries and returns only the playable Songs and Steps
void GetCourseInfo( NotesType nt, vector<Info> &ci, int Difficult = -1 ) const;
void GetCourseInfo( StepsType nt, vector<Info> &ci, int Difficult = -1 ) const;
int GetEstimatedNumStages() const { return m_entries.size(); }
bool HasDifficult( NotesType nt ) const;
bool IsPlayableIn( NotesType nt ) const;
bool HasDifficult( StepsType nt ) const;
bool IsPlayableIn( StepsType nt ) const;
RageColor GetColor() const;
Difficulty GetDifficulty( const Info &stage ) const;
void GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHighOut ) const;
@@ -113,7 +113,7 @@ public:
float fSurviveTime;
} m_MemCardScores[NUM_MEMORY_CARDS][NUM_NOTES_TYPES];
void AddScores( NotesType nt, bool bPlayerEnabled[NUM_PLAYERS], int iDancePoints[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] ); // iNewRecordIndexOut[p] = -1 if not a new record
void AddScores( StepsType nt, bool bPlayerEnabled[NUM_PLAYERS], int iDancePoints[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] ); // iNewRecordIndexOut[p] = -1 if not a new record
// sorting values
int SortOrder_TotalDifficulty;
stepmania/src/DifficultyDisplay.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ DifficultyDisplay::DifficultyDisplay()
}
}
void DifficultyDisplay::SetDifficulties( const Song* pSong, NotesType curType )
void DifficultyDisplay::SetDifficulties( const Song* pSong, StepsType curType )
{
for( int diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff )
{
stepmania/src/DifficultyDisplay.h
+1 -1
View File
@@ -22,7 +22,7 @@ class DifficultyDisplay : public ActorFrame
{
public:
DifficultyDisplay();
void SetDifficulties( const Song* pSong, NotesType curType );
void SetDifficulties( const Song* pSong, StepsType curType );
void UnsetDifficulties();
protected:
stepmania/src/EditMenu.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ EditMenu::EditMenu()
m_iSelection[ROW_SONG] = i;
OnRowValueChanged( ROW_SONG );
// Select the current NotesType and difficulty if any
// Select the current StepsType and difficulty if any
if( GAMESTATE->m_pCurNotes )
{
for( i=0; i<m_NotesTypes.size(); i++ )
stepmania/src/EditMenu.h
+5 -5
View File
@@ -54,9 +54,9 @@ public:
{
"Group",
"Song",
"NotesType",
"StepsType",
"Difficulty",
"Source NotesType",
"Source StepsType",
"Source Difficulty",
"Action"
};
@@ -90,9 +90,9 @@ public:
CString GetSelectedGroup() { return m_sGroups[m_iSelection[ROW_GROUP]]; }
Song* GetSelectedSong() { return m_pSongs[m_iSelection[ROW_SONG]]; }
NotesType GetSelectedNotesType() { return m_NotesTypes[m_iSelection[ROW_NOTES_TYPE]]; }
StepsType GetSelectedNotesType() { return m_NotesTypes[m_iSelection[ROW_NOTES_TYPE]]; }
Difficulty GetSelectedDifficulty() { return (Difficulty)m_iSelection[ROW_DIFFICULTY]; }
NotesType GetSelectedSourceNotesType() { return m_NotesTypes[m_iSelection[ROW_SOURCE_NOTES_TYPE]]; }
StepsType GetSelectedSourceNotesType() { return m_NotesTypes[m_iSelection[ROW_SOURCE_NOTES_TYPE]]; }
Difficulty GetSelectedSourceDifficulty() { return (Difficulty)m_iSelection[ROW_SOURCE_DIFFICULTY]; }
Action GetSelectedAction() { return m_Actions[m_iSelection[ROW_ACTION]]; }
@@ -113,7 +113,7 @@ private:
DifficultyMeter m_SourceMeter;
CStringArray m_sGroups;
vector<NotesType> m_NotesTypes;
vector<StepsType> m_NotesTypes;
vector<Song*> m_pSongs;
vector<Action> m_Actions;
stepmania/src/GameConstantsAndTypes.h
+16 -16
View File
@@ -61,24 +61,24 @@ CString DifficultyToString( Difficulty dc );
Difficulty StringToDifficulty( CString sDC );
enum NotesType
enum StepsType
{
NOTES_TYPE_DANCE_SINGLE = 0,
NOTES_TYPE_DANCE_DOUBLE,
NOTES_TYPE_DANCE_COUPLE,
NOTES_TYPE_DANCE_SOLO,
NOTES_TYPE_PUMP_SINGLE,
NOTES_TYPE_PUMP_HALFDOUBLE,
NOTES_TYPE_PUMP_DOUBLE,
NOTES_TYPE_PUMP_COUPLE,
NOTES_TYPE_EZ2_SINGLE,
NOTES_TYPE_EZ2_DOUBLE,
NOTES_TYPE_EZ2_REAL,
NOTES_TYPE_PARA_SINGLE,
NOTES_TYPE_DS3DDX_SINGLE,
NOTES_TYPE_BM_SINGLE,
STEPS_TYPE_DANCE_SINGLE = 0,
STEPS_TYPE_DANCE_DOUBLE,
STEPS_TYPE_DANCE_COUPLE,
STEPS_TYPE_DANCE_SOLO,
STEPS_TYPE_PUMP_SINGLE,
STEPS_TYPE_PUMP_HALFDOUBLE,
STEPS_TYPE_PUMP_DOUBLE,
STEPS_TYPE_PUMP_COUPLE,
STEPS_TYPE_EZ2_SINGLE,
STEPS_TYPE_EZ2_DOUBLE,
STEPS_TYPE_EZ2_REAL,
STEPS_TYPE_PARA_SINGLE,
STEPS_TYPE_DS3DDX_SINGLE,
STEPS_TYPE_BM_SINGLE,
NUM_NOTES_TYPES, // leave this at the end
NOTES_TYPE_INVALID,
STEPS_TYPE_INVALID,
};
//
stepmania/src/GameManager.cpp
+33 -33
View File
@@ -637,7 +637,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"single", // m_szName
NOTES_TYPE_DANCE_SINGLE, // m_NotesType
STEPS_TYPE_DANCE_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
4, // m_iColsPerPlayer
@@ -664,7 +664,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"versus", // m_szName
NOTES_TYPE_DANCE_SINGLE, // m_NotesType
STEPS_TYPE_DANCE_SINGLE, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
4, // m_iColsPerPlayer
@@ -691,7 +691,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"double", // m_szName
NOTES_TYPE_DANCE_DOUBLE, // m_NotesType
STEPS_TYPE_DANCE_DOUBLE, // m_NotesType
StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
8, // m_iColsPerPlayer
@@ -726,7 +726,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"couple", // m_szName
NOTES_TYPE_DANCE_COUPLE, // m_NotesType
STEPS_TYPE_DANCE_COUPLE, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
4, // m_iColsPerPlayer
@@ -753,7 +753,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"solo", // m_szName
NOTES_TYPE_DANCE_SOLO, // m_NotesType
STEPS_TYPE_DANCE_SOLO, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 320, 320 }, // m_iCenterX
6, // m_iColsPerPlayer
@@ -784,7 +784,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
"couple (edit)", // m_szName
NOTES_TYPE_DANCE_COUPLE, // m_NotesType
STEPS_TYPE_DANCE_COUPLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
8, // m_iColsPerPlayer
@@ -816,7 +816,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
},
/* { // STYLE_DANCE_SOLO_VERSUS
"dance-solo-versus", // m_szName
NOTES_TYPE_DANCE_SOLO, // m_NotesType
STEPS_TYPE_DANCE_SOLO, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
6, // m_iColsPerPlayer
@@ -847,7 +847,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"single", // m_szName
NOTES_TYPE_PUMP_SINGLE, // m_NotesType
STEPS_TYPE_PUMP_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -876,7 +876,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"versus", // m_szName
NOTES_TYPE_PUMP_SINGLE, // m_NotesType
STEPS_TYPE_PUMP_SINGLE, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -905,7 +905,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"halfdouble", // m_szName
NOTES_TYPE_PUMP_HALFDOUBLE, // m_NotesType
STEPS_TYPE_PUMP_HALFDOUBLE, // m_NotesType
StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
6, // m_iColsPerPlayer
@@ -936,7 +936,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"double", // m_szName
NOTES_TYPE_PUMP_DOUBLE, // m_NotesType
STEPS_TYPE_PUMP_DOUBLE, // m_NotesType
StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
10, // m_iColsPerPlayer
@@ -975,7 +975,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"couple", // m_szName
NOTES_TYPE_PUMP_COUPLE, // m_NotesType
STEPS_TYPE_PUMP_COUPLE, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -1004,7 +1004,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
"couple (edit)", // m_szName
NOTES_TYPE_PUMP_COUPLE, // m_NotesType
STEPS_TYPE_PUMP_COUPLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
10, // m_iColsPerPlayer
@@ -1038,7 +1038,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"single", // m_szName
NOTES_TYPE_EZ2_SINGLE, // m_NotesType
STEPS_TYPE_EZ2_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -1067,7 +1067,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"real", // m_szName
NOTES_TYPE_EZ2_REAL, // m_NotesType
STEPS_TYPE_EZ2_REAL, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
7, // m_iColsPerPlayer
@@ -1100,7 +1100,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"versus", // m_szName
NOTES_TYPE_EZ2_SINGLE, // m_NotesType
STEPS_TYPE_EZ2_SINGLE, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -1129,7 +1129,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"versusReal", // m_szName
NOTES_TYPE_EZ2_REAL, // m_NotesType
STEPS_TYPE_EZ2_REAL, // m_NotesType
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
7, // m_iColsPerPlayer
@@ -1162,7 +1162,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"double", // m_szName
NOTES_TYPE_EZ2_DOUBLE, // m_NotesType
STEPS_TYPE_EZ2_DOUBLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 320, 320 }, // m_iCenterX
10, // m_iColsPerPlayer
@@ -1201,7 +1201,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"single", // m_szName
NOTES_TYPE_PARA_SINGLE, // m_NotesType
STEPS_TYPE_PARA_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 320, 320 }, // m_iCenterX
5, // m_iColsPerPlayer
@@ -1230,7 +1230,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"single", // m_szName
NOTES_TYPE_DS3DDX_SINGLE, // m_NotesType
STEPS_TYPE_DS3DDX_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
8, // m_iColsPerPlayer
@@ -1265,7 +1265,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"BM-single", // m_szName
NOTES_TYPE_BM_SINGLE, // m_NotesType
STEPS_TYPE_BM_SINGLE, // m_NotesType
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
6, // m_iColsPerPlayer
@@ -1591,7 +1591,7 @@ void GameManager::GetStylesForGame( Game game, vector<Style>& aStylesAddTo, bool
}
}
Style GameManager::GetEditorStyleForNotesType( NotesType nt )
Style GameManager::GetEditorStyleForNotesType( StepsType nt )
{
for( int s=0; s<NUM_STYLES; s++ )
if( g_StyleDefs[s].m_NotesType == nt && g_StyleDefs[s].m_bUsedForEdit )
@@ -1610,7 +1610,7 @@ void GameManager::GetModesChoicesForGame( Game game, vector<ModeChoice*>& apChoi
}
*/
void GameManager::GetNotesTypesForGame( Game game, vector<NotesType>& aNotesTypeAddTo )
void GameManager::GetNotesTypesForGame( Game game, vector<StepsType>& aNotesTypeAddTo )
{
for( int nt=0; nt<NUM_NOTES_TYPES; nt++ )
{
@@ -1628,7 +1628,7 @@ void GameManager::GetNotesTypesForGame( Game game, vector<NotesType>& aNotesType
}
}
if(found)
aNotesTypeAddTo.push_back( (NotesType)nt );
aNotesTypeAddTo.push_back( (StepsType)nt );
}
}
@@ -1644,11 +1644,11 @@ void GameManager::GetEnabledGames( vector<Game>& aGamesOut )
}
}
int GameManager::NotesTypeToNumTracks( NotesType nt )
int GameManager::NotesTypeToNumTracks( StepsType nt )
{
if(nt >= NUM_NOTES_TYPES)
{
// invalid NotesType
// invalid StepsType
ASSERT(0);
return -1;
}
@@ -1656,7 +1656,7 @@ int GameManager::NotesTypeToNumTracks( NotesType nt )
return NotesTypes[nt].NumTracks;
}
NotesType GameManager::StringToNotesType( CString sNotesType )
StepsType GameManager::StringToNotesType( CString sNotesType )
{
sNotesType.MakeLower();
@@ -1670,18 +1670,18 @@ NotesType GameManager::StringToNotesType( CString sNotesType )
for( int i=0; i<NUM_NOTES_TYPES; i++ )
if( NotesTypes[i].name == sNotesType )
return NotesType(i);
return StepsType(i);
// invalid NotesType
LOG->Warn( "Invalid NotesType string '%s' encountered. Assuming this is 'dance-single'.", sNotesType.c_str() );
return NOTES_TYPE_DANCE_SINGLE;
// invalid StepsType
LOG->Warn( "Invalid StepsType string '%s' encountered. Assuming this is 'dance-single'.", sNotesType.c_str() );
return STEPS_TYPE_DANCE_SINGLE;
}
CString GameManager::NotesTypeToString( NotesType nt )
CString GameManager::NotesTypeToString( StepsType nt )
{
if(nt >= NUM_NOTES_TYPES)
{
// invalid NotesType
// invalid StepsType
ASSERT(0);
return "";
}
stepmania/src/GameManager.h
+5 -5
View File
@@ -28,14 +28,14 @@ public:
const StyleDef* GetStyleDefForStyle( Style s );
void GetStylesForGame( Game game, vector<Style>& aStylesAddTo, bool editor=false );
void GetNotesTypesForGame( Game game, vector<NotesType>& aNotesTypeAddTo );
Style GetEditorStyleForNotesType( NotesType nt );
void GetNotesTypesForGame( Game game, vector<StepsType>& aNotesTypeAddTo );
Style GetEditorStyleForNotesType( StepsType nt );
void GetEnabledGames( vector<Game>& aGamesOut );
static int NotesTypeToNumTracks( NotesType nt );
static NotesType StringToNotesType( CString sNotesType );
static CString NotesTypeToString( NotesType nt );
static int NotesTypeToNumTracks( StepsType nt );
static StepsType StringToNotesType( CString sNotesType );
static CString NotesTypeToString( StepsType nt );
static Game StringToGameType( CString sGameType );
Style GameAndStringToStyle( Game game, CString sStyle );
stepmania/src/GameState.h
+1 -1
View File
@@ -234,7 +234,7 @@ public:
//
// Filled in by ScreenNameEntry and used by ScreenRanking to flash the recent high scores
NotesType m_RankingNotesType; // meaningless if a course was played
StepsType m_RankingNotesType; // meaningless if a course was played
RankingCategory m_RankingCategory[NUM_PLAYERS]; // meaningless if a course was played
Course* m_pRankingCourse; // meaningless unless Course was played
int m_iRankingIndex[NUM_PLAYERS]; // -1 if no new high score
stepmania/src/MusicWheel.cpp
+2 -2
View File
@@ -633,8 +633,8 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
continue;
WheelItemData& WID = arrayWheelItemDatas[i];
WID.m_Flags.bHasBeginnerOr1Meter = pSong->IsEasy( NOTES_TYPE_DANCE_SINGLE );
WID.m_Flags.bEdits = pSong->HasEdits( NOTES_TYPE_DANCE_SINGLE );
WID.m_Flags.bHasBeginnerOr1Meter = pSong->IsEasy( STEPS_TYPE_DANCE_SINGLE );
WID.m_Flags.bEdits = pSong->HasEdits( STEPS_TYPE_DANCE_SINGLE );
WID.m_Flags.iStagesForSong = SongManager::GetNumStagesForSong( pSong );
}
stepmania/src/NoteData.cpp
+10 -10
View File
@@ -612,7 +612,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData
const int iIndex = BeatToNoteRow( fBeat );
// if( m_iNumTracks != sMeasureLine.GetLength() )
// RageException::Throw( "Actual number of note columns (%d) is different from the NotesType (%d).", m_iNumTracks, sMeasureLine.GetLength() );
// RageException::Throw( "Actual number of note columns (%d) is different from the StepsType (%d).", m_iNumTracks, sMeasureLine.GetLength() );
for( int c=0; c<min(sMeasureLine.GetLength(),out.GetNumTracks()); c++ )
{
@@ -803,15 +803,15 @@ void NoteDataUtil::Turn( NoteData &in, TurnType tt )
{
case left:
case right:
// Is there a way to do this withoutn handling each NotesType? -Chris
// Is there a way to do this withoutn handling each StepsType? -Chris
// Identity transform for ones not handled below. What should we do here?
for( t = 0; t < MAX_NOTE_TRACKS; ++t )
iTakeFromTrack[t] = t;
switch( GAMESTATE->GetCurrentStyleDef()->m_NotesType )
{
case NOTES_TYPE_DANCE_SINGLE:
case NOTES_TYPE_DANCE_DOUBLE:
case NOTES_TYPE_DANCE_COUPLE:
case STEPS_TYPE_DANCE_SINGLE:
case STEPS_TYPE_DANCE_DOUBLE:
case STEPS_TYPE_DANCE_COUPLE:
iTakeFromTrack[0] = 2;
iTakeFromTrack[1] = 0;
iTakeFromTrack[2] = 3;
@@ -821,7 +821,7 @@ void NoteDataUtil::Turn( NoteData &in, TurnType tt )
iTakeFromTrack[6] = 7;
iTakeFromTrack[7] = 5;
break;
case NOTES_TYPE_DANCE_SOLO:
case STEPS_TYPE_DANCE_SOLO:
iTakeFromTrack[0] = 5;
iTakeFromTrack[1] = 4;
iTakeFromTrack[2] = 0;
@@ -829,8 +829,8 @@ void NoteDataUtil::Turn( NoteData &in, TurnType tt )
iTakeFromTrack[4] = 1;
iTakeFromTrack[5] = 2;
break;
case NOTES_TYPE_PUMP_SINGLE:
case NOTES_TYPE_PUMP_COUPLE:
case STEPS_TYPE_PUMP_SINGLE:
case STEPS_TYPE_PUMP_COUPLE:
iTakeFromTrack[0] = 3;
iTakeFromTrack[1] = 4;
iTakeFromTrack[2] = 2;
@@ -842,7 +842,7 @@ void NoteDataUtil::Turn( NoteData &in, TurnType tt )
iTakeFromTrack[8] = 5;
iTakeFromTrack[9] = 6;
break;
case NOTES_TYPE_PUMP_HALFDOUBLE:
case STEPS_TYPE_PUMP_HALFDOUBLE:
iTakeFromTrack[0] = 2;
iTakeFromTrack[1] = 0;
iTakeFromTrack[2] = 1;
@@ -850,7 +850,7 @@ void NoteDataUtil::Turn( NoteData &in, TurnType tt )
iTakeFromTrack[4] = 4;
iTakeFromTrack[5] = 5;
break;
case NOTES_TYPE_PUMP_DOUBLE:
case STEPS_TYPE_PUMP_DOUBLE:
iTakeFromTrack[0] = 8;
iTakeFromTrack[1] = 9;
iTakeFromTrack[2] = 7;
stepmania/src/NotesLoaderBMS.cpp
+13 -13
View File
@@ -62,7 +62,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
{
LOG->Trace( "Steps::LoadFromBMSFile( '%s' )", sPath.c_str() );
out.m_NotesType = NOTES_TYPE_INVALID;
out.m_NotesType = STEPS_TYPE_INVALID;
NoteData* pNoteData = new NoteData;
pNoteData->SetNumTracks( MAX_NOTE_TRACKS );
@@ -107,14 +107,14 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
switch( atoi(value_data) )
{
case 1: // 4 or 6 single
out.m_NotesType = NOTES_TYPE_DANCE_SINGLE;
out.m_NotesType = STEPS_TYPE_DANCE_SINGLE;
// if the mode should be solo, then we'll update m_DanceStyle below when we read in step data
break;
case 2: // couple/battle
out.m_NotesType = NOTES_TYPE_DANCE_COUPLE;
out.m_NotesType = STEPS_TYPE_DANCE_COUPLE;
break;
case 3: // double
out.m_NotesType = NOTES_TYPE_DANCE_DOUBLE;
out.m_NotesType = STEPS_TYPE_DANCE_DOUBLE;
break;
default:
LOG->Warn( "Invalid value '%d' for '#player'", atoi(value_data) );
@@ -142,7 +142,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
// if there's a 6 in the description, it's probably part of "6panel" or "6-panel"
if( value_data.Find("6") != -1 )
out.m_NotesType = NOTES_TYPE_DANCE_SOLO;
out.m_NotesType = STEPS_TYPE_DANCE_SOLO;
}
if( -1 != value_name.Find("#playlevel") )
{
@@ -186,15 +186,15 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
}
}
if( out.m_NotesType == NOTES_TYPE_DANCE_SINGLE ||
out.m_NotesType == NOTES_TYPE_DANCE_DOUBLE ||
out.m_NotesType == NOTES_TYPE_DANCE_COUPLE) // if there are 4 panels, then the Up+Right track really contains the notes for Up
if( out.m_NotesType == STEPS_TYPE_DANCE_SINGLE ||
out.m_NotesType == STEPS_TYPE_DANCE_DOUBLE ||
out.m_NotesType == STEPS_TYPE_DANCE_COUPLE) // if there are 4 panels, then the Up+Right track really contains the notes for Up
{
pNoteData->MoveTapNoteTrack(DANCE_NOTE_PAD1_UP, DANCE_NOTE_PAD1_UPRIGHT);
}
// we're done reading in all of the BMS values
if( out.m_NotesType == NOTES_TYPE_INVALID )
if( out.m_NotesType == STEPS_TYPE_INVALID )
{
LOG->Warn("Couldn't determine note types of file '%s'", sPath.c_str() );
delete pNoteData;
@@ -210,14 +210,14 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
switch( out.m_NotesType )
{
case NOTES_TYPE_DANCE_SINGLE:
case STEPS_TYPE_DANCE_SINGLE:
iTransformNewToOld[0] = DANCE_NOTE_PAD1_LEFT;
iTransformNewToOld[1] = DANCE_NOTE_PAD1_DOWN;
iTransformNewToOld[2] = DANCE_NOTE_PAD1_UP;
iTransformNewToOld[3] = DANCE_NOTE_PAD1_RIGHT;
break;
case NOTES_TYPE_DANCE_DOUBLE:
case NOTES_TYPE_DANCE_COUPLE:
case STEPS_TYPE_DANCE_DOUBLE:
case STEPS_TYPE_DANCE_COUPLE:
iTransformNewToOld[0] = DANCE_NOTE_PAD1_LEFT;
iTransformNewToOld[1] = DANCE_NOTE_PAD1_DOWN;
iTransformNewToOld[2] = DANCE_NOTE_PAD1_UP;
@@ -227,7 +227,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
iTransformNewToOld[6] = DANCE_NOTE_PAD2_UP;
iTransformNewToOld[7] = DANCE_NOTE_PAD2_RIGHT;
break;
case NOTES_TYPE_DANCE_SOLO:
case STEPS_TYPE_DANCE_SOLO:
iTransformNewToOld[0] = DANCE_NOTE_PAD1_LEFT;
iTransformNewToOld[1] = DANCE_NOTE_PAD1_UPLEFT;
iTransformNewToOld[2] = DANCE_NOTE_PAD1_DOWN;
stepmania/src/NotesLoaderDWI.cpp
+11 -11
View File
@@ -106,7 +106,7 @@ bool DWILoader::LoadFromDWITokens(
{
LOG->Trace( "Steps::LoadFromDWITokens()" );
out.m_NotesType = NOTES_TYPE_INVALID;
out.m_NotesType = STEPS_TYPE_INVALID;
sStepData1.Replace( "\n", "" );
sStepData1.Replace( "\r", "" );
@@ -115,28 +115,28 @@ bool DWILoader::LoadFromDWITokens(
sStepData2.Replace( "\r", "" );
sStepData2.Replace( " ", "" );
if( sMode == "SINGLE" ) out.m_NotesType = NOTES_TYPE_DANCE_SINGLE;
else if( sMode == "DOUBLE" ) out.m_NotesType = NOTES_TYPE_DANCE_DOUBLE;
else if( sMode == "COUPLE" ) out.m_NotesType = NOTES_TYPE_DANCE_COUPLE;
else if( sMode == "SOLO" ) out.m_NotesType = NOTES_TYPE_DANCE_SOLO;
if( sMode == "SINGLE" ) out.m_NotesType = STEPS_TYPE_DANCE_SINGLE;
else if( sMode == "DOUBLE" ) out.m_NotesType = STEPS_TYPE_DANCE_DOUBLE;
else if( sMode == "COUPLE" ) out.m_NotesType = STEPS_TYPE_DANCE_COUPLE;
else if( sMode == "SOLO" ) out.m_NotesType = STEPS_TYPE_DANCE_SOLO;
else
{
ASSERT(0); // Unrecognized DWI notes format
out.m_NotesType = NOTES_TYPE_DANCE_SINGLE;
out.m_NotesType = STEPS_TYPE_DANCE_SINGLE;
}
g_mapDanceNoteToNoteDataColumn.clear();
switch( out.m_NotesType )
{
case NOTES_TYPE_DANCE_SINGLE:
case STEPS_TYPE_DANCE_SINGLE:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_RIGHT] = 3;
break;
case NOTES_TYPE_DANCE_DOUBLE:
case NOTES_TYPE_DANCE_COUPLE:
case STEPS_TYPE_DANCE_DOUBLE:
case STEPS_TYPE_DANCE_COUPLE:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2;
@@ -146,7 +146,7 @@ bool DWILoader::LoadFromDWITokens(
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_UP] = 6;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_RIGHT] = 7;
break;
case NOTES_TYPE_DANCE_SOLO:
case STEPS_TYPE_DANCE_SOLO:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UPLEFT] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 2;
@@ -457,7 +457,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
(iNumParams==5) ? sParams[4] : "",
*pNewNotes
);
if(pNewNotes->m_NotesType != NOTES_TYPE_INVALID)
if(pNewNotes->m_NotesType != STEPS_TYPE_INVALID)
out.m_apNotes.push_back( pNewNotes );
else
delete pNewNotes;
stepmania/src/NotesLoaderKSF.cpp
+4 -4
View File
@@ -127,17 +127,17 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s
}
notedata.SetNumTracks( 5 );
out.m_NotesType = NOTES_TYPE_PUMP_SINGLE;
out.m_NotesType = STEPS_TYPE_PUMP_SINGLE;
if( sFName.Find("double") != -1 )
{
notedata.SetNumTracks( 10 );
out.m_NotesType = NOTES_TYPE_PUMP_DOUBLE;
out.m_NotesType = STEPS_TYPE_PUMP_DOUBLE;
} else if( sFName.Find("_2") != -1 ) {
notedata.SetNumTracks( 10 );
out.m_NotesType = NOTES_TYPE_PUMP_COUPLE;
out.m_NotesType = STEPS_TYPE_PUMP_COUPLE;
} else if( sFName.Find("halfdouble") != -1 ) {
notedata.SetNumTracks( 6 );
out.m_NotesType = NOTES_TYPE_PUMP_HALFDOUBLE;
out.m_NotesType = STEPS_TYPE_PUMP_HALFDOUBLE;
}
}
stepmania/src/NotesWriterDWI.cpp
+10 -10
View File
@@ -229,9 +229,9 @@ void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Steps &out, int start )
CString str;
switch( out.m_NotesType )
{
case NOTES_TYPE_DANCE_SINGLE:
case NOTES_TYPE_DANCE_COUPLE:
case NOTES_TYPE_DANCE_DOUBLE:
case STEPS_TYPE_DANCE_SINGLE:
case STEPS_TYPE_DANCE_COUPLE:
case STEPS_TYPE_DANCE_DOUBLE:
str = NotesToDWIString(
notedata.GetTapNote(start+0, row),
notedata.GetTapNote(start+1, row),
@@ -244,7 +244,7 @@ void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Steps &out, int start )
notedata.SetTapNote(start+2, row, TAP_EMPTY);
notedata.SetTapNote(start+3, row, TAP_EMPTY);
break;
case NOTES_TYPE_DANCE_SOLO:
case STEPS_TYPE_DANCE_SOLO:
str = NotesToDWIString(
notedata.GetTapNote(0, row),
notedata.GetTapNote(1, row),
@@ -299,10 +299,10 @@ bool NotesWriterDWI::WriteDWINotesTag( FILE* fp, const Steps &out )
switch( out.m_NotesType )
{
case NOTES_TYPE_DANCE_SINGLE: fprintf( fp, "#SINGLE:" ); break;
case NOTES_TYPE_DANCE_COUPLE: fprintf( fp, "#COUPLE:" ); break;
case NOTES_TYPE_DANCE_DOUBLE: fprintf( fp, "#DOUBLE:" ); break;
case NOTES_TYPE_DANCE_SOLO: fprintf( fp, "#SOLO:" ); break;
case STEPS_TYPE_DANCE_SINGLE: fprintf( fp, "#SINGLE:" ); break;
case STEPS_TYPE_DANCE_COUPLE: fprintf( fp, "#COUPLE:" ); break;
case STEPS_TYPE_DANCE_DOUBLE: fprintf( fp, "#DOUBLE:" ); break;
case STEPS_TYPE_DANCE_SOLO: fprintf( fp, "#SOLO:" ); break;
default: return false; // not a type supported by DWI
}
@@ -389,8 +389,8 @@ bool NotesWriterDWI::Write( CString sPath, const Song &out )
continue;
WriteDWINotesField( fp, *out.m_apNotes[i], 0 );
if(out.m_apNotes[i]->m_NotesType==NOTES_TYPE_DANCE_DOUBLE ||
out.m_apNotes[i]->m_NotesType==NOTES_TYPE_DANCE_COUPLE)
if(out.m_apNotes[i]->m_NotesType==STEPS_TYPE_DANCE_DOUBLE ||
out.m_apNotes[i]->m_NotesType==STEPS_TYPE_DANCE_COUPLE)
{
fprintf( fp, ":\n" );
WriteDWINotesField( fp, *out.m_apNotes[i], 4 );
stepmania/src/ScreenEditMenu.cpp
+2 -2
View File
@@ -129,10 +129,10 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
return;
Song* pSong = m_Selector.GetSelectedSong();
NotesType nt = m_Selector.GetSelectedNotesType();
StepsType nt = m_Selector.GetSelectedNotesType();
Difficulty dc = m_Selector.GetSelectedDifficulty();
Steps* pNotes = m_Selector.GetSelectedNotes();
// NotesType soureNT = m_Selector.GetSelectedSourceNotesType();
// StepsType soureNT = m_Selector.GetSelectedSourceNotesType();
// Difficulty sourceDiff = m_Selector.GetSelectedSourceDifficulty();
Steps* pSourceNotes = m_Selector.GetSelectedSourceNotes();
EditMenu::Action action = m_Selector.GetSelectedAction();
stepmania/src/ScreenEvaluation.cpp
+4 -4
View File
@@ -71,8 +71,8 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
GAMESTATE->m_pCurSong = SONGMAN->GetAllSongs()[0];
GAMESTATE->m_pCurCourse = SONGMAN->m_pCourses[0];
GAMESTATE->m_pCurNotes[PLAYER_1] = GAMESTATE->m_pCurSong->GetNotes( NOTES_TYPE_DANCE_SINGLE, DIFFICULTY_HARD );
GAMESTATE->m_pCurNotes[PLAYER_2] = GAMESTATE->m_pCurSong->GetNotes( NOTES_TYPE_DANCE_SINGLE, DIFFICULTY_HARD );
GAMESTATE->m_pCurNotes[PLAYER_1] = GAMESTATE->m_pCurSong->GetNotes( STEPS_TYPE_DANCE_SINGLE, DIFFICULTY_HARD );
GAMESTATE->m_pCurNotes[PLAYER_2] = GAMESTATE->m_pCurSong->GetNotes( STEPS_TYPE_DANCE_SINGLE, DIFFICULTY_HARD );
GAMESTATE->m_PlayerOptions[PLAYER_1].m_bHoldNotes = false;
GAMESTATE->m_PlayerOptions[PLAYER_2].m_bHoldNotes = false;
GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed = 2;
@@ -168,7 +168,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
break;
case summary:
{
NotesType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
bool bIsHumanPlayer[NUM_PLAYERS];
for( p=0; p<NUM_PLAYERS; p++ )
bIsHumanPlayer[p] = GAMESTATE->IsHumanPlayer(p);
@@ -196,7 +196,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
break;
case course:
{
NotesType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
bool bIsHumanPlayer[NUM_PLAYERS];
for( p=0; p<NUM_PLAYERS; p++ )
bIsHumanPlayer[p] = GAMESTATE->IsHumanPlayer(p);
stepmania/src/ScreenHowToPlay.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
default: ASSERT(0); // we should cover all gametypes....
}
NotesType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
int iNumOfTracks = GAMEMAN->NotesTypeToNumTracks( nt );
ASSERT(iNumOfTracks > 0); // crazy to have less than 1 track....
stepmania/src/ScreenRanking.cpp
+4 -4
View File
@@ -99,7 +99,7 @@ ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
}
vector<NotesType> aNotesTypesToShow;
vector<StepsType> aNotesTypesToShow;
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aNotesTypesToShow );
// subtract hidden NotesTypes
@@ -108,10 +108,10 @@ ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
split( NOTES_TYPES_TO_HIDE, ",", asNotesTypesToHide, true );
for( unsigned i=0; i<asNotesTypesToHide.size(); i++ )
{
NotesType nt = GameManager::StringToNotesType(asNotesTypesToHide[i]);
if( nt != NOTES_TYPE_INVALID )
StepsType nt = GameManager::StringToNotesType(asNotesTypesToHide[i]);
if( nt != STEPS_TYPE_INVALID )
{
const vector<NotesType>::iterator iter = find( aNotesTypesToShow.begin(), aNotesTypesToShow.end(), nt );
const vector<StepsType>::iterator iter = find( aNotesTypesToShow.begin(), aNotesTypesToShow.end(), nt );
if( iter != aNotesTypesToShow.end() )
aNotesTypesToShow.erase( iter );
}
stepmania/src/ScreenRanking.h
+1 -1
View File
@@ -29,7 +29,7 @@ protected:
{
enum { TYPE_CATEGORY, TYPE_COURSE } type;
int colorIndex;
NotesType nt; // used in category and course
StepsType nt; // used in category and course
RankingCategory category;
Course* pCourse;
};
stepmania/src/Song.cpp
+14 -14
View File
@@ -829,7 +829,7 @@ void Song::ReCalculateRadarValuesAndLastBeat()
}
}
void Song::GetNotes( vector<Steps*>& arrayAddTo, NotesType nt, Difficulty dc, int iMeterLow, int iMeterHigh, CString sDescription, bool bIncludeAutoGen ) const
void Song::GetNotes( vector<Steps*>& arrayAddTo, StepsType 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 Steps
{
@@ -848,7 +848,7 @@ void Song::GetNotes( vector<Steps*>& arrayAddTo, NotesType nt, Difficulty dc, in
}
}
Steps* Song::GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const
Steps* Song::GetNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen ) const
{
vector<Steps*> vNotes;
GetNotes( vNotes, nt, dc, -1, -1, "", bIncludeAutoGen );
@@ -858,7 +858,7 @@ Steps* Song::GetNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const
return vNotes[0];
}
Steps* Song::GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen ) const
Steps* Song::GetNotes( StepsType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen ) const
{
vector<Steps*> vNotes;
GetNotes( vNotes, nt, DIFFICULTY_INVALID, iMeterLow, iMeterHigh, "", bIncludeAutoGen );
@@ -868,7 +868,7 @@ Steps* Song::GetNotes( NotesType nt, int iMeterLow, int iMeterHigh, bool bInclud
return vNotes[0];
}
Steps* Song::GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen ) const
Steps* Song::GetNotes( StepsType nt, CString sDescription, bool bIncludeAutoGen ) const
{
vector<Steps*> vNotes;
GetNotes( vNotes, nt, DIFFICULTY_INVALID, -1, -1, sDescription, bIncludeAutoGen );
@@ -879,7 +879,7 @@ Steps* Song::GetNotes( NotesType nt, CString sDescription, bool bIncludeAutoGen
}
Steps* Song::GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen ) const
Steps* Song::GetClosestNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen ) const
{
Difficulty newDC = dc;
Steps* pNotes;
@@ -907,7 +907,7 @@ Steps* Song::GetClosestNotes( NotesType nt, Difficulty dc, bool bIncludeAutoGen
return pNotes;
}
void Song::GetEdits( vector<Steps*>& arrayAddTo, NotesType nt, bool bIncludeAutoGen ) const
void Song::GetEdits( vector<Steps*>& arrayAddTo, StepsType nt, bool bIncludeAutoGen ) const
{
}
@@ -920,7 +920,7 @@ bool Song::SongCompleteForStyle( const StyleDef *st ) const
return true;
}
bool Song::SongHasNotesType( NotesType nt ) const
bool Song::SongHasNotesType( StepsType nt ) const
{
for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Steps
if( m_apNotes[i]->m_NotesType == nt )
@@ -928,7 +928,7 @@ bool Song::SongHasNotesType( NotesType nt ) const
return false;
}
bool Song::SongHasNotesTypeAndDifficulty( NotesType nt, Difficulty dc ) const
bool Song::SongHasNotesTypeAndDifficulty( StepsType nt, Difficulty dc ) const
{
for( unsigned i=0; i < m_apNotes.size(); i++ ) // foreach Steps
if( m_apNotes[i]->m_NotesType == nt && m_apNotes[i]->GetDifficulty() == dc )
@@ -1000,7 +1000,7 @@ void Song::SaveToDWIFile()
void Song::AddAutoGenNotes()
{
for( NotesType ntMissing=(NotesType)0; ntMissing<NUM_NOTES_TYPES; ntMissing=(NotesType)(ntMissing+1) )
for( StepsType ntMissing=(StepsType)0; ntMissing<NUM_NOTES_TYPES; ntMissing=(StepsType)(ntMissing+1) )
{
if( SongHasNotesType(ntMissing) )
continue;
@@ -1010,10 +1010,10 @@ void Song::AddAutoGenNotes()
int iNumTracksOfMissing = GAMEMAN->NotesTypeToNumTracks(ntMissing);
// look for closest match
NotesType ntBestMatch = (NotesType)-1;
StepsType ntBestMatch = (StepsType)-1;
int iBestTrackDifference = 10000; // inf
for( NotesType nt=(NotesType)0; nt<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
for( StepsType nt=(StepsType)0; nt<NUM_NOTES_TYPES; nt=(StepsType)(nt+1) )
{
vector<Steps*> apNotes;
this->GetNotes( apNotes, nt );
@@ -1035,7 +1035,7 @@ void Song::AddAutoGenNotes()
}
}
void Song::AutoGen( NotesType ntTo, NotesType ntFrom )
void Song::AutoGen( StepsType ntTo, StepsType ntFrom )
{
// int iNumTracksOfTo = GAMEMAN->NotesTypeToNumTracks(ntTo);
@@ -1088,7 +1088,7 @@ bool Song::IsNew() const
return GetNumTimesPlayed()==0;
}
bool Song::IsEasy( NotesType nt ) const
bool Song::IsEasy( StepsType nt ) const
{
Steps* pBeginnerNotes = GetNotes( nt, DIFFICULTY_BEGINNER );
Steps* pEasyNotes = GetNotes( nt, DIFFICULTY_EASY );
@@ -1123,7 +1123,7 @@ bool Song::IsEasy( NotesType nt ) const
return false;
}
bool Song::HasEdits( NotesType nt ) const
bool Song::HasEdits( StepsType nt ) const
{
vector<Steps*> vpNotes;
this->GetEdits( vpNotes, nt );
stepmania/src/SongManager.cpp
+5 -5
View File
@@ -296,7 +296,7 @@ void SongManager::ReadNoteScoresFromFile( CString fn, int c )
for( unsigned i=0; i<uNumNotes; i++ )
{
NotesType nt;
StepsType nt;
Difficulty dc;
getline(f, line);
@@ -661,7 +661,7 @@ RageColor SongManager::GetSongColor( const Song* pSong )
* set up, which is too restrictive. How to handle this?
*
* XXX: Once we support edits, ignore them, too. */
// const NotesType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
// const StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_NotesType;
for( unsigned i=0; i<pSong->m_apNotes.size(); i++ )
{
const Steps* pNotes = pSong->m_apNotes[i];
@@ -1018,8 +1018,8 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const StyleDef *sd,
pExtra2Notes = pExtra1Notes;
}
// 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 Steps that matches the NotesType because the player
// If there are any notes at all that match this StepsType, everything should be filled out.
// Also, it's guaranteed that there is at least one Steps that matches the StepsType because the player
// had to play something before reaching the extra stage!
ASSERT( pExtra2Song && pExtra1Song && pExtra2Notes && pExtra1Notes );
@@ -1097,7 +1097,7 @@ struct CategoryScoreToInsert
};
// set iNewRecordIndex = -1 if not a new record
void SongManager::AddScores( NotesType nt, bool bPlayerEnabled[NUM_PLAYERS],
void SongManager::AddScores( StepsType nt, bool bPlayerEnabled[NUM_PLAYERS],
RankingCategory hsc[NUM_PLAYERS],
int iScore[NUM_PLAYERS],
int iNewRecordIndexOut[NUM_PLAYERS] )
stepmania/src/SongManager.h
+1 -1
View File
@@ -99,7 +99,7 @@ public:
int iScore;
CString sName;
} m_MachineScores[NUM_NOTES_TYPES][NUM_RANKING_CATEGORIES][NUM_RANKING_LINES];
void AddScores( NotesType nt, bool bPlayerEnabled[NUM_PLAYERS], RankingCategory hsc[NUM_PLAYERS], int iScore[NUM_PLAYERS], int iNewRecordIndexOut[NUM_PLAYERS] ); // set iNewRecordIndex = -1 if not a new record
void AddScores( StepsType nt, bool bPlayerEnabled[NUM_PLAYERS], RankingCategory hsc[NUM_PLAYERS], int iScore[NUM_PLAYERS], int iNewRecordIndexOut[NUM_PLAYERS] ); // set iNewRecordIndex = -1 if not a new record
void UpdateBest();
void UpdateRankingCourses();
stepmania/src/StepMania.dsp
+4 -4
View File
@@ -65,7 +65,7 @@ IntDir=.\../Debug6
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
@@ -102,7 +102,7 @@ IntDir=.\Debug
TargetDir=\stepmania\stepmania
TargetName=default
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
@@ -142,7 +142,7 @@ IntDir=.\../Release6
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
@@ -183,7 +183,7 @@ IntDir=.\StepMania___Xbox_Release
TargetDir=\stepmania\stepmania
TargetName=default
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
stepmania/src/Steps.cpp
+6 -8
View File
@@ -28,11 +28,11 @@
Steps::Steps()
{
/* FIXME: should we init this to NOTES_TYPE_INVALID?
/* FIXME: should we init this to STEPS_TYPE_INVALID?
* I have a feeling that it's the right thing to do but that
* it'd trip obscure asserts all over the place, so I'll wait
* until after b6 to do this. -glenn */
m_NotesType = NOTES_TYPE_DANCE_SINGLE;
m_NotesType = STEPS_TYPE_DANCE_SINGLE;
m_Difficulty = DIFFICULTY_INVALID;
m_iMeter = 0;
for(int i = 0; i < NUM_RADAR_CATEGORIES; ++i)
@@ -165,12 +165,10 @@ void Steps::Decompress() const
notes->CopyRange( &pdata, 0, pdata.GetLastRow(), 0 );
else
notes->LoadTransformedSlidingWindow( &pdata, notes->GetNumTracks() );
return;
}
else if(!notes_comp)
{
return; /* there is no data */
/* there is no data, do nothing */
}
else
{
@@ -214,13 +212,13 @@ void Steps::DeAutogen()
Compress();
}
void Steps::AutogenFrom( Steps *parent_, NotesType ntTo )
void Steps::AutogenFrom( Steps *parent_, StepsType ntTo )
{
parent = parent_;
m_NotesType = ntTo;
}
void Steps::CopyFrom( Steps* pSource, NotesType ntTo ) // pSource does not have to be of the same NotesType!
void Steps::CopyFrom( Steps* pSource, StepsType ntTo ) // pSource does not have to be of the same StepsType!
{
m_NotesType = ntTo;
NoteData noteData;
@@ -236,7 +234,7 @@ void Steps::CopyFrom( Steps* pSource, NotesType ntTo ) // pSource does not have
this->SetRadarValue( (RadarCategory)r, radarValues[r] );
}
void Steps::CreateBlank( NotesType ntTo )
void Steps::CreateBlank( StepsType ntTo )
{
m_NotesType = ntTo;
NoteData noteData;
stepmania/src/Steps.h
+4 -4
View File
@@ -25,9 +25,9 @@ public:
~Steps();
// initializers
void AutogenFrom( Steps *parent, NotesType ntTo );
void CopyFrom( Steps* pSource, NotesType ntTo );
void CreateBlank( NotesType ntTo );
void AutogenFrom( Steps *parent, StepsType ntTo );
void CopyFrom( Steps* pSource, StepsType ntTo );
void CreateBlank( StepsType ntTo );
void Compress() const;
void Decompress() const;
@@ -44,7 +44,7 @@ public:
void SetRadarValue(int r, float val);
bool IsAutogen() const; // Was created by autogen?
NotesType m_NotesType;
StepsType m_NotesType;
void GetNoteData( NoteData* pNoteDataOut ) const;
void SetNoteData( NoteData* pNewNoteData );
stepmania/src/StyleDef.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ PlayerNumber StyleDef::ControllerToPlayerNumber( GameController controller ) con
}
}
bool StyleDef::MatchesNotesType( NotesType type ) const
bool StyleDef::MatchesNotesType( StepsType type ) const
{
if(type == m_NotesType) return true;
stepmania/src/StyleDef.h
+2 -2
View File
@@ -45,7 +45,7 @@ public:
/* Steps format used for each player. For example, "dance versus" reads
* the Steps with the tag "dance-single". */
NotesType m_NotesType;
StepsType m_NotesType;
enum StyleType
{
@@ -75,7 +75,7 @@ public:
void GetTransformedNoteDataForStyle( PlayerNumber pn, NoteData* pOriginal, NoteData* pNoteDataOut ) const;
bool MatchesNotesType( NotesType type ) const;
bool MatchesNotesType( StepsType type ) const;
void GetMinAndMaxColX( PlayerNumber pn, float& fMixXOut, float& fMaxXOut ) const;
};
stepmania/src/song.h
+11 -11
View File
@@ -95,7 +95,7 @@ public:
CString GetCacheFilePath() const;
void AddAutoGenNotes();
void AutoGen( NotesType ntTo, NotesType ntFrom ); // create Steps of type ntTo from Steps of type ntFrom
void AutoGen( StepsType ntTo, StepsType ntFrom ); // create Steps of type ntTo from Steps of type ntFrom
void RemoveAutoGenNotes();
/* Directory this song data came from: */
@@ -243,18 +243,18 @@ public:
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<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;
bool SongHasNotesType( StepsType nt ) const;
bool SongHasNotesTypeAndDifficulty( StepsType nt, Difficulty dc ) const;
void GetNotes( vector<Steps*>& arrayAddTo, StepsType nt, Difficulty dc = DIFFICULTY_INVALID, int iMeterLow = -1, int iMeterHigh = -1, CString sDescription = "", bool bIncludeAutoGen = true ) const;
Steps* GetNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen = true ) const;
Steps* GetNotes( StepsType nt, int iMeterLow, int iMeterHigh, bool bIncludeAutoGen = true ) const;
Steps* GetNotes( StepsType nt, CString sDescription, bool bIncludeAutoGen = true ) const;
Steps* GetClosestNotes( StepsType nt, Difficulty dc, bool bIncludeAutoGen = true ) const;
void GetEdits( vector<Steps*>& arrayAddTo, StepsType nt, bool bIncludeAutoGen = true ) const;
int GetNumTimesPlayed() const;
bool IsNew() const;
bool IsEasy( NotesType nt ) const;
bool HasEdits( NotesType nt ) const;
bool IsEasy( StepsType nt ) const;
bool HasEdits( StepsType nt ) const;
Grade GetGradeForDifficulty( const StyleDef *s, PlayerNumber pn, Difficulty dc ) const;
bool NormallyDisplayed() const;
bool RouletteDisplayed() const;