diff --git a/src/main/java/core/math/Coordinates.java b/src/main/java/core/math/Coordinates.java index a935958..215d3b7 100644 --- a/src/main/java/core/math/Coordinates.java +++ b/src/main/java/core/math/Coordinates.java @@ -52,6 +52,6 @@ public class Coordinates { public static boolean outOfBounds(Vector2D position, Vector2D size) { return (position.x + size.magnitude() < 0 || position.x - size.magnitude() > Master.SCREEN_Y_COORDINATES * Master.SCREEN_RATIO || - position.y + size.magnitude() < 0 || position.y - position.magnitude() > Master.SCREEN_Y_COORDINATES); + position.y + size.magnitude() < 0 || position.y - size.magnitude() > Master.SCREEN_Y_COORDINATES); } } diff --git a/src/main/java/core/objects/core/GameObject.java b/src/main/java/core/objects/core/GameObject.java index 3ebf025..720dbe6 100644 --- a/src/main/java/core/objects/core/GameObject.java +++ b/src/main/java/core/objects/core/GameObject.java @@ -104,28 +104,6 @@ public abstract class GameObject implements Drawable { g2d.fillOval((int) abs.x, (int) abs.y, (int) sizeAbs.x, (int) sizeAbs.y); } - /** - * This method draws an oval at the current position and size with arguments - * - * @param g2d The Graphics2D object provided by the master - * @param arg Arguments like "center" for the object being drawn in the center - */ - public void drawOval(Graphics2D g2d, String arg) { - - Vector2D abs; - - if(arg.contains("center")){ - abs = Coordinates.getWorldCoordinates(getCenterPosition()); - } else { - abs = Coordinates.getWorldCoordinates(position); - } - - Vector2D sizeAbs = Coordinates.getWorldCoordinates(size); - - g2d.setPaint(mainColor); - g2d.drawOval((int) abs.x, (int) abs.y, (int) sizeAbs.x, (int) sizeAbs.y); - } - /** * Destroy this {@code GameObject} */ diff --git a/target/classes/objects/ships/BattleShip.class b/target/classes/objects/ships/BattleShip.class index 200598c..f25ab33 100644 Binary files a/target/classes/objects/ships/BattleShip.class and b/target/classes/objects/ships/BattleShip.class differ diff --git a/target/classes/objects/ships/Shell.class b/target/classes/objects/ships/Shell.class index f487acf..8cb2189 100644 Binary files a/target/classes/objects/ships/Shell.class and b/target/classes/objects/ships/Shell.class differ