Bugfixes in QC for commit 7c9a8c9:

fixed OptionSelectEngine invalid centring time when using simple option select
fixed issues with cardodge left/right moving checker (in MoveUserCarLeft/Right), and positioning of bottomRight.X variable across the whole game
Fixed incorrect error messages or error messages not showing up in FileCryptor command
Consistency: add newlines to success messages in FileCryptor command
Consistency: add success messages for Windows encryption/decryption
Fix error checking not working in delete command
Fix issues with configuration file formatting under Windows 7
Fix ZeeTerminal crashing when cancel pressed in filecryptor or delete command
Colour change for Windows Dialogue instructions for Delete and FileCryptor commands
Make CarDodge front screen more spatious in terms of decorative cars being more spaced out from the main menu text, to better properly support the old OptionSelectEngine.

Author: rforzachamp821

CommandFiles/CommandsFiles/CommandsFile_51to60.cpp

@@ -155,7 +155,9 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 
 		// Encryption and decryption both require only keys and file/folderpath
 		if (sFileName == "") {
-			std::cout << wordWrap("Type in \"*open\" for Windows File Dialogue, or \"*openfolder\" for Windows Folder Dialogue.\n");
+			colour(LCYN, ConfigObjMain.sColourGlobalBack);
+			std::cout << wordWrap("Type in \"*open\" for Windows File Dialogue, or \"*openfolder\" for Windows Folder Dialogue.\n\n");
+			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			sFileName = StrInput("Please input path to desired file/folder (0 to exit): > ");
 			if (sFileName == "0") {
 				Exiting();
@@ -170,6 +172,10 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			FileCryptorOpen.FileOpenDialogue("Open a File For Encryption", false);
 			sFileName = FileCryptorOpen.GetRetrievedPathName();
+			if (sFileName == "") {
+				Exiting();
+				return true;
+			}
 		}
 		else if (sFileName == "*openfolder") {
 			FileOpenGUIEngine FileCryptorOpen;
@@ -178,6 +184,10 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			FileCryptorOpen.FileOpenDialogue("Open a Folder For Encryption", true);
 			sFileName = FileCryptorOpen.GetRetrievedPathName();
+			if (sFileName == "") {
+				Exiting();
+				return true;
+			}
 		}
 
 		if (bUseWindowsEncryption == false && rKey1 == 0) {
@@ -199,7 +209,11 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 				if (!EncryptFileA(sFileName.c_str())) {
 					VerbosityDisplay("In Commands(): ERROR - EncryptFileA() function failed, with error code " + std::to_string(GetLastError()) + ".\n");
 					UserErrorDisplay("ERROR - An error occured when encrypting data. Failed with error code " + std::to_string(GetLastError()) + ".\n");
-					return true;
+				}
+				else {
+					colour(LGRN, ConfigObjMain.sColourGlobalBack);
+					std::cout << CentreText("File/folder encryption successful!") << "\n";
+					colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 				}
 			}
 			else {
@@ -221,8 +235,12 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 
 				}
 				else {
-					FileCryptorObj.EncryptFile(sFileName, rKey1, rKey2);
+					if (!FileCryptorObj.EncryptFile(sFileName, rKey1, rKey2)) {
+						UserErrorDisplay("When encrypting " + sFileName + ": ERROR - " + FileCryptorObj.GetErrorLevelInfo() + "\n");
+						nNumberOfFailedFiles++;
+					}
 				}
+			
 				std::chrono::steady_clock::time_point TimePointEnd = std::chrono::steady_clock::now();
 				std::chrono::duration<long double> ElapsedSeconds = TimePointEnd - TimePointStart;
 
@@ -231,17 +249,21 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 					std::cout << "File/folder encryption complete!\n" << nNumberOfFailedFiles << " files have not been encrypted due to an error. Errors have been displayed above.\nElapsed Time: " << ElapsedSeconds.count() << " seconds.\n\n";
 				}
 				else {
-					std::cout << "File/folder encryption successfully completed!\nElapsed Time: " << ElapsedSeconds.count();
+					std::cout << "File/folder encryption successfully completed!\nElapsed Time: " << ElapsedSeconds.count() << " seconds.\n\n";
 				}
 				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			}
 		}
 		else if (nOption == 2) {
 			if (bUseWindowsEncryption) {
-				if (DecryptFileA(sFileName.c_str(), NULL)) {
+				if (!DecryptFileA(sFileName.c_str(), NULL)) {
 					VerbosityDisplay("In Commands(): ERROR - DecryptFileA() function failed, with error code " + std::to_string(GetLastError()) + ".\n");
 					UserErrorDisplay("ERROR - An error occured when decrypting data. Failed with error code " + std::to_string(GetLastError()) + ".\n");
-					return true;
+				}
+				else {
+					colour(LGRN, ConfigObjMain.sColourGlobalBack);
+					std::cout << CentreText("File/folder decryption successful!") << "\n";
+					colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 				}
 			}
 			else {
@@ -263,7 +285,10 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 
 				}
 				else {
-					FileCryptorObj.DecryptFile(sFileName, rKey1, rKey2);
+					if (!FileCryptorObj.DecryptFile(sFileName, rKey1, rKey2)) {
+						UserErrorDisplay("When decrypting " + sFileName + ": ERROR - " + FileCryptorObj.GetErrorLevelInfo() + "\n");
+						nNumberOfFailedFiles++;
+					}
 				}
 				std::chrono::steady_clock::time_point TimePointEnd = std::chrono::steady_clock::now();
 				std::chrono::duration<long double> ElapsedSeconds = TimePointEnd - TimePointStart;
@@ -273,7 +298,7 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 					std::cout << "File/folder decryption complete!\n" << nNumberOfFailedFiles << " files have not been decrypted due to an error. Errors have been displayed above.\nElapsed Time: " << ElapsedSeconds.count() << " seconds.\n\n";
 				}
 				else {
-					std::cout << "File/folder decryption successfully completed!\nElapsed Time: " << ElapsedSeconds.count();
+					std::cout << "File/folder decryption successfully completed!\nElapsed Time: " << ElapsedSeconds.count() << " seconds.\n\n";
 				}
 				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			}
