From aa6f1cabec12c52ef6d0e08dde36878865ac88af Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 28 Nov 2021 19:02:24 +0800
Subject: [PATCH] Edit to the previous commit

---
 sfall/HRP/Init.cpp         | 12 +++++-------
 sfall/Modules/MainMenu.cpp |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sfall/HRP/Init.cpp b/sfall/HRP/Init.cpp
index 00c7d0a5..6c983c79 100644
--- a/sfall/HRP/Init.cpp
+++ b/sfall/HRP/Init.cpp
@@ -104,9 +104,7 @@ static bool DisableExtHRP(const char* runFileName, std::string &cmdline) {
 	fwrite(restore, 1, sizeof(restore), ft);
 
 	fseek(ft, 0xEE5C0, SEEK_SET);
-	BYTE restore1[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	BYTE restore1[39] = {0};
 	fwrite(restore1, 1, sizeof(restore1), ft);
 	fclose(ft);
 
@@ -193,12 +191,12 @@ void Setting::init(const char* exeFileName, std::string &cmdline) {
 	if (Setting::ExternalEnabled()) {
 		char infoMsg[512];
 		sf::Translate::Get("sfall", "HiResInfo",
-			"Attention:\nThis version of sfall has its own integrated High Resolution mode patch, which is compatible with the High Resolution Patch by Mash.\n\n"
-			"Now you can disable the external HRP to get new graphic improvements from sfall.\n"
-			"In order to continue using the High Resolution Patch by Mash without seeing this message, disable the \"HiResMode\" option in the ddraw.ini file.\n\n"
+			"This version of sfall has its own integrated High Resolution mode patch, which is compatible with the High Resolution Patch by Mash.\n\n"
+			"If you want to continue using the High Resolution Patch by Mash without seeing this message, disable the \"HiResMode\" option in the ddraw.ini file.\n"
+			"Or you can disable the external HRP to get new graphic improvements from sfall.\n\n"
 			"Do you want to disable the High Resolution Patch by Mash?", infoMsg, 512);
 
-		if (MessageBoxA(0, infoMsg, "sfall: Incompatibility of High Resolution patches", MB_TASKMODAL | MB_ICONWARNING | MB_YESNO) == IDYES) {
+		if (MessageBoxA(0, infoMsg, "sfall: Conflict of High Resolution patches", MB_TASKMODAL | MB_ICONWARNING | MB_YESNO) == IDYES) {
 			if (!DisableExtHRP(exeFileName, cmdline)) {
 				MessageBoxA(0, "An error occurred while trying to deactivate the High Resolution Patch.", "sfall", MB_TASKMODAL | MB_ICONERROR);
 			} else {
diff --git a/sfall/Modules/MainMenu.cpp b/sfall/Modules/MainMenu.cpp
index eed3d638..4eac0ea8 100644
--- a/sfall/Modules/MainMenu.cpp
+++ b/sfall/Modules/MainMenu.cpp
@@ -28,9 +28,9 @@ namespace sfall
 {
 
 #ifdef NDEBUG
-static const char* VerString1 = "SFALL w/ HRP" VERSION_STRING;
+static const char* VerString1 = "SFALL w/ HRP " VERSION_STRING;
 #else
-static const char* VerString1 = "SFALL w/ HRP" VERSION_STRING " Debug Build";
+static const char* VerString1 = "SFALL w/ HRP " VERSION_STRING " Debug Build";
 #endif
 
 long MainMenu::mXOffset;