fixed check fainted

cfeltch537 · Apr 5, 2013 · c30d342 · c30d342
1 parent 06d25ef
commit c30d342
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/Battle.java b/SoftwareEngineeringProject/src/edu/ycp/cs320/fokemon_webApp/shared/Battle/Battle.java
@@ -234,11 +234,11 @@ public void Turn(int turnNumber){
 }
 private void CheckFaintedPokemon() {
 	// TODO Auto-generated method stub
-	if(user.getTeam(user.getCurrentPokemonIndex()).getStats().getStatus()==Status.NRM){
+	if(user.getTeam(user.getCurrentPokemonIndex()).getStats().getStatus()==Status.FNT){
 		battleMessage.add(user.getTeam(user.getCurrentPokemonIndex()).getInfo().getNickname()+" has lost the battle.  ");
 		battleOver=true;
 	}
-	if(opponent.getTeam(opponent.getCurrentPokemonIndex()).getStats().getStatus()==Status.NRM){
+	if(opponent.getTeam(opponent.getCurrentPokemonIndex()).getStats().getStatus()==Status.FNT){
 		battleMessage.add(opponent.getTeam(opponent.getCurrentPokemonIndex()).getInfo().getNickname()+" has lost the battle.  ");
 		battleOver=true;
 	}