diff --git a/src/main/java/com/example/tankbattle/Tank.java b/src/main/java/com/example/tankbattle/Tank.java index bf9136e..3050ca2 100644 --- a/src/main/java/com/example/tankbattle/Tank.java +++ b/src/main/java/com/example/tankbattle/Tank.java @@ -28,8 +28,8 @@ public class Tank { this.x = x; this.y = y; this.dir = dir; - this.tf = tf; this.group = group; + this.tf = tf; } public void fire(){ @@ -46,18 +46,6 @@ public class Tank { return x; } - public void setX(int x) { - this.x = x; - } - - public int getY() { - return y; - } - - public void setY(int y) { - this.y = y; - } - public Group getGroup() { return group; } @@ -66,6 +54,10 @@ public class Tank { this.group = group; } + public int getY() { + return y; + } + public boolean isMoving() { return moving; } diff --git a/src/main/java/com/example/tankbattle/TankFrame.java b/src/main/java/com/example/tankbattle/TankFrame.java index 2587338..2368690 100644 --- a/src/main/java/com/example/tankbattle/TankFrame.java +++ b/src/main/java/com/example/tankbattle/TankFrame.java @@ -17,7 +17,7 @@ public class TankFrame extends Frame { List bullets = new ArrayList<>(); List tanks = new ArrayList<>(); - public static final int GAME_WIDTH = 800,GAME_HEIGHT=600; + static final int GAME_WIDTH = 800,GAME_HEIGHT=600; public TankFrame() { setSize(GAME_WIDTH, GAME_HEIGHT); @@ -133,6 +133,7 @@ public class TankFrame extends Frame { } private void setMainTankDir() { + if (!bL && !bU && !bR && !bD) { myTank.setMoving(false); } else {