diff --git a/stepmania/src/HighScore.h b/stepmania/src/HighScore.h index 443883bbdc..3c818efe02 100644 --- a/stepmania/src/HighScore.h +++ b/stepmania/src/HighScore.h @@ -41,7 +41,7 @@ struct HighScore iProductID = 0; ZERO( iTapNoteScores ); ZERO( iHoldNoteScores ); - radarValues.Init(); + radarValues.MakeUnknown(); } bool operator>=( const HighScore& other ) const; diff --git a/stepmania/src/RadarValues.cpp b/stepmania/src/RadarValues.cpp index 2871aa46f3..0ee343f1db 100644 --- a/stepmania/src/RadarValues.cpp +++ b/stepmania/src/RadarValues.cpp @@ -7,15 +7,21 @@ RadarValues::RadarValues() { - Init(); + MakeUnknown(); } -void RadarValues::Init() +void RadarValues::MakeUnknown() { FOREACH_RadarCategory( rc ) m_fValues[rc] = RADAR_VAL_UNKNOWN; } +void RadarValues::Zero() +{ + FOREACH_RadarCategory( rc ) + m_fValues[rc] = 0; +} + XNode* RadarValues::CreateNode() const { XNode* pNode = new XNode; diff --git a/stepmania/src/RadarValues.h b/stepmania/src/RadarValues.h index e896621b19..e9589330f4 100644 --- a/stepmania/src/RadarValues.h +++ b/stepmania/src/RadarValues.h @@ -18,7 +18,8 @@ struct RadarValues operator float* () { return m_fValues; }; RadarValues(); - void Init(); + void MakeUnknown(); + void Zero(); RadarValues& operator+=( const RadarValues& other ) diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index 73a839733c..3fb8d0b989 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -31,8 +31,8 @@ void StageStats::Init() ZERO( iTapNoteScores[p] ); ZERO( iHoldNoteScores[p] ); - ZERO( radarPossible[p] ); // zero, don't init. We're going to be incrementing these - ZERO( radarActual[p] ); // zero, don't init. We're going to be incrementing these + radarPossible[p].Zero(); + radarActual[p].Zero(); fFirstSecond[p] = 999999; fLastSecond[p] = 0; diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp index 755afe65c4..5906d11d83 100644 --- a/stepmania/src/Trail.cpp +++ b/stepmania/src/Trail.cpp @@ -65,7 +65,7 @@ RadarValues Trail::GetRadarValues() const else { m_bRadarValuesCached = true; - m_CachedRadarValues.Init(); + m_CachedRadarValues.Zero(); FOREACH_CONST( TrailEntry, m_vEntries, e ) {