Refac

Author: armin-reichert

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadeCommon_GameModel.java

@@ -32,15 +32,14 @@ public abstract class ArcadeCommon_GameModel extends AbstractGameModel {
     public static final int EXTRA_LIFE_SCORE = 10_000;
     public static final byte[] KILLED_GHOST_VALUE_FACTORS = {2, 4, 8, 16}; // points = factor * 100
 
-    protected final GameContext gameContext;
     protected MapSelector mapSelector;
     protected GateKeeper gateKeeper;
     protected Steering autopilot;
     protected Steering demoLevelSteering;
     protected int cruiseElroy;
 
     protected ArcadeCommon_GameModel(GameContext gameContext) {
-        this.gameContext = gameContext;
+        super(gameContext);
     }
 
     // GameEvents interface

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java

@@ -215,7 +215,6 @@ public Vector2i chasingTargetTile() {
         };
     }
 
-    private final GameContext gameContext;
     private final ScoreManager scoreManager;
     private final TengenMsPacMan_GameData hud = new TengenMsPacMan_GameData();
     private final TengenMsPacMan_MapSelector mapSelector;
@@ -234,7 +233,7 @@ public Vector2i chasingTargetTile() {
     private int numContinues;
 
     public TengenMsPacMan_GameModel(GameContext gameContext, File highScoreFile) {
-        this.gameContext = requireNonNull(gameContext);
+        super(gameContext);
         scoreManager = new DefaultScoreManager(gameContext, highScoreFile);
         actorSpeedControl = new TengenActorSpeedControl();
         mapSelector = new TengenMsPacMan_MapSelector();

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

@@ -4,6 +4,7 @@
 */
 package de.amr.pacmanfx.model;
 
+import de.amr.pacmanfx.GameContext;
 import de.amr.pacmanfx.event.GameEventManager;
 import de.amr.pacmanfx.event.GameEventType;
 import de.amr.pacmanfx.lib.timer.Pulse;
@@ -31,8 +32,13 @@ public abstract class AbstractGameModel implements Game {
     protected final BooleanProperty cutScenesEnabled = new SimpleBooleanProperty(true);
     protected final IntegerProperty initialLifeCount = new SimpleIntegerProperty(3);
     protected final SimulationStep simulationStep = new SimulationStep();
+    protected final GameContext gameContext;
     protected GameLevel level;
 
+    protected AbstractGameModel(GameContext gameContext) {
+        this.gameContext = gameContext;
+    }
+
     @Override
     public SimulationStep simulationStep() {
         return simulationStep;