From ac59559d908edb118bd85ff31d14335cf32f5ee3 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sat, 5 Mar 2016 15:35:09 +0000
Subject: [PATCH] Clear input when pressing Escape.

---
 src/challenges/challengeHome.c | 7 ++++---
 src/challenges/challengeHome.h | 1 +
 src/galaxy/galacticMap.c       | 2 +-
 src/galaxy/galacticMap.h       | 1 +
 src/game/title.c               | 2 ++
 src/game/title.h               | 1 +
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/challenges/challengeHome.c b/src/challenges/challengeHome.c
index 03156df..e340508 100644
--- a/src/challenges/challengeHome.c
+++ b/src/challenges/challengeHome.c
@@ -80,7 +80,6 @@ void initChallengeHome(void)
 	initBackground();
 	
 	start = getWidget("start", "challenges");
-	start->enabled = 0;
 	start->action = startChallengeMission;
 	
 	getWidget("resume", "challengesMenu")->action = resume;
@@ -168,7 +167,9 @@ static void doChallenges(void)
 				
 				updateChallengeMissionData();
 			
-				start->enabled = c->available;
+				start->enabled = 1;
+				
+				playSound(SND_GUI_CLICK);
 			}
 			
 			app.mouse.button[SDL_BUTTON_LEFT] = 0;
@@ -436,7 +437,7 @@ static void handleKeyboard(void)
 		
 		playSound(SND_GUI_CLOSE);
 		
-		memset(app.keyboard, 0, sizeof(int) * MAX_KEYBOARD_KEYS);
+		clearInput();
 	}
 }
 
diff --git a/src/challenges/challengeHome.h b/src/challenges/challengeHome.h
index 5dd92ff..b22ca32 100644
--- a/src/challenges/challengeHome.h
+++ b/src/challenges/challengeHome.h
@@ -59,6 +59,7 @@ extern char *getPlanetTextureName(int n);
 extern void playMusic(char *filename);
 extern char *timeToString(long millis, int showHours);
 extern char *getChallengeDescription(Challenge *c);
+extern void clearInput(void);
 
 extern App app;
 extern Battle battle;
diff --git a/src/galaxy/galacticMap.c b/src/galaxy/galacticMap.c
index 00452d7..5c5f545 100644
--- a/src/galaxy/galacticMap.c
+++ b/src/galaxy/galacticMap.c
@@ -615,7 +615,7 @@ static void handleKeyboard(void)
 		
 		playSound(SND_GUI_CLOSE);
 		
-		memset(app.keyboard, 0, sizeof(int) * MAX_KEYBOARD_KEYS);
+		clearInput();
 	}
 }
 
diff --git a/src/galaxy/galacticMap.h b/src/galaxy/galacticMap.h
index 0dacbdb..acd619c 100644
--- a/src/galaxy/galacticMap.h
+++ b/src/galaxy/galacticMap.h
@@ -59,6 +59,7 @@ extern void updateAllMissions(void);
 extern StarSystem *getStarSystem(char *name);
 extern void showOKDialog(void (*callback)(void), const char *format, ...);
 extern char *getTranslatedString(char *string);
+extern void clearInput(void);
 
 extern App app;
 extern Colors colors;
diff --git a/src/game/title.c b/src/game/title.c
index acfd599..09ae397 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -202,6 +202,8 @@ static void handleKeyboard(void)
 	{
 		returnFromOptions();
 		playSound(SND_GUI_CLOSE);
+		
+		clearInput();
 	}
 }
 
diff --git a/src/game/title.h b/src/game/title.h
index fb20035..818165e 100644
--- a/src/game/title.h
+++ b/src/game/title.h
@@ -55,6 +55,7 @@ extern void initChallengeHome(void);
 extern void selectWidget(const char *name, const char *group);
 extern void drawStats(void);
 extern void updateAllMissions(void);
+extern void clearInput(void);
 
 extern App app;
 extern Battle battle;