[Scummvm-git-logs] scummvm master -> df9e0abc1dc5bffd435eee26cda40198dbefaf88

[sev-]

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:
df9e0abc1d SAGA: Partial fix for the options dialog text positions for ite-tw


Commit: df9e0abc1dc5bffd435eee26cda40198dbefaf88
    https://github.com/scummvm/scummvm/commit/df9e0abc1dc5bffd435eee26cda40198dbefaf88
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-12T01:57:45+01:00

Commit Message:
SAGA: Partial fix for the options dialog text positions for ite-tw

Changed paths:
    engines/saga/displayinfo.h
    engines/saga/interface.cpp


diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h
index 920642d5843..1876f2d4b8b 100644
--- a/engines/saga/displayinfo.h
+++ b/engines/saga/displayinfo.h
@@ -206,6 +206,24 @@ static PanelButton ITE_OptionPanelButtons[] = {
 	{kPanelButtonOptionText,5,56, 109,17,	kTextSound,'-',0, 0,0,0},	// text: noise
 };
 
+static PanelButton ITE_OptionPanelButtons_ZH[] = {
+	{kPanelButtonOptionSlider,	284,19, 13,75,	0,'-',0,	0,0,0}, //slider-scroller
+	{kPanelButtonOption,	113,18, 45,17,	kTextReadingSpeed,'r',0,	0,0,0}, //read speed
+	{kPanelButtonOption,	113,37, 45,17,	kTextMusic,'m',0,	0,0,0}, //music
+	{kPanelButtonOption,	113,56, 45,17,	kTextSound,'n',0,	0,0,0}, //sound-noise
+	{kPanelButtonOption,	13,79, 135,17,	kTextQuitGame,'q',0,	0,0,0}, //quit
+	{kPanelButtonOption,	13,98, 135,17,	kTextContinuePlaying,'c',0,	0,0,0}, //continue
+	{kPanelButtonOption,	164,98, 57,17,	kTextLoad,'l',0,	0,0,0}, //load
+	{kPanelButtonOption,	241,98, 57,17,	kTextSave,'s',0,	0,0,0},	//save
+	{kPanelButtonOptionSaveFiles,	166,20, 112,74,	0,'-',0,	0,0,0},	//savefiles
+
+	{kPanelButtonOptionText,-1,4, 0,0,	kTextGameOptions,'-',0,	0,0,0},	// text: game options
+	{kPanelButtonOptionText,2,18, 96,17,	kTextReadingSpeed,'-',0, 0,0,0},	// text: read speed
+	{kPanelButtonOptionText,2,18, 80,17,	kTextShowDialog,'-',0, 0,0,0},	// text: read speed
+	{kPanelButtonOptionText,2,37, 80,17,	kTextMusic,'-',0, 0,0,0},	// text: music
+	{kPanelButtonOptionText,2,56, 80,17,	kTextSound,'-',0, 0,0,0},	// text: noise
+};
+
 static PanelButton ITE_QuitPanelButtons[] = {
 	{kPanelButtonQuit, 11,17, 60,16, kTextQuit,'q',0, 0,0,0},
 	{kPanelButtonQuit, 121,17, 60,16, kTextCancel,'c',0, 0,0,0},
@@ -338,8 +356,8 @@ static const GameDisplayInfo ITE_DisplayInfo_ZH = {
 	8, 0,			// save file index
 	8,				// optionSaveFileVisible
 	8, 8,			// option panel offsets
-	ARRAYSIZE(ITE_OptionPanelButtons),
-	ITE_OptionPanelButtons,
+	ARRAYSIZE(ITE_OptionPanelButtons_ZH),
+	ITE_OptionPanelButtons_ZH,
 
 	64,54,			// quit panel offsets
 	192,38,			// quit panel width & height
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index a876a1a8a87..5d715678946 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -933,6 +933,9 @@ void Interface::drawPanelText(InterfacePanel *panel, PanelButton *panelButton) {
 	textPoint.x = rect.left;
 	textPoint.y = rect.top + (_vm->getPlatform() == Common::kPlatformPC98 ? 0 : 1);
 
+	if (_vm->getGameId() == GID_ITE && _vm->getLanguage() == Common::ZH_TWN)
+		textPoint.y -= 4;
+
 	_vm->_font->textDraw(textFont, text, textPoint,
 						_vm->KnownColor2ColorId(kKnownColorVerbText), _vm->KnownColor2ColorId(textShadowKnownColor), _vm->getPlatform() == Common::kPlatformPC98 ?  kFontOutline : kFontShadow);
 }
@@ -2366,6 +2369,11 @@ void Interface::drawPanelButtonText(InterfacePanel *panel, PanelButton *panelBut
 	point.x = panel->x + panelButton->xOffset + (panelButton->width / 2) - (textWidth / 2);
 	point.y = panel->y + panelButton->yOffset + (panelButton->height / 2) - (textHeight / 2);
 
+	if (_vm->getGameId() == GID_ITE && _vm->getLanguage() == Common::ZH_TWN) {
+		point.y -= 3;
+		point.x += 2;
+	}
+
 	if (panelButton == panel->currentButton) {
 		textColor = kKnownColorVerbTextActive;
 	} else {