@@ -302,21 +327,29 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 			// Output title, prompt input
 			CentreColouredText(" ___DELETE___ ", 1);
 
-			std::cout << wordWrap("\n\nThis command allows you to delete files or folders permanently.\nType in \"*open\" for Windows File Dialogue, or \"*openfolder\" for Windows Folder Dialogue.\n\n");
+			std::cout << wordWrap("\n\nThis command allows you to delete files or folders permanently.\n");
+			colour(LCYN, ConfigObjMain.sColourGlobalBack);
+			std::cout << wordWrap("Type in \"*open\" for Windows File Dialogue, or \"*openfolder\" for Windows Folder Dialogue.\n\n");
+			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			sFileName = StrInput("Please input the path to the file/folder you want to delete (0 to exit): > ");
 			if (sFileName == "0") {
 				Exiting();
 				return true;
 			}
 		}
 
+
 		if (sFileName == "*open") {
 			FileOpenGUIEngine DeleteOpen;
 			colour(YLW, ConfigObjMain.sColourGlobalBack);
 			std::cout << "Opening the Windows File Dialogue...\n";
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			DeleteOpen.FileOpenDialogue("Open a File For Encryption", false);
 			sFileName = DeleteOpen.GetRetrievedPathName();
+			if (sFileName == "") {
+				Exiting();
+				return true;
+			}
 		}
 		else if (sFileName == "*openfolder") {
 			FileOpenGUIEngine DeleteOpen;
@@ -325,27 +358,37 @@ bool commands::Commands51To60(const std::string sCommand, char* cCommandArgs, co
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 			DeleteOpen.FileOpenDialogue("Open a Folder For Encryption", true);
 			sFileName = DeleteOpen.GetRetrievedPathName();
+			if (sFileName == "") {
+				Exiting();
+				return true;
+			}
 		}
 
 		// Delete file/folder
-		std::error_code ecDelete{};
 		try {
-			std::filesystem::remove_all(sFileName, ecDelete);
+			std::error_code ecDelete{};
+			uintmax_t nReturnCode = std::filesystem::remove_all(sFileName, ecDelete);
+
+			// 0 means no files have been deleted
+			if (nReturnCode == 0) {
+				VerbosityDisplay("In Commands(): ERROR - Failed to delete file/folder. Error code: 2. Error info: File/folder not found.\n");
+				UserErrorDisplay("ERROR - An error occured when deleting file/folder. Error info: File/folder not found.\n");
+				return true;
+			}
+			// -1 means error
+			else if (nReturnCode == -1) {
+				VerbosityDisplay("In Commands(): ERROR - Failed to delete file/folder. Error code: " + std::to_string(ecDelete.value()) + ". Error info: " + ecDelete.message() + ".\n");
+				UserErrorDisplay("ERROR - An error occured when deleting file/folder. Error code: " + std::to_string(ecDelete.value()) + ".\n");
+				return true;
+			}
 		}
 
-		catch (std::bad_alloc) {
+		catch (std::bad_alloc&) {
 			VerbosityDisplay("In Commands(): ERROR - Memory allocation failed for std::filesystem::remove_all().\n");
 			UserErrorDisplay("ERROR - Failed to allocate memory. Please try again later.\n");
 			return true;
 		}
 
-		// Get error messages
-		if (ecDelete) {
-			VerbosityDisplay("In Commands(): ERROR - Failed to delete file/folder. Error code: " + std::to_string(ecDelete.value()) + ". Error info: " + ecDelete.message() + ".\n");
-			UserErrorDisplay("ERROR - An error occured when deleting file/folder. Info: " + ecDelete.message() + ".\n");
-			return true;
-		}
-
 		colour(LGRN, ConfigObjMain.sColourGlobalBack);
 		std::cout << '\n' << CentreText("File/folder deletion successful!") << "\n";
 		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);

Engine/ConfigFile-System/ConfigFile-System.cpp

@@ -107,20 +107,20 @@ ConfigFileSystem::~ConfigFileSystem() {
 bool ConfigFileSystem::CreateConfigFile()
 {
 	// 1. Attempt to create config file in user-defined location
-	std::ofstream CreateConfigOut(sConfigFileUserLocation, std::ios::binary);
+	std::ofstream CreateConfigOut(sConfigFileUserLocation);
 
 	// 2. Check if open successful; if not, use default location; if not, return false
 	if (CreateConfigOut.fail() == true) {
 		VerbosityDisplay("In ConfigFileSystem::CreateConfigFile(): Warning - User file location cannot be opened. Attempting to create config file in default location.\n", nObjectID);
-		CreateConfigOut.open(sConfigFileDefaultLocation, std::ios::binary);
+		CreateConfigOut.open(sConfigFileDefaultLocation);
 		if (CreateConfigOut.fail() == true) {
 			VerbosityDisplay("In ConfigFileSystem::CreateConfigFile(): ERROR - Default location could not be opened. Configuration file creation failed.", nObjectID);
 			return false;
 		}
 		else {
 			// Point to new file
 			sConfigFileUserLocation = sConfigFileDefaultLocation;
-			CreateConfigOut.open(sConfigFileUserLocation, std::ios::binary);
+			CreateConfigOut.open(sConfigFileUserLocation);
 		}
 	}
 
@@ -142,13 +142,13 @@ bool ConfigFileSystem::WriteConfigFile() {
 	std::string sConfigFinalLocation = "";
 
 	// 2. Create test file stream
-	std::ifstream TestStreamIn(sConfigFileUserLocation, std::ios::binary);
+	std::ifstream TestStreamIn(sConfigFileUserLocation);
 
 	// 3. Test for file existence in user-set location and ZeeTerminal folder
 	if (TestStreamIn.fail() == true) {
 		VerbosityDisplay("In ConfigFileSystem::WriteConfigFile(): Warning- User-defined file seems to be nonexistent. Attempting to write to default location.\n", nObjectID);
 		TestStreamIn.clear();
-		TestStreamIn.open(sConfigFileDefaultLocation, std::ios::binary);
+		TestStreamIn.open(sConfigFileDefaultLocation);
 
 		if (TestStreamIn.fail() == true) {
 			VerbosityDisplay("In ConfigFileSystem::WriteConfigFile(): Warning - Default location file not found. Attempting to create new configuration file.\n", nObjectID);
@@ -167,7 +167,7 @@ bool ConfigFileSystem::WriteConfigFile() {
 	TestStreamIn.close();
 
 	// 5. Open main file stream; post message that write operation has began.
-	std::ofstream MainStreamOut(sConfigFinalLocation, std::ios::binary);
+	std::ofstream MainStreamOut(sConfigFinalLocation);
 
 	// Unexpected failure - just exit
 	if (MainStreamOut.fail()) {
@@ -209,13 +209,13 @@ bool ConfigFileSystem::ReadConfigFile()
 	std::string sConfigFinalLocation = "";
 
 	// 2. Create test file stream 
-	std::ifstream TestStreamIn(sConfigFileUserLocation, std::ios::binary);
+	std::ifstream TestStreamIn(sConfigFileUserLocation);
 
 	// 3. Test for file existence in user-set location and ZeeTerminal folder
 	if (TestStreamIn.fail() == true) {
 		VerbosityDisplay("In ConfigFileSystem::ReadConfigFile(): Warning- User-defined file seems to be nonexistent. Attempting to read from default location.\n", nObjectID);
 		TestStreamIn.clear();
-		TestStreamIn.open(sConfigFileDefaultLocation, std::ios::binary);
+		TestStreamIn.open(sConfigFileDefaultLocation);
 
 		if (TestStreamIn.fail() == true) {
 			VerbosityDisplay("In ConfigFileSystem::ReadConfigFile(): Warning - Default location file not found. Attempting to create new configuration file.\n", nObjectID);
@@ -234,7 +234,7 @@ bool ConfigFileSystem::ReadConfigFile()
 	TestStreamIn.close();
 
 	// 5. Create new main file stream
-	std::ifstream MainStreamIn(sConfigFinalLocation, std::ios::binary);
+	std::ifstream MainStreamIn(sConfigFinalLocation);
 
 	// Unexpected failure - just exit
 	if (MainStreamIn.fail()) {
@@ -283,7 +283,7 @@ bool ConfigFileSystem::ReadConfigFile()
 		}
 
 		// 10. Parse final contents and put into value string
-		std::getline(LineStream, sValueBuffer, '\r');
+		std::getline(LineStream, sValueBuffer, '\n');
 
 		// Check if anything is in the value string
 		if (sValueBuffer == "") {

Engine/FileOpenGUIEngine/FileOpenGUIEngine.cpp

@@ -57,7 +57,7 @@ bool FileOpenGUIEngine::FileOpenDialogue(std::string sTitle, bool bSelectFolder)
 	IFileOpenDialog* pFileOpen = NULL;
 	IShellItem* pItem = NULL;
 
-	LPWSTR pwszFilePath = (LPWSTR)L"";
+	LPWSTR pwszFilePath = 0;
 
 	// Initialise COM libraries
 	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
@@ -144,7 +144,9 @@ bool FileOpenGUIEngine::FileOpenDialogue(std::string sTitle, bool bSelectFolder)
 
 done:
 
-	CoTaskMemFree(pwszFilePath);
+	if (pwszFilePath) {
+		CoTaskMemFree(pwszFilePath);
+	}
 
 	if (pItem)
 	{

Engine/OptionSelectEngine/OptionSelectEngine.cpp

@@ -101,7 +101,11 @@ int OptionSelectEngine::SimpleOptionSelect(std::string sPrompt, std::string sTit
 	while (true) {
 		// Input centred when options are centred - avoids overcomplication
 		std::string sInputPrompt = "Please input a desired option number (input 0 to exit): > ";
-		MoveCursorToXCoord(((csbiOptionSelect.srWindow.Right - csbiOptionSelect.srWindow.Left) - sInputPrompt.length()) / 2);
+
+		// Move prompt to centre if centring prompt is enabled
+		if (bCentrePrompt) {
+			MoveCursorToXCoord(((csbiOptionSelect.srWindow.Right - csbiOptionSelect.srWindow.Left) - sInputPrompt.length()) / 2);
+		}
 		nInput = NumInputi(sInputPrompt);
 
 		if (nInput == 0) {

GameFiles/CarDodge/CarDodge.cpp

@@ -132,47 +132,42 @@ inline void RenderMainMenuCars() {
 	ciMainMenuEnemyCar.CarStyle = Style.EnemyCar;
 
 	// Set up left side of main menu
-	ciMainMenuUserCar.bottomLeft = { short(nDirectionsTextLeftColumn - 7), 14 };
-	ciMainMenuUserCar.bottomRight = { short(ciMainMenuUserCar.bottomLeft.X + 4), ciMainMenuUserCar.bottomLeft.Y };
-
-	ciMainMenuEnemyCar.bottomLeft = { short(nDirectionsTextLeftColumn - 10), 9 };
-	ciMainMenuEnemyCar.bottomRight = { short(ciMainMenuEnemyCar.bottomLeft.X + 4), ciMainMenuEnemyCar.bottomLeft.Y };
+	ciMainMenuUserCar.bottomLeft = { short(nDirectionsTextLeftColumn - 10), 14 };
+	ciMainMenuEnemyCar.bottomLeft = { short(nDirectionsTextLeftColumn - 13), 9 };
 
 	// Render left side of main menu
 	colour(LYLW, sMenuColourBack);
 	RenderCar(ciMainMenuEnemyCar);
 	RenderCar(ciMainMenuUserCar);
 
 	// Set up right side of main menu
-	ciMainMenuUserCar.bottomLeft = { short(nDirectionsTextRightColumn + 3), 14 };
-	ciMainMenuUserCar.bottomRight = { short(ciMainMenuUserCar.bottomLeft.X + 4), ciMainMenuUserCar.bottomLeft.Y };
+	ciMainMenuUserCar.bottomLeft = { short(nDirectionsTextRightColumn + 6), 14 };
 	ciMainMenuUserCar.CarStyle = Style.XtraAero;
 
-	ciMainMenuEnemyCar.bottomLeft = { short(nDirectionsTextRightColumn + 8), 11 };
-	ciMainMenuEnemyCar.bottomRight = { short(ciMainMenuEnemyCar.bottomLeft.X + 4), ciMainMenuEnemyCar.bottomLeft.Y };
+	ciMainMenuEnemyCar.bottomLeft = { short(nDirectionsTextRightColumn + 11), 11 };
 
 	// Render left side of main menu
 	RenderCar(ciMainMenuEnemyCar);
 	RenderCar(ciMainMenuUserCar);
 
 	// Render annotations for the cars on both sides of the main menu
 	colour(LGRN, sMenuColourBack);
-	SetCursorPosition(nDirectionsTextRightColumn + 9, 13);
+	SetCursorPosition(nDirectionsTextRightColumn + 12, 13);
 	std::cout << "||";
-	SetCursorPosition(nDirectionsTextRightColumn + 9, 14);
+	SetCursorPosition(nDirectionsTextRightColumn + 12, 14);
 	std::cout << "VV";
 
-	SetCursorPosition(nDirectionsTextRightColumn + 4, 8);
+	SetCursorPosition(nDirectionsTextRightColumn + 7, 8);
 	std::cout << "^^";
-	SetCursorPosition(nDirectionsTextRightColumn + 4, 9);
+	SetCursorPosition(nDirectionsTextRightColumn + 7, 9);
 	std::cout << "||";
 
 	colour(LMAG, sMenuColourBack);
-	SetCursorPosition(nDirectionsTextLeftColumn, 9);
+	SetCursorPosition(nDirectionsTextLeftColumn - 3, 9);
 	std::cout << "\\/";
-	SetCursorPosition(nDirectionsTextLeftColumn, 11);
+	SetCursorPosition(nDirectionsTextLeftColumn - 3, 11);
 	std::cout << "/\\";
-	SetCursorPosition(nDirectionsTextLeftColumn - 6, 10);
+	SetCursorPosition(nDirectionsTextLeftColumn - 9, 10);
 	std::cout << "<-- CRASH";
 
 	// Set colours back to normal
@@ -205,11 +200,13 @@ void CarDodgeMainMenu()
 		// Ensure that terminal is suitable for playing the game
 		if (!VerifyIfGameIsRunnable(true, true)) {
 			std::cout << "Take your time to resize the main menu window. The CarDodge main menu will reappear when the window is resized.\nPress any key to exit the game.\n";
+			bool bExitGame = false;
 			while (true) {
 				// Check if user inputted anything
 				if (_kbhit()) {
 					_getch();
-					return;
+					bExitGame = true;
+					break;
 				}
 
 				// Check window size repeatedly
@@ -221,6 +218,9 @@ void CarDodgeMainMenu()
 				sleep(1);
 			}
 
+			// Game needs to be exited as user pressed a key - break out of main while loop
+			if (bExitGame) break;
+
 			// Clear screen to start terminal afresh from any error messages
 			cls();
 		}