diff --git a/src/HalloSchiffeVersenken.java b/src/HalloSchiffeVersenken.java index 519e799..cd1f2c1 100644 --- a/src/HalloSchiffeVersenken.java +++ b/src/HalloSchiffeVersenken.java @@ -2,9 +2,10 @@ public class HalloSchiffeVersenken { public static void main(String[] args) throws InterruptedException { //LUCAS CODE - MainMenuModel model = new MainMenuModel(); - MainMenuView view = new MainMenuView(); - MainMenuController controller = new MainMenuController(model, view); + coinToss ct = new coinToss(); + //MainMenuModel model = new MainMenuModel(); + //MainMenuView view = new MainMenuView(); + //MainMenuController controller = new MainMenuController(model, view); //System.out.println("HelloSchiffeVersenekn"); @@ -21,7 +22,7 @@ public class HalloSchiffeVersenken { */ //JOSHUA CODE - startLocalGame localTest = new startLocalGame(); + //startLocalGame localTest = new startLocalGame(); //startMultiplayerGame multiplayerTest = new startMultiplayerGame(); } } diff --git a/src/MainMenuController.java b/src/MainMenuController.java index d7c1611..e866efe 100644 --- a/src/MainMenuController.java +++ b/src/MainMenuController.java @@ -25,6 +25,11 @@ public class MainMenuController implements ActionListener { view.showPanel("MultiMenu"); }else if (e.getSource() == view.getSoundButton()) { view.toggleMute(); + }else if(e.getSource() == view.getLocalButton()) { + model.setGameMode("LocalGame"); + startLocalGame localGame = new startLocalGame(); + view.addPanel(localGame.getLocalPanel(), "LocalMenu"); + view.showPanel("LocalMenu"); } } } \ No newline at end of file diff --git a/src/startLocalGame.java b/src/startLocalGame.java index 9142325..6a60ceb 100644 --- a/src/startLocalGame.java +++ b/src/startLocalGame.java @@ -224,4 +224,7 @@ public class startLocalGame { rightPlayerTextField.setText("Leicht"); } } + public JPanel getLocalPanel() { + return localGamePanel; + } }