Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed an issue where the Mouse could be used while in game
  • Loading branch information
jdm13003 committed Apr 27, 2016
1 parent 62f0528 commit f9ae420
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/main/Game.java
Expand Up @@ -103,7 +103,7 @@ public class Game extends Canvas implements Runnable{
e.printStackTrace(); e.printStackTrace();
} }
addKeyListener(new KeyboardInput(this)); addKeyListener(new KeyboardInput(this));
this.addMouseListener(new MouseInput()); this.addMouseListener(new MouseInput(this));
tp = new Skins(this); tp = new Skins(this);
c = new Controller(tp, this); c = new Controller(tp, this);
menu = new Menu(); menu = new Menu();
Expand Down
62 changes: 33 additions & 29 deletions src/main/MouseInput.java
Expand Up @@ -4,55 +4,59 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;


public class MouseInput implements MouseListener{ public class MouseInput implements MouseListener{

private Game game;

public MouseInput(Game game){
this.game = game;
}
public void mouseClicked(MouseEvent arg0) { public void mouseClicked(MouseEvent arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

} }


public void mouseEntered(MouseEvent arg0) { public void mouseEntered(MouseEvent arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

} }


public void mouseExited(MouseEvent arg0) { public void mouseExited(MouseEvent arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

} }


public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
int mx = e.getX(); int mx = e.getX();
int my = e.getY(); int my = e.getY();

if(game.State == game.State.MENU){
if(mx >= 265 && mx <= 535 && my >= 225 && my <= 275) if(mx >= 265 && mx <= 535 && my >= 225 && my <= 275)
{ {
Game.numberOfPlayers = 1; Game.numberOfPlayers = 1;
Game.padraicmode = false; Game.padraicmode = false;
Game.State = Game.STATE.GAME; 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) { public void mouseReleased(MouseEvent arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

} }


} }

0 comments on commit f9ae420

Please sign in to comment.