From d7f4346cb7afd6b93d2a76f548b96534c4eebef5 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 11 Apr 2005 07:28:09 +0000
Subject: [PATCH] use union in RadarValues for readability

---
 stepmania/src/GameCommand.cpp |  2 +-
 stepmania/src/RadarValues.cpp | 14 +++++++-------
 stepmania/src/RadarValues.h   | 26 +++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index b1780eb2f2..ffd6ff64a5 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -603,7 +603,7 @@ static HighScore MakeRandomHighScore( float fPercentDP )
 	FOREACH_HoldNoteScore( hns )
 		hs.iHoldNoteScores[hns] = rand() % 100;
 	FOREACH_RadarCategory( rc )
-		hs.radarValues.m_fValues[rc] = randomf( 0, 1 );
+		hs.radarValues.m_Values.f[rc] = randomf( 0, 1 );
 
 	return hs;
 }
diff --git a/stepmania/src/RadarValues.cpp b/stepmania/src/RadarValues.cpp
index 49be940953..49d921cb98 100644
--- a/stepmania/src/RadarValues.cpp
+++ b/stepmania/src/RadarValues.cpp
@@ -16,13 +16,13 @@ RadarValues::RadarValues()
 void RadarValues::MakeUnknown()
 {
 	FOREACH_RadarCategory( rc )
-		m_fValues[rc] = RADAR_VAL_UNKNOWN;
+		m_Values.f[rc] = RADAR_VAL_UNKNOWN;
 }
 
 void RadarValues::Zero()
 {
 	FOREACH_RadarCategory( rc )
-		m_fValues[rc] = 0;
+		m_Values.f[rc] = 0;
 }
 
 XNode* RadarValues::CreateNode() const
@@ -36,12 +36,12 @@ XNode* RadarValues::CreateNode() const
 		if( rc >= RADAR_NUM_TAPS_AND_HOLDS )
 		{
 			if( WRITE_SIMPLE_VALUES )
-				pNode->AppendChild( RadarCategoryToString(rc),	(int)m_fValues[rc] );
+				pNode->AppendChild( RadarCategoryToString(rc),	(int)m_Values.f[rc] );
 		}
 		else
 		{
 			if( WRITE_COMPLEX_VALUES )
-				pNode->AppendChild( RadarCategoryToString(rc),	m_fValues[rc] );
+				pNode->AppendChild( RadarCategoryToString(rc),	m_Values.f[rc] );
 		}
 	}
 
@@ -55,7 +55,7 @@ void RadarValues::LoadFromNode( const XNode* pNode )
 	Zero();
 
 	FOREACH_RadarCategory( rc )
-		pNode->GetChildValue( RadarCategoryToString(rc),	m_fValues[rc] );
+		pNode->GetChildValue( RadarCategoryToString(rc),	m_Values.f[rc] );
 }
 
 /* iMaxValues is only used for writing compatibility fields in non-cache
@@ -68,7 +68,7 @@ CString RadarValues::ToString( int iMaxValues ) const
 
 	CStringArray asRadarValues;
 	for( int r=0; r < iMaxValues; r++ )
-		asRadarValues.push_back( ssprintf("%.3f", m_fValues[r]) );
+		asRadarValues.push_back( ssprintf("%.3f", m_Values.f[r]) );
 
 	return join( ",",asRadarValues );
 }
@@ -85,7 +85,7 @@ void RadarValues::FromString( CString sRadarValues )
 	}
 
 	FOREACH_RadarCategory(rc)
-		m_fValues[rc] = strtof( saValues[rc], NULL );
+		m_Values.f[rc] = strtof( saValues[rc], NULL );
     
 }
 
diff --git a/stepmania/src/RadarValues.h b/stepmania/src/RadarValues.h
index becef606d3..604a86d0b1 100644
--- a/stepmania/src/RadarValues.h
+++ b/stepmania/src/RadarValues.h
@@ -11,10 +11,26 @@ struct XNode;
 
 struct RadarValues
 {
-	float m_fValues[NUM_RADAR_CATEGORIES];
+	union Values
+	{
+		struct
+		{
+			float fStream;
+			float fVoltage;
+			float fAir;
+			float fFreeze;
+			float fChaos;
+			float fNumTapsAndHolds;
+			float fNumJumps;
+			float fNumHolds;
+			float fNumMines;
+			float fNumHands;
+		} v;
+		float f[NUM_RADAR_CATEGORIES];
+	} m_Values;
 
-    operator const float* () const	{ return m_fValues; };
-    operator float* ()				{ return m_fValues; };
+    operator const float* () const	{ return m_Values.f; };
+    operator float* ()				{ return m_Values.f; };
 
 	RadarValues();
 	void MakeUnknown();
@@ -24,14 +40,14 @@ struct RadarValues
 	RadarValues& operator+=( const RadarValues& other )
 	{
 		FOREACH_RadarCategory( rc )
-			m_fValues[rc] += other.m_fValues[rc];
+			m_Values.f[rc] += other.m_Values.f[rc];
 		return *this;
 	}
 	bool operator==( const RadarValues& other ) const
 	{
 		FOREACH_RadarCategory( rc )
 		{
-			if( m_fValues[rc] != other.m_fValues[rc] )
+			if( m_Values.f[rc] != other.m_Values.f[rc] )
 				return false;
 		}
 		return true;