slight cleanup

src/NotesLoaderBMS.cpp

@@ -91,8 +91,8 @@ static void SearchForDifficulty( RString sTag, Steps *pOut )
 static void SlideDuplicateDifficulties( Song &p )
 {
 	/* BMS files have to guess the Difficulty from the meter; this is inaccurate,
-	* and often leads to duplicates. Slide duplicate difficulties upwards. We
+	* and often leads to duplicates. Slide duplicate difficulties upwards.
-	* only do this with BMS files, since a very common bug was having *all*
+	* We only do this with BMS files, since a very common bug was having *all*
 	* difficulties slid upwards due to (for example) having two beginner steps.
 	* We do a second pass in Song::TidyUpData to eliminate any remaining duplicates
 	* after this. */
@@ -125,12 +125,7 @@ void BMSLoader::GetApplicableFiles( const RString &sPath, vector<RString> &out )
 	GetDirListing( sPath + RString("*.bml"), out );
 }
 
-
+/*===========================================================================*/
-/*===========================================================================
- *===========================================================================
- *===========================================================================
- *===========================================================================
- */
 
 struct BMSObject
 {
@@ -151,16 +146,11 @@ struct BMSObject
 	}
 };
 
-
-
-
 struct BMSMeasure
 {
 	float size;
 };
 
-
-
 typedef map<RString, RString> BMSHeaders;
 typedef map<int, BMSMeasure> BMSMeasures;
 typedef vector<BMSObject> BMSObjects;
@@ -179,7 +169,6 @@ public:
 	BMSMeasures measures;
 
 	void TidyUpData();
-
 };
 
 BMSChart::BMSChart()
@@ -232,7 +221,7 @@ bool BMSChart::Load( const RString &chartPath )
 				if( channel == 2 )
 				{
 					// special channel: time signature
-					this->measures[measure] = (BMSMeasure){ StringToFloat(data) };
+					this->measures[measure] = (BMSMeasure)(StringToFloat(data));
 				}
 				else
 				{
@@ -277,9 +266,6 @@ void BMSChart::TidyUpData()
 	sort( objects.begin(), objects.end() );
 }
 
-
-
-
 class BMSSong {
 
 	map<RString, int> mapKeysoundToIndex;
@@ -289,7 +275,6 @@ public:
 	BMSSong( Song *song );
 	unsigned AllocateKeysound( RString filename, RString path );
 	Song *GetSong();
-
 };
 
 BMSSong::BMSSong( Song *song )
@@ -301,7 +286,6 @@ BMSSong::BMSSong( Song *song )
 	{
 		mapKeysoundToIndex[out->m_vsKeysoundFile[i]] = i;
 	}
-	
 }
 
 Song *BMSSong::GetSong()
@@ -365,23 +349,18 @@ unsigned BMSSong::AllocateKeysound( RString filename, RString path )
 	mapKeysoundToIndex[filename] = index;
 	mapKeysoundToIndex[normalizedFilename] = index;
 	return index;
-	
 }
 
-
 struct BMSChartInfo {
-
 	RString title;
 	RString artist;
 	RString genre;
 
 	RString backgroundFile;
 	RString musicFile;
-	
 };
 
 class BMSChartReader {
-
 	BMSChart *in;
 	Steps *out;
 	BMSSong *song;
@@ -486,7 +465,6 @@ void BMSChartReader::ReadHeaders()
 
 void BMSChartReader::CalculateStepsType()
 {
-
 	for( unsigned i = 0; i < in->objects.size(); i ++ )
 	{
 		BMSObject &obj = in->objects[i];
@@ -499,7 +477,6 @@ void BMSChartReader::CalculateStepsType()
 
 	nonEmptyTracksCount = nonEmptyTracks.size();
 	out->m_StepsType = DetermineStepsType();
-
 }
 
 enum BmsRawChannel
@@ -758,7 +735,6 @@ bool BMSChartReader::ReadNoteData()
 			measureAdjust = adjustedMeasureSize / measureSize;
 			td.SetBPMAtRow( BeatToNoteRow(measureStartBeat), measureAdjust * currentBPM );
 			// end measure size adjustment
-			
 		}
 
 		int row = BeatToNoteRow( measureStartBeat + adjustedMeasureSize * obj.position );
@@ -844,7 +820,6 @@ bool BMSChartReader::ReadNoteData()
 	out->TidyUpData();
 	out->SetSavedToDisk( true );	// we're loading from disk, so this is by definintion already saved
 
-
 	return true;
 }
 
@@ -853,8 +828,6 @@ Steps *BMSChartReader::GetSteps()
 	return out;
 }
 
-
-
 struct BMSStepsInfo {
 	Steps *steps;
 	BMSChartInfo info;
@@ -877,7 +850,6 @@ BMSSongLoader::BMSSongLoader( RString songDir, Song *outSong ): song(outSong), d
 
 bool BMSSongLoader::Load( RString fileName )
 {
-
 	// before doing anything else, load the chart first!
 	BMSChart chart;
 	if( !chart.Load( dir + fileName ) ) return false;
@@ -906,7 +878,6 @@ bool BMSSongLoader::Load( RString fileName )
 
 void BMSSongLoader::AddToSong()
 {
-
 	RString commonSubstring = "";
 
 	{
@@ -1044,11 +1015,7 @@ void BMSSongLoader::AddToSong()
 
 }
 
-/*===========================================================================
+/*===========================================================================*/
- *===========================================================================
- *===========================================================================
- *===========================================================================
- */
 
 bool BMSLoader::LoadNoteDataFromSimfile( const RString & cachePath, Steps & out )
 {
@@ -1068,7 +1035,6 @@ bool BMSLoader::LoadNoteDataFromSimfile( const RString & cachePath, Steps & out
 
 bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
 {
-
 	LOG->Trace( "Song::LoadFromBMSDir(%s)", sDir.c_str() );
 
 	ASSERT( out.m_vsKeysoundFile.empty() );
@@ -1091,7 +1057,6 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
 
 }
 
-
 /*
  * (c) 2001-2004 Chris Danford, Glenn Maynard
  * All rights reserved.