From f4898e10209a54d2cc90aa107a201124cd4d58be Mon Sep 17 00:00:00 2001 From: Haakon Gunleiksrud <haakogun@stud.ntnu.no> Date: Thu, 2 Apr 2020 10:40:37 +0200 Subject: [PATCH] #68 Removed report methods from sprite classes. --- frontend/core/src/com/gameware/game/sprites/Bubble.java | 4 ---- .../core/src/com/gameware/game/sprites/ColorRushButton.java | 5 ----- .../core/src/com/gameware/game/sprites/ColorRushTarget.java | 5 ----- .../core/src/com/gameware/game/sprites/LoadingCircle.java | 5 ----- frontend/core/src/com/gameware/game/sprites/PauseButton.java | 5 ----- frontend/core/src/com/gameware/game/sprites/PauseCircle.java | 5 ----- frontend/core/src/com/gameware/game/sprites/Sprite.java | 1 - 7 files changed, 30 deletions(-) diff --git a/frontend/core/src/com/gameware/game/sprites/Bubble.java b/frontend/core/src/com/gameware/game/sprites/Bubble.java index 1825d47..b73e52f 100644 --- a/frontend/core/src/com/gameware/game/sprites/Bubble.java +++ b/frontend/core/src/com/gameware/game/sprites/Bubble.java @@ -100,10 +100,6 @@ public class Bubble extends Actor { this.bubble.setDrawable(new TextureRegionDrawable(new TextureRegion(this.unpoppedTex))); } - public Object report() { - return null; - } - public void dispose() { } diff --git a/frontend/core/src/com/gameware/game/sprites/ColorRushButton.java b/frontend/core/src/com/gameware/game/sprites/ColorRushButton.java index bc92132..9347f87 100644 --- a/frontend/core/src/com/gameware/game/sprites/ColorRushButton.java +++ b/frontend/core/src/com/gameware/game/sprites/ColorRushButton.java @@ -30,11 +30,6 @@ public class ColorRushButton extends Sprite{ this.disabled = false; } - @Override - public Object report() { - return null; - } - @Override public void draw(SpriteBatch sb) { diff --git a/frontend/core/src/com/gameware/game/sprites/ColorRushTarget.java b/frontend/core/src/com/gameware/game/sprites/ColorRushTarget.java index bc145c6..b1cea52 100644 --- a/frontend/core/src/com/gameware/game/sprites/ColorRushTarget.java +++ b/frontend/core/src/com/gameware/game/sprites/ColorRushTarget.java @@ -35,11 +35,6 @@ public class ColorRushTarget extends Sprite{ } - @Override - public Object report() { - return null; - } - @Override public void draw(SpriteBatch sb) { sb.begin(); diff --git a/frontend/core/src/com/gameware/game/sprites/LoadingCircle.java b/frontend/core/src/com/gameware/game/sprites/LoadingCircle.java index 4891469..4be099d 100644 --- a/frontend/core/src/com/gameware/game/sprites/LoadingCircle.java +++ b/frontend/core/src/com/gameware/game/sprites/LoadingCircle.java @@ -48,9 +48,4 @@ public class LoadingCircle extends Sprite { public void reset() { } - - @Override - public Object report() { - return null; - } } diff --git a/frontend/core/src/com/gameware/game/sprites/PauseButton.java b/frontend/core/src/com/gameware/game/sprites/PauseButton.java index fd3faf3..1393659 100644 --- a/frontend/core/src/com/gameware/game/sprites/PauseButton.java +++ b/frontend/core/src/com/gameware/game/sprites/PauseButton.java @@ -38,11 +38,6 @@ public class PauseButton extends Sprite { } - @Override - public Object report() { - return null; - } - @Override public void draw(SpriteBatch sb) { sb.begin(); diff --git a/frontend/core/src/com/gameware/game/sprites/PauseCircle.java b/frontend/core/src/com/gameware/game/sprites/PauseCircle.java index b175ea6..2bd78d9 100644 --- a/frontend/core/src/com/gameware/game/sprites/PauseCircle.java +++ b/frontend/core/src/com/gameware/game/sprites/PauseCircle.java @@ -32,11 +32,6 @@ public class PauseCircle extends Sprite { } - @Override - public Object report() { - return null; - } - @Override public void draw(SpriteBatch sb) { this.sr.begin(ShapeRenderer.ShapeType.Filled); diff --git a/frontend/core/src/com/gameware/game/sprites/Sprite.java b/frontend/core/src/com/gameware/game/sprites/Sprite.java index 4241dbd..ce95834 100644 --- a/frontend/core/src/com/gameware/game/sprites/Sprite.java +++ b/frontend/core/src/com/gameware/game/sprites/Sprite.java @@ -11,7 +11,6 @@ public abstract class Sprite { protected Object bounds; public abstract void reset(); - public abstract Object report(); public abstract void draw(SpriteBatch sb); public abstract void update(float dt); -- GitLab