fix vc7 warnings

This commit is contained in:
Chris Danford
2005-05-16 19:45:03 +00:00
parent 9de6862130
commit 0ad77eb5cc
2 changed files with 14 additions and 20 deletions
+6 -6
View File
@@ -157,15 +157,15 @@ void ScreenDebugOverlay::Update( float fDeltaTime )
bool bOn = false; bool bOn = false;
switch( i ) switch( i )
{ {
case DebugLine_Autoplay: bOn=PREFSMAN->m_bAutoPlay; break; case DebugLine_Autoplay: bOn=PREFSMAN->m_bAutoPlay.Get(); break;
case DebugLine_CoinMode: bOn=true; break; case DebugLine_CoinMode: bOn=true; break;
case DebugLine_Slow: bOn=g_bIsSlow; break; case DebugLine_Slow: bOn=g_bIsSlow; break;
case DebugLine_Halt: bOn=g_bIsHalt; break; case DebugLine_Halt: bOn=g_bIsHalt; break;
case DebugLine_LightsDebug: bOn=PREFSMAN->m_bDebugLights; break; case DebugLine_LightsDebug: bOn=PREFSMAN->m_bDebugLights.Get(); break;
case DebugLine_MonkeyInput: bOn=PREFSMAN->m_bMonkeyInput; break; case DebugLine_MonkeyInput: bOn=PREFSMAN->m_bMonkeyInput.Get(); break;
case DebugLine_Stats: bOn=PREFSMAN->m_bShowStats; break; case DebugLine_Stats: bOn=PREFSMAN->m_bShowStats.Get(); break;
case DebugLine_Vsync: bOn=PREFSMAN->m_bVsync; break; case DebugLine_Vsync: bOn=PREFSMAN->m_bVsync.Get(); break;
case DebugLine_ScreenTestMode: bOn=PREFSMAN->m_bScreenTestMode;break; case DebugLine_ScreenTestMode: bOn=PREFSMAN->m_bScreenTestMode.Get(); break;
case DebugLine_ClearMachineStats: bOn=true; break; case DebugLine_ClearMachineStats: bOn=true; break;
case DebugLine_FillMachineStats: bOn=true; break; case DebugLine_FillMachineStats: bOn=true; break;
case DebugLine_SendNotesEnded: bOn=true; break; case DebugLine_SendNotesEnded: bOn=true; break;
@@ -107,12 +107,6 @@ static void MoveData( int &sel, int &opt, bool ToSel )
else opt = !!sel; else opt = !!sel;
} }
static void MoveData( int &sel, bool &opt, bool ToSel )
{
if( ToSel ) sel = opt;
else opt = !!sel;
}
template<class T> template<class T>
static void MoveData( int &sel, Preference<T> &opt, bool ToSel ) static void MoveData( int &sel, Preference<T> &opt, bool ToSel )
{ {