Added projectile collision

Disabled firing while swimming
Slowed down bullet speed.

Author: redomar

src/com/redomar/game/entities/Player.java

@@ -64,11 +64,13 @@ public void tick() {
 		if(fireRate > 0) fireRate--;
 
 		if (Game.getMouse().getButton() == 1 && fireRate <= 0){
-			double dx = Game.getMouse().getX() - 480/2;
-			double dy = Game.getMouse().getY() - 320/2;
-			double dir = Math.atan2(dy, dx);
-			shoot(x, y, dir);
-			fireRate = Small.FIRE_RATE;
+			if(!swim.isActive(swimType)){
+				double dx = Game.getMouse().getX() - 480/2;
+				double dy = Game.getMouse().getY() - 320/2;
+				double dir = Math.atan2(dy, dx);
+				shoot(x, y, dir);
+				fireRate = Small.FIRE_RATE;
+			}
 		}
 
 		for (int i = 0; i < projectiles.size(); i++) {

src/com/redomar/game/entities/projectiles/Projectile.java

@@ -4,6 +4,7 @@
 
 import com.redomar.game.entities.Entity;
 import com.redomar.game.level.LevelHandler;
+import com.redomar.game.level.tiles.Tile;
 
 public abstract class Projectile extends Entity{
 
@@ -26,6 +27,56 @@ public Projectile(LevelHandler level, int x, int y, double dir) {
 
 	protected abstract void move();
 
+	public boolean tileCollision(double xa, double ya, int nx, int ny){
+		int xMin = 0;
+		int xMax = 7;
+		int yMin = 0;
+		int yMax = 7;
+
+		for (int x = xMin; x < xMax; x++) {
+			if (isSolid((int) xa, (int) ya, x, yMin, nx, ny)) {
+				return true;
+			}
+		}
+
+		for (int x = xMin; x < xMax; x++) {
+			if (isSolid((int) xa, (int) ya, x, yMax, nx, ny)) {
+				return true;
+			}
+		}
+
+		for (int y = yMin; y < yMax; y++) {
+			if (isSolid((int) xa, (int) ya, xMin, y, nx, ny)) {
+				return true;
+			}
+		}
+
+		for (int y = yMin; y < yMax; y++) {
+			if (isSolid((int) xa, (int) ya, xMax, y, nx, ny)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	private boolean isSolid(int xa, int ya, int x, int y, int nx, int ny) {
+		if (level == null) {
+			return false;
+		}
+
+		Tile lastTile = level.getTile((nx + x) >> 3,
+				(ny + y) >> 3);
+		Tile newtTile = level.getTile((nx + x + xa) >> 3, (ny
+				+ y + ya) >> 3);
+
+		if (!lastTile.equals(newtTile) && newtTile.isSolid()) {
+			return true;
+		}
+
+		return false;
+	}
+
 	public void remove(){
 		setRemoved(true);
 	}

src/com/redomar/game/entities/projectiles/Small.java

@@ -6,19 +6,20 @@
 
 public class Small extends Projectile{
 
-	public static final int FIRE_RATE = 12;
+	public static final int FIRE_RATE = 7;
 
 	public Small(LevelHandler level, int x, int y, double dir) {
 		super(level, x, y, dir);
-		range = 50 + life.nextInt(5);
+		range = 125 - life.nextInt(30);
 		damage = 20;
-		speed = 3;
+		speed = 2;
 
 		nx = speed * Math.cos(angle);
 		ny = speed * Math.sin(angle);
 	}
 
 	public void tick() {
+		if (tileCollision(x, y,(int) nx,(int) ny)) remove();
 		move();
 	}