From 3ad723338379ab38897dae6421618f9b2b601934 Mon Sep 17 00:00:00 2001 From: Joshua Date: Mon, 23 Dec 2024 18:35:22 +0100 Subject: [PATCH] JoinGame now calls GameController.startOnlineGame(...) correctly. --- src/JoinGame.java | 14 +++++++------- src/MainFrame.java | 2 +- src/startLocalGame.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/JoinGame.java b/src/JoinGame.java index 3e02716..27144b7 100644 --- a/src/JoinGame.java +++ b/src/JoinGame.java @@ -42,9 +42,9 @@ public class JoinGame extends JPanel { * @param playerName Name des Spielers * @author Lucas Bronson, Joshua Kuklok */ - public JoinGame(MainFrame frame,int g,int playerType,String playerName) { + public JoinGame(MainFrame frame,int g,int playerType,String playerName, int semesterCounter) { setLayout(null); - buildPanel(frame,g,playerType,playerName); + buildPanel(frame,g,playerType,playerName, semesterCounter); } /** @@ -55,7 +55,7 @@ public class JoinGame extends JPanel { * @param playerName Name des Spielers * @author Lucas Bronson, Joshua Kuklok */ - private void buildPanel(MainFrame frame,int g,int playerType,String playerName) { + private void buildPanel(MainFrame frame,int g,int playerType,String playerName, int semesterCounter) { if(g==1){ spielBeitretenLabel= new JLabel("Spiel beitreten"); }else{ @@ -114,13 +114,13 @@ public class JoinGame extends JPanel { try { if(playerType == 0) { - GameController.startOnlineGame(HumanPlayer.class, playerName, address,GameController.semesterToBoardSize(2)); + GameController.startOnlineGame(HumanPlayer.class, playerName, address,GameController.semesterToBoardSize(semesterCounter)); } else if(playerType == 1) { - GameController.startOnlineGame(SpecificAiPlayerEasy.class, playerName, address,GameController.semesterToBoardSize(2)); + GameController.startOnlineGame(SpecificAiPlayerEasy.class, playerName, address,GameController.semesterToBoardSize(semesterCounter)); } else if (playerType == 2) { - GameController.startOnlineGame(SpecificAiPlayerMedium.class, playerName, address,GameController.semesterToBoardSize(2)); + GameController.startOnlineGame(SpecificAiPlayerMedium.class, playerName, address,GameController.semesterToBoardSize(semesterCounter)); } else if (playerType == 3) { - GameController.startOnlineGame(SpecificAiPlayerHard.class, playerName, address,GameController.semesterToBoardSize(2)); + GameController.startOnlineGame(SpecificAiPlayerHard.class, playerName, address,GameController.semesterToBoardSize(semesterCounter)); } } catch (IOException ex) { throw new RuntimeException(ex); diff --git a/src/MainFrame.java b/src/MainFrame.java index 8780a7c..bb44f06 100644 --- a/src/MainFrame.java +++ b/src/MainFrame.java @@ -83,7 +83,7 @@ public class MainFrame extends JFrame { public void showPanelSMG(String panelName, int num, int playerType,String playerName) { this.localMult = num; - JoinGame joinGame = new JoinGame(this, localMult, playerType, playerName); + JoinGame joinGame = new JoinGame(this, localMult, playerType, playerName, semesterCounter); mainPanel.add(joinGame, panelName); mainPanel.revalidate(); mainPanel.repaint(); diff --git a/src/startLocalGame.java b/src/startLocalGame.java index ac99d15..a2aace0 100644 --- a/src/startLocalGame.java +++ b/src/startLocalGame.java @@ -7,7 +7,7 @@ import java.util.HashMap; /** * Das startLocalGame Panel dient dem Erstellen eines lokalen Spiels. * Hier kann der Benutzer Spieler inklusive Namen und das Semester, in dem sich der Benutzer befindet, einstellen. - * @author Lucas Bronson, Joshua Kuklok + * @author Lucas Bronson, Joshua Kuklok, Luca Conte */ public class startLocalGame extends JPanel { // Player