langfingaz/SoftwareQuality
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

ueb10 1a)

Browse Source
This commit is contained in:
Daniel Langbein 2025-01-16 14:38:57 +01:00
parent d5cf87582a
commit 1190b5fec1
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boulder-dash/src/fr/enssat/BoulderDash/models/LevelModel.java
View File

@ -62,18 +62,16 @@ public class LevelModel extends Observable implements Runnable {
/** /**
* Class constructor * Class constructor
* *
* @param levelName Level name
* @param audioLoadHelper Audio load helper * @param audioLoadHelper Audio load helper
* @param mode Instance mode * @param mode Instance mode
*/ */
public LevelModel(String levelName, AudioLoadHelper audioLoadHelper, String mode) { public LevelModel(LevelLoadHelper levelLoadHelper, AudioLoadHelper audioLoadHelper, String mode) {
this.levelName = levelName;
this.audioLoadHelper = audioLoadHelper; this.audioLoadHelper = audioLoadHelper;
this.gamePaused = false; this.gamePaused = false;
this.gameRunning = true; this.gameRunning = true;
this.mode = mode; this.mode = mode;
setLevelLoadHelper(new LevelLoadHelper(this.levelName)); setLevelLoadHelper(levelLoadHelper);
this.cursorModel = new CursorModel(); this.cursorModel = new CursorModel();
this.createLimits(); this.createLimits();
@ -91,7 +89,7 @@ public class LevelModel extends Observable implements Runnable {
* @param audioLoadHelper Audio load helper * @param audioLoadHelper Audio load helper
*/ */
public LevelModel(String levelName, AudioLoadHelper audioLoadHelper) { public LevelModel(String levelName, AudioLoadHelper audioLoadHelper) {
this(levelName, audioLoadHelper, "game"); this(new LevelLoadHelper(levelName), audioLoadHelper, "game");
} }
/** /**

3
boulder-dash/src/fr/enssat/BoulderDash/views/LevelEditorView.java
View File

@ -5,6 +5,7 @@ import java.awt.*;
import java.util.Observable; import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import fr.enssat.BoulderDash.helpers.LevelLoadHelper;
import fr.enssat.BoulderDash.helpers.LevelSelectorHelper; import fr.enssat.BoulderDash.helpers.LevelSelectorHelper;
import fr.enssat.BoulderDash.controllers.LevelEditorController; import fr.enssat.BoulderDash.controllers.LevelEditorController;
import fr.enssat.BoulderDash.controllers.NavigationBetweenViewController; import fr.enssat.BoulderDash.controllers.NavigationBetweenViewController;
@ -169,7 +170,7 @@ public class LevelEditorView extends JFrame implements Observer {
if(selectedLevelValue != null && !selectedLevelValue.isEmpty()) { if(selectedLevelValue != null && !selectedLevelValue.isEmpty()) {
// Load existing model // Load existing model
pickedLevelModel = new LevelModel(selectedLevelValue, this.nav.getAudioLoadHelper(), "editor"); pickedLevelModel = new LevelModel(new LevelLoadHelper(selectedLevelValue), this.nav.getAudioLoadHelper(), "editor");
} else { } else {
// New blank model for editor // New blank model for editor
pickedLevelModel = new LevelModel(this.nav.getAudioLoadHelper()); pickedLevelModel = new LevelModel(this.nav.getAudioLoadHelper());