From fab4ac6ce73b949342b458348c092881656283ac Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 28 May 2015 11:58:04 +0200 Subject: [PATCH] Buttonpress improved --- model/gameState/PlayState.java | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java index 69d638f..1cfbf76 100644 --- a/model/gameState/PlayState.java +++ b/model/gameState/PlayState.java @@ -143,26 +143,8 @@ public class PlayState extends GameState{ @Override public void buttonPressed(ButtonEvent e) { - - switch(e.getButton().getButtonID()){ - case 1: - addBullet(GameModel.colors[0],player.getIndex()); - break; - case 2: - addBullet(GameModel.colors[1],player.getIndex()); - break; - case 3: - addBullet(GameModel.colors[2],player.getIndex()); - break; - case 4: - addBullet(GameModel.colors[3],player.getIndex()); - break; - case 5: - addBullet(GameModel.colors[4],player.getIndex()); - break; - case 6: - addBullet(GameModel.colors[5],player.getIndex()); - break; + if(e.getButton().getButtonID() != 0){ + addBullet(GameModel.colors[e.getButton().getButtonID()-1],player.getIndex()); } } @@ -172,7 +154,7 @@ public class PlayState extends GameState{ } @Override - public void onJoystickMoved(JoystickEvent e) { + public void onJoystickMoved(JoystickEvent e) { switch(e.getJoystick().getPos()){ case CENTER: break;