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

fix bad cast causes bogus value, assert

Browse Source
This commit is contained in:
Chris Danford
2005-05-20 06:49:21 +00:00
parent f4022b6bc4
commit b6af8a9816
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+6 -7
View File
@@ -111,10 +111,9 @@ template<class T>
static void MoveData( int &sel, Preference<T> &opt, bool ToSel ) static void MoveData( int &sel, Preference<T> &opt, bool ToSel )
{ {
if( ToSel ) sel = opt; if( ToSel ) sel = opt;
else opt.Set( sel ); else opt.Set( (T)sel );
} }
template<>
static void MoveData( int &sel, Preference<bool> &opt, bool ToSel ) static void MoveData( int &sel, Preference<bool> &opt, bool ToSel )
{ {
if( ToSel ) sel = opt; if( ToSel ) sel = opt;
@@ -271,7 +270,7 @@ static void WheelSections( int &sel, bool ToSel, const ConfOption *pConfOption )
MoveMap( sel, PREFSMAN->m_MusicWheelUsesSections, ToSel, mapping, ARRAYSIZE(mapping) ); MoveMap( sel, PREFSMAN->m_MusicWheelUsesSections, ToSel, mapping, ARRAYSIZE(mapping) );
} }
MOVE( CourseSort, (int &) PREFSMAN->m_CourseSortOrder ); MOVE( CourseSort, PREFSMAN->m_CourseSortOrder );
MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd ); MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd );
MOVE( Translations, PREFSMAN->m_bShowNativeLanguage ); MOVE( Translations, PREFSMAN->m_bShowNativeLanguage );
MOVE( Lyrics, PREFSMAN->m_bShowLyrics ); MOVE( Lyrics, PREFSMAN->m_bShowLyrics );
@@ -281,7 +280,7 @@ MOVE( AutogenSteps, PREFSMAN->m_bAutogenSteps );
MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses ); MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses );
/* Background options */ /* Background options */
MOVE( DancingCharacters, (int &) PREFSMAN->m_ShowDancingCharacters ); MOVE( DancingCharacters, PREFSMAN->m_ShowDancingCharacters );
MOVE( BeginnerHelper, PREFSMAN->m_bShowBeginnerHelper ); MOVE( BeginnerHelper, PREFSMAN->m_bShowBeginnerHelper );
static void BGBrightness( int &sel, bool ToSel, const ConfOption *pConfOption ) static void BGBrightness( int &sel, bool ToSel, const ConfOption *pConfOption )
@@ -298,7 +297,7 @@ static void NumBackgrounds( int &sel, bool ToSel, const ConfOption *pConfOption
/* Input options */ /* Input options */
MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange ); MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange );
MOVE( AutoPlay, (int&)PREFSMAN->m_AutoPlay ); MOVE( AutoPlay, PREFSMAN->m_AutoPlay );
MOVE( BackDelayed, PREFSMAN->m_bDelayedBack ); MOVE( BackDelayed, PREFSMAN->m_bDelayedBack );
MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation ); MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation );
@@ -363,7 +362,7 @@ static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pCo
} }
/* Machine options */ /* Machine options */
MOVE( ScoringType, (int &) PREFSMAN->m_ScoringType ); MOVE( ScoringType, PREFSMAN->m_ScoringType );
static void JudgeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption ) static void JudgeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
@@ -501,7 +500,7 @@ static void AspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption )
} }
/* Sound options */ /* Sound options */
MOVE( ResamplingQuality, (int&)PREFSMAN->m_SoundResampleQuality ); MOVE( ResamplingQuality, PREFSMAN->m_SoundResampleQuality );
MOVE( AttractSoundFrequency,PREFSMAN->m_iAttractSoundFrequency ); MOVE( AttractSoundFrequency,PREFSMAN->m_iAttractSoundFrequency );
static void SoundVolume( int &sel, bool ToSel, const ConfOption *pConfOption ) static void SoundVolume( int &sel, bool ToSel, const ConfOption *pConfOption )