ole #7

Merged
lgc merged 23 commits from ole into main 2024-11-26 14:01:01 +00:00
3 changed files with 13 additions and 4 deletions
Showing only changes of commit d95df0cf5f - Show all commits

View File

@ -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();
}
}

View File

@ -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");
}
}
}

View File

@ -224,4 +224,7 @@ public class startLocalGame {
rightPlayerTextField.setText("Leicht");
}
}
public JPanel getLocalPanel() {
return localGamePanel;
}
}