From 666d241a4fa983567827e30ba1796c4abd1ea146 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 1 Jun 2007 04:50:36 +0000 Subject: [PATCH] Cleanup. --- stepmania/src/Difficulty.cpp | 4 ++-- stepmania/src/StepsUtil.cpp | 12 ++++++------ stepmania/src/TrailUtil.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index 277401cf2b..915518091d 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -43,11 +43,11 @@ Difficulty StringToDifficulty( const RString& sDC ) else if( s2 == "maniac" ) return Difficulty_Hard; else if( s2 == "heavy" ) return Difficulty_Hard; else if( s2 == "smaniac" ) return Difficulty_Challenge; - else if( s2 == "challenge" )return Difficulty_Challenge; + else if( s2 == "challenge" ) return Difficulty_Challenge; else if( s2 == "expert" ) return Difficulty_Challenge; else if( s2 == "oni" ) return Difficulty_Challenge; else if( s2 == "edit" ) return Difficulty_Edit; - else return Difficulty_Invalid; + else return Difficulty_Invalid; } diff --git a/stepmania/src/StepsUtil.cpp b/stepmania/src/StepsUtil.cpp index e513be7df0..2989255ab3 100644 --- a/stepmania/src/StepsUtil.cpp +++ b/stepmania/src/StepsUtil.cpp @@ -312,16 +312,16 @@ void StepsID::LoadFromNode( const XNode* pNode ) RString sTemp; - pNode->GetAttrValue("StepsType", sTemp); + pNode->GetAttrValue( "StepsType", sTemp ); st = GameManager::StringToStepsType( sTemp ); - pNode->GetAttrValue("Difficulty", sTemp); + pNode->GetAttrValue( "Difficulty", sTemp ); dc = StringToDifficulty( sTemp ); if( dc == Difficulty_Edit ) { - pNode->GetAttrValue("Description", sDescription); - pNode->GetAttrValue("Hash", uHash); + pNode->GetAttrValue( "Description", sDescription ); + pNode->GetAttrValue( "Hash", uHash ); } else { @@ -332,8 +332,8 @@ void StepsID::LoadFromNode( const XNode* pNode ) RString StepsID::ToString() const { - RString s = GameManager::StepsTypeToString(st); - s += " " + DifficultyToString(dc); + RString s = GameManager::StepsTypeToString( st ); + s += " " + DifficultyToString( dc ); if( dc == Difficulty_Edit ) { s += " " + sDescription; diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp index e1302e3a00..2b1557316d 100644 --- a/stepmania/src/TrailUtil.cpp +++ b/stepmania/src/TrailUtil.cpp @@ -50,17 +50,17 @@ void TrailID::LoadFromNode( const XNode* pNode ) RString sTemp; - pNode->GetAttrValue("StepsType", sTemp); + pNode->GetAttrValue( "StepsType", sTemp ); st = GameManager::StringToStepsType( sTemp ); - pNode->GetAttrValue("CourseDifficulty", sTemp); + pNode->GetAttrValue( "CourseDifficulty", sTemp ); cd = StringToDifficulty( sTemp ); } RString TrailID::ToString() const { - RString s = GameManager::StepsTypeToString(st); - s += " " + DifficultyToString(cd); + RString s = GameManager::StepsTypeToString( st ); + s += " " + DifficultyToString( cd ); return s; }