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

fix stupid VC

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-30 01:45:26 +00:00
parent 36795241c2
commit 02b6b82b53
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+7 -9
View File
@@ -62,14 +62,12 @@ static void MoveMap( int &sel, T &opt, bool ToSel, const T *mapping, unsigned cn
/* "sel" is the selection in the menu. */ /* "sel" is the selection in the menu. */
template<class T> static void MoveData( int &sel, int &opt, bool ToSel )
static void MoveData( int &sel, T &opt, bool ToSel )
{ {
if( ToSel ) (int&) sel = opt; if( ToSel ) sel = opt;
else opt = (T) sel; else opt = !!sel;
} }
template<>
static void MoveData( int &sel, bool &opt, bool ToSel ) static void MoveData( int &sel, bool &opt, bool ToSel )
{ {
if( ToSel ) sel = opt; if( ToSel ) sel = opt;
@@ -242,8 +240,8 @@ MOVE( Instructions, PREFSMAN->m_bShowInstructions );
MOVE( Caution, PREFSMAN->m_bShowCaution ); MOVE( Caution, PREFSMAN->m_bShowCaution );
MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni ); MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni );
MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup ); MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup );
MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections ); MOVE( WheelSections, (int &) PREFSMAN->m_MusicWheelUsesSections );
MOVE( CourseSort, PREFSMAN->m_iCourseSortOrder ); MOVE( CourseSort, (int &) PREFSMAN->m_iCourseSortOrder );
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 );
@@ -253,7 +251,7 @@ MOVE( AutogenSteps, PREFSMAN->m_bAutogenSteps );
MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses ); MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses );
/* Background options */ /* Background options */
MOVE( DancingCharacters, PREFSMAN->m_ShowDancingCharacters ); MOVE( DancingCharacters, (int &) 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 )
@@ -320,7 +318,7 @@ static void SongsPerPlay( int &sel, bool ToSel, const ConfOption *pConfOption )
MOVE( EventMode, PREFSMAN->m_bEventMode ); MOVE( EventMode, PREFSMAN->m_bEventMode );
/* Machine options */ /* Machine options */
MOVE( ScoringType, PREFSMAN->m_iScoringType ); MOVE( ScoringType, (int &) PREFSMAN->m_iScoringType );
static void JudgeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption ) static void JudgeDifficulty( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {