From d08e8b9d968739192cc5b8a16b251d39f795d706 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 7 Nov 2004 10:38:20 +0000 Subject: [PATCH] metrics cleanup --- stepmania/src/Player.cpp | 3 +-- stepmania/src/ScreenLogo.cpp | 2 +- stepmania/src/ThemeManager.cpp | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index f603fc61d6..738e765b91 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -530,8 +530,7 @@ void PlayerMinus::DrawPrimitives() DISPLAY->CameraPushMatrix(); DISPLAY->PushMatrix(); - float fCenterY = (GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2; -// float fHeight = GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD; + float fCenterY = this->GetY()+(GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2; DISPLAY->LoadMenuPerspective( 45, SCALE(fSkew,0.f,1.f,this->GetX(),SCREEN_CENTER_X), fCenterY ); diff --git a/stepmania/src/ScreenLogo.cpp b/stepmania/src/ScreenLogo.cpp index 8ba1922126..4f856b7820 100644 --- a/stepmania/src/ScreenLogo.cpp +++ b/stepmania/src/ScreenLogo.cpp @@ -9,7 +9,7 @@ ScreenLogo::ScreenLogo( CString sName ) : ScreenAttract( sName ) { m_sprLogo.SetName( "Logo" ); m_sprLogo.Load( THEME->GetPathG("ScreenLogo",GAMESTATE->GetCurrentGame()->m_szName) ); - ON_COMMAND( m_sprLogo ); + SET_XY_AND_ON_COMMAND( m_sprLogo ); this->AddChild( &m_sprLogo ); this->SortByDrawOrder(); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index d41ec718c4..35225fb7ff 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -201,6 +201,8 @@ void ThemeManager::LoadThemeRecursive( deque &theme, const CString &sThem continue; if( sName.Right(8) == "SpacingX" || sName.Right(8) == "SpacingY" ) continue; + if( sName.Right(7) == "OffsetX" || sName.Right(7) == "OffsetY" ) + continue; int i = atoi( sValue ); if( sName.Right(1) == "X" )