Merge remote-tracking branch 'origin/aside'

Author: redomar

src/com/redomar/game/Game.java

@@ -99,12 +99,7 @@ public void init() {
 		screen = new Screen(WIDTH, HEIGHT, new SpriteSheet("/sprite_sheet.png"));
 		input = new InputHandler(this);
 		setWindow(new WindowHandler(this));
-		setLevel(new LevelHandler("/levels/custom_level.png"));
-
-		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
-				Jdata_UserName, null, -1));
-
-		level.addEntity(player);
+		setMap("/levels/custom_level.png");
 		Packet00Login loginPacket = new Packet00Login(player.getUsername(), player.x, player.y);
 
 		if (socketServer != null) {
@@ -115,6 +110,13 @@ public void init() {
 		loginPacket.writeData(getSocketClient());
 	}
 
+	public void setMap(String Map_str) {
+		setLevel(new LevelHandler(Map_str));
+		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
+				Jdata_UserName, null, -1));
+		level.addEntity(player);
+	}
+
 	public synchronized void start() {
 		running = true;
 		new Thread(this).start();
@@ -213,17 +215,22 @@ public void render() {
 			}
 		}
 
-		if (input.PlayMusic == true && notActive == true){
+		if (input.isPlayMusic() == true && notActive == true){
 			int musicOption = JOptionPane.showConfirmDialog(this, "You are about to turn on music and can be VERY loud", "Music Options", 2, 2);
 			if (musicOption == 0){
 				musicThread.start();
 				notActive = false;
 			} else {
 				System.out.println("Canceled");
-				input.PlayMusic = false;
+				input.setPlayMusic(false);
 			}
 		}
 
+		if (input.isChangeLevel() == true){
+			JOptionPane.showMessageDialog(this, "Switching Levels is currently disabled");
+			input.setChangeLevel(false);
+		}
+		
 		Graphics g = bs.getDrawGraphics();
 
 		g.drawRect(0, 0, getWidth(), getHeight());

src/com/redomar/game/InputHandler.java

@@ -33,7 +33,10 @@ public void toggle(boolean isPressed) {
 	public Key down = new Key();
 	public Key left = new Key();
 	public Key right = new Key();
-	public boolean PlayMusic = false;
+	public Key Z = new Key();
+	private boolean PlayMusic = false;
+	private boolean ChangeLevel = false;
+	private int map;
 
 	public void keyPressed(KeyEvent e) {
 		toggleKey(e.getKeyCode(), true);
@@ -61,8 +64,42 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			right.toggle(isPressed);
 		}
 		if (keyCode == KeyEvent.VK_M){
-			this.PlayMusic = true;
+			this.setPlayMusic(true);
 		}
+		if (keyCode == KeyEvent.VK_Z){
+//			if (map == 0){
+//				Game.getGame().setMap("/levels/water_level.png");
+//				map++;
+//			} else{
+//				Game.getGame().setMap("/levels/custom_level.png");
+//				map--;
+//			}
+			this.setChangeLevel(true);
+		}
+	}
+
+	public int getMap() {
+		return map;
+	}
+
+	public void setMap(int map) {
+		this.map = map;
+	}
+
+	public boolean isPlayMusic() {
+		return PlayMusic;
+	}
+
+	public void setPlayMusic(boolean playMusic) {
+		PlayMusic = playMusic;
+	}
+
+	public boolean isChangeLevel() {
+		return ChangeLevel;
+	}
+
+	public void setChangeLevel(boolean changeLevel) {
+		ChangeLevel = changeLevel;
 	}
 
 }