Refac

Author: armin-reichert

pacman-core/src/main/java/de/amr/pacmanfx/controller/GameState.java

@@ -81,7 +81,7 @@ public void onUpdate(GameContext context) {
         static final short TICK_NEW_GAME_SHOW_GUYS = 120;
         static final short TICK_NEW_GAME_START_HUNTING = 240;
         static final short TICK_DEMO_LEVEL_START_HUNTING = 120;
-        static final short TICK_RESUME_GAME =  90;
+        static final short TICK_RESUME_HUNTING =  90;
 
         @Override
         public void onEnter(GameContext context) {
@@ -91,13 +91,9 @@ public void onEnter(GameContext context) {
         @Override
         public void onUpdate(GameContext context) {
             if (context.game().isPlaying()) {
-                // resume running game
                 if (timer.tickCount() == 1) {
-                    context.game().resetPacManAndGhostAnimations();
-                    context.gameLevel().getReadyToPlay();
-                    context.gameLevel().showPacAndGhosts();
-                    context.eventManager().publishEvent(GameEventType.GAME_CONTINUED);
-                } else if (timer.tickCount() == TICK_RESUME_GAME) {
+                    context.game().continueGame();
+                } else if (timer.tickCount() == TICK_RESUME_HUNTING) {
                     context.gameController().changeGameState(GameState.HUNTING);
                 }
             }

pacman-core/src/main/java/de/amr/pacmanfx/model/AbstractGameModel.java

@@ -75,6 +75,14 @@ public Optional<GameLevel> level() {
         return Optional.ofNullable(level);
     }
 
+    @Override
+    public void continueGame() {
+        resetPacManAndGhostAnimations();
+        level.getReadyToPlay();
+        level.showPacAndGhosts();
+        eventManager().publishEvent(GameEventType.GAME_CONTINUED);
+    }
+
     @Override
     public void startHunting() {
         level.pac().playAnimation();

pacman-core/src/main/java/de/amr/pacmanfx/model/GameLifecycle.java

@@ -11,6 +11,7 @@ public interface GameLifecycle {
     void prepareForNewGame();
     boolean canStartNewGame();
     void startNewGame();
+    void continueGame();
     void buildNormalLevel(int levelNumber);
     void buildDemoLevel();
     void createLevel(int levelNumber);