From 112cb0b384e5e9a2c20ed8f588b30f7b3e7cb337 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 6 Sep 2003 02:05:39 +0000
Subject: [PATCH] simplify

---
 stepmania/src/GameState.cpp  | 6 ------
 stepmania/src/StageStats.cpp | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 243e1671cd..68271c22a7 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -462,13 +462,7 @@ void GameState::GetFinalEvalStatsAndSongs( StageStats& statsOut, vector<Song*>&
 			--PassedRegularSongsLeft;
 		}
 
-		// weight long and marathon songs
-		int iLengthMultiplier = SongManager::GetNumStagesForSong( s.pSong );
-
 		statsOut.AddStats( s );
-		for( int p=0; p<NUM_PLAYERS; p++ )
-			if( IsPlayerEnabled(p) )
-				statsOut.iMeter[p] += s.iMeter[p] * (iLengthMultiplier-1);
 
 		vSongsOut.insert( vSongsOut.begin(), s.pSong );
 	}
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index 8ddecb1836..abec94e3b6 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -14,7 +14,7 @@
 #include "StageStats.h"
 #include "GameState.h"
 #include "RageLog.h"
-
+#include "SongManager.h"
 
 StageStats::StageStats()
 {
@@ -27,9 +27,13 @@ void StageStats::AddStats( const StageStats& other )
 	StageType = STAGE_INVALID; // meaningless
 	memset( fAliveSeconds, 0, sizeof(fAliveSeconds) );
 	
+	// weight long and marathon songs
+	ASSERT( other.pSong );
+	const int iLengthMultiplier = SongManager::GetNumStagesForSong( other.pSong );
+
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
-		iMeter[p] += other.iMeter[p];
+		iMeter[p] += other.iMeter[p] * iLengthMultiplier;
 		fAliveSeconds[p] += other.fAliveSeconds[p];
 		bFailed[p] |= other.bFailed[p];
 		iPossibleDancePoints[p] += other.iPossibleDancePoints[p];