Merge branch 'master' into malte-ai

This commit is contained in:
Malte Tammena 2017-10-18 13:16:18 +02:00
commit eddeaaf5f3

View file

@ -3,7 +3,7 @@ package game;
import java.util.Random;
import player.Player;
import player.Player2;
import player.MaurizioAI;
/**
* Represents a game of Connect Four.
@ -168,14 +168,14 @@ public class Game {
* @return the state of the game, -1 = still undecided , 0 = draw, 1 = Player 1 wins, ...
*/
private int checkState(boolean output) {
if(Player2.checkWin(this.board, p1.getID())){
if(MaurizioAI.checkWin(this.board, p1.getID())){
this.gameOn = false;
if(output){
System.out.println(p1.getP().getName() + " wins!");
}
return p1.getID(); // player 1 wins
}
if(Player2.checkWin(this.board, p2.getID())){
if(MaurizioAI.checkWin(this.board, p2.getID())){
this.gameOn = false;
if(output){
System.out.println(p2.getP().getName() + " wins!");