support MultiPlayer

stepmania/src/ScoreDisplayAliveTime.cpp

@@ -7,6 +7,7 @@
 #include "StatsManager.h"
 #include "ActorUtil.h"
 #include "LuaManager.h"
+#include "RageLog.h"
 
 REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime )
 
@@ -14,6 +15,7 @@ REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime )
 ScoreDisplayAliveTime::ScoreDisplayAliveTime()
 {
 	m_PlayerNumber = PLAYER_INVALID;
+	m_MultiPlayer = MultiPlayer_Invalid;
 }
 
 ScoreDisplayAliveTime::~ScoreDisplayAliveTime()
@@ -27,8 +29,10 @@ void ScoreDisplayAliveTime::LoadFromNode( const XNode* pNode )
 	{
 		Lua *L = LUA->Get();
 		bool b = pNode->PushAttrValue( L, "PlayerNumber" );
-		ASSERT( b );
 		LuaHelpers::Pop( L, m_PlayerNumber );
+		bool b2 = pNode->PushAttrValue( L, "MultiPlayer" );
+		LuaHelpers::Pop( L, m_MultiPlayer );
+		ASSERT( b || b2 );
 		LUA->Release( L );
 	}
 }
@@ -50,11 +54,15 @@ void ScoreDisplayAliveTime::HandleMessage( const Message &msg )
 void ScoreDisplayAliveTime::UpdateNumber()
 {
 	float fSecsIntoPlay = 0;
-	ASSERT( m_PlayerNumber != PLAYER_INVALID );
+	ASSERT( m_PlayerNumber != PLAYER_INVALID  ||  m_MultiPlayer != MultiPlayer_Invalid );
-	if( GAMESTATE->IsPlayerEnabled(m_PlayerNumber) )
+	if( m_PlayerNumber != PLAYER_INVALID  &&  GAMESTATE->IsPlayerEnabled(m_PlayerNumber) )
 		fSecsIntoPlay = 
 			STATSMAN->GetAccumPlayedStageStats().m_player[m_PlayerNumber].m_fAliveSeconds +
 			STATSMAN->m_CurStageStats.m_player[m_PlayerNumber].m_fAliveSeconds;
+	if( m_MultiPlayer != MultiPlayer_Invalid  &&  GAMESTATE->IsMultiPlayerEnabled(m_MultiPlayer) )
+		fSecsIntoPlay = 
+			STATSMAN->GetAccumPlayedStageStats().m_fGameplaySeconds +
+			STATSMAN->m_CurStageStats.m_fGameplaySeconds;
 
 	SetText( SecondsToMMSSMsMs(fSecsIntoPlay) );
 }

stepmania/src/ScoreDisplayAliveTime.h

@@ -30,6 +30,7 @@ public:
 
 private:
 	PlayerNumber m_PlayerNumber;
+	MultiPlayer m_MultiPlayer;
 };
 
 #endif