diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java index 3891799..2e839a1 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/game/Game.java @@ -378,10 +378,6 @@ public class Game { return level.get(); } - /** - * Get the player's current level property - * @return player's current level property - */ public IntegerProperty levelProperty() { return level; } @@ -402,10 +398,6 @@ public class Game { this.lives.set(lives); } - /** - * Get the player's remaining lives property - * @return player's remaining lives property - */ public IntegerProperty livesProperty() { return lives; } @@ -418,10 +410,6 @@ public class Game { this.multiplier.set(multiplier); } - /** - * Get the player's current multiplier property - * @return player's current multiplier property - */ public IntegerProperty multiplierProperty() { return multiplier; } @@ -434,10 +422,6 @@ public class Game { return score.get(); } - /** - * Get the player's current score property - * @return player's current score property - */ public IntegerProperty scoreProperty() { return score; } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/game/MultiplayerGame.java b/src/main/java/uk/mgrove/ac/soton/comp1206/game/MultiplayerGame.java index eae6b43..160fbac 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/game/MultiplayerGame.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/game/MultiplayerGame.java @@ -187,22 +187,10 @@ public class MultiplayerGame extends Game { return scores; } - /** - * Get the leaderboard scores property - * @return property for leaderboard scores - */ public SimpleListProperty>> leaderboardScoresProperty() { return leaderboardScores; } - /** - * Get the player boards property - * @return property for player boards - */ - public SimpleMapProperty playerBoardsProperty() { - return playerBoards; - } - /** * Notify server that player is dead */ diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java index ab94661..76ab123 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/BaseScene.java @@ -10,9 +10,19 @@ import uk.mgrove.ac.soton.comp1206.ui.GameWindow; */ public abstract class BaseScene { + /** + * Game window scene is being displayed in + */ protected final GameWindow gameWindow; + /** + * Root node + */ protected GamePane root; + + /** + * Current scene being displayed + */ protected Scene scene; /**