From 7d3f7733650a7f92f9603b1a8abee35dde8c1af6 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Tue, 19 Nov 2024 10:51:32 +0100 Subject: [PATCH] 1b: inline field, make fields final --- .../displayableElement/DisplayableElementModel.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java index 645b51a4..32ccb64d 100644 --- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java +++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java @@ -15,19 +15,19 @@ import java.io.IOException; * @since 2015-06-19 */ public abstract class DisplayableElementModel { - private static String spriteStorageFolderPath = "./res/drawable/field/"; + protected final String spriteName; + private final boolean destructible; + private final boolean moving; - private boolean destructible; - private boolean moving; private boolean animate; private boolean impactExplosive; - protected final String spriteName; private int priority; - private BufferedImage sprite; private boolean falling; private boolean convertible; private String collideSound; + private BufferedImage sprite; + /** * Class constructor * @@ -146,7 +146,7 @@ public abstract class DisplayableElementModel { * @return Folder path of the sprite storage */ private static String getSpriteStorageFolderPath() { - return spriteStorageFolderPath; + return "./res/drawable/field/"; } /**