From 1428fb37705542c2d4017f236413f6f33029eb73 Mon Sep 17 00:00:00 2001
From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com>
Date: Sun, 31 Oct 2021 13:18:21 +0300
Subject: [PATCH] Added Hebrew translation. Switched to MessageBoxW in some
 places.

---
 SpaceCadetPinball/Sound.cpp            |   2 +-
 SpaceCadetPinball/SpaceCadetPinball.rc | Bin 478262 -> 512962 bytes
 SpaceCadetPinball/high_score.cpp       |   5 ++---
 SpaceCadetPinball/options.cpp          |   1 +
 SpaceCadetPinball/options.h            |   1 +
 SpaceCadetPinball/resource.h           |   2 +-
 SpaceCadetPinball/winmain.cpp          |  24 +++++++++++++++++-------
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/SpaceCadetPinball/Sound.cpp b/SpaceCadetPinball/Sound.cpp
index 2eb61f9..0225bec 100644
--- a/SpaceCadetPinball/Sound.cpp
+++ b/SpaceCadetPinball/Sound.cpp
@@ -49,7 +49,7 @@ int Sound::Init(HINSTANCE hInstance, int voices, void (* someFuncPtr)(int, MIXWA
 	{
 		/*FT does not have the file, defaults work OK*/
 		if (!pb::FullTiltMode)
-			MessageBoxA(winmain::hwnd_frame, pinball::get_rc_string(42, 0), "", 0x2000u);
+			MessageBoxW(winmain::hwnd_frame, pinball::get_rc_Wstring(42, 0), L"", 0x2000u);
 	}
 
 	WndClass.style = 0;
diff --git a/SpaceCadetPinball/SpaceCadetPinball.rc b/SpaceCadetPinball/SpaceCadetPinball.rc
index cdb42413ae48d4a0716ef73a8ea46aa8f81073ee..8cc6b0fc8d24146c4969708e72d189de5c679b69 100644
GIT binary patch
delta 3361
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
AQ~&?~

delta 59
zcmX@KTz=aO*$qD!o7I@w)tDH87(_E~S7TyHFrOS}*tMO>hDD*LJ>>)o5VI~%Il<Pl
Kz3(Es2@?QRt`tQ8

diff --git a/SpaceCadetPinball/high_score.cpp b/SpaceCadetPinball/high_score.cpp
index 1e3fb8c..5896106 100644
--- a/SpaceCadetPinball/high_score.cpp
+++ b/SpaceCadetPinball/high_score.cpp
@@ -185,7 +185,6 @@ INT_PTR high_score::HighScore(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	HWND parent;
 	int nIDDlgItem;
-	CHAR String1[256];
 	CHAR name[32];
 
 	switch (msg)
@@ -247,8 +246,8 @@ INT_PTR high_score::HighScore(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case DLG_HIGHSCORES_Cancel:
 			break;
 		case DLG_HIGHSCORES_Clear:
-			lstrcpyA(String1, pinball::get_rc_string(41, 0));
-			if (MessageBoxA(hWnd, pinball::get_rc_string(40, 0), String1, MB_DEFBUTTON2 | MB_OKCANCEL) == 1)
+			if (MessageBoxW(hWnd, pinball::get_rc_Wstring(40, 0),
+			                pinball::get_rc_Wstring(41, 0), MB_DEFBUTTON2 | MB_OKCANCEL) == 1)
 			{
 				clear_table(dlg_hst);
 				if (dlg_enter_name)
diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp
index 471f506..2c491dd 100644
--- a/SpaceCadetPinball/options.cpp
+++ b/SpaceCadetPinball/options.cpp
@@ -84,6 +84,7 @@ LanguageMenuEntry options::LanguageMenu[]
 	{L"Čeština", Languages::Czech},
 	{L"Dansk", Languages::Danish},
 	{L"Suomi", Languages::Finnish},
+	{L"עִברִית", Languages::Hebrew},
 };
 
 void options::ReadOptions()
diff --git a/SpaceCadetPinball/options.h b/SpaceCadetPinball/options.h
index c271cdd..c8d9940 100644
--- a/SpaceCadetPinball/options.h
+++ b/SpaceCadetPinball/options.h
@@ -18,6 +18,7 @@ enum class Languages
 	Czech = MAKELANGID(LANG_CZECH, SUBLANG_CZECH_CZECH_REPUBLIC),
 	Danish = MAKELANGID(LANG_DANISH, SUBLANG_DANISH_DENMARK),
 	Finnish = MAKELANGID(LANG_FINNISH, SUBLANG_FINNISH_FINLAND),
+	Hebrew = MAKELANGID(LANG_HEBREW, SUBLANG_HEBREW_ISRAEL),
 };
 
 struct LanguageMenuEntry
diff --git a/SpaceCadetPinball/resource.h b/SpaceCadetPinball/resource.h
index aefee6f..739a6b0 100644
--- a/SpaceCadetPinball/resource.h
+++ b/SpaceCadetPinball/resource.h
@@ -242,7 +242,7 @@
 #define DLG_HIGHSCORES_EditName5        605
 #define Menu1_AlternativeRender         601
 #define Menu1_Language                  700
-#define Menu1_LanguageMax               714
+#define Menu1_LanguageMax               715
 
 // Next default values for new objects
 // 
diff --git a/SpaceCadetPinball/winmain.cpp b/SpaceCadetPinball/winmain.cpp
index fe2f11c..bee1d0c 100644
--- a/SpaceCadetPinball/winmain.cpp
+++ b/SpaceCadetPinball/winmain.cpp
@@ -165,8 +165,18 @@ int winmain::WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	pinball::FindShiftKeys();
 	options::init_resolution();
 
+	// Some languages use RTL layout
+	DWORD dwExStyle;
+	switch (options::Options.Language)
+	{
+	case Languages::Hebrew:
+		dwExStyle = WS_EX_LAYOUTRTL;
+		break;
+	default:
+		dwExStyle = 0;
+	}
 	auto windowName = pinball::get_rc_Wstring(38, 0);
-	windowHandle = CreateWindowExW(0, windowClass, windowName,
+	windowHandle = CreateWindowExW(dwExStyle, windowClass, windowName,
 		WndStyle, 0, 0, 640, 480, nullptr, nullptr, hInstance, nullptr);
 
 	hwnd_frame = windowHandle;
@@ -600,9 +610,9 @@ LRESULT CALLBACK winmain::message_handler(HWND hWnd, UINT Msg, WPARAM wParam, LP
 						iHwnd * iHwnd * iHwnd * iHwnd * iHwnd * iHwnd * iHwnd);
 					if (static_cast<int>(WinExec(cmdLine, 5u)) < 32)
 					{
-						auto caption = pinball::get_rc_string(170, 0);
-						auto text = pinball::get_rc_string(171, 0);
-						MessageBoxA(hwnd_frame, text, caption, 0x2010u);
+						auto caption = pinball::get_rc_Wstring(170, 0);
+						auto text = pinball::get_rc_Wstring(171, 0);
+						MessageBoxW(hwnd_frame, text, caption, 0x2010u);
 					}
 					memory::free(tmpBuf);
 				}
@@ -774,9 +784,9 @@ void winmain::memalloc_failure()
 	midi::music_stop();
 	Sound::Close();
 	gdrv::uninit();
-	char* caption = pinball::get_rc_string(170, 0);
-	char* text = pinball::get_rc_string(179, 0);
-	MessageBoxA(nullptr, text, caption, 0x2030u);
+	auto caption = pinball::get_rc_Wstring(170, 0);
+	auto text = pinball::get_rc_Wstring(179, 0);
+	MessageBoxW(nullptr, text, caption, 0x2030u);
 	_exit(1);
 }