diff --git a/src/main/java/com/example/tankbattle/Bullet.java b/src/main/java/com/example/tankbattle/Bullet.java index 778273d..7d155c5 100644 --- a/src/main/java/com/example/tankbattle/Bullet.java +++ b/src/main/java/com/example/tankbattle/Bullet.java @@ -5,7 +5,8 @@ import java.awt.Graphics; public class Bullet { private static final int SPEED = 1; - private static final int WIDTH = 30, HEIGHT = 30; + public static final int WIDTH = ResourceMgr.bulletD.getWidth(); + public static final int HEIGHT = ResourceMgr.bulletD.getHeight(); private int x, y; private Dir dir; @@ -38,7 +39,7 @@ public class Bullet { default: break; } - + move(); } diff --git a/src/main/java/com/example/tankbattle/Tank.java b/src/main/java/com/example/tankbattle/Tank.java index 0038863..f1927d2 100644 --- a/src/main/java/com/example/tankbattle/Tank.java +++ b/src/main/java/com/example/tankbattle/Tank.java @@ -8,6 +8,9 @@ public class Tank { private Dir dir = Dir.DOWN; private static final int SPEED = 5; + private static final int WIDTH = ResourceMgr.tankD.getWidth(); + private static final int HEIGHT = ResourceMgr.tankD.getHeight(); + private boolean moving = false; private TankFrame tf = null; @@ -79,6 +82,8 @@ public class Tank { } public void fire(){ - tf.bullets.add(new Bullet(this.x, this.y, this.dir, this.tf)); + int bX = this.x + Tank.WIDTH >> 1 - Bullet.WIDTH >> 1; + int bY = this.y + Tank.HEIGHT >> 1 - Bullet.HEIGHT >> 1; + tf.bullets.add(new Bullet(bX, bY, this.dir, this.tf)); } }