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

name cleanup: NotesType -> StepsType

Browse Source
This commit is contained in:
Chris Danford
2004-07-12 02:19:24 +00:00
parent 6001123924
commit d412ab055d
20 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CatalogXml.cpp
+2 -2
View File
@@ -125,10 +125,10 @@ void SaveCatalogXml()
XNode* pNode = xml.AppendChild( "StepsTypesToShow" );
vector<StepsType> vStepsTypes;
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, vStepsTypes );
GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_CurGame, vStepsTypes );
for( vector<StepsType>::const_iterator iter = vStepsTypes.begin(); iter != vStepsTypes.end(); iter++ )
{
pNode->AppendChild( "StepsType", GAMEMAN->NotesTypeToString(*iter) );
pNode->AppendChild( "StepsType", GAMEMAN->StepsTypeToString(*iter) );
}
}
stepmania/src/EditMenu.cpp
+11 -11
View File
@@ -98,7 +98,7 @@ EditMenu::EditMenu()
// fill in data structures
SONGMAN->GetGroupNames( m_sGroups );
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, m_StepsTypes );
GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_CurGame, m_StepsTypes );
ChangeToRow( (Row)0 );
OnRowValueChanged( (Row)0 );
@@ -125,8 +125,8 @@ EditMenu::EditMenu()
{
if( m_StepsTypes[i] == GAMESTATE->m_pCurSteps[PLAYER_1]->m_StepsType )
{
m_iSelection[ROW_NOTES_TYPE] = i;
OnRowValueChanged( ROW_NOTES_TYPE );
m_iSelection[ROW_STEPS_TYPE] = i;
OnRowValueChanged( ROW_STEPS_TYPE );
m_iSelection[ROW_DIFFICULTY] = GAMESTATE->m_pCurSteps[PLAYER_1]->GetDifficulty();
OnRowValueChanged( ROW_DIFFICULTY );
break;
@@ -263,17 +263,17 @@ void EditMenu::OnRowValueChanged( Row row )
m_SongBanner.ScaleToClipped( SONG_BANNER_WIDTH, SONG_BANNER_HEIGHT );
m_SongTextBanner.LoadFromSong( GetSelectedSong() );
// fall through
case ROW_NOTES_TYPE:
m_textValue[ROW_NOTES_TYPE].SetText( GAMEMAN->NotesTypeToString(GetSelectedNotesType()) );
case ROW_STEPS_TYPE:
m_textValue[ROW_STEPS_TYPE].SetText( GAMEMAN->StepsTypeToString(GetSelectedStepsType()) );
// fall through
case ROW_DIFFICULTY:
m_textValue[ROW_DIFFICULTY].SetText( DifficultyToString(GetSelectedDifficulty()) );
m_Meter.SetFromSteps( GetSelectedNotes() );
// fall through
case ROW_SOURCE_NOTES_TYPE:
m_textLabel[ROW_SOURCE_NOTES_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
m_textValue[ROW_SOURCE_NOTES_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
m_textValue[ROW_SOURCE_NOTES_TYPE].SetText( GAMEMAN->NotesTypeToString(GetSelectedSourceNotesType()) );
case ROW_SOURCE_STEPS_TYPE:
m_textLabel[ROW_SOURCE_STEPS_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
m_textValue[ROW_SOURCE_STEPS_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
m_textValue[ROW_SOURCE_STEPS_TYPE].SetText( GAMEMAN->StepsTypeToString(GetSelectedSourceStepsType()) );
// fall through
case ROW_SOURCE_DIFFICULTY:
m_textLabel[ROW_SOURCE_DIFFICULTY].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
@@ -310,12 +310,12 @@ void EditMenu::OnRowValueChanged( Row row )
Steps* EditMenu::GetSelectedNotes()
{
return GetSelectedSong()->GetStepsByDifficulty(GetSelectedNotesType(),GetSelectedDifficulty(), false);
return GetSelectedSong()->GetStepsByDifficulty(GetSelectedStepsType(),GetSelectedDifficulty(), false);
}
Steps* EditMenu::GetSelectedSourceNotes()
{
return GetSelectedSong()->GetStepsByDifficulty(GetSelectedSourceNotesType(),GetSelectedSourceDifficulty(), false);
return GetSelectedSong()->GetStepsByDifficulty(GetSelectedSourceStepsType(),GetSelectedSourceDifficulty(), false);
}
/*
stepmania/src/EditMenu.h
+4 -4
View File
@@ -32,9 +32,9 @@ public:
{
ROW_GROUP,
ROW_SONG,
ROW_NOTES_TYPE,
ROW_STEPS_TYPE,
ROW_DIFFICULTY,
ROW_SOURCE_NOTES_TYPE,
ROW_SOURCE_STEPS_TYPE,
ROW_SOURCE_DIFFICULTY,
ROW_ACTION,
NUM_ROWS
@@ -81,9 +81,9 @@ public:
CString GetSelectedGroup() const { ASSERT(m_iSelection[ROW_GROUP] < (int)m_sGroups.size()); return m_sGroups[m_iSelection[ROW_GROUP]]; }
Song* GetSelectedSong() const { ASSERT(m_iSelection[ROW_SONG] < (int)m_pSongs.size()); return m_pSongs[m_iSelection[ROW_SONG]]; }
StepsType GetSelectedNotesType() const { ASSERT(m_iSelection[ROW_NOTES_TYPE] < (int)m_StepsTypes.size()); return m_StepsTypes[m_iSelection[ROW_NOTES_TYPE]]; }
StepsType GetSelectedStepsType() const { ASSERT(m_iSelection[ROW_STEPS_TYPE] < (int)m_StepsTypes.size()); return m_StepsTypes[m_iSelection[ROW_STEPS_TYPE]]; }
Difficulty GetSelectedDifficulty() const { return (Difficulty)m_iSelection[ROW_DIFFICULTY]; }
StepsType GetSelectedSourceNotesType() const { ASSERT(m_iSelection[ROW_SOURCE_NOTES_TYPE] < (int)m_StepsTypes.size()); return m_StepsTypes[m_iSelection[ROW_SOURCE_NOTES_TYPE]]; }
StepsType GetSelectedSourceStepsType() const { ASSERT(m_iSelection[ROW_SOURCE_STEPS_TYPE] < (int)m_StepsTypes.size()); return m_StepsTypes[m_iSelection[ROW_SOURCE_STEPS_TYPE]]; }
Difficulty GetSelectedSourceDifficulty() const { return (Difficulty)m_iSelection[ROW_SOURCE_DIFFICULTY]; }
Action GetSelectedAction() const { ASSERT(m_iSelection[ROW_ACTION] < (int)m_Actions.size()); return m_Actions[m_iSelection[ROW_ACTION]]; }
stepmania/src/GameManager.cpp
+18 -18
View File
@@ -33,7 +33,7 @@ const int PNM9_COL_SPACING = 32;
struct {
char *name;
int NumTracks;
} const NotesTypes[NUM_STEPS_TYPES] = {
} const StepsTypes[NUM_STEPS_TYPES] = {
{ "dance-single", 4 },
{ "dance-double", 8 },
{ "dance-couple", 8 },
@@ -2827,7 +2827,7 @@ void GameManager::GetStylesForGame( Game game, vector<const Style*>& aStylesAddT
}
}
const Style* GameManager::GetEditorStyleForNotesType( StepsType st )
const Style* GameManager::GetEditorStyleForStepsType( StepsType st )
{
for( unsigned s=0; s<NUM_STYLES; s++ )
{
@@ -2841,7 +2841,7 @@ const Style* GameManager::GetEditorStyleForNotesType( StepsType st )
}
void GameManager::GetNotesTypesForGame( Game game, vector<StepsType>& aNotesTypeAddTo )
void GameManager::GetStepsTypesForGame( Game game, vector<StepsType>& aStepsTypeAddTo )
{
FOREACH_StepsType( st )
{
@@ -2855,7 +2855,7 @@ void GameManager::GetNotesTypesForGame( Game game, vector<StepsType>& aNotesType
found = true;
}
if( found )
aNotesTypeAddTo.push_back( st );
aStepsTypeAddTo.push_back( st );
}
}
@@ -2905,42 +2905,42 @@ bool GameManager::IsGameEnabled( Game game )
return find( aGames.begin(), aGames.end(), game ) != aGames.end();
}
int GameManager::NotesTypeToNumTracks( StepsType st )
int GameManager::StepsTypeToNumTracks( StepsType st )
{
ASSERT_M( st < NUM_STEPS_TYPES, ssprintf("%i", st) );
return NotesTypes[st].NumTracks;
return StepsTypes[st].NumTracks;
}
StepsType GameManager::StringToNotesType( CString sNotesType )
StepsType GameManager::StringToStepsType( CString sStepsType )
{
sNotesType.MakeLower();
sStepsType.MakeLower();
// HACK! We elminitated "ez2-single-hard", but we should still handle it.
if( sNotesType == "ez2-single-hard" )
sNotesType = "ez2-single";
if( sStepsType == "ez2-single-hard" )
sStepsType = "ez2-single";
// HACK! "para-single" used to be called just "para"
if( sNotesType == "para" )
sNotesType = "para-single";
if( sStepsType == "para" )
sStepsType = "para-single";
for( int i=0; i<NUM_STEPS_TYPES; i++ )
if( NotesTypes[i].name == sNotesType )
if( StepsTypes[i].name == sStepsType )
return StepsType(i);
// invalid StepsType
LOG->Warn( "Invalid StepsType string '%s' encountered. Assuming this is 'dance-single'.", sNotesType.c_str() );
LOG->Warn( "Invalid StepsType string '%s' encountered. Assuming this is 'dance-single'.", sStepsType.c_str() );
return STEPS_TYPE_DANCE_SINGLE;
}
CString GameManager::NotesTypeToString( StepsType st )
CString GameManager::StepsTypeToString( StepsType st )
{
ASSERT_M( st < NUM_STEPS_TYPES, ssprintf("%i", st) );
return NotesTypes[st].name;
return StepsTypes[st].name;
}
CString GameManager::NotesTypeToThemedString( StepsType st )
CString GameManager::StepsTypeToThemedString( StepsType st )
{
CString s = NotesTypeToString( st );
CString s = StepsTypeToString( st );
if( THEME->HasMetric( "StepsType", s ) )
return THEME->GetMetric( "StepsType", s );
else
stepmania/src/GameManager.h
+6 -6
View File
@@ -19,18 +19,18 @@ public:
void GetStylesForGame( Game game, vector<const Style*>& aStylesAddTo, bool editor=false );
void GetAllStyles( vector<const Style*>& aStylesAddTo, bool editor=false );
void GetNotesTypesForGame( Game game, vector<StepsType>& aNotesTypeAddTo );
const Style* GetEditorStyleForNotesType( StepsType st );
void GetStepsTypesForGame( Game game, vector<StepsType>& aStepsTypeAddTo );
const Style* GetEditorStyleForStepsType( StepsType st );
const Style* GetDemonstrationStyleForGame( Game game );
const Style* GetHowToPlayStyleForGame( Game game );
void GetEnabledGames( vector<Game>& aGamesOut );
bool IsGameEnabled( Game game );
static int NotesTypeToNumTracks( StepsType st );
static StepsType StringToNotesType( CString sNotesType );
static CString NotesTypeToString( StepsType st );
static CString NotesTypeToThemedString( StepsType st );
static int StepsTypeToNumTracks( StepsType st );
static StepsType StringToStepsType( CString sStepsType );
static CString StepsTypeToString( StepsType st );
static CString StepsTypeToThemedString( StepsType st );
static Game StringToGameType( CString sGameType );
const Style* GameAndStringToStyle( Game game, CString sStyle );
static CString StyleToThemedString( const Style* s );
stepmania/src/NotesLoaderBMS.cpp
+1 -1
View File
@@ -319,7 +319,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
return false;
}
int iNumNewTracks = GameManager::NotesTypeToNumTracks( out.m_StepsType );
int iNumNewTracks = GameManager::StepsTypeToNumTracks( out.m_StepsType );
int iTransformNewToOld[MAX_NOTE_TRACKS];
int i;
stepmania/src/NotesLoaderSM.cpp
+4 -4
View File
@@ -11,7 +11,7 @@
#define MAX_EDIT_SIZE_BYTES 20*1024 // 20 KB
void SMLoader::LoadFromSMTokens(
CString sNotesType,
CString sStepsType,
CString sDescription,
CString sDifficulty,
CString sMeter,
@@ -21,8 +21,8 @@ void SMLoader::LoadFromSMTokens(
Steps &out
)
{
TrimLeft(sNotesType);
TrimRight(sNotesType);
TrimLeft(sStepsType);
TrimRight(sStepsType);
TrimLeft(sDescription);
TrimRight(sDescription);
TrimLeft(sDifficulty);
@@ -31,7 +31,7 @@ void SMLoader::LoadFromSMTokens(
// LOG->Trace( "Steps::LoadFromSMTokens()" );
out.m_StepsType = GameManager::StringToNotesType(sNotesType);
out.m_StepsType = GameManager::StringToStepsType(sStepsType);
out.SetDescription(sDescription);
out.SetDifficulty(StringToDifficulty( sDifficulty ));
stepmania/src/NotesLoaderSM.h
+1 -1
View File
@@ -12,7 +12,7 @@ class MsdFile;
class SMLoader: public NotesLoader
{
static void LoadFromSMTokens(
CString sNotesType,
CString sStepsType,
CString sDescription,
CString sDifficulty,
CString sMeter,
stepmania/src/NotesWriterSM.cpp
+2 -2
View File
@@ -128,9 +128,9 @@ void NotesWriterSM::WriteSMNotesTag( const Steps &in, RageFile &f, bool bSavingC
{
f.PutLine( "" );
f.PutLine( ssprintf( "//---------------%s - %s----------------",
GameManager::NotesTypeToString(in.m_StepsType).c_str(), in.GetDescription().c_str() ) );
GameManager::StepsTypeToString(in.m_StepsType).c_str(), in.GetDescription().c_str() ) );
f.PutLine( "#NOTES:" );
f.PutLine( ssprintf( " %s:", GameManager::NotesTypeToString(in.m_StepsType).c_str() ) );
f.PutLine( ssprintf( " %s:", GameManager::StepsTypeToString(in.m_StepsType).c_str() ) );
f.PutLine( ssprintf( " %s:", in.GetDescription().c_str() ) );
f.PutLine( ssprintf( " %s:", DifficultyToString(in.GetDifficulty()).c_str() ) );
f.PutLine( ssprintf( " %d:", in.GetMeter() ) );
stepmania/src/Profile.cpp
+4 -4
View File
@@ -1178,7 +1178,7 @@ XNode* Profile::SaveCategoryScoresCreateNode() const
continue;
XNode* pStepsTypeNode = pNode->AppendChild( "StepsType" );
pStepsTypeNode->AppendAttr( "Type", GameManager::NotesTypeToString(st) );
pStepsTypeNode->AppendAttr( "Type", GameManager::StepsTypeToString(st) );
FOREACH_RankingCategory( rc )
{
@@ -1214,7 +1214,7 @@ void Profile::LoadCategoryScoresFromNode( const XNode* pNode )
CString str;
if( !(*stepsType)->GetAttrValue( "Type", str ) )
WARN_AND_CONTINUE;
StepsType st = GameManager::StringToNotesType( str );
StepsType st = GameManager::StringToStepsType( str );
if( st == STEPS_TYPE_INVALID )
WARN_AND_CONTINUE;
@@ -1393,7 +1393,7 @@ void Profile::LoadAwardsFromNode( const XNode* pNode )
CString sStepsType;
if( !(*pAward)->GetAttrValue( "StepsType", sStepsType ) )
WARN_AND_CONTINUE;
StepsType st = GameManager::StringToNotesType( sStepsType );
StepsType st = GameManager::StringToStepsType( sStepsType );
if( st == STEPS_TYPE_INVALID )
WARN_AND_CONTINUE;
@@ -1463,7 +1463,7 @@ XNode* Profile::SaveAwardsCreateNode() const
XNode* pAward = pNode->AppendChild( "PerDifficultyAward" );
pAward->AppendAttr( "StepsType", GameManager::NotesTypeToString(st) );
pAward->AppendAttr( "StepsType", GameManager::StepsTypeToString(st) );
pAward->AppendAttr( "Difficulty", DifficultyToString(dc) );
pAward->AppendAttr( "PerDifficultyAward", PerDifficultyAwardToString(pda) );
stepmania/src/ScreenEdit.cpp
+1 -1
View File
@@ -975,7 +975,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
pSteps->GetNoteData( &m_NoteFieldEdit );
SCREENMAN->SystemMessage( ssprintf(
"Switched to %s %s '%s'",
GAMEMAN->NotesTypeToString( pSteps->m_StepsType ).c_str(),
GAMEMAN->StepsTypeToString( pSteps->m_StepsType ).c_str(),
DifficultyToString( pSteps->GetDifficulty() ).c_str(),
pSteps->GetDescription().c_str() ) );
SOUND->PlayOnce( THEME->GetPathToS("ScreenEdit switch") );
stepmania/src/ScreenEditMenu.cpp
+3 -3
View File
@@ -96,16 +96,16 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
return;
Song* pSong = m_Selector.GetSelectedSong();
StepsType st = m_Selector.GetSelectedNotesType();
StepsType st = m_Selector.GetSelectedStepsType();
Difficulty dc = m_Selector.GetSelectedDifficulty();
Steps* pSteps = m_Selector.GetSelectedNotes();
// StepsType soureNT = m_Selector.GetSelectedSourceNotesType();
// StepsType soureNT = m_Selector.GetSelectedSourceStepsType();
// Difficulty sourceDiff = m_Selector.GetSelectedSourceDifficulty();
Steps* pSourceNotes = m_Selector.GetSelectedSourceNotes();
EditMenu::Action action = m_Selector.GetSelectedAction();
GAMESTATE->m_pCurSong = pSong;
GAMESTATE->m_pCurStyle = GAMEMAN->GetEditorStyleForNotesType( st );
GAMESTATE->m_pCurStyle = GAMEMAN->GetEditorStyleForStepsType( st );
GAMESTATE->m_pCurSteps[PLAYER_1] = pSteps;
//
stepmania/src/ScreenEnding.cpp
+2 -2
View File
@@ -37,7 +37,7 @@ CString GetStatsLineTitle( PlayerNumber pn, EndingStatsLine line )
// Ugly...
{
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
CString sStepsType = GAMEMAN->NotesTypeToThemedString(st);
CString sStepsType = GAMEMAN->StepsTypeToThemedString(st);
if( GAMESTATE->IsCourseMode() )
{
CourseDifficulty cd = (CourseDifficulty)line;
@@ -73,7 +73,7 @@ CString GetStatsLineValue( PlayerNumber pn, EndingStatsLine line )
// Ugly...
{
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
CString sStepsType = GAMEMAN->NotesTypeToThemedString(st);
CString sStepsType = GAMEMAN->StepsTypeToThemedString(st);
if( GAMESTATE->IsCourseMode() )
{
CourseDifficulty cd = (CourseDifficulty)line;
stepmania/src/ScreenRanking.cpp
+6 -6
View File
@@ -265,7 +265,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
// calculate which StepsTypes to show
vector<StepsType> aStepsTypesToShow;
{
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aStepsTypesToShow );
GAMEMAN->GetStepsTypesForGame( GAMESTATE->m_CurGame, aStepsTypesToShow );
// subtract hidden StepsTypes
{
@@ -273,7 +273,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
split( STEPS_TYPES_TO_HIDE, ",", asStepsTypesToHide, true );
for( unsigned i=0; i<asStepsTypesToHide.size(); i++ )
{
StepsType st = GameManager::StringToNotesType(asStepsTypesToHide[i]);
StepsType st = GameManager::StringToStepsType(asStepsTypesToHide[i]);
if( st != STEPS_TYPE_INVALID )
{
const vector<StepsType>::iterator iter = find( aStepsTypesToShow.begin(), aStepsTypesToShow.end(), st );
@@ -673,7 +673,7 @@ float ScreenRanking::SetPage( PageToShow pts )
case PAGE_TYPE_CATEGORY:
{
m_textCategory.SetText( ssprintf("Type %c", 'A'+pts.category) );
m_textStepsType.SetText( GameManager::NotesTypeToThemedString(pts.nt) );
m_textStepsType.SetText( GameManager::StepsTypeToThemedString(pts.nt) );
for( int l=0; l<NUM_RANKING_LINES; l++ )
{
@@ -713,7 +713,7 @@ float ScreenRanking::SetPage( PageToShow pts )
{
m_textCourseTitle.SetText( pts.pCourse->GetFullDisplayTitle() );
m_Banner.LoadFromCourse( pts.pCourse );
m_textStepsType.SetText( GameManager::NotesTypeToThemedString(pts.nt) );
m_textStepsType.SetText( GameManager::StepsTypeToThemedString(pts.nt) );
const HighScoreList &hsl = PROFILEMAN->GetMachineProfile()->GetCourseHighScoreList( pts.pCourse, pts.pTrail );
for( int l=0; l<NUM_RANKING_LINES; l++ )
@@ -762,7 +762,7 @@ float ScreenRanking::SetPage( PageToShow pts )
return SECONDS_PER_PAGE;
case PAGE_TYPE_ALL_STEPS:
{
m_textStepsType.SetText( GameManager::NotesTypeToThemedString(pts.nt) );
m_textStepsType.SetText( GameManager::StepsTypeToThemedString(pts.nt) );
for( unsigned s=0; s<m_vpStepsScoreRowItem.size(); s++ )
{
@@ -807,7 +807,7 @@ float ScreenRanking::SetPage( PageToShow pts )
return m_ListScoreRowItems.GetSecondsForCompleteScrollThrough();
case PAGE_TYPE_ALL_COURSES:
{
m_textStepsType.SetText( GameManager::NotesTypeToThemedString(pts.nt) );
m_textStepsType.SetText( GameManager::StepsTypeToThemedString(pts.nt) );
for( unsigned c=0; c<m_vpCourseScoreRowItem.size(); c++ )
{
stepmania/src/Song.cpp
+3 -3
View File
@@ -1100,7 +1100,7 @@ void Song::AddAutoGenNotes()
continue;
// missing Steps of this type
int iNumTracksOfMissing = GAMEMAN->NotesTypeToNumTracks(stMissing);
int iNumTracksOfMissing = GAMEMAN->StepsTypeToNumTracks(stMissing);
// look for closest match
StepsType stBestMatch = (StepsType)-1;
@@ -1112,7 +1112,7 @@ void Song::AddAutoGenNotes()
continue;
/* has (non-autogen) Steps of this type */
const int iNumTracks = GAMEMAN->NotesTypeToNumTracks(st);
const int iNumTracks = GAMEMAN->StepsTypeToNumTracks(st);
const int iTrackDifference = abs(iNumTracks-iNumTracksOfMissing);
if( iTrackDifference < iBestTrackDifference )
{
@@ -1128,7 +1128,7 @@ void Song::AddAutoGenNotes()
void Song::AutoGen( StepsType ntTo, StepsType ntFrom )
{
// int iNumTracksOfTo = GAMEMAN->NotesTypeToNumTracks(ntTo);
// int iNumTracksOfTo = GAMEMAN->StepsTypeToNumTracks(ntTo);
for( unsigned int j=0; j<m_vpSteps.size(); j++ )
{
stepmania/src/Steps.cpp
+6 -6
View File
@@ -35,7 +35,7 @@ Steps::~Steps()
void Steps::SetNoteData( const NoteData* pNewNoteData )
{
ASSERT( pNewNoteData->GetNumTracks() == GameManager::NotesTypeToNumTracks(m_StepsType) );
ASSERT( pNewNoteData->GetNumTracks() == GameManager::StepsTypeToNumTracks(m_StepsType) );
DeAutogen();
@@ -60,7 +60,7 @@ void Steps::GetNoteData( NoteData* pNoteDataOut ) const
else
{
pNoteDataOut->ClearAll();
pNoteDataOut->SetNumTracks( GameManager::NotesTypeToNumTracks(m_StepsType) );
pNoteDataOut->SetNumTracks( GameManager::StepsTypeToNumTracks(m_StepsType) );
}
}
@@ -173,7 +173,7 @@ void Steps::Decompress() const
notes = new NoteData;
int iNewTracks = GameManager::NotesTypeToNumTracks(m_StepsType);
int iNewTracks = GameManager::StepsTypeToNumTracks(m_StepsType);
if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET )
{
@@ -192,7 +192,7 @@ void Steps::Decompress() const
{
// load from compressed
notes = new NoteData;
notes->SetNumTracks( GameManager::NotesTypeToNumTracks(m_StepsType) );
notes->SetNumTracks( GameManager::StepsTypeToNumTracks(m_StepsType) );
NoteDataUtil::LoadFromSMNoteDataString(*notes, notes_comp->notes, notes_comp->attacks );
}
@@ -241,7 +241,7 @@ void Steps::CopyFrom( Steps* pSource, StepsType ntTo ) // pSource does not have
m_StepsType = ntTo;
NoteData noteData;
pSource->GetNoteData( &noteData );
noteData.SetNumTracks( GameManager::NotesTypeToNumTracks(ntTo) );
noteData.SetNumTracks( GameManager::StepsTypeToNumTracks(ntTo) );
this->SetNoteData( &noteData );
this->SetDescription( "Copied from "+pSource->GetDescription() );
this->SetDifficulty( pSource->GetDifficulty() );
@@ -253,7 +253,7 @@ void Steps::CreateBlank( StepsType ntTo )
{
m_StepsType = ntTo;
NoteData noteData;
noteData.SetNumTracks( GameManager::NotesTypeToNumTracks(ntTo) );
noteData.SetNumTracks( GameManager::StepsTypeToNumTracks(ntTo) );
this->SetNoteData( &noteData );
}
stepmania/src/StepsUtil.cpp
+3 -3
View File
@@ -172,7 +172,7 @@ XNode* StepsID::CreateNode() const
XNode* pNode = new XNode;
pNode->name = "Steps";
pNode->AppendAttr( "StepsType", GameManager::NotesTypeToString(st) );
pNode->AppendAttr( "StepsType", GameManager::StepsTypeToString(st) );
pNode->AppendAttr( "Difficulty", DifficultyToString(dc) );
if( dc == DIFFICULTY_EDIT )
{
@@ -196,7 +196,7 @@ void StepsID::LoadFromNode( const XNode* pNode )
CString sTemp;
pNode->GetAttrValue("StepsType", sTemp);
st = GameManager::StringToNotesType( sTemp );
st = GameManager::StringToStepsType( sTemp );
pNode->GetAttrValue("Difficulty", sTemp);
dc = StringToDifficulty( sTemp );
@@ -213,7 +213,7 @@ void StepsID::LoadFromNode( const XNode* pNode )
CString StepsID::ToString() const
{
CString s = GameManager::NotesTypeToString(st);
CString s = GameManager::StepsTypeToString(st);
s += " " + DifficultyToString(dc);
if( dc == DIFFICULTY_EDIT )
{
stepmania/src/Style.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ PlayerNumber Style::ControllerToPlayerNumber( GameController controller ) const
}
}
bool Style::MatchesNotesType( StepsType type ) const
bool Style::MatchesStepsType( StepsType type ) const
{
if(type == m_StepsType) return true;
stepmania/src/Style.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
void GetTransformedNoteDataForStyle( PlayerNumber pn, const NoteData* pOriginal, NoteData* pNoteDataOut ) const;
bool MatchesNotesType( StepsType type ) const;
bool MatchesStepsType( StepsType type ) const;
void GetMinAndMaxColX( PlayerNumber pn, float& fMixXOut, float& fMaxXOut ) const;
};
stepmania/src/TrailUtil.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ XNode* TrailID::CreateNode() const
XNode* pNode = new XNode;
pNode->name = "Trail";
pNode->AppendAttr( "StepsType", GameManager::NotesTypeToString(st) );
pNode->AppendAttr( "StepsType", GameManager::StepsTypeToString(st) );
pNode->AppendAttr( "CourseDifficulty", CourseDifficultyToString(cd) );
return pNode;
@@ -52,7 +52,7 @@ void TrailID::LoadFromNode( const XNode* pNode )
CString sTemp;
pNode->GetAttrValue("StepsType", sTemp);
st = GameManager::StringToNotesType( sTemp );
st = GameManager::StringToStepsType( sTemp );
pNode->GetAttrValue("CourseDifficulty", sTemp);
cd = StringToCourseDifficulty( sTemp );
@@ -60,7 +60,7 @@ void TrailID::LoadFromNode( const XNode* pNode )
CString TrailID::ToString() const
{
CString s = GameManager::NotesTypeToString(st);
CString s = GameManager::StepsTypeToString(st);
s += " " + CourseDifficultyToString(cd);
return s;
}