PlayerState::LaunchAttack, RemoveActiveAttacks

2006-01-13 05:49:27 +00:00
parent f61f021f1f
commit 09c419f482
1 changed files with 3 additions and 2 deletions
@@ -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() ) );
 }