Merge branch 'master' of github.com:teamteamteam/SpaceScooter

This commit is contained in:
lubiana 2014-11-06 16:15:54 +01:00
commit 1525c358c1
1 changed files with 1 additions and 3 deletions

View File

@ -75,7 +75,6 @@ public class Player extends ShootingEntity implements KeyboardListener {
super.remove(); super.remove();
} }
@Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
//spontaneous fire happens here //spontaneous fire happens here
if(e.getKeyCode() == KeyEvent.VK_SPACE) { if(e.getKeyCode() == KeyEvent.VK_SPACE) {
@ -83,7 +82,6 @@ public class Player extends ShootingEntity implements KeyboardListener {
} }
} }
@Override
public void keyReleased(KeyEvent e) { public void keyReleased(KeyEvent e) {
//space up -> reset shot cooldown //space up -> reset shot cooldown
if(e.getKeyCode() == KeyEvent.VK_SPACE) { if(e.getKeyCode() == KeyEvent.VK_SPACE) {
@ -91,7 +89,7 @@ public class Player extends ShootingEntity implements KeyboardListener {
} }
} }
@Override
public void keyTyped(KeyEvent e) {} public void keyTyped(KeyEvent e) {}
} }