Merge branch 'master' of https://git.sch.bme.hu/sabvente/akettorony

src/view/Sounds.java

@@ -26,6 +26,7 @@ public class Sounds {
 			clip = AudioSystem.getClip();
 			clip.open(aStream);
 			clip.loop(Clip.LOOP_CONTINUOUSLY);
+			clips.add(clip);
 		} catch (LineUnavailableException | IOException e1) {
 			e1.printStackTrace();
 		}

src/world/Enemy.java

@@ -16,8 +16,7 @@ public class Enemy extends Placeable implements ITickable {
 	private Field prevField;
 	private int moveTries;
 	private static HashMap<EnemyType, Integer> moveTimes = new HashMap<EnemyType, Integer>();
-	static
-		{
+	static {
 		moveTimes.put(EnemyType.HUMAN, 4);
 		moveTimes.put(EnemyType.DWARF, 5);
 		moveTimes.put(EnemyType.ELF, 3);
@@ -41,8 +40,7 @@ public class Enemy extends Placeable implements ITickable {
 			split();
 	}
 
-	private void Die()
-	{
+	private void Die() {
 		field.getWorld().notifyEnemyDied(this);
 		field.stepOff(this);
 		if (this.type == EnemyType.HUMAN)
@@ -80,6 +78,13 @@ public class Enemy extends Placeable implements ITickable {
 				reset();
 				potentials.get(index).stepOn(this);
 			}
+			else
+			{
+				field.stepOff(this);
+				prevField = field;
+				reset();
+				prevField.stepOn(this);
+			}
 		} else {
 			moveTries++;
 		}
@@ -91,7 +96,8 @@ public class Enemy extends Placeable implements ITickable {
 			Die();
 			return;
 		}
-		field.getWorld().getSpawnManager().spawnEnemy(field, type, hp, prevField);
+		field.getWorld().getSpawnManager()
+				.spawnEnemy(field, type, hp, prevField);
 	}
 
 	private void reset() {

src/world/SpawnManager.java

@@ -16,9 +16,6 @@ public class SpawnManager implements ITickable, IEnemyObserver
 	private int spawnTimeLeft;
 	private int currentTime;
 	private int enemiesAlive;
-	public static boolean randomEnemySpawnPos=false;
-	public static EnemyType fixedSpawnType;
-	public static boolean isFixedSpawnType;
 
 	public SpawnManager(Engine engine, World world, ArrayList<Field> spawns)
 	{
@@ -48,27 +45,11 @@ public class SpawnManager implements ITickable, IEnemyObserver
 
 	private void spawnEnemies()
 	{
-		Field spawnField = null;
-		if (!randomEnemySpawnPos)
-		{
-			spawnField = spawns.get(0);
-		}
-		else
-		{
-			spawnField = spawns.get(new Random().nextInt(spawns.size()));
-		}
+		Field spawnField = spawns.get(new Random().nextInt(spawns.size()));
 		int num = nextSpawnNum();
 		for (int i = 0; i < num; i++)
 		{
-			EnemyType t;
-			if (isFixedSpawnType)
-			{
-				t = fixedSpawnType;
-			}
-			else
-			{
-				t = EnemyType.values()[new Random().nextInt(EnemyType.values().length)];
-			}
+			EnemyType t = EnemyType.values()[new Random().nextInt(EnemyType.values().length)];
 			Enemy e = new Enemy(t);
 			e.setField(spawnField);
 			spawnField.stepOn(e);