From fd9fd294dbf14da43c54e405da835578eced6e59 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 28 Nov 2024 17:43:03 +0100
Subject: [PATCH] 1b: rm animate, impactExplosive

---
 .../displayableElement/BoulderModel.java      |  1 -
 .../displayableElement/DiamondModel.java      |  1 -
 .../DisplayableElementModel.java              | 38 -------------------
 .../displayableElement/RockfordModel.java     |  2 -
 4 files changed, 42 deletions(-)

diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java
index cff2e659..a81df42f 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/BoulderModel.java
@@ -13,7 +13,6 @@ public class BoulderModel extends DisplayableElementModel {
     BoulderModel(boolean convertible) {
 		super("boulder", false,true);
 		setPriority(2);
-		setAnimate(true);
 		setCollideSound("die");
 		setConvertibleValue(convertible);
 
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java
index e67c3b1a..b2d8a235 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DiamondModel.java
@@ -24,7 +24,6 @@ public class DiamondModel extends DisplayableElementModel {
 
 	DiamondModel() {
 		super("diamond", true, true);
-		setAnimate(true);
 		setCollideSound("coin");
 
 		this.initSprites();
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 94be73e6..5d3e94c7 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java
@@ -19,8 +19,6 @@ public abstract class DisplayableElementModel {
 	private final boolean destructible;
 	private final boolean moving;
 
-	private boolean animate = false;
-	private boolean impactExplosive = false;
 	private int priority = 0;
     private boolean falling = false;
 	private boolean convertible = false;
@@ -146,42 +144,6 @@ public abstract class DisplayableElementModel {
 		this.priority = priority;
 	}
 
-	/**
-	 * Gets the 'animate' value
-     *
-     * @return  Whether object is animated or not
-	 */
-	public boolean isAnimate() {
-		return this.animate;
-	}
-
-	/**
-	 * Sets the 'animate' value
-     *
-     * @return  animate  Whether object is animated or not
-	 */
-	public void setAnimate(boolean animate) {
-		this.animate = animate;
-	}
-
-	/**
-	 * Gets the 'impact explosive' value
-     *
-     * @return  Whether object explodes on impact or not
-	 */
-	public boolean isImpactExplosive() {
-		return this.impactExplosive;
-	}
-
-	/**
-	 * Sets the 'impact explosive' value
-     *
-     * @return  impactExplosive  Whether object explodes on impact or not
-	 */
-	public void setImpactExplosive(boolean impactExplosive) {
-		this.impactExplosive = impactExplosive;
-	}
-	
 	/**
 	 * Sets the sprite
      *
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java
index 0533945a..84089cea 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/RockfordModel.java
@@ -49,8 +49,6 @@ public class RockfordModel extends DisplayableElementModel {
     RockfordModel() {
 		super("rockford", true, true);
 		setPriority(1);
-		setImpactExplosive(true);
-		setAnimate(true);
 
 		// Speed of the animation of the sprite
 		this.setSpeed(100);