From 3175fcc1aa22a0955542895e83c924f6af077c35 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 4 Jul 2008 22:44:20 +0000
Subject: [PATCH] remove unused StrokeIsUnder

---
 stepmania/src/BitmapText.cpp | 27 ++++++---------------------
 stepmania/src/Font.cpp       |  2 --
 stepmania/src/Font.h         |  2 --
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index dca096fc7c..11725a3ebf 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -537,17 +537,6 @@ bool BitmapText::EarlyAbortDraw() const
 	return m_wTextLines.empty();
 }
 
-#define DRAW_STROKE \
-if( m_StrokeColor.a > 0 ) \
-{ \
-	RageColor c = m_StrokeColor; \
-	c.a *= m_pTempState->diffuse[0].a; \
-	for( unsigned i=0; i<m_aVertices.size(); i++ ) \
-		m_aVertices[i].c = c; \
-	DrawChars( true ); \
-}
-
-
 // draw text at x, y using colorTop blended down to colorBottom, with size multiplied by scale
 void BitmapText::DrawPrimitives()
 {
@@ -577,9 +566,13 @@ void BitmapText::DrawPrimitives()
 		//
 		// render the stroke
 		//
-		if( m_pFont->GetStrokeIsUnder() )
+		if( m_StrokeColor.a > 0 )
 		{
-			DRAW_STROKE;
+			RageColor c = m_StrokeColor;
+			c.a *= m_pTempState->diffuse[0].a;
+			for( unsigned i=0; i<m_aVertices.size(); i++ )
+				m_aVertices[i].c = c;
+			DrawChars( true );
 		}
 
 		//
@@ -668,14 +661,6 @@ void BitmapText::DrawPrimitives()
 				m_aVertices[i+3].p -= jitter;	// top right
 			}
 		}
-
-		//
-		// render the stroke
-		//
-		if( !m_pFont->GetStrokeIsUnder() )
-		{
-			DRAW_STROKE;
-		}
 	}
 
 	/* render the glow pass */
diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index 6a64409991..2a10a29a46 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -229,7 +229,6 @@ Font::Font()
 	m_pDefault = NULL;
 	m_bRightToLeft = false;
 	m_DefaultStrokeColor = RageColor(1,1,1,1);
-	m_bStrokeIsUnder = true;
 }
 
 Font::~Font()
@@ -694,7 +693,6 @@ void Font::Load( const RString &sIniPath, RString sChars )
 		RString s;
 		if( ini.GetValue( "main", "DefaultStrokeColor", s ) )
 			m_DefaultStrokeColor.FromString( s );
-		ini.GetValue( "main", "StrokeIsUnder", m_bStrokeIsUnder );
 	}
 
 	{
diff --git a/stepmania/src/Font.h b/stepmania/src/Font.h
index 51e20e9f2a..2e0deffb59 100644
--- a/stepmania/src/Font.h
+++ b/stepmania/src/Font.h
@@ -148,7 +148,6 @@ public:
 
 	bool IsRightToLeft() const { return m_bRightToLeft; };
 	const RageColor &GetDefaultStrokeColor() const { return m_DefaultStrokeColor; };
-	const bool GetStrokeIsUnder() const { return m_bStrokeIsUnder; };
 
 private:
 	/* List of pages and fonts that we use (and are responsible for freeing). */
@@ -168,7 +167,6 @@ private:
 	bool m_bRightToLeft;
 
 	RageColor m_DefaultStrokeColor;
-	bool m_bStrokeIsUnder;	// draw stroke under if true, over if false
 
 	/* We keep this around only for reloading. */
 	RString m_sChars;