Game #23

Merged
schrom01 merged 43 commits from Game into main 2022-03-20 16:56:34 +01:00
1 changed files with 5 additions and 5 deletions
Showing only changes of commit 63204a4b29 - Show all commits

View File

@ -179,17 +179,17 @@ public class Game implements GameSpecification {
} }
public int gamePhase() throws PositionVectorNotValid { public int gamePhase() throws PositionVectorNotValid {
do{ while (getWinner() == NO_WINNER) {
userInterface.printTrack(track); userInterface.printTrack(track);
Direction direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); Direction direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove();
doCarTurn(direction); doCarTurn(direction);
int winner = getWinner(); int winner = getWinner();
if(winner != NO_WINNER) { if(allCarsCrashed()) {
return winner; return NO_WINNER;
} }
switchToNextActiveCar(); switchToNextActiveCar();
} while (!allCarsCrashed()); }
return NO_WINNER; return getWinner();
} }
/** /**