Working on reset state and the end game

src/MenuManager.cpp

@@ -320,7 +320,7 @@ namespace ZL {
 	}
 
 	void MenuManager::showMainMenu() {
-		if (onResetGame) onResetGame();
+		gameState_.currentLocationName.clear();
 
 		audioPlayer_.crossFadeMusicAsync("audio/main menu final.ogg");
 
@@ -1195,11 +1195,24 @@ namespace ZL {
 			uiManager.setNodeVisible("hint6a", false);
 			uiManager.setNodeVisible("hint6aarrow", false);
 		}
+		else
+		{
+			if (!gameState_.tutorialNeedOpenTaxiScreen)
+			{
+				uiManager.setNodeVisible("hint6a", true);
+				uiManager.setNodeVisible("hint6aarrow", true);
+			}
+		}
 		if (gameState_.tutorialJournalScreenOpened)
 		{
 			uiManager.setNodeVisible("hint6b", false);
 			uiManager.setNodeVisible("hint6barrow", false);
 		}
+		else
+		{
+			uiManager.setNodeVisible("hint6b", true);
+			uiManager.setNodeVisible("hint6barrow", true);
+		}
 		if (gameState_.tutorialPhoneChatScreenOpened && gameState_.tutorialJournalScreenOpened) {
 			gameState_.tutorialStep = TutorialStep::Step6;
 		}