Merge pull request RobertoIA#15 from YusunPark/master

fix : Fix bug due to go to menu function

Author: geeneve

src/engine/Core.java

@@ -144,14 +144,17 @@ public static void main(final String[] args) {
 					returnCode = frame.setScreen(currentScreen);
 
 					LOGGER.info("Closing game screen.");
-					if(returnCode != 1) break; 
 					gameState = ((GameScreen) currentScreen).getGameState();
 
 					gameState = new GameState(gameState.getLevel() + 1,
 							gameState.getScore(),
 							gameState.getLivesRemaining(),
 							gameState.getBulletsShot(),
 							gameState.getShipsDestroyed());
+					if(returnCode != 2) {
+						break;
+					}
+
 
 				} while (gameState.getLivesRemaining() > 0
 						&& gameState.getLevel() <= NUM_LEVELS);

src/engine/DrawManager.java

@@ -344,20 +344,20 @@ public void drawMenu(final Screen screen, final int option) {
 	 *            Option selected.
 	 */
 	public void drawPause(final Screen screen, final int option) {
-		String restartString = "Go to Restart";
 		String goMenuString = "Go to Menu";
+		String restartString = "Go to Restart";
 
 		if (option == 1)
 			backBufferGraphics.setColor(Color.GREEN);
 		else
 			backBufferGraphics.setColor(Color.WHITE);
-		drawCenteredRegularString(screen, restartString,
+		drawCenteredRegularString(screen, goMenuString,
 				screen.getHeight() / 3 * 2);
 		if (option == 7)
 			backBufferGraphics.setColor(Color.GREEN);
 		else
 			backBufferGraphics.setColor(Color.WHITE);
-		drawCenteredRegularString(screen, goMenuString, screen.getHeight()
+		drawCenteredRegularString(screen, restartString, screen.getHeight()
 				/ 3 * 2 + fontRegularMetrics.getHeight() * 2);
 	}
 

src/screen/GameScreen.java

@@ -111,6 +111,7 @@ public GameScreen(final GameState gameState,
 		this.bulletsShot = gameState.getBulletsShot();
 		this.shipsDestroyed = gameState.getShipsDestroyed();
 		this.isPause = false;
+		this.returnCode = 2;
 	}
 
 	/**
@@ -233,11 +234,9 @@ else if (this.enemyShipSpecialExplosionCooldown.checkFinished())
 
 		if (this.returnCode == 1) {
 			this.isPause = false;
-
+			this.lives = 0;
 			this.titlescreen = new screen.TitleScreen(this.width, this.height, this.fps);
 			returnCode = titlescreen.run();
-
-			this.levelFinished = true;
 			this.screenFinishedCooldown.reset();
 			this.isRunning = false;
 		}

src/screen/PauseScreen.java

@@ -66,6 +66,14 @@ protected final void update() {
 				this.isRunning = false;
 				return;
 			}
+			if (inputManager.isKeyDown(KeyEvent.VK_ESCAPE)){
+				this.returnCode = 2;
+				this.isRunning = false;
+
+				return;
+			}
+
+
 		}
     }