From 09c419f482011284582ae75ce6b73996821bba1e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 13 Jan 2006 05:49:27 +0000 Subject: [PATCH] PlayerState::LaunchAttack, RemoveActiveAttacks --- stepmania/src/ScoreKeeperRave.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScoreKeeperRave.cpp b/stepmania/src/ScoreKeeperRave.cpp index 1e44ba7168..e41f5666d8 100644 --- a/stepmania/src/ScoreKeeperRave.cpp +++ b/stepmania/src/ScoreKeeperRave.cpp @@ -140,6 +140,7 @@ void ScoreKeeperRave::LaunchAttack( AttackLevel al ) } PlayerNumber pnToAttack = OPPOSITE_PLAYER[pn]; + PlayerState *pPlayerStateToAttack = GAMESTATE->m_pPlayerState[pnToAttack]; Attack a; a.level = al; @@ -147,10 +148,10 @@ void ScoreKeeperRave::LaunchAttack( AttackLevel al ) a.sModifiers = sAttackToGive; // remove current attack (if any) - GAMESTATE->RemoveActiveAttacksForPlayer( pnToAttack ); + pPlayerStateToAttack->RemoveActiveAttacks(); // apply new attack - GAMESTATE->LaunchAttack( (MultiPlayer)pnToAttack, a ); + pPlayerStateToAttack->LaunchAttack( a ); // SCREENMAN->SystemMessage( ssprintf( "attacking %d with %s", pnToAttack, sAttackToGive.c_str() ) ); }