From 427fe69374f2e789d2121701d258d17f696c7239 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 20 Jun 2019 21:17:32 +0100
Subject: [PATCH] MessageBoxA usage cleanup

---
 src/Profile.cpp | 29 +++++++++++++++--------------
 src/TextScr.cpp | 23 +++++++++++++++--------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/Profile.cpp b/src/Profile.cpp
index a41c1efd..dc2a2f9b 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -254,21 +254,22 @@ BOOL InitializeGame(HWND hWnd)
 	InitFlags();
 	if (!TransferStage(13, 200, 10, 8))
 	{
-#if defined(NONPORTABLE) && defined(WINDOWS)
-	#ifdef JAPANESE
-		MessageBoxA(hWnd, "ステージの読み込みに失敗", "エラー", MB_OK);
-	#else
-		MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK);
-	#endif
-#else
-	(void)hWnd;
+		#if defined(NONPORTABLE) && defined(WINDOWS)
+			#ifdef JAPANESE
+			MessageBoxA(hWnd, "ステージの読み込みに失敗", "エラー", MB_OK);
+			#else
+			MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK);
+			#endif
+		#else
+			(void)hWnd;
+
+			#ifdef JAPANESE
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
+			#else
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL);
+			#endif
+		#endif
 
-	#ifdef JAPANESE
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
-	#else
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL);
-	#endif
-#endif
 		return FALSE;
 	}
 
diff --git a/src/TextScr.cpp b/src/TextScr.cpp
index 0dab8ef4..8200eeda 100644
--- a/src/TextScr.cpp
+++ b/src/TextScr.cpp
@@ -695,7 +695,11 @@ int TextScriptProc()
 						if (!TransferStage(z, w, x, y))
 						{
 							#if defined(NONPORTABLE) && defined(WINDOWS)
-							MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", 0);
+								#ifdef JAPANESE
+								MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", MB_OK);
+								#else
+								MessageBoxA(ghWnd, "Failed to load stage", "Error", MB_OK);
+								#endif
 							#else
 								#ifdef JAPANESE
 								SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
@@ -1250,16 +1254,19 @@ int TextScriptProc()
 					else
 					{
 						char str_0[0x40];
-						#if defined(NONPORTABLE) && defined(WINDOWS)
-						sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]);
-						MessageBoxA(0, str_0, "エラー", 0);
-						#else
-							#ifdef JAPANESE
+						#ifdef JAPANESE
 							sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]);
-							SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL);
+							#if defined(NONPORTABLE) && defined(WINDOWS)
+								MessageBoxA(NULL, str_0, "エラー", MB_OK);
 							#else
+								SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL);
+							#endif
+						#else
 							sprintf(str_0, "Unknown code:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]);
-							SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL);
+							#if defined(NONPORTABLE) && defined(WINDOWS)
+								MessageBoxA(NULL, str_0, "Error", MB_OK);
+							#else
+								SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL);
 							#endif
 						#endif