diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp index 53e1c1aa08..7f061b38d8 100644 --- a/stepmania/src/GhostArrowRow.cpp +++ b/stepmania/src/GhostArrowRow.cpp @@ -29,7 +29,6 @@ void GhostArrowRow::Load( PlayerNumber pn ) { m_PlayerNumber = pn; - GameDef* pGameDef = GAMESTATE->GetCurrentGameDef(); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); m_iNumCols = pStyleDef->m_iColsPerPlayer; diff --git a/stepmania/src/GrayArrowRow.cpp b/stepmania/src/GrayArrowRow.cpp index e89193990c..a08ae0805d 100644 --- a/stepmania/src/GrayArrowRow.cpp +++ b/stepmania/src/GrayArrowRow.cpp @@ -29,7 +29,6 @@ void GrayArrowRow::Load( PlayerNumber pn ) { m_PlayerNumber = pn; - GameDef* pGameDef = GAMESTATE->GetCurrentGameDef(); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); m_iNumCols = pStyleDef->m_iColsPerPlayer; diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 9f9a2b0d60..938da9a108 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -482,7 +482,7 @@ void MusicWheel::BuildWheelItemDatas( CArray &arr /////////////////////////////////// arrayWheelItemDatas.SetSize( 0, 300 ); // clear out the previous wheel items and set large capacity jumps - bool bUseSections; + bool bUseSections = false; switch( so ) { case SORT_MOST_PLAYED: bUseSections = false; break; @@ -500,7 +500,6 @@ void MusicWheel::BuildWheelItemDatas( CArray &arr // make WheelItemDatas with sections CString sLastSection = ""; D3DXCOLOR colorSection; - int iCurWheelItem = 0; for( int i=0; i< arraySongs.GetSize(); i++ ) { Song* pSong = arraySongs[i]; @@ -696,10 +695,6 @@ void MusicWheel::RebuildWheelItemDisplays() void MusicWheel::NotesChanged( PlayerNumber pn ) // update grade graphics and top score { - DifficultyClass dc = GAMESTATE->m_PreferredDifficultyClass[pn]; - Song* pSong = GAMESTATE->m_pCurSong; - Notes* m_pNotes = GAMESTATE->m_pCurNotes[ pn ]; - for( int i=0; iGetCurrentStyleDef(); - this->CopyAll( pNoteData ); // init note displays diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index bd58d0fdfd..9e0caa49cb 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -27,8 +27,8 @@ Screen::~Screen() void Screen::AddChild( Actor* pActor ) { // add only if the actor is on screen - float fX = pActor->GetX(); - float fY = pActor->GetY(); +// float fX = pActor->GetX(); +// float fY = pActor->GetY(); // if( SCREEN_LEFT>=fX && fX<=SCREEN_RIGHT && SCREEN_TOP>=fY && fY<=SCREEN_BOTTOM ) ActorFrame::AddChild( pActor ); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index c88b5f50fa..8b4885ea56 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -288,9 +288,6 @@ ScreenGameplay::ScreenGameplay() this->AddChild( &m_textSongOptions ); - // Get the current StyleDef definition (used below) - const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); - for( p=0; pIsPlayerEnabled(PlayerNumber(p)) ) diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index 65bbd8ac8a..70f33273a6 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -209,9 +209,6 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, const InputEventType if( m_bMadeChoice ) return; - PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller ); - - if( CodeDetector::DetectAndAdjustOptions(GameI.controller) ) { m_soundOptionsChange.Play(); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 6b1e76d6ac..ee08b3f054 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -686,8 +686,6 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn ) // m_BPMDisplay.BeginTweening( 0.2f ); // m_BPMDisplay.SetTweenZoomY( 1.2f ); - DifficultyClass dc = GAMESTATE->m_PreferredDifficultyClass[pn]; - Song* pSong = GAMESTATE->m_pCurSong; Notes* m_pNotes = GAMESTATE->m_pCurNotes[pn]; if( m_pNotes ) diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index c44a0d6432..b3a629eb6a 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -56,7 +56,6 @@ ScreenSelectStyle::ScreenSelectStyle() for( int i=0; iGetPathTo("Graphics",ssprintf("select style icons game %d",GAMESTATE->m_CurGame) ) ); m_sprIcon[i].StopAnimating(); m_sprIcon[i].SetState( i );