From 6d115f5b5542d51a97b8f749999a594c3e4b4061 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 26 Mar 2006 19:19:39 +0000
Subject: [PATCH] add EqualsNoCase for better clarity than
 "!string.CompareNoCase()"

---
 stepmania/src/Actor.cpp            | 38 +++++++++++++++---------------
 stepmania/src/AnnouncerManager.cpp |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 058e6fd7d9..448841dff5 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -805,26 +805,26 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
 
 void Actor::SetHorizAlignString( const RString &s )
 {
-	if     (s.CompareNoCase("left")==0)	this->SetHorizAlign( align_left ); /* call derived */
-	else if(s.CompareNoCase("center")==0)	this->SetHorizAlign( align_center );
-	else if(s.CompareNoCase("right")==0)	this->SetHorizAlign( align_right );
+	if     (s.EqualsNoCase("left"))		this->SetHorizAlign( align_left ); /* call derived */
+	else if(s.EqualsNoCase("center"))	this->SetHorizAlign( align_center );
+	else if(s.EqualsNoCase("right"))	this->SetHorizAlign( align_right );
 	else	ASSERT(0);
 }
 
 void Actor::SetVertAlignString( const RString &s )
 {
-	if     (s.CompareNoCase("top")==0)	this->SetVertAlign( align_top ); /* call derived */
-	else if(s.CompareNoCase("middle")==0)	this->SetVertAlign( align_middle );
-	else if(s.CompareNoCase("bottom")==0)	this->SetVertAlign( align_bottom );
+	if     (s.EqualsNoCase("top"))		this->SetVertAlign( align_top ); /* call derived */
+	else if(s.EqualsNoCase("middle"))	this->SetVertAlign( align_middle );
+	else if(s.EqualsNoCase("bottom"))	this->SetVertAlign( align_bottom );
 	else	ASSERT(0);
 }
 
 void Actor::SetEffectClockString( const RString &s )
 {
-	if     (s.CompareNoCase("timer")==0)	this->SetEffectClock( CLOCK_TIMER );
-	else if(s.CompareNoCase("beat")==0)	this->SetEffectClock( CLOCK_BGM_BEAT );
-	else if(s.CompareNoCase("music")==0)	this->SetEffectClock( CLOCK_BGM_TIME );
-	else if(s.CompareNoCase("bgm")==0)	this->SetEffectClock( CLOCK_BGM_BEAT ); // compat, deprecated
+	if     (s.EqualsNoCase("timer"))	this->SetEffectClock( CLOCK_TIMER );
+	else if(s.EqualsNoCase("beat"))		this->SetEffectClock( CLOCK_BGM_BEAT );
+	else if(s.EqualsNoCase("music"))	this->SetEffectClock( CLOCK_BGM_TIME );
+	else if(s.EqualsNoCase("bgm"))		this->SetEffectClock( CLOCK_BGM_BEAT ); // compat, deprecated
 	else
 	{
 		CabinetLight cl = StringToCabinetLight( s );
@@ -1168,26 +1168,26 @@ void Actor::TweenState::MakeWeightedAverage( TweenState& average_out, const Twee
 
 void Actor::SetBlendModeString( const RString &s )
 {
-	if     (s.CompareNoCase("normal")==0)	this->SetBlendMode( BLEND_NORMAL );
-	else if(s.CompareNoCase("add")==0)	this->SetBlendMode( BLEND_ADD );
-	else if(s.CompareNoCase("noeffect")==0)	this->SetBlendMode( BLEND_NO_EFFECT );
+	if     (s.EqualsNoCase("normal"))	this->SetBlendMode( BLEND_NORMAL );
+	else if(s.EqualsNoCase("add"))		this->SetBlendMode( BLEND_ADD );
+	else if(s.EqualsNoCase("noeffect"))	this->SetBlendMode( BLEND_NO_EFFECT );
 	else	ASSERT(0);
 }
 
 void Actor::SetCullModeString( const RString &s )
 {
-	if     (s.CompareNoCase("back")==0)	this->SetCullMode( CULL_BACK );
-	else if(s.CompareNoCase("front")==0)	this->SetCullMode( CULL_FRONT );
-	else if(s.CompareNoCase("none")==0)	this->SetCullMode( CULL_NONE );
+	if     (s.EqualsNoCase("back"))		this->SetCullMode( CULL_BACK );
+	else if(s.EqualsNoCase("front"))	this->SetCullMode( CULL_FRONT );
+	else if(s.EqualsNoCase("none"))		this->SetCullMode( CULL_NONE );
 	else	ASSERT(0);
 }
 
 void Actor::SetZTestModeString( const RString &s )
 {
 	// for metrics backward compatibility
-	if(s.CompareNoCase("off")==0)			this->SetZTestMode( ZTEST_OFF );
-	else if(s.CompareNoCase("writeonpass")==0)	this->SetZTestMode( ZTEST_WRITE_ON_PASS );
-	else if(s.CompareNoCase("writeonfail")==0)	this->SetZTestMode( ZTEST_WRITE_ON_FAIL );
+	if(s.EqualsNoCase("off"))		this->SetZTestMode( ZTEST_OFF );
+	else if(s.EqualsNoCase("writeonpass"))	this->SetZTestMode( ZTEST_WRITE_ON_PASS );
+	else if(s.EqualsNoCase("writeonfail"))	this->SetZTestMode( ZTEST_WRITE_ON_FAIL );
 	else	ASSERT(0);
 }
 
diff --git a/stepmania/src/AnnouncerManager.cpp b/stepmania/src/AnnouncerManager.cpp
index c6c0e34c9a..ac4af0b362 100644
--- a/stepmania/src/AnnouncerManager.cpp
+++ b/stepmania/src/AnnouncerManager.cpp
@@ -95,7 +95,7 @@ RString AnnouncerManager::GetPathTo( RString sAnnouncerName, RString sFolderName
 	int i;
 	for(i = 0; aliases[i][0] != NULL; ++i)
 	{
-		if(sFolderName.CompareNoCase(aliases[i][0]))
+		if(!sFolderName.EqualsNoCase(aliases[i][0]))
 			continue; /* no match */
 
 		if( !DirectoryIsEmpty(AnnouncerPath+aliases[i][1]+"/") )
@@ -138,7 +138,7 @@ void AnnouncerManager::NextAnnouncer()
 	{
 		unsigned i;
 		for( i=0; i<as.size(); i++ )
-			if( as[i].CompareNoCase(m_sCurAnnouncerName)==0 )
+			if( as[i].EqualsNoCase(m_sCurAnnouncerName) )
 				break;
 		if( i==as.size()-1 )
 			SwitchAnnouncer( "" );