diff --git a/src/main/java/com/example/tankbattle/Bullet.java b/src/main/java/com/example/tankbattle/Bullet.java index 77ffab4..f5a3b09 100644 --- a/src/main/java/com/example/tankbattle/Bullet.java +++ b/src/main/java/com/example/tankbattle/Bullet.java @@ -11,9 +11,7 @@ public class Bullet { private Dir dir; private boolean living = true; - - private TankFrame tf = null; - + TankFrame tf = null; private Group group = Group.BAD; public Bullet(int x, int y, Dir dir, Group group, TankFrame tf) { @@ -24,6 +22,14 @@ public class Bullet { this.tf = tf; } + public Group getGroup() { + return group; + } + + public void setGroup(Group group) { + this.group = group; + } + public void paint(Graphics g) { if (!living) { tf.bullets.remove(this); diff --git a/src/main/java/com/example/tankbattle/Tank.java b/src/main/java/com/example/tankbattle/Tank.java index 0ddc223..7a0d133 100644 --- a/src/main/java/com/example/tankbattle/Tank.java +++ b/src/main/java/com/example/tankbattle/Tank.java @@ -105,15 +105,14 @@ public class Tank { move(); } + public void setDir(Dir dir) { + this.dir = dir; + } public void setMoving(boolean moving) { this.moving = moving; } - public void setDir(Dir dir) { - this.dir = dir; - } - public void setX(int x) { this.x = x; }