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

[sev-]

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

Summary:
660b694b35 SAGA: More fixes to text positioning in options for ite-tw
d175d1d802 SAGA: Further fixes to ite-tw verb drawing


Commit: 660b694b357e1140bdf8648cc6100d5d43ba0ec6
    https://github.com/scummvm/scummvm/commit/660b694b357e1140bdf8648cc6100d5d43ba0ec6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-12T23:44:50+01:00

Commit Message:
SAGA: More fixes to text positioning in options 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 1876f2d4b8b..82e432169a0 100644
--- a/engines/saga/displayinfo.h
+++ b/engines/saga/displayinfo.h
@@ -217,7 +217,7 @@ static PanelButton ITE_OptionPanelButtons_ZH[] = {
 	{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,9,0, 165,17,	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
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 5d715678946..ce075bc799a 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -933,8 +933,10 @@ 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)
+	if (_vm->getGameId() == GID_ITE && _vm->getLanguage() == Common::ZH_TWN) {
 		textPoint.y -= 4;
+		textPoint.x -= 1;
+	}
 
 	_vm->_font->textDraw(textFont, text, textPoint,
 						_vm->KnownColor2ColorId(kKnownColorVerbText), _vm->KnownColor2ColorId(textShadowKnownColor), _vm->getPlatform() == Common::kPlatformPC98 ?  kFontOutline : kFontShadow);
@@ -2371,7 +2373,7 @@ void Interface::drawPanelButtonText(InterfacePanel *panel, PanelButton *panelBut
 
 	if (_vm->getGameId() == GID_ITE && _vm->getLanguage() == Common::ZH_TWN) {
 		point.y -= 3;
-		point.x += 2;
+		point.x += 1;
 	}
 
 	if (panelButton == panel->currentButton) {


Commit: d175d1d802e4781ae1e86ffaba0055994ac61a8e
    https://github.com/scummvm/scummvm/commit/d175d1d802e4781ae1e86ffaba0055994ac61a8e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-12T23:44:55+01:00

Commit Message:
SAGA: Further fixes to ite-tw verb drawing

Changed paths:
    engines/saga/displayinfo.h


diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h
index 82e432169a0..736c77bb1b9 100644
--- a/engines/saga/displayinfo.h
+++ b/engines/saga/displayinfo.h
@@ -157,14 +157,14 @@ static PanelButton ITE_MainPanelButtons[] = {
 };
 
 static PanelButton ITE_MainPanelButtons_ZH[] = {
-	{kPanelButtonVerb,		52,0,	36,14,	kVerbITEWalkTo,'w',0,	0,1,0},
-	{kPanelButtonVerb,		52,14,	36,14,	kVerbITELookAt,'l',0,	2,3,0},
-	{kPanelButtonVerb,		52,28,	36,14,	kVerbITEPickUp,'p',0,	4,5,0},
-	{kPanelButtonVerb,		88,0,	36,14,	kVerbITETalkTo,'t',0,	0,1,0},
-	{kPanelButtonVerb,		88,14,	36,14,	kVerbITEOpen,'o',0,	6,7,0},
-	{kPanelButtonVerb,		88,28,	36,14,	kVerbITEClose,'c',0,	8,9,0},
-	{kPanelButtonVerb,		124,0,	36,14,	kVerbITEUse,'u',0,		10,11,0},
-	{kPanelButtonVerb,		124,14,	36,14,	kVerbITEGive,'g',0,	12,13,0},
+	{kPanelButtonVerb,		53,0,	34,16,	kVerbITEWalkTo,'w',0,	0,1,0},
+	{kPanelButtonVerb,		53,17,	34,16,	kVerbITELookAt,'l',0,	2,3,0},
+	{kPanelButtonVerb,		53,34,	34,16,	kVerbITEPickUp,'p',0,	4,5,0},
+	{kPanelButtonVerb,		92,0,	34,16,	kVerbITETalkTo,'t',0,	0,1,0},
+	{kPanelButtonVerb,		92,17,	34,16,	kVerbITEOpen,'o',0,	6,7,0},
+	{kPanelButtonVerb,		92,34,	34,16,	kVerbITEClose,'c',0,	8,9,0},
+	{kPanelButtonVerb,		132,0,	34,16,	kVerbITEUse,'u',0,		10,11,0},
+	{kPanelButtonVerb,		132,17,	34,16,	kVerbITEGive,'g',0,	12,13,0},
 	{kPanelButtonArrow,		306,6,	8,5,	-1,'U',0,			0,4,2},
 	{kPanelButtonArrow,		306,41,	8,5,	1,'D',0,			1,5,3},
 
@@ -326,7 +326,7 @@ static const GameDisplayInfo ITE_DisplayInfo_ZH = {
 	0,				// status x offset
 	137,			// status y offset
 	320,			// status width
-	15,				// status height
+	14,				// status height
 	0,				// status text y offset
 	186,			// status text color
 	15,				// status BG color
@@ -341,7 +341,7 @@ static const GameDisplayInfo ITE_DisplayInfo_ZH = {
 	8, 9,			// inventory Up & Down button indexes
 	2, 4,			// inventory rows, columns
 
-	0, 152,			// main panel offsets
+	0, 153,			// main panel offsets
 	ARRAYSIZE(ITE_MainPanelButtons_ZH),
 	ITE_MainPanelButtons_ZH,