From 9b10e93c6a1cc16cc5f8dfef6262dd5a0d669020 Mon Sep 17 00:00:00 2001
From: Josua Oppermann <josua.oppermann@gmail.com>
Date: Thu, 9 Jan 2025 16:26:22 +0100
Subject: [PATCH] getter and setter von Tile fix
---
Board.java | 8 ++++----
GameUI.java | 4 ++--
README.md | 2 --
Tile.java | 8 ++++----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Board.java b/Board.java
index 3f805c9..005b976 100644
--- a/Board.java
+++ b/Board.java
@@ -93,11 +93,11 @@ public class Board extends Thread {
public boolean victoryCheck() {
boolean victory = false;
for(int i = 0; i < 3; i++) {
- if(currentPlayer == tiles[0+i*3].get_owner() && currentPlayer == tiles[1+i*3].get_owner() && currentPlayer == tiles[2+i*3].get_owner()) victory = true;
- if(currentPlayer == tiles[0+i].get_owner() && currentPlayer == tiles[3+i].get_owner() && currentPlayer == tiles[6+i].get_owner()) victory = true;
+ if(currentPlayer == tiles[0+i*3].getOwner() && currentPlayer == tiles[1+i*3].getOwner() && currentPlayer == tiles[2+i*3].getOwner()) victory = true;
+ if(currentPlayer == tiles[0+i].getOwner() && currentPlayer == tiles[3+i].getOwner() && currentPlayer == tiles[6+i].getOwner()) victory = true;
}
- if(currentPlayer == tiles[0].get_owner() && currentPlayer == tiles[4].get_owner() && currentPlayer == tiles[8].get_owner()) victory = true;
- if(currentPlayer == tiles[2].get_owner() && currentPlayer == tiles[4].get_owner() && currentPlayer == tiles[6].get_owner()) victory = true;
+ if(currentPlayer == tiles[0].getOwner() && currentPlayer == tiles[4].getOwner() && currentPlayer == tiles[8].getOwner()) victory = true;
+ if(currentPlayer == tiles[2].getOwner() && currentPlayer == tiles[4].getOwner() && currentPlayer == tiles[6].getOwner()) victory = true;
return victory;
}
}
diff --git a/GameUI.java b/GameUI.java
index 555e552..5462d34 100644
--- a/GameUI.java
+++ b/GameUI.java
@@ -131,10 +131,10 @@ public class GameUI extends Application{
* @param stage current scene
*/
private void handleTurn(int index, Stage stage){
- if (board.tiles[index].exist_owner()) {
+ if (board.tiles[index].existOwner()) {
return;
}
- board.tiles[index].set_owner(board.currentPlayer);
+ board.tiles[index].setOwner(board.currentPlayer);
//replace symbols with images
String imageSymbols = board.currentPlayer == 0 ? getClass().getResource("/textures/1_" + rnd.nextInt(3) + ".png").toExternalForm() :
diff --git a/README.md b/README.md
index 6b36ceb..dfd36a8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
# Tick-Tack-Trauma
-
-
## Getting started
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
diff --git a/Tile.java b/Tile.java
index 889bc5b..d6323a4 100644
--- a/Tile.java
+++ b/Tile.java
@@ -11,7 +11,7 @@ public class Tile {
* -1 = no one; 0 = Player 1; 1 = Player 2
* @param owner
*/
- public void set_owner(int player){
+ public void setOwner(int player){
owner = player;
}
@@ -19,20 +19,20 @@ public class Tile {
* -1 = no one; 0 = Player 1; 1 = Player 2
* @return owner
*/
- public int get_owner(){
+ public int getOwner(){
return owner;
}
/**Returns if the Tile-owner is equal to the given Player
* @param owner
*/
- public boolean is_owner(int player){
+ public boolean isOwner(int player){
return owner == player;
}
/**Whether this Tile is owned by a Player
*/
- public boolean exist_owner(){
+ public boolean existOwner(){
return owner != -1;
}
--
GitLab