* Merge Confilct

This commit is contained in:
JJTCM committed 2014-10-31 11:06:30 +01:00
1 parent 3588532c24
commit d013afb465
2 files changed
+79 -11

No files matched your search

@@ -35,13 +35,15 @@ public class Player extends ShootingEntity {
if(Keyboard.isKeyDown(KeyEvent.VK_RIGHT) && this.x < (GameConfig.windowWidth - this.getImage().getWidth())) {
this.x += off;
}
if(Keyboard.isKeyDown(KeyEvent.VK_SPACE)) {
if(Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==false) {
shoot = true;
this.shoot();
}
if(!Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==true) {
shoot = false;
}
}
if(!Keyboard.isKeyDown(KeyEvent.VK_SPACE) && shoot==true) {
shoot = false;
}
}