From 01b5b73dba7b867b54f34e34a109ac01e2ec1098 Mon Sep 17 00:00:00 2001
From: onpon4 <onpon4@riseup.net>
Date: Fri, 27 Feb 2015 19:52:55 -0500
Subject: [PATCH] Fixed defaulting to "easy" difficulty.

---
 src/Starfighter.cpp | 1 +
 src/comms.cpp       | 1 -
 src/events.cpp      | 2 --
 src/loadSave.cpp    | 3 +--
 src/title.cpp       | 2 ++
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Starfighter.cpp b/src/Starfighter.cpp
index 8c1de83..241c60f 100644
--- a/src/Starfighter.cpp
+++ b/src/Starfighter.cpp
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
 	// Determine which part of the game we will go to...
 	int section = 0;
 
+	currentGame.difficulty = DIFFICULTY_NORMAL;
 	newGame();
 
 	while (true)
diff --git a/src/comms.cpp b/src/comms.cpp
index d169b35..54e0349 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -61,7 +61,6 @@ static void createMissionDetailSurface(SDL_Surface *comms, int missionSlot)
 {
 	char name[50];
 	char string[2000];
-	int lines = 0;
 	int y = 50;
 	int newY = y;
 	int col = FONT_WHITE;
diff --git a/src/events.cpp b/src/events.cpp
index 773efa5..9b594dc 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Starfighter.h"
 
-static char lastKeyEvents[] = "                         ";
-
 /*
 Checked during the main game loop. When the game is paused
 it goes into a constant loop checking this routine. If escape is
diff --git a/src/loadSave.cpp b/src/loadSave.cpp
index c603f98..89aba72 100644
--- a/src/loadSave.cpp
+++ b/src/loadSave.cpp
@@ -98,9 +98,8 @@ bool loadGame(int slot)
 
 	fclose(fp);
 
-	if(currentGame.saveFormat < 2) {
+	if (currentGame.saveFormat < 2)
 		currentGame.difficulty = DIFFICULTY_NORMAL;
-	}
 
 	weapon[0] = currentGame.playerWeapon;
 	player = currentGame.thePlayer;
diff --git a/src/title.cpp b/src/title.cpp
index 7c751e2..adcf30d 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -467,9 +467,11 @@ int doTitle()
 						if (selectedOption == 1)
 							engine.done = 1;
 						else if (selectedOption == 2)
+						{
 							currentGame.difficulty++;
 							if (currentGame.difficulty > DIFFICULTY_NIGHTMARE)
 								currentGame.difficulty = DIFFICULTY_EASY;
+						}
 						else if (selectedOption == listLength)
 							{menuType = 0; selectedOption = 1;}
 						createDifficultyMenu();