Skip to content

Commit 7365aa5

Browse files
armin-reichertarmin-reichert
committed
Refac
1 parent 5910297 commit 7365aa5

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
lines changed

‎pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public OptionalInt cutSceneNumber(int levelNumber) {
273273
}
274274

275275
@Override
276-
public void createLevel(GameContext gameContext, int levelNumber) {
276+
public void createLevel(int levelNumber) {
277277
WorldMap worldMap = mapSelector.getWorldMap(levelNumber);
278278
level = new GameLevel(levelNumber, worldMap, createLevelData(levelNumber));
279279
level.setGameOverStateTicks(150);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public void prepareForNewGame() {
6868
}
6969

7070
@Override
71-
public void startNewGame(GameContext gameContext) {
71+
public void startNewGame() {
7272
prepareForNewGame();
7373
theHUD().theLevelCounter().clear();
74-
buildNormalLevel(gameContext, 1);
74+
buildNormalLevel(1);
7575
gameContext.eventManager().publishEvent(GameEventType.GAME_STARTED);
7676
}
7777

@@ -214,8 +214,8 @@ public void onGameEnding() {
214214
}
215215

216216
@Override
217-
public void buildNormalLevel(GameContext gameContext, int levelNumber) {
218-
createLevel(gameContext, levelNumber);
217+
public void buildNormalLevel(int levelNumber) {
218+
createLevel(levelNumber);
219219
level.setDemoLevel(false);
220220
level.pac().immuneProperty().bind(gameContext.gameController().propertyImmunity());
221221
level.pac().usingAutopilotProperty().bind(gameContext.gameController().propertyUsingAutopilot());
@@ -228,9 +228,9 @@ public void buildNormalLevel(GameContext gameContext, int levelNumber) {
228228
}
229229

230230
@Override
231-
public void buildDemoLevel(GameContext gameContext) {
231+
public void buildDemoLevel() {
232232
int levelNumber = 1;
233-
createLevel(gameContext, levelNumber);
233+
createLevel(levelNumber);
234234
level.setDemoLevel(true);
235235
level.pac().setImmune(false);
236236
level.pac().setUsingAutopilot(true);
@@ -267,7 +267,7 @@ public void startLevel() {
267267

268268
@Override
269269
public void startNextLevel() {
270-
buildNormalLevel(gameContext, level.number() + 1);
270+
buildNormalLevel(level.number() + 1);
271271
startLevel();
272272
}
273273

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public OptionalInt cutSceneNumber(int levelNumber) {
267267
}
268268

269269
@Override
270-
public void createLevel(GameContext gameContext, int levelNumber) {
270+
public void createLevel(int levelNumber) {
271271
WorldMap worldMap = mapSelector.getWorldMap(levelNumber);
272272
level = new GameLevel(levelNumber, worldMap, createLevelData(levelNumber));
273273
level.addHouseContent();

‎pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_GameModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public PacManXXL_MsPacMan_GameModel(GameContext gameContext, MapSelector mapSele
2323
public PacManXXL_Common_MapSelector mapSelector() { return (PacManXXL_Common_MapSelector) mapSelector; }
2424

2525
@Override
26-
public void buildDemoLevel(GameContext gameContext) {
26+
public void buildDemoLevel() {
2727
// Select random (standard) level with different map and map color scheme for each choice
2828
int[] levelNumbers = { 1, 3, 6, 10, 14, 18 };
2929
int levelNumber = levelNumbers[new Random().nextInt(levelNumbers.length)];
3030
mapSelector().setMapSelectionMode(MapSelectionMode.NO_CUSTOM_MAPS);
31-
createLevel(gameContext, levelNumber);
31+
createLevel(levelNumber);
3232
level.setData(createLevelData(1)); // use settings (speed etc.) of first level
3333
level.setDemoLevel(true);
3434
level.pac().setImmune(false);

‎pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public PacManXXL_PacMan_GameModel(GameContext gameContext, MapSelector mapSelect
3131
public PacManXXL_Common_MapSelector mapSelector() { return (PacManXXL_Common_MapSelector) mapSelector; }
3232

3333
@Override
34-
public void buildDemoLevel(GameContext gameContext) {
34+
public void buildDemoLevel() {
3535
// Select random (standard) level with different map and map color scheme for each choice
3636
int[] levelNumbers = { 1, 3, 6, 10, 14, 18 };
3737
int levelNumber = levelNumbers[new Random().nextInt(levelNumbers.length)];
3838
mapSelector().setMapSelectionMode(MapSelectionMode.NO_CUSTOM_MAPS);
39-
createLevel(gameContext, levelNumber);
39+
createLevel(levelNumber);
4040
level.setData(createLevelData(1)); // always run with settings (speed etc.) of first level
4141
level.setDemoLevel(true);
4242
level.pac().setImmune(false);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public void startLevel() {
414414
@Override
415415
public void startNextLevel() {
416416
if (level.number() < LAST_LEVEL_NUMBER) {
417-
buildNormalLevel(gameContext, level.number() + 1);
417+
buildNormalLevel(level.number() + 1);
418418
startLevel();
419419
level.showPacAndGhosts();
420420
} else {
@@ -436,10 +436,10 @@ public long pacPowerFadingTicks(GameLevel level) {
436436
}
437437

438438
@Override
439-
public void startNewGame(GameContext gameContext) {
439+
public void startNewGame() {
440440
prepareForNewGame();
441441
hud.theLevelCounter().setStartLevel(startLevelNumber);
442-
buildNormalLevel(gameContext, startLevelNumber);
442+
buildNormalLevel(startLevelNumber);
443443
eventManager().publishEvent(GameEventType.GAME_STARTED);
444444
}
445445

@@ -469,7 +469,7 @@ public OptionalInt cutSceneNumber(int levelNumber) {
469469
}
470470

471471
@Override
472-
public void createLevel(GameContext gameContext, int levelNumber) {
472+
public void createLevel(int levelNumber) {
473473
WorldMap worldMap = mapSelector.createWorldMapForLevel(mapCategory, levelNumber);
474474
level = new GameLevel(levelNumber, worldMap, createLevelData());
475475
level.setGameOverStateTicks(420);
@@ -542,8 +542,8 @@ private LevelData createLevelData() {
542542
}
543543

544544
@Override
545-
public void buildNormalLevel(GameContext gameContext, int levelNumber) {
546-
createLevel(gameContext, levelNumber);
545+
public void buildNormalLevel(int levelNumber) {
546+
createLevel(levelNumber);
547547
level.setDemoLevel(false);
548548
level.pac().immuneProperty().bind(gameContext.gameController().propertyImmunity());
549549
level.pac().usingAutopilotProperty().bind(gameContext.gameController().propertyUsingAutopilot());
@@ -557,8 +557,8 @@ public void buildNormalLevel(GameContext gameContext, int levelNumber) {
557557
}
558558

559559
@Override
560-
public void buildDemoLevel(GameContext gameContext) {
561-
createLevel(gameContext, 1);
560+
public void buildDemoLevel() {
561+
createLevel(1);
562562
level.setDemoLevel(true);
563563
level.setGameOverStateTicks(120);
564564
level.pac().setImmune(false);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void onUpdate(GameContext context) {
103103
}
104104
else if (context.game().canStartNewGame()) {
105105
if (timer.tickCount() == 1) {
106-
context.game().startNewGame(context);
106+
context.game().startNewGame();
107107
}
108108
else if (timer.tickCount() == 2) {
109109
context.game().startLevel();
@@ -118,7 +118,7 @@ else if (timer.tickCount() == TICK_NEW_GAME_START_HUNTING) {
118118
}
119119
else { // start demo level
120120
if (timer.tickCount() == 1) {
121-
context.game().buildDemoLevel(context);
121+
context.game().buildDemoLevel();
122122
context.eventManager().publishEvent(GameEventType.LEVEL_CREATED);
123123
}
124124
else if (timer.tickCount() == 2) {
@@ -369,7 +369,7 @@ public void onEnter(GameContext context) {
369369
lastTestedLevelNumber = context.game().lastLevelNumber() == Integer.MAX_VALUE ? 25 : context.game().lastLevelNumber();
370370
timer.restartIndefinitely();
371371
context.game().prepareForNewGame();
372-
context.game().buildNormalLevel(context, 1);
372+
context.game().buildNormalLevel(1);
373373
context.game().startLevel();
374374
context.gameLevel().showPacAndGhosts();
375375
context.gameLevel().showMessage(GameLevel.MESSAGE_TEST);
@@ -458,7 +458,7 @@ public void onEnter(GameContext context) {
458458
lastTestedLevelNumber = context.game().lastLevelNumber() == Integer.MAX_VALUE ? 25 : context.game().lastLevelNumber();
459459
timer.restartSeconds(TEST_DURATION_SEC);
460460
context.game().prepareForNewGame();
461-
context.game().buildNormalLevel(context, 1);
461+
context.game().buildNormalLevel(1);
462462
context.game().startLevel();
463463
configureLevelForTest(context);
464464
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public interface Game {
3939
void resetEverything();
4040
void prepareForNewGame();
4141
boolean canStartNewGame();
42-
void startNewGame(GameContext gameContext);
43-
void createLevel(GameContext gameContext, int levelNumber);
44-
void buildNormalLevel(GameContext gameContext, int levelNumber);
45-
void buildDemoLevel(GameContext gameContext);
42+
void startNewGame();
43+
void createLevel(int levelNumber);
44+
void buildNormalLevel(int levelNumber);
45+
void buildDemoLevel();
4646
boolean isPacManSafeInDemoLevel();
4747
void startLevel();
4848
void startNextLevel();
@@ -64,5 +64,4 @@ public interface Game {
6464
boolean haveGhostsBeenKilled();
6565
long pacPowerFadingTicks(GameLevel gameLevel);
6666
long pacPowerTicks(GameLevel level);
67-
68-
}
67+
}

0 commit comments

Comments
 (0)