From 64bdcec8dc039964b9fd3dce9d9e4ac8f3782997 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 2 Apr 2003 18:24:00 +0000 Subject: [PATCH] Fix warning. No need to push/pop the matrix when entering and exiting perspective; it's done already. No need to push/pop otherwise, either. --- stepmania/src/Player.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 1ef5a6d224..6f05c66c05 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -259,11 +259,10 @@ void Player::DrawPrimitives() float fTilt = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt; bool bReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fReverseScroll==1; - float fReverseScale = bReverse ? -1 : 1; + float fReverseScale = bReverse ? -1.0f : 1.0f; if( fTilt != 0 ) { - DISPLAY->PushMatrix(); DISPLAY->EnterPerspective(45, false); // construct view and project matrix @@ -275,20 +274,13 @@ void Player::DrawPrimitives() DISPLAY->LookAt(Eye, At, Up); } - else - DISPLAY->PushMatrix(); m_GrayArrowRow.Draw(); m_NoteField.Draw(); m_GhostArrowRow.Draw(); - if( GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt != 0 ) - { + if( fTilt != 0 ) DISPLAY->ExitPerspective(); - DISPLAY->PopMatrix(); - } - else - DISPLAY->PopMatrix(); m_Judgment.Draw();