From 0ad77eb5ccd5aa1b8bcf9c77bf7994ba0e8be406 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 16 May 2005 19:45:03 +0000 Subject: [PATCH] fix vc7 warnings --- stepmania/src/ScreenDebugOverlay.cpp | 28 +++++++++++----------- stepmania/src/ScreenOptionsMasterPrefs.cpp | 6 ----- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index 83ce03da8c..89dd5d58c2 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -157,20 +157,20 @@ void ScreenDebugOverlay::Update( float fDeltaTime ) bool bOn = false; switch( i ) { - case DebugLine_Autoplay: bOn=PREFSMAN->m_bAutoPlay; break; - case DebugLine_CoinMode: bOn=true; break; - case DebugLine_Slow: bOn=g_bIsSlow; break; - case DebugLine_Halt: bOn=g_bIsHalt; break; - case DebugLine_LightsDebug: bOn=PREFSMAN->m_bDebugLights; break; - case DebugLine_MonkeyInput: bOn=PREFSMAN->m_bMonkeyInput; break; - case DebugLine_Stats: bOn=PREFSMAN->m_bShowStats; break; - case DebugLine_Vsync: bOn=PREFSMAN->m_bVsync; break; - case DebugLine_ScreenTestMode: bOn=PREFSMAN->m_bScreenTestMode;break; - case DebugLine_ClearMachineStats: bOn=true; break; - case DebugLine_FillMachineStats: bOn=true; break; - case DebugLine_SendNotesEnded: bOn=true; break; - case DebugLine_CurrentScreen: bOn=false; break; - case DebugLine_Uptime: bOn=false; break; + case DebugLine_Autoplay: bOn=PREFSMAN->m_bAutoPlay.Get(); break; + case DebugLine_CoinMode: bOn=true; break; + case DebugLine_Slow: bOn=g_bIsSlow; break; + case DebugLine_Halt: bOn=g_bIsHalt; break; + case DebugLine_LightsDebug: bOn=PREFSMAN->m_bDebugLights.Get(); break; + case DebugLine_MonkeyInput: bOn=PREFSMAN->m_bMonkeyInput.Get(); break; + case DebugLine_Stats: bOn=PREFSMAN->m_bShowStats.Get(); break; + case DebugLine_Vsync: bOn=PREFSMAN->m_bVsync.Get(); break; + case DebugLine_ScreenTestMode: bOn=PREFSMAN->m_bScreenTestMode.Get(); break; + case DebugLine_ClearMachineStats: bOn=true; break; + case DebugLine_FillMachineStats: bOn=true; break; + case DebugLine_SendNotesEnded: bOn=true; break; + case DebugLine_CurrentScreen: bOn=false; break; + case DebugLine_Uptime: bOn=false; break; default: ASSERT(0); } diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 624ac2c057..22263b7ef2 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -107,12 +107,6 @@ static void MoveData( int &sel, int &opt, bool ToSel ) else opt = !!sel; } -static void MoveData( int &sel, bool &opt, bool ToSel ) -{ - if( ToSel ) sel = opt; - else opt = !!sel; -} - template static void MoveData( int &sel, Preference &opt, bool ToSel ) {