Update Scene class (and some derivates) to be abstract

1 files changed, 7 insertions, 9 deletions

diff --git a/src/Battle.java b/src/BattleScene.java
index cde2734..1e4b633 100644
--- a/src/Battle.java
+++ b/src/BattleScene.java
@@ -22,15 +22,12 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JButton;
 
-// TODO: rename to BattleScene
-public class Battle extends MapScene {
+public class BattleScene extends MapScene {
 
 	private enum Mode {
 		NONE, ATTACK, MOVE
 	};
 
-	// TODO: make sub observe this object to remove this reference
-	private Sub main;
 	// TODO: refractor, make Points()
 	private int previousX = -1;
 	private int previousY = -1;
@@ -46,10 +43,10 @@ public class Battle extends MapScene {
 	private int realX = 0;
 	private int realY = 0;
 
-	public Battle(JFrame frame, Sub sub) {
-		super(frame, sub);
-		this.main = sub;
+	public BattleScene(JFrame frame) {
+		super(frame);
 
+		// TODO: this should be handled in MapScene
 		MapLoader mapLoader = new MapLoader("../testmap.json");
 		this.map = mapLoader.getMap();
 
@@ -175,8 +172,9 @@ public class Battle extends MapScene {
 		}
 
 		if (enemyCounter == 0) {
-			//win
-			this.main.backToMenu();
+			// win
+			// TODO: reimplement on upper level
+			// this.main.backToMenu();
 		}	
 	}