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

fix possible infinite loop

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-13 23:11:32 +00:00
parent e335f5a90a
commit 388fc02c6d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+12 -3
View File
@@ -21,6 +21,7 @@
#include "ModeChoice.h" #include "ModeChoice.h"
#include "ActorUtil.h" #include "ActorUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include <set>
#define NUM_ICON_PARTS THEME->GetMetricI(m_sName,"NumIconParts") #define NUM_ICON_PARTS THEME->GetMetricI(m_sName,"NumIconParts")
#define NUM_PREVIEW_PARTS THEME->GetMetricI(m_sName,"NumPreviewParts") #define NUM_PREVIEW_PARTS THEME->GetMetricI(m_sName,"NumPreviewParts")
@@ -218,7 +219,11 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
} }
m_Next[dir][c] = c + add; m_Next[dir][c] = c + add;
wrap( m_Next[dir][c], m_aModeChoices.size() ); /* By default, only wrap around for DIR_AUTO. */
if( dir == DIR_AUTO )
wrap( m_Next[dir][c], m_aModeChoices.size() );
else
m_Next[dir][c] = clamp( m_Next[dir][c], 0, (int)m_aModeChoices.size()-1 );
} }
const CString dirname = dirs[dir]; const CString dirname = dirs[dir];
@@ -346,15 +351,16 @@ void ScreenSelectMaster::UpdateSelectableChoices()
bool ScreenSelectMaster::Move( PlayerNumber pn, Dirs dir ) bool ScreenSelectMaster::Move( PlayerNumber pn, Dirs dir )
{ {
const int start = m_iChoice[pn];
int iSwitchToIndex = m_iChoice[pn]; int iSwitchToIndex = m_iChoice[pn];
set<int> seen;
do do
{ {
iSwitchToIndex = m_Next[dir][iSwitchToIndex]; iSwitchToIndex = m_Next[dir][iSwitchToIndex];
if( iSwitchToIndex == -1 ) if( iSwitchToIndex == -1 )
return false; // can't go that way return false; // can't go that way
if( iSwitchToIndex == start ) if( seen.find(iSwitchToIndex) != seen.end() )
return false; // went full circle and none found return false; // went full circle and none found
seen.insert( iSwitchToIndex );
} }
while( !m_aModeChoices[iSwitchToIndex].IsPlayable() ); while( !m_aModeChoices[iSwitchToIndex].IsPlayable() );
@@ -464,6 +470,9 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, int iNewChoice ) bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, int iNewChoice )
{ {
if( iNewChoice == m_iChoice[pn] )
return false; // already there
if( GetPage(m_iChoice[pn]) != GetPage(iNewChoice) ) if( GetPage(m_iChoice[pn]) != GetPage(iNewChoice) )
return ChangePage( iNewChoice ); return ChangePage( iNewChoice );