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

rename: m_sPreferredGroup -> m_sPreferredSongGroup

Browse Source 
add SongGroup to ModeChoice
This commit is contained in:
Chris Danford
2004-12-01 07:24:55 +00:00
parent 2b6350e63b
commit 683587e81b
11 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.h
+1 -1
View File
@@ -211,7 +211,7 @@ const int NUM_RANKING_LINES = 5;
//
// Group stuff
//
#define GROUP_ALL_MUSIC CString("")
#define GROUP_ALL_MUSIC CString("--ALL MUSIC--")
//
stepmania/src/GameState.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ void GameState::Reset()
// m_iCoins = 0; // don't reset coin count!
m_MasterPlayerNumber = PLAYER_INVALID;
m_mapEnv.clear();
m_sPreferredGroup = GROUP_ALL_MUSIC;
m_sPreferredSongGroup = GROUP_ALL_MUSIC;
m_bChangedFailType = false;
FOREACH_PlayerNumber( p )
{
stepmania/src/GameState.h
+1 -1
View File
@@ -102,7 +102,7 @@ public:
bool ShowMarvelous() const;
CString m_sLoadingMessage; // used in loading screen
CString m_sPreferredGroup; // GROUP_ALL_MUSIC denotes no preferred group
CString m_sPreferredSongGroup; // GROUP_ALL_MUSIC denotes no preferred group
bool m_bChangedFailType; // true if FailType was changed in the song options screen
Difficulty m_PreferredDifficulty[NUM_PLAYERS];
SortOrder m_SortOrder; // used by MusicWheel
stepmania/src/ModeChoice.cpp
+28 -17
View File
@@ -129,8 +129,7 @@ void ModeChoice::Load( int iIndex, CString sChoice )
m_bInvalid |= true;
}
if( sName == "style" )
else if( sName == "style" )
{
const Style* style = GAMEMAN->GameAndStringToStyle( GAMESTATE->m_pCurGame, sValue );
if( style )
@@ -139,7 +138,7 @@ void ModeChoice::Load( int iIndex, CString sChoice )
m_bInvalid |= true;
}
if( sName == "playmode" )
else if( sName == "playmode" )
{
PlayMode pm = StringToPlayMode( sValue );
if( pm != PLAY_MODE_INVALID )
@@ -148,7 +147,7 @@ void ModeChoice::Load( int iIndex, CString sChoice )
m_bInvalid |= true;
}
if( sName == "difficulty" )
else if( sName == "difficulty" )
{
Difficulty dc = StringToDifficulty( sValue );
if( dc != DIFFICULTY_INVALID )
@@ -157,20 +156,24 @@ void ModeChoice::Load( int iIndex, CString sChoice )
m_bInvalid |= true;
}
if( sName == "announcer" )
else if( sName == "announcer" )
{
m_sAnnouncer = sValue;
if( sName == "name" )
}
else if( sName == "name" )
{
m_sName = sValue;
}
if( sName == "mod" )
else if( sName == "mod" )
{
if( m_sModifiers != "" )
m_sModifiers += ",";
m_sModifiers += sValue;
}
if( sName == "song" )
else if( sName == "song" )
{
m_pSong = SONGMAN->FindSong( sValue );
if( m_pSong == NULL )
@@ -180,14 +183,14 @@ void ModeChoice::Load( int iIndex, CString sChoice )
}
}
if( sName == "steps" )
else if( sName == "steps" )
{
/* Save the name of the steps, and set this later, since we want to process
* any "song" and "style" commands first. */
sSteps = sValue;
}
if( sName == "course" )
else if( sName == "course" )
{
m_pCourse = SONGMAN->FindCourse( sValue );
if( m_pCourse == NULL )
@@ -197,13 +200,19 @@ void ModeChoice::Load( int iIndex, CString sChoice )
}
}
if( sName == "screen" )
m_sScreen = sValue;
if( sName == "setenv" )
else if( sName == "screen" )
{
ASSERT( asBits.size() == 2 );
m_SetEnv[ asBits[0] ] = asBits[1];
m_sScreen = sValue;
}
else if( sName == "setenv" )
{
m_SetEnv[ asBits[0] ] = sValue;
}
else if( sName == "songgroup" )
{
m_sSongGroup = sValue;
}
}
@@ -472,6 +481,8 @@ void ModeChoice::Apply( PlayerNumber pn ) const
GAMESTATE->m_pCurCharacters[pn] = m_pCharacter;
for( map<CString,CString>::const_iterator i = m_SetEnv.begin(); i != m_SetEnv.end(); i++ )
GAMESTATE->m_mapEnv[ i->first ] = i->second;
if( !m_sSongGroup.empty() )
GAMESTATE->m_sPreferredSongGroup = m_sSongGroup;
// HACK: Set life type to BATTERY just once here so it happens once and
// we don't override the user's changes if they back out.
stepmania/src/ModeChoice.h
+1
View File
@@ -46,6 +46,7 @@ struct ModeChoice // used in SelectMode
Trail* m_pTrail;
Character* m_pCharacter;
std::map<CString,CString> m_SetEnv;
CString m_sSongGroup;
};
#endif
stepmania/src/MusicBannerWheel.cpp
+2 -2
View File
@@ -55,10 +55,10 @@ MusicBannerWheel::MusicBannerWheel()
m_ScrollingList.SetSpacing( BANNERSPACING );
this->AddChild( &m_ScrollingList );
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC )
SONGMAN->GetSongs( arraySongs, GAMESTATE->GetNumStagesLeft() );
else // Get the Group They Want
SONGMAN->GetSongs( arraySongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );
SONGMAN->GetSongs( arraySongs, GAMESTATE->m_sPreferredSongGroup, GAMESTATE->GetNumStagesLeft() );
//Detect autogenned songs
if ( !PREFSMAN->m_bAutogenSteps )
stepmania/src/MusicWheel.cpp
+6 -6
View File
@@ -125,10 +125,10 @@ void MusicWheel::Load()
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
{
// make the preferred group the group of the last song played.
if( GAMESTATE->m_sPreferredGroup==GROUP_ALL_MUSIC && !PREFSMAN->m_bPickExtraStage )
if( GAMESTATE->m_sPreferredSongGroup==GROUP_ALL_MUSIC && !PREFSMAN->m_bPickExtraStage )
{
ASSERT(GAMESTATE->m_pCurSong);
GAMESTATE->m_sPreferredGroup = GAMESTATE->m_pCurSong->m_sGroupName;
GAMESTATE->m_sPreferredSongGroup = GAMESTATE->m_pCurSong->m_sGroupName;
}
Song* pSong;
@@ -354,9 +354,9 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SortOrder so, CString sP
// else
// SONGMAN->GetSongs( apAllSongs, GAMESTATE->GetNumStagesLeft() );
if( so == SORT_MOST_PLAYED )
SONGMAN->GetBestSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );
SONGMAN->GetBestSongs( apAllSongs, GAMESTATE->m_sPreferredSongGroup, GAMESTATE->GetNumStagesLeft() );
else
SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );
SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredSongGroup, GAMESTATE->GetNumStagesLeft() );
// copy only songs that have at least one Steps for the current GameMode
for( unsigned i=0; i<apAllSongs.size(); i++ )
@@ -475,7 +475,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
///////////////////////////////////
vector<Song*> arraySongs;
GetSongList(arraySongs, so, GAMESTATE->m_sPreferredGroup );
GetSongList(arraySongs, so, GAMESTATE->m_sPreferredSongGroup );
bool bUseSections = true;
@@ -489,7 +489,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
break;
case SORT_GROUP:
SongUtil::SortSongPointerArrayByGroupAndTitle( arraySongs );
bUseSections = GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC;
bUseSections = GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC;
break;
case SORT_TITLE:
SongUtil::SortSongPointerArrayByTitle( arraySongs );
stepmania/src/ScreenJukebox.cpp
+2 -2
View File
@@ -35,10 +35,10 @@ bool ScreenJukebox::SetSong( bool bDemonstration )
vSongs.push_back( tCourse->m_entries[i].pSong );
if ( vSongs.size() == 0 )
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC )
SONGMAN->GetSongs( vSongs );
else
SONGMAN->GetSongs( vSongs, GAMESTATE->m_sPreferredGroup );
SONGMAN->GetSongs( vSongs, GAMESTATE->m_sPreferredSongGroup );
//
// Calculate what difficulties to show
stepmania/src/ScreenJukeboxMenu.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void ScreenJukeboxMenu::MenuStart( PlayerNumber pn )
bool bModifiers = m_Selector.GetSelectedModifiers();
GAMESTATE->m_pCurStyle = style;
GAMESTATE->m_sPreferredGroup = (sGroup=="ALL MUSIC") ? GROUP_ALL_MUSIC : sGroup;
GAMESTATE->m_sPreferredSongGroup = (sGroup=="ALL MUSIC") ? GROUP_ALL_MUSIC : sGroup;
FOREACH_PlayerNumber( p )
GAMESTATE->m_PreferredDifficulty[p] = dc;
GAMESTATE->m_bJukeboxUsesModifiers = bModifiers;
stepmania/src/ScreenSelectGroup.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme
if( !PREFSMAN->m_bShowSelectGroup )
{
GAMESTATE->m_sPreferredGroup = GROUP_ALL_MUSIC;
GAMESTATE->m_sPreferredSongGroup = GROUP_ALL_MUSIC;
HandleScreenMessage( SM_GoToNextScreen );
return;
}
@@ -220,9 +220,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
m_bChosen = true;
GAMESTATE->m_pCurSong = NULL;
GAMESTATE->m_sPreferredGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
GAMESTATE->m_sPreferredSongGroup = (m_GroupList.GetSelectionName()=="ALL MUSIC" ? GROUP_ALL_MUSIC : m_GroupList.GetSelectionName() );
if( GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC )
if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC )
SOUND->PlayOnceFromAnnouncer( "select group comment all music" );
else
SOUND->PlayOnceFromAnnouncer( "select group comment general" );
stepmania/src/SongManager.cpp
+1 -1
View File
@@ -910,7 +910,7 @@ bool CompareNotesPointersForExtra(const Steps *n1, const Steps *n2)
void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd,
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions& po_out, SongOptions& so_out )
{
CString sGroup = GAMESTATE->m_sPreferredGroup;
CString sGroup = GAMESTATE->m_sPreferredSongGroup;
if( sGroup == GROUP_ALL_MUSIC )
{
if( GAMESTATE->m_pCurSong == NULL )