Tanks v0.2.1 - Mines now blow up when in range of another mine or hit…

… by a bullet

src/tanks/Bullet.java

@@ -127,23 +127,27 @@ else if (dy >= 0 && dy < bound && horizontalDist < verticalDist)
 					((Tank) o).destroy = true;
 				}
 			}
-			else if (o instanceof Bullet && o != this)
+			else if ((o instanceof Bullet || o instanceof Mine) && o != this)
 			{
-				if (!((Bullet)o).destroy)
+				if (!o.destroy)
 				{
 
 					double horizontalDist = Math.abs(this.posX - o.posX);
 					double verticalDist = Math.abs(this.posY - o.posY);
 
-					double bound = this.size / 2 + Bullet.bullet_size / 2;
+					int s = Bullet.bullet_size;
+					if (o instanceof Mine)
+						s = Mine.mine_size;
+
+					double bound = this.size / 2 + s / 2;
 
 					if (horizontalDist < bound && verticalDist < bound)
 					{
 						this.destroy = true;
 						this.vX = 0;
 						this.vY = 0;
 						this.destroy = true;
-						((Bullet)o).destroy = true;
+						o.destroy = true;
 
 						this.vX = 0;
 						this.vY = 0;

src/tanks/Mine.java

@@ -5,8 +5,9 @@
 
 public class Mine extends Movable
 {
+	public static int mine_size = 30;
 	int timer = 1000;
-	int size = 30;
+	int size = mine_size;
 
 	Tank tank;
 
@@ -37,6 +38,9 @@ public void update()
 	{
 		this.timer--;
 
+		if (destroy)
+			this.explode();
+
 		if (this.timer <= 0)
 			this.explode();
 		super.update();

src/tanks/SolidObject.java

@@ -2,4 +2,6 @@
 
 public interface SolidObject {
 	Obstacle getFaces();
+
+	//Not yet implemented	
 }