From 87148206a7bbd17c6056ea9b333da6b836b6d2cc Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 14 May 2011 22:58:42 -0500
Subject: [PATCH] [ModIcon] Added StopWords metric.

---
 Docs/Changelog_sm5.txt       | 1 +
 Themes/_fallback/metrics.ini | 1 +
 src/ModIcon.cpp              | 9 +++++----
 src/ModIcon.h                | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 9ad6035da8..daf91cd16f 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -10,6 +10,7 @@ StepMania 5.0 $NEXT | 20110xyy
 
 2011/05/14
 ----------
+* [ModIcon] Added StopWords metric. [AJ]
 * [ScreenSelectMaster] Add "ScreenEmpty" param to MenuStartP# when the GameCommand
   doesn't set a screen. [AJ]
 * [StepsDisplay] Added MeterFormatString metric. [AJ]
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 298794735b..1b23a2200c 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -4036,6 +4036,7 @@ TextX=0
 TextY=0
 TextOnCommand=maxwidth,40;uppercase,true;shadowlength,0;diffuse,color("#f6ff00")
 CropTextToWidth=50
+StopWords="1X,default,Overhead,Off"
 
 [ModIconSelectMusic]
 Fallback="ModIcon"
diff --git a/src/ModIcon.cpp b/src/ModIcon.cpp
index 0ef95daeb4..9dcf9dd929 100644
--- a/src/ModIcon.cpp
+++ b/src/ModIcon.cpp
@@ -40,11 +40,9 @@ void ModIcon::Load( RString sMetricsGroup )
 
 	CROP_TEXT_TO_WIDTH.Load( sMetricsGroup, "CropTextToWidth" );
 	// stop words
-	/*
 	STOP_WORDS.Load( sMetricsGroup, "StopWords" );
 	m_vStopWords.empty();
 	split(STOP_WORDS, ",", m_vStopWords);
-	*/
 
 	Set("");
 }
@@ -54,6 +52,7 @@ void ModIcon::Set( const RString &_sText )
 	RString sText = _sText;
 
 	// todo: make these metricable -aj
+	/*
 	static const RString sStopWords[] = 
 	{
 		"1X",
@@ -61,9 +60,11 @@ void ModIcon::Set( const RString &_sText )
 		"OVERHEAD",
 		"OFF",
 	};
+	*/
 
-	for( unsigned i=0; i<ARRAYLEN(sStopWords); i++ )
-		if( sText.EqualsNoCase(sStopWords[i]) )
+	//for( unsigned i=0; i<ARRAYLEN(sStopWords); i++ )
+	for( unsigned i = 0; i < m_vStopWords.size(); i++ )
+		if( sText.EqualsNoCase(m_vStopWords[i]) )
 			sText = "";
 
 	sText.Replace( " ", "\n" );
diff --git a/src/ModIcon.h b/src/ModIcon.h
index 19be734685..11fb08bbbd 100644
--- a/src/ModIcon.h
+++ b/src/ModIcon.h
@@ -21,6 +21,8 @@ protected:
 	AutoActor	m_sprEmpty;
 
 	ThemeMetric<int> CROP_TEXT_TO_WIDTH;
+	ThemeMetric<RString> STOP_WORDS;
+	vector<RString> m_vStopWords;
 };
 
 #endif