megamanmalte/VierGewinnt
1
0
Fork 0
Code Issues 1 Pull requests 3 Packages Projects Releases Wiki Activity

Merge branch 'fix-naming' into 'master'

Browse source 
Fixed naming issue, build passing

See merge request !12
This commit is contained in:
Malte Tammena 2017-10-18 13:14:43 +02:00
parent abcf0c9bd0 b04e2a8fc6
commit 9e968e4050
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/Game.java
View file

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