Merge branch 'aside'

Author: redomar

res/music/yoshi song.mp3

@@ -15,7 +15,7 @@ public class InputHandler implements KeyListener {
 
 	public InputHandler(Game game) {
 		InputContext context = InputContext.getInstance();
-		// Important to know wether the keyboard is in Azerty or Qwerty.
+		// Important to know whether the keyboard is in Azerty or Qwerty.
 		// Azerty countries used QZSD instead of WASD keys.
 		isAzertyCountry = context.getLocale().getCountry().equals("BE")
 				|| context.getLocale().getCountry().equals("FR");

src/com/redomar/game/InputHandler.java

@@ -7,6 +7,14 @@ public class AnimatedTile extends BasicTile {
 	private long lastIterationTime;
 	private int animationSwitchDelay;
 
+	/**
+	 * 
+	 * @param id Unique ID for the Tile
+	 * @param animationCoords A 2D array of all x,y-coordinates in Integers.
+	 * @param tileColour Colours from the SpriteSheet.
+	 * @param levelColour Colours to be displayed in the Game World.
+	 * @param animationSwitchDelay Length of time to be delayed to the next frame from the 2D array.
+	 */
 	public AnimatedTile(int id, int[][] animationCoords, int tileColour,
 			int levelColour, int animationSwitchDelay) {
 		super(id, animationCoords[0][0], animationCoords[0][1], tileColour,

src/com/redomar/game/level/tiles/AnimatedTile.java

@@ -2,6 +2,15 @@
 
 public class BasicSolidTile extends BasicTile {
 
+	/**
+	 * This is a solid tile, but does not emit any light. This tile does not have any animations.
+	 * 
+	 * @param id Unique ID for the Tile
+	 * @param x Specifies the x-coordinate from the SpriteSheet, measured in 8 pixels. Must be 0 - 31
+	 * @param y Specifies the y-coordinate from the SpriteSheet, measured in 8 pixels. Must be 0 - 31
+	 * @param tileColour Colours from the SpriteSheet.
+	 * @param levelColour Colours to be displayed in the Game World.
+	 */
 	public BasicSolidTile(int id, int x, int y, int tileColour, int levelColour) {
 		super(id, x, y, tileColour, levelColour);
 		this.solid = true;

src/com/redomar/game/level/tiles/BasicSolidTile.java

@@ -8,6 +8,15 @@ public class BasicTile extends Tile {
 	protected int tileId;
 	protected int tileColour;
 
+	/**
+	 * This is a tile that does not emit light, nor is sold. This tile does not have any animations.
+	 * 
+	 * @param id Unique ID for the Tile
+	 * @param x Specifies the x-coordinate from the SpriteSheet, measured in 8 pixels. Must be 0 - 31
+	 * @param y Specifies the y-coordinate from the SpriteSheet, measured in 8 pixels. Must be 0 - 31
+	 * @param tileColour Colours from the SpriteSheet.
+	 * @param levelColour Colours to be displayed in the Game World.
+	 */
 	public BasicTile(int id, int x, int y, int tileColour, int levelColour) {
 		super(id, false, false, levelColour);
 

src/com/redomar/game/level/tiles/BasicTile.java

@@ -13,7 +13,7 @@ public class Music implements Runnable {
 
 	private InputStream file;
 	private Player musicPlayer;
-	private static String songName[] = { "/music/yoshi song.mp3",
+	private static String songName[] = { "/music/Towards The End.mp3",
 			"/music/Towards The End.mp3", "/music/Towards The End.mp3" };
 	private static int songNumber;
 	private Printing print = new Printing();