diff --git a/src/main/Game.java b/src/main/Game.java index 690da55..e97ec19 100644 --- a/src/main/Game.java +++ b/src/main/Game.java @@ -103,7 +103,7 @@ public class Game extends Canvas implements Runnable{ e.printStackTrace(); } addKeyListener(new KeyboardInput(this)); - this.addMouseListener(new MouseInput()); + this.addMouseListener(new MouseInput(this)); tp = new Skins(this); c = new Controller(tp, this); menu = new Menu(); diff --git a/src/main/MouseInput.java b/src/main/MouseInput.java index e8dd7fb..45db040 100644 --- a/src/main/MouseInput.java +++ b/src/main/MouseInput.java @@ -4,55 +4,59 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; public class MouseInput implements MouseListener{ - + private Game game; + + public MouseInput(Game game){ + this.game = game; + } public void mouseClicked(MouseEvent arg0) { // TODO Auto-generated method stub - + } public void mouseEntered(MouseEvent arg0) { // TODO Auto-generated method stub - + } public void mouseExited(MouseEvent arg0) { // TODO Auto-generated method stub - + } public void mousePressed(MouseEvent e) { int mx = e.getX(); int my = e.getY(); - - if(mx >= 265 && mx <= 535 && my >= 225 && my <= 275) - { - Game.numberOfPlayers = 1; - Game.padraicmode = false; - Game.State = Game.STATE.GAME; + if(game.State == game.State.MENU){ + if(mx >= 265 && mx <= 535 && my >= 225 && my <= 275) + { + Game.numberOfPlayers = 1; + Game.padraicmode = false; + Game.State = Game.STATE.GAME; + } + else if(mx >= 285 && mx <= 515 && my >= 325 && my <= 375) + { + Game.numberOfPlayers = 2; + Game.padraicmode = false; + Game.State = Game.STATE.GAME; + } + else if(mx >= 365 && mx <= 435 && my >= 425 && my <= 475) + { + System.exit(1); + } + else if(mx >= 610 && mx <= 650 && my >= 540 && my <= 580) + { + Game.numberOfPlayers = 1; + Game.padraicmode = true; + Game.State = Game.STATE.GAME; + } } - else if(mx >= 285 && mx <= 515 && my >= 325 && my <= 375) - { - Game.numberOfPlayers = 2; - Game.padraicmode = false; - Game.State = Game.STATE.GAME; - } - else if(mx >= 365 && mx <= 435 && my >= 425 && my <= 475) - { - System.exit(1); - } - else if(mx >= 610 && mx <= 650 && my >= 540 && my <= 580) - { - Game.numberOfPlayers = 1; - Game.padraicmode = true; - Game.State = Game.STATE.GAME; - } - - + } public void mouseReleased(MouseEvent arg0) { // TODO Auto-generated method stub - + } }