From be46f3587e81047cccf2234a1e0c4f38b63fb915 Mon Sep 17 00:00:00 2001 From: Joshua Date: Mon, 23 Dec 2024 18:50:39 +0100 Subject: [PATCH] Fixed semesterCounter for onlineGame. --- src/JoinGame.java | 3 ++- src/MainFrame.java | 2 +- src/startMultiplayerGame.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/JoinGame.java b/src/JoinGame.java index 27144b7..98e2b8c 100644 --- a/src/JoinGame.java +++ b/src/JoinGame.java @@ -13,7 +13,7 @@ import java.net.InetSocketAddress; public class JoinGame extends JPanel { // Funktionshilfen - String standardPort = "1234"; + String standardPort = "51525"; // Grafiken ImageIcon backButtonIcon = new ImageIcon("graphics/backButton.png"); @@ -56,6 +56,7 @@ public class JoinGame extends JPanel { * @author Lucas Bronson, Joshua Kuklok */ private void buildPanel(MainFrame frame,int g,int playerType,String playerName, int semesterCounter) { + System.out.println("semesterzahl in JoinGame" + semesterCounter); if(g==1){ spielBeitretenLabel= new JLabel("Spiel beitreten"); }else{ diff --git a/src/MainFrame.java b/src/MainFrame.java index bb44f06..bb47933 100644 --- a/src/MainFrame.java +++ b/src/MainFrame.java @@ -80,7 +80,7 @@ public class MainFrame extends JFrame { * @param playerName Name des Spielers * @author Lucas Bronson, Joshua Kuklok */ - public void showPanelSMG(String panelName, int num, int playerType,String playerName) { + public void showPanelSMG(String panelName, int num, int playerType,String playerName, int semesterCounter) { this.localMult = num; JoinGame joinGame = new JoinGame(this, localMult, playerType, playerName, semesterCounter); diff --git a/src/startMultiplayerGame.java b/src/startMultiplayerGame.java index d4533a0..cd10369 100644 --- a/src/startMultiplayerGame.java +++ b/src/startMultiplayerGame.java @@ -154,13 +154,13 @@ public class startMultiplayerGame extends JPanel { @Override public void actionPerformed(ActionEvent e) { if (PlayerIcon.getIcon() == humanPlayerIcon) { - frame.showPanelSMG("JoinGame",1,0, PlayerNickname); + frame.showPanelSMG("JoinGame",1,0, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) { - frame.showPanelSMG("JoinGame",1,1, PlayerNickname); + frame.showPanelSMG("JoinGame",1,1, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) { - frame.showPanelSMG("JoinGame",1,2, PlayerNickname); + frame.showPanelSMG("JoinGame",1,2, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) { - frame.showPanelSMG("JoinGame",1,3, PlayerNickname); + frame.showPanelSMG("JoinGame",1,3, PlayerNickname, semesterCounter); } } }); @@ -171,13 +171,13 @@ public class startMultiplayerGame extends JPanel { public void actionPerformed(ActionEvent e) { //Parameter -> panelName, Spiel erstellen oder beitreten (int), Spielertyp(int 0-3), Spielername if (PlayerIcon.getIcon() == humanPlayerIcon) { - frame.showPanelSMG("JoinGame",0,0, PlayerNickname); + frame.showPanelSMG("JoinGame",0,0, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) { - frame.showPanelSMG("JoinGame",0,1, PlayerNickname); + frame.showPanelSMG("JoinGame",0,1, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) { - frame.showPanelSMG("JoinGame",0,2, PlayerNickname); + frame.showPanelSMG("JoinGame",0,2, PlayerNickname, semesterCounter); } else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) { - frame.showPanelSMG("JoinGame",0,3, PlayerNickname); + frame.showPanelSMG("JoinGame",0,3, PlayerNickname, semesterCounter); } } });