tweak rave mercy rules

2004-05-16 05:21:43 +00:00
parent a8882ff9d0
commit 3e91007367
1 changed files with 12 additions and 2 deletions
@@ -114,9 +114,19 @@ void ScoreKeeperRave::AddSuperMeterDelta( float fUnscaledPercentChange )
 			GAMESTATE->m_fSuperMeter[m_PlayerNumber] -= 1.f;
 	}

-	// mercy: remove attacks on life drain
+	// mercy: if losing remove attacks on life drain
 	if( fUnscaledPercentChange < 0 )
-		GAMESTATE->RemoveActiveAttacksForPlayer( m_PlayerNumber );
+	{
+		bool bWinning;
+		switch( m_PlayerNumber )
+		{
+		case PLAYER_1:	bWinning = GAMESTATE->m_fTugLifePercentP1 > 0.5f;	break;
+		case PLAYER_2:	bWinning = GAMESTATE->m_fTugLifePercentP1 < 0.5f;	break;
+		default:	ASSERT(0);
+		}
+		if( !bWinning )
+			GAMESTATE->RemoveActiveAttacksForPlayer( m_PlayerNumber );
+	}
 }