From aa020f9351d8e72fa24d4c42ffd38dc2bef39e55 Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Sat, 19 Jun 2004 04:37:37 +0000 Subject: [PATCH] style cleanup. only turn lighting off if we turned it on. --- stepmania/src/ScreenHowToPlay.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index d1d65f3abe..d460921e1a 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -304,7 +304,13 @@ void ScreenHowToPlay::DrawPrimitives() if( m_pmDancePad || m_pmCharacter ) { - if(!PREFSMAN->m_bCelShadeModels) { + if(PREFSMAN->m_bCelShadeModels) + { + if( m_pmDancePad ) m_pmDancePad->DrawCelShaded(); + if( m_pmCharacter ) m_pmCharacter->DrawCelShaded(); + } + else + { DISPLAY->SetLighting( true ); DISPLAY->SetLightDirectional( 0, @@ -313,17 +319,13 @@ void ScreenHowToPlay::DrawPrimitives() RageColor(0,0,0,1), RageVector3(0, 0, 1) ); - if( m_pmCharacter ) {m_pmCharacter->Draw();} - if( m_pmDancePad ) {m_pmDancePad->Draw();} - } - else { - if( m_pmDancePad ) {m_pmDancePad->DrawCelShaded();} - if( m_pmCharacter ) {m_pmCharacter->DrawCelShaded();} + if( m_pmCharacter ) m_pmCharacter->Draw(); + if( m_pmDancePad ) m_pmDancePad->Draw(); + + DISPLAY->SetLightOff( 0 ); + DISPLAY->SetLighting( false ); } - DISPLAY->SetLightOff( 0 ); - DISPLAY->SetLighting( false ); - m_Overlay.DrawPrimitives(); m_In.DrawPrimitives(); m_Out.DrawPrimitives();