From f747eb4ab1311e5d8672ac3e84cbc0a825c24e5b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 1 May 2005 08:05:50 +0000 Subject: [PATCH] fix warnings --- stepmania/src/OptionRowHandler.cpp | 2 +- stepmania/src/ScreenJukebox.cpp | 1 - stepmania/src/Sprite.cpp | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index 9a7d32e2be..9cd6f4290e 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -296,7 +296,7 @@ public: } else if( GAMESTATE->IsCourseMode() ) // playing a course { - defOut.bOneChoiceForAllPlayers = PREFSMAN->m_bLockCourseDifficulties; + defOut.bOneChoiceForAllPlayers = (bool)PREFSMAN->m_bLockCourseDifficulties; vector vTrails; GAMESTATE->m_pCurCourse->GetTrails( vTrails, GAMESTATE->GetCurrentStyle()->m_StepsType ); diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index ac05ddc1c9..7e2936ac79 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -141,7 +141,6 @@ void ScreenJukebox::Init() FOREACH_EnabledPlayer( p ) { /* Reset the combo, in case ComboContinuesBetweenSongs is enabled. */ - Profile* pProfile = PROFILEMAN->GetProfile(p); STATSMAN->m_CurStageStats.m_player[p].iCurCombo = 0; if( GAMESTATE->m_bJukeboxUsesModifiers ) diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 3abbdd7841..6d9fc886b2 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -402,9 +402,6 @@ void TexCoordArrayFromRect(float fImageCoords[8], const RectF &rect) void Sprite::DrawTexture( const TweenState *state ) { - if( m_fBaseAlpha != 1 ) - int dkjfksdf = 0; - Actor::SetGlobalRenderStates(); // set Actor-specified render states // bail if cropped all the way