Merge remote-tracking branch 'origin/aside'

Author: redomar

src/com/redomar/game/Game.java

@@ -68,7 +68,7 @@ public class Game extends Canvas implements Runnable {
 	private Music music = new Music();
 	private Time time = new Time();
 	private Font font = new Font();
-	private Thread musicThread = new Thread(music);
+	private Thread musicThread = new Thread(music, "MUSIC");
 	private String nowPlaying;
 	private boolean notActive = true;
 	private boolean noAudioDevice = false;
@@ -144,7 +144,7 @@ public static void npcKill(){
 
 	public synchronized void start() {
 		running = true;
-		new Thread(this).start();
+		new Thread(this, "GAME").start();
 
 		if (Jdata_Host == 0) {
 			socketServer = new GameServer(this);

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

@@ -31,6 +31,14 @@ public void tick() {
 			isSwimming = false;
 		}
 
+		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 12) {
+			isMagma = true;
+		}
+		
+		if (isMagma && level.getTile(this.getX() >> 3, this.getY() >> 3).getId() != 12){
+			isMagma = false;
+		}
+
 		tickCount++;
 
 	}
@@ -76,12 +84,36 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
+		
+		if (isMagma) {
+			int waterColour = 0;
+			yOffset += 4;
+
+			colour = Colours.get(-1, 111, -1, faceCol);
+
+			if (tickCount % 60 < 15) {
+				waterColour = Colours.get(-1, -1, 541, -1);
+			} else if (15 <= tickCount % 60 && tickCount % 60 < 30) {
+				yOffset--;
+				waterColour = Colours.get(-1, 521, 510, -1);
+			} else if (30 <= tickCount % 60 && tickCount % 60 < 45) {
+				waterColour = Colours.get(-1, 510, -1, 521);
+			} else {
+				yOffset--;
+				waterColour = Colours.get(-1, -1, 521, 510);
+			}
+			
+			screen.render(xOffset, yOffset + 3, 31 + 31 * 32, waterColour,
+					0x00, 1);
+			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
+					0x01, 1);
+		}
 
 		screen.render((xOffset + (modifier * flipTop)), yOffset,
 				(xTile + yTile * 32), colour, flipTop, scale);
 		screen.render((xOffset + modifier - (modifier * flipTop)), yOffset,
 				((xTile + 1) + yTile * 32), colour, flipTop, scale);
-		if (!isSwimming) {
+		if (!isSwimming && !isMagma) {
 			screen.render((xOffset + (modifier * flipBottom)),
 					(yOffset + modifier), (xTile + (yTile + 1) * 32), colour,
 					flipBottom, scale);

src/com/redomar/game/net/GameClient.java

@@ -22,7 +22,7 @@ public class GameClient extends Thread {
 	private Game game;
 
 	public GameClient(Game game, String ipAddress) {
-		this.game = game;
+		this.setGame(game);
 		try {
 			this.socket = new DatagramSocket();
 			this.ipAddress = InetAddress.getByName(ipAddress);
@@ -65,7 +65,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			System.out.println("[" + address.getHostAddress() + ":" + port
 					+ "] " + ((Packet01Disconnect) packet).getUsername()
 					+ " has disconnected...");
-			game.getLevel().removeEntity(
+			Game.getLevel().removeEntity(
 					((Packet01Disconnect) packet).getUsername());
 			break;
 		case MOVE:
@@ -78,13 +78,13 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 	private void handleLogin(Packet00Login packet, InetAddress address, int port) {
 		System.out.println("[" + address.getHostAddress() + ":" + port + "] "
 				+ packet.getUsername() + " has joined...");
-		PlayerMP player = new PlayerMP(game.getLevel(), packet.getX(),
+		PlayerMP player = new PlayerMP(Game.getLevel(), packet.getX(),
 				packet.getY(), packet.getUsername(), address, port);
-		game.getLevel().addEntity(player);
+		Game.getLevel().addEntity(player);
 	}
 
 	private void handleMove(Packet02Move packet) {
-		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(),
+		Game.getLevel().movePlayer(packet.getUsername(), packet.getX(),
 				packet.getY(), packet.getNumSteps(), packet.isMoving(),
 				packet.getMovingDir());
 	}
@@ -99,4 +99,12 @@ public void sendData(byte[] data) {
 		}
 	}
 
+	public Game getGame() {
+		return game;
+	}
+
+	public void setGame(Game game) {
+		this.game = game;
+	}
+
 }

src/com/redomar/game/net/GameServer.java

@@ -23,7 +23,7 @@ public class GameServer extends Thread {
 	private List<PlayerMP> connectedPlayers = new ArrayList<PlayerMP>();
 
 	public GameServer(Game game) {
-		this.game = game;
+		this.setGame(game);
 		try {
 			this.socket = new DatagramSocket(1331);
 		} catch (SocketException e) {
@@ -66,7 +66,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			System.out.println("[" + address.getHostAddress() + ":" + port
 					+ "] " + ((Packet00Login) packet).getUsername()
 					+ " has connected...");
-			PlayerMP player = new PlayerMP(game.getLevel(), 10, 10,
+			PlayerMP player = new PlayerMP(Game.getLevel(), 10, 10,
 					((Packet00Login) packet).getUsername(), address, port);
 			this.addConnection(player, (Packet00Login) packet);
 			break;
@@ -162,4 +162,12 @@ public void sendDataToAllClients(byte[] data) {
 			sendData(data, p.ipAddess, p.port);
 		}
 	}
+
+	public Game getGame() {
+		return game;
+	}
+
+	public void setGame(Game game) {
+		this.game = game;
+	}
 }