From b6af8a981691e86b3e701c9e6e991ceb45912c9c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 20 May 2005 06:49:21 +0000 Subject: [PATCH] fix bad cast causes bogus value, assert --- stepmania/src/ScreenOptionsMasterPrefs.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 5549d4cf3c..7f97def93b 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -111,10 +111,9 @@ template static void MoveData( int &sel, Preference &opt, bool ToSel ) { if( ToSel ) sel = opt; - else opt.Set( sel ); + else opt.Set( (T)sel ); } -template<> static void MoveData( int &sel, Preference &opt, bool ToSel ) { 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) ); } -MOVE( CourseSort, (int &) PREFSMAN->m_CourseSortOrder ); +MOVE( CourseSort, PREFSMAN->m_CourseSortOrder ); MOVE( RandomAtEnd, PREFSMAN->m_bMoveRandomToEnd ); MOVE( Translations, PREFSMAN->m_bShowNativeLanguage ); MOVE( Lyrics, PREFSMAN->m_bShowLyrics ); @@ -281,7 +280,7 @@ MOVE( AutogenSteps, PREFSMAN->m_bAutogenSteps ); MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses ); /* Background options */ -MOVE( DancingCharacters, (int &) PREFSMAN->m_ShowDancingCharacters ); +MOVE( DancingCharacters, PREFSMAN->m_ShowDancingCharacters ); MOVE( BeginnerHelper, PREFSMAN->m_bShowBeginnerHelper ); 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 */ MOVE( AutoMapOnJoyChange, PREFSMAN->m_bAutoMapOnJoyChange ); -MOVE( AutoPlay, (int&)PREFSMAN->m_AutoPlay ); +MOVE( AutoPlay, PREFSMAN->m_AutoPlay ); MOVE( BackDelayed, PREFSMAN->m_bDelayedBack ); MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation ); @@ -363,7 +362,7 @@ static void SongsPerPlayOrEventMode( int &sel, bool ToSel, const ConfOption *pCo } /* Machine options */ -MOVE( ScoringType, (int &) PREFSMAN->m_ScoringType ); +MOVE( ScoringType, PREFSMAN->m_ScoringType ); 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 */ -MOVE( ResamplingQuality, (int&)PREFSMAN->m_SoundResampleQuality ); +MOVE( ResamplingQuality, PREFSMAN->m_SoundResampleQuality ); MOVE( AttractSoundFrequency,PREFSMAN->m_iAttractSoundFrequency ); static void SoundVolume( int &sel, bool ToSel, const ConfOption *pConfOption )