From c540417e230949139c80154cd6518a8f90e9c07f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Sep 2006 20:29:34 +0000 Subject: [PATCH] transition --- stepmania/src/BitmapText.cpp | 12 ++++++------ stepmania/src/Sprite.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 251aea5b73..3a323ff442 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -191,9 +191,9 @@ void BitmapText::BuildChars() int iY; // the top position of the first row of characters switch( m_VertAlign ) { - case align_top: iY = 0; break; - case align_middle: iY = -(int)roundf(m_size.y/2.0f); break; - case align_bottom: iY = -(int)m_size.y; break; + case VertAlign_Top: iY = 0; break; + case VertAlign_Middle: iY = -(int)roundf(m_size.y/2.0f); break; + case VertAlign_Bottom: iY = -(int)m_size.y; break; default: ASSERT( false ); } @@ -209,9 +209,9 @@ void BitmapText::BuildChars() int iX; switch( m_HorizAlign ) { - case align_left: iX = 0; break; - case align_center: iX = -(int)roundf(iLineWidth/2.0f); break; - case align_right: iX = -iLineWidth; break; + case HorizAlign_Left: iX = 0; break; + case HorizAlign_Center: iX = -(int)roundf(iLineWidth/2.0f); break; + case HorizAlign_Right: iX = -iLineWidth; break; default: ASSERT( false ); } diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 35dd7e234c..98fefe5f05 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -354,17 +354,17 @@ void Sprite::DrawTexture( const TweenState *state ) switch( m_HorizAlign ) { - case align_left: quadVerticies.left = 0; quadVerticies.right = m_size.x; break; - case align_center: quadVerticies.left = -m_size.x/2; quadVerticies.right = m_size.x/2; break; - case align_right: quadVerticies.left = -m_size.x; quadVerticies.right = 0; break; + case HorizAlign_Left: quadVerticies.left = 0; quadVerticies.right = m_size.x; break; + case HorizAlign_Center: quadVerticies.left = -m_size.x/2; quadVerticies.right = m_size.x/2; break; + case HorizAlign_Right: quadVerticies.left = -m_size.x; quadVerticies.right = 0; break; default: ASSERT( false ); } switch( m_VertAlign ) { - case align_top: quadVerticies.top = 0; quadVerticies.bottom = m_size.y; break; - case align_middle: quadVerticies.top = -m_size.y/2; quadVerticies.bottom = m_size.y/2; break; - case align_bottom: quadVerticies.top = -m_size.y; quadVerticies.bottom = 0; break; + case VertAlign_Top: quadVerticies.top = 0; quadVerticies.bottom = m_size.y; break; + case VertAlign_Middle: quadVerticies.top = -m_size.y/2; quadVerticies.bottom = m_size.y/2; break; + case VertAlign_Bottom: quadVerticies.top = -m_size.y; quadVerticies.bottom = 0; break; default: ASSERT(0); }