[Scummvm-git-logs] scummvm master -> 6cd9fd93ca300755ccad9cfef6d96a3cd2ec8fbc

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6cd9fd93ca ULTIMA8: Fix U8 Japanese menu text


Commit: 6cd9fd93ca300755ccad9cfef6d96a3cd2ec8fbc
    https://github.com/scummvm/scummvm/commit/6cd9fd93ca300755ccad9cfef6d96a3cd2ec8fbc
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-08-29T21:48:06+09:00

Commit Message:
ULTIMA8: Fix U8 Japanese menu text

Changed paths:
    devtools/create_ultima/files/ultima8/u8japanese.ini
    engines/ultima/ultima8/gumps/menu_gump.cpp


diff --git a/devtools/create_ultima/files/ultima8/u8japanese.ini b/devtools/create_ultima/files/ultima8/u8japanese.ini
index 8bf59d711b..65dd0ede65 100644
--- a/devtools/create_ultima/files/ultima8/u8japanese.ini
+++ b/devtools/create_ultima/files/ultima8/u8japanese.ini
@@ -4,10 +4,34 @@
 Give thy name:=–¼‘O‚ð“ü—Í‚µ‚ĉº‚³‚¢
 HERE LIES*THE AVATAR*REST IN PEACE=HERE LIES*THE AVATAR*REST IN PEACE%ƒAƒoƒ^[ƒ‹AˆÀ‚ç‚©‚É–°‚é
 Quit the game?=ƒQ[ƒ€‚ðI—¹‚µ‚Ü‚·‚©?
+1.Intro=‚P.˜Í
+2.Read Diary=‚Q.“ú‹L‚ð“Ç‚Þ
+3.Write Diary=‚R.“ú‹L‚ð‘‚­
+4.Options=‚S.Ý’è
+5.Credits=‚T.ƒNƒŒƒWƒbƒg
+6.Quit=‚U.ƒQ[ƒ€I—¹
+7.Quotes=‚V.ƒEƒ‹ƒeƒBƒ}Œê˜^
+8.End Game=‚W.ÅIÍ
 
 [gumps]
-# quit confirmation is text-only in Japanese game
+# quit confirmation and menu are text-only in Japanese game
 18,0=0,0
+37,0=0,0
+37,1=0,0
+37,2=0,0
+37,3=0,0
+37,4=0,0
+37,5=0,0
+37,6=0,0
+37,7=0,0
+37,8=0,0
+37,9=0,0
+37,10=0,0
+37,11=0,0
+37,12=0,0
+37,13=0,0
+37,14=0,0
+37,15=0,0
 
 [jpfonts]
 0=16,0xC0C0FF
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index 823006f894..29b190ecfb 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -103,6 +103,17 @@ static const int gumpShape = 35;
 static const int paganShape = 32;
 static const int menuEntryShape = 37;
 
+static const char *MENU_TXT[] = {
+	"1.Intro",
+	"2.Read Diary",
+	"3.Write Diary",
+	"4.Options",
+	"5.Credits",
+	"6.Quit",
+	"7.Quotes",
+	"8.End Game"
+};
+
 void MenuGump::InitGump(Gump *newparent, bool take_focus) {
 	ModalGump::InitGump(newparent, take_focus);
 
@@ -133,7 +144,13 @@ void MenuGump::InitGump(Gump *newparent, bool take_focus) {
 				FrameID frame_down(GameData::GUMPS, menuEntryShape, i * 2 + 1);
 				frame_up = _TL_SHP_(frame_up);
 				frame_down = _TL_SHP_(frame_down);
-				Gump *widget = new ButtonWidget(x_, y_, frame_up, frame_down, true);
+				Gump *widget;
+				if (frame_up._shapeNum) {
+					widget = new ButtonWidget(x_, y_, frame_up, frame_down, true);
+				} else {
+					// JA U8 has text labels
+					widget = new ButtonWidget(x_, y_, _TL_(MENU_TXT[i]), true, 0);
+				}
 				widget->InitGump(this, false);
 				widget->SetIndex(i + 1);
 			}