From 6ab1eb0390df10e5d4f2eec1a2f5b26e90e47624 Mon Sep 17 00:00:00 2001 From: Alexander Sazonov Date: Fri, 8 Apr 2022 10:55:01 +0200 Subject: [PATCH] Small adjustment to VoteHandler (both ghostVote and humanVote) --- .../unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java | 11 ++++++++++- .../cs108/gamelogic/klassenstruktur/Passenger.java | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java index 7d14119..b06914d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java @@ -90,6 +90,11 @@ public class VoteHandler { passengers[ghostPosition] = g; passengers[ghostPosition].send( "You are now a ghost!"); // TODO: ServerGameInfoHandler might deal with this one + + // set hasVoted to false for all passengers for future votings + for (Passenger passenger : passengers) { + passenger.setHasVoted(false); + } } /** @@ -100,7 +105,7 @@ public class VoteHandler { * * @param passengers: train passengers */ - public void humanVote(Passenger[] passengers) { + public void humanVote(Passenger[] passengers, Game game) { // array to collect votes for all players during voting, i.e. votes for player 1 are saved in // votesForPlayers[0] @@ -176,5 +181,9 @@ public class VoteHandler { } } } + // set hasVoted to false for all passengers for future votings + for (Passenger passenger : passengers) { + passenger.setHasVoted(false); + } } } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Passenger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Passenger.java index c968db9..4450eb7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Passenger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Passenger.java @@ -71,9 +71,9 @@ public class Passenger { // changes this passenger's status from human to ghost isGhost = true; } - public void setHasVoted() { + public void setHasVoted(boolean voted) { // used to signal that this passenger voted during a voting - hasVoted = true; + hasVoted = voted; } public int getPosition() {