From 09487a5eb92142df34e2b916b7591866511c638e Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Wed, 21 Mar 2018 07:26:11 +0000
Subject: [PATCH] Escape to go back in title.

---
 src/game/title.c | 27 ++++++++++++++++++++++-----
 src/game/title.h |  3 ++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/game/title.c b/src/game/title.c
index 8318bff..082a281 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -34,7 +34,7 @@ static void doSaveSlot(void);
 static void doLoadCancel(void);
 static void doOK(void);
 static void doCancel(void);
-static void returnFromOptions(void);
+void returnToTitle(void);
 
 static Texture *atlasTexture;
 static Atlas *title;
@@ -123,6 +123,13 @@ static void logic(void)
 	{
 		titleAlpha++;
 	}
+	
+	if (app.keyboard[SDL_SCANCODE_ESCAPE])
+	{
+		doLoadCancel();
+		
+		app.keyboard[SDL_SCANCODE_ESCAPE] = 0;
+	}
 }
 
 static void draw(void)
@@ -136,7 +143,15 @@ static void draw(void)
 	
 	drawWidgets();
 	
-	if (saveAction == SA_DELETE)
+	if (saveAction == SA_NEW)
+	{
+		drawText(SCREEN_WIDTH / 2, 275, 24, TA_CENTER, colors.white, "Choose a save slot to use ...");
+	}
+	else if (saveAction == SA_LOAD)
+	{
+		drawText(SCREEN_WIDTH / 2, 275, 24, TA_CENTER, colors.white, "Choose a save game to load ...");
+	}
+	else if (saveAction == SA_DELETE)
 	{
 		drawText(SCREEN_WIDTH / 2, 350, 24, TA_CENTER, colors.white, "Are you sure you want to overwrite this game?");
 		drawText(SCREEN_WIDTH / 2, 400, 22, TA_CENTER, colors.white, "All progress will be lost!");
@@ -247,12 +262,12 @@ static void doContinueGame(void)
 
 static void doOptions(void)
 {
-	initOptions(returnFromOptions);
+	initOptions(returnToTitle);
 }
 
 static void doCredits(void)
 {
-	initCredits();
+	initCredits(0);
 }
 
 static void doQuit(void)
@@ -298,6 +313,8 @@ static void doSaveSlot(void)
 static void doLoadCancel(void)
 {
 	showWidgetGroup("title");
+	
+	saveAction = SA_NONE;
 }
 
 static void doOK(void)
@@ -322,7 +339,7 @@ static void doCancel(void)
 	doNewGame();
 }
 
-static void returnFromOptions(void)
+void returnToTitle(void)
 {
 	app.delegate.logic = &logic;
 	app.delegate.draw = &draw;
diff --git a/src/game/title.h b/src/game/title.h
index 56d5c46..47b45f8 100644
--- a/src/game/title.h
+++ b/src/game/title.h
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 enum
 {
+	SA_NONE,
 	SA_LOAD,
 	SA_NEW,
 	SA_DELETE
@@ -40,7 +41,7 @@ extern char *getSaveWidgetLabel(char *filename);
 extern Widget *getSelectedWidget(void);
 extern Texture *getTexture(const char *filename);
 extern Widget *getWidget(char *name, char *group);
-extern void initCredits(void);
+extern void initCredits(int playMusic);
 extern void initHub(void);
 extern void initOptions(void (*callback)(void));
 extern void loadGame(void);