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

fix "can't get to mode menu because m_Wheel.m_SortOrder and GAMESTATE->m_SortOrder are out of sync"

Browse Source
This commit is contained in:
Chris Danford
2005-04-29 08:18:44 +00:00
parent 85a35497fe
commit 76a3465bd1
4 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+19 -22
View File
@@ -200,21 +200,18 @@ void MusicWheel::Load( CString sType )
GAMESTATE->m_SongOptions = so;
}
m_SortOrder = GAMESTATE->m_PreferredSortOrder;
GAMESTATE->m_SortOrder = GAMESTATE->m_PreferredSortOrder;
/* Never start in the mode menu; some elements may not initialize correctly. */
if( m_SortOrder == SORT_MODE_MENU )
m_SortOrder = SORT_INVALID;
if( GAMESTATE->m_SortOrder == SORT_MODE_MENU )
GAMESTATE->m_SortOrder = SORT_INVALID;
m_SortOrder = ForceAppropriateSort( GAMESTATE->m_PlayMode, m_SortOrder );
GAMESTATE->m_SortOrder = ForceAppropriateSort( GAMESTATE->m_PlayMode, GAMESTATE->m_SortOrder );
/* Only save the sort order if the player didn't already have one. If he did, don't
* overwrite it. */
if( GAMESTATE->m_PreferredSortOrder == SORT_INVALID )
{
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
GAMESTATE->m_SortOrder = m_SortOrder;
}
GAMESTATE->m_PreferredSortOrder = GAMESTATE->m_SortOrder;
/* Update for SORT_MOST_PLAYED. */
SONGMAN->UpdateBest();
@@ -290,7 +287,7 @@ bool MusicWheel::SelectSongOrCourse()
return true;
// Select the first selectable song based on the sort order...
vector<WheelItemData> &wiWheelItems = m_WheelItemDatas[m_SortOrder];
vector<WheelItemData> &wiWheelItems = m_WheelItemDatas[GAMESTATE->m_SortOrder];
for( unsigned i = 0; i < wiWheelItems.size(); i++ )
{
if( wiWheelItems[i].m_pSong )
@@ -325,7 +322,7 @@ bool MusicWheel::SelectSong( Song *p )
return false;
unsigned i;
vector<WheelItemData> &from = m_WheelItemDatas[m_SortOrder];
vector<WheelItemData> &from = m_WheelItemDatas[GAMESTATE->m_SortOrder];
for( i=0; i<from.size(); i++ )
{
if( from[i].m_pSong == p )
@@ -355,7 +352,7 @@ bool MusicWheel::SelectCourse( Course *p )
GAMESTATE->m_pCurCourse = p;
unsigned i;
vector<WheelItemData> &from = m_WheelItemDatas[m_SortOrder];
vector<WheelItemData> &from = m_WheelItemDatas[GAMESTATE->m_SortOrder];
for( i=0; i<from.size(); i++ )
{
if( from[i].m_pCourse == p )
@@ -381,7 +378,7 @@ bool MusicWheel::SelectCourse( Course *p )
bool MusicWheel::SelectModeMenuItem()
{
/* Select the last-chosen option. */
const vector<WheelItemData> &from = m_WheelItemDatas[m_SortOrder];
const vector<WheelItemData> &from = m_WheelItemDatas[GAMESTATE->m_SortOrder];
unsigned i;
for( i=0; i<from.size(); i++ )
{
@@ -1044,14 +1041,14 @@ void MusicWheel::Update( float fDeltaTime )
SCREENMAN->PostMessageToTopScreen( SM_SortOrderChanged, 0 );
SetOpenGroup(SongUtil::GetSectionNameFromSongAndSort( pPrevSelectedSong, m_SortOrder ));
SetOpenGroup(SongUtil::GetSectionNameFromSongAndSort( pPrevSelectedSong, GAMESTATE->m_SortOrder ));
m_iSelection = 0;
//
// Select the previously selected item
//
switch( m_SortOrder )
switch( GAMESTATE->m_SortOrder )
{
default:
// Look for the last selected song or course
@@ -1066,7 +1063,7 @@ void MusicWheel::Update( float fDeltaTime )
// Change difficulty for sorts by meter - XXX: do this with GameCommand?
//
Difficulty dc = DIFFICULTY_INVALID;
switch( m_SortOrder )
switch( GAMESTATE->m_SortOrder )
{
case SORT_EASY_METER: dc = DIFFICULTY_EASY; break;
case SORT_MEDIUM_METER: dc = DIFFICULTY_MEDIUM; break;
@@ -1248,7 +1245,7 @@ void MusicWheel::ChangeMusic(int dist)
bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change successful
{
ASSERT( new_so < NUM_SORT_ORDERS );
if( m_SortOrder == new_so )
if( GAMESTATE->m_SortOrder == new_so )
return false;
/* Don't change to SORT_MODE_MENU if it doesn't have at least two choices. */
@@ -1275,7 +1272,7 @@ bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change success
GAMESTATE->m_PreferredSortOrder = new_so;
GAMESTATE->m_SortOrder = new_so;
m_SortOrder = new_so;
GAMESTATE->m_SortOrder = new_so;
m_WheelState = STATE_FLYING_OFF_BEFORE_NEXT_SORT;
return true;
@@ -1284,12 +1281,12 @@ bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change success
bool MusicWheel::NextSort() // return true if change successful
{
// don't allow NextSort when on the sort menu or mode menu
if( m_SortOrder == SORT_MODE_MENU )
if( GAMESTATE->m_SortOrder == SORT_MODE_MENU )
return false;
// find the index of the current sort
int cur = 0;
while( cur < int(SONG_SORT_ORDERS.size()) && SONG_SORT_ORDERS[cur] != m_SortOrder )
while( cur < int(SONG_SORT_ORDERS.size()) && SONG_SORT_ORDERS[cur] != GAMESTATE->m_SortOrder )
++cur;
// move to the next sort with wrapping
@@ -1409,7 +1406,7 @@ void MusicWheel::StartRandom()
void MusicWheel::SetOpenGroup(CString group, SortOrder so)
{
if( so != SORT_INVALID )
m_SortOrder = so;
GAMESTATE->m_SortOrder = so;
m_sExpandedSectionName = group;
@@ -1418,7 +1415,7 @@ void MusicWheel::SetOpenGroup(CString group, SortOrder so)
old = m_CurWheelItemData[m_iSelection];
m_CurWheelItemData.clear();
vector<WheelItemData> &from = m_WheelItemDatas[m_SortOrder];
vector<WheelItemData> &from = m_WheelItemDatas[GAMESTATE->m_SortOrder];
for( unsigned i = 0; i < from.size(); ++i )
{
WheelItemData &d = from[i];
@@ -1646,7 +1643,7 @@ Song *MusicWheel::GetPreferredSelectionForRandomOrPortal()
}
CString sPreferredGroup = m_sExpandedSectionName;
vector<WheelItemData> &wid = m_WheelItemDatas[m_SortOrder];
vector<WheelItemData> &wid = m_WheelItemDatas[GAMESTATE->m_SortOrder];
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
stepmania/src/MusicWheel.h
-2
View File
@@ -68,7 +68,6 @@ public:
bool SelectSong( Song *p );
bool SelectSection( const CString & SectionName );
void SetOpenGroup(CString group, SortOrder so = SORT_INVALID);
SortOrder GetSortOrder() const { return m_SortOrder; }
protected:
void GetSongList(vector<Song*> &arraySongs, SortOrder so, CString sPreferredGroup );
@@ -88,7 +87,6 @@ protected:
int m_iSelection; // index into m_CurWheelItemData
CString m_sExpandedSectionName;
CString m_sLastModeMenuItem;
SortOrder m_SortOrder;
int m_iSwitchesLeftInSpinDown;
float m_fLockedWheelVelocity;
stepmania/src/ScreenNetSelectMusic.cpp
+1 -2
View File
@@ -468,8 +468,7 @@ void ScreenNetSelectMusic::StartSelectedSong()
GAMESTATE->m_pCurSteps[pn].Set( pSteps );
}
GAMESTATE->m_PreferredSortOrder = m_MusicWheel.GetSortOrder();
GAMESTATE->m_SortOrder = m_MusicWheel.GetSortOrder();
GAMESTATE->m_PreferredSortOrder = GAMESTATE->m_SortOrder;
GAMESTATE->m_pPreferredSong = pSong;
TweenOffScreen();
stepmania/src/ScreenSelectMusic.cpp
+12 -12
View File
@@ -319,7 +319,7 @@ void ScreenSelectMusic::Init()
}
m_MusicSortDisplay.SetName( "SortIcon" );
m_MusicSortDisplay.Set( m_MusicWheel.GetSortOrder() );
m_MusicSortDisplay.Set( GAMESTATE->m_SortOrder );
SET_XY( m_MusicSortDisplay );
this->AddChild( &m_MusicSortDisplay );
@@ -521,7 +521,7 @@ void ScreenSelectMusic::TweenOnScreen()
TweenSongPartsOnScreen( true );
TweenCoursePartsOnScreen( true );
switch( m_MusicWheel.GetSortOrder() )
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES:
@@ -578,7 +578,7 @@ void ScreenSelectMusic::TweenOnScreen()
void ScreenSelectMusic::TweenOffScreen()
{
switch( m_MusicWheel.GetSortOrder() )
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES:
@@ -672,7 +672,7 @@ void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort()
m_sprHighScoreFrame[p].RunCommands( SCORE_FRAME_SORT_CHANGE_COMMAND(p) );
}
switch( m_MusicWheel.GetSortOrder() )
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES:
@@ -1361,7 +1361,7 @@ void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &vpns )
m_GrooveRadar.SetFromSteps( pn, pSteps );
m_MusicWheel.NotesOrTrailChanged( pn );
if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState( m_MusicWheel.GetSortOrder() );
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder );
}
if( SHOW_DIFFICULTY_LIST )
@@ -1414,7 +1414,7 @@ void ScreenSelectMusic::AfterTrailChange( const vector<PlayerNumber> &vpns )
m_GrooveRadar.SetEmpty( pn );
m_MusicWheel.NotesOrTrailChanged( pn );
if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState( m_MusicWheel.GetSortOrder() );
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder );
}
if( SHOW_DIFFICULTY_LIST )
@@ -1539,11 +1539,11 @@ void ScreenSelectMusic::AfterMusicChange()
bool bWantBanner = true;
static SortOrder s_lastSortOrder = SORT_INVALID;
if( m_MusicWheel.GetSortOrder() != s_lastSortOrder )
if( GAMESTATE->m_SortOrder != s_lastSortOrder )
{
// Reload to let Lua metrics have a chance to change the help text.
LoadHelpText();
s_lastSortOrder = m_MusicWheel.GetSortOrder();
s_lastSortOrder = GAMESTATE->m_SortOrder;
}
switch( m_MusicWheel.GetSelectedType() )
@@ -1573,7 +1573,7 @@ void ScreenSelectMusic::AfterMusicChange()
break;
case TYPE_SORT:
bWantBanner = false; /* we load it ourself */
switch( m_MusicWheel.GetSortOrder() )
switch( GAMESTATE->m_SortOrder )
{
case SORT_MODE_MENU:
m_Banner.LoadMode();
@@ -1887,12 +1887,12 @@ void ScreenSelectMusic::UpdateOptionsDisplays()
void ScreenSelectMusic::SortOrderChanged()
{
m_MusicSortDisplay.Set( m_MusicWheel.GetSortOrder() );
m_MusicSortDisplay.Set( GAMESTATE->m_SortOrder );
if( SHOW_PANES )
FOREACH_HumanPlayer(pn)
m_PaneDisplay[pn].SetFromGameState( m_MusicWheel.GetSortOrder() );
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder );
switch( m_MusicWheel.GetSortOrder() )
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES: