[Scummvm-git-logs] scummvm master -> 31e320f3b7daeecabbabadb785a6a2ef58107fd2

[athrxx]

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:
e7b836b03f KYRA: (EOB II/ZH) - move version string to the right
31e320f3b7 KYRA: (EOB II/ZH) - fix chargen modify menu glitch


Commit: e7b836b03f50adff54e5dc83b99fb24379eb6ff5
    https://github.com/scummvm/scummvm/commit/e7b836b03f50adff54e5dc83b99fb24379eb6ff5
Author: athrxx (athrxx at scummvm.org)
Date: 2023-08-13T03:02:06+02:00

Commit Message:
KYRA: (EOB II/ZH) - move version string to the right

(the  Chinese version has a  version string of its own hard
coded onto the bitmap. We have to move our scummvm
version string  a bit to the right to avoid printing over the
other text.

Changed paths:
    engines/kyra/sequence/sequences_darkmoon.cpp


diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
index f904372784d..8b38c104b55 100644
--- a/engines/kyra/sequence/sequences_darkmoon.cpp
+++ b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -163,7 +163,7 @@ int DarkMoonEngine::mainMenu() {
 			of = _screen->setFont(Screen::FID_6_FNT);
 			op = _screen->setCurPage(2);
 			Common::String versionString = "ScummVM " + _versionString;
-			_screen->printText(versionString.c_str(), 267 - versionString.size() * 6, _flags.platform == Common::kPlatformFMTowns ? 152 : 160, _flags.platform == Common::kPlatformAmiga ? 18 : 13, 0);
+			_screen->printText(versionString.c_str(), (_flags.lang == Common::ZH_TWN ? 306 : 267) - versionString.size() * 6, _flags.platform == Common::kPlatformFMTowns ? 152 : 160, _flags.platform == Common::kPlatformAmiga ? 18 : 13, _flags.lang == Common::ZH_TWN ? 231 : 0);
 			_screen->setFont(of);
 			_screen->_curPage = op;
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);


Commit: 31e320f3b7daeecabbabadb785a6a2ef58107fd2
    https://github.com/scummvm/scummvm/commit/31e320f3b7daeecabbabadb785a6a2ef58107fd2
Author: athrxx (athrxx at scummvm.org)
Date: 2023-08-13T03:02:11+02:00

Commit Message:
KYRA: (EOB II/ZH) - fix chargen modify menu glitch

Changed paths:
    engines/kyra/engine/chargen.cpp


diff --git a/engines/kyra/engine/chargen.cpp b/engines/kyra/engine/chargen.cpp
index df91ad77080..ca8ee83ac97 100644
--- a/engines/kyra/engine/chargen.cpp
+++ b/engines/kyra/engine/chargen.cpp
@@ -1402,7 +1402,7 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 	} else if (_vm->game() == GI_EOB2 && _vm->gameFlags().lang == Common::Language::ZH_TWN) {
 		_screen->setFont(Screen::FID_8_FNT);
 		Common::String statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
-		_screen->copyRegion(b->x - 115, b->y - 63, b->x + 29, b->y + 1, index == 6 ? 20 : 40, 14, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(b->x - 115, b->y - 63, b->x + 29, b->y + 1, index == 6 ? 20 : 40, 13, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->printShadedText(statStr.c_str(), b->x + 29, b->y + 1, _vm->guiSettings()->colors.guiColorLightRed, 0, _vm->guiSettings()->colors.guiColorBlack);
 	} else {
 		Common::String statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
@@ -1506,7 +1506,7 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 			_screen->sega_getRenderer()->render(0, (b->x + 32) >> 3, b->y >> 3, 5, 1);
 		} else if (_vm->game() == GI_EOB2 && _vm->gameFlags().lang == Common::Language::ZH_TWN) {
 			Common::String statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
-			_screen->copyRegion(b->x - 115, b->y - 63, b->x + 29, b->y + 1, index == 6 ? 20 : 40, 14, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(b->x - 115, b->y - 63, b->x + 29, b->y + 1, index == 6 ? 20 : 40, 13, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->printShadedText(statStr.c_str(), b->x + 29, b->y + 1, _vm->guiSettings()->colors.guiColorLightRed, 0, _vm->guiSettings()->colors.guiColorBlack);
 
 			if (hpChanged) {
@@ -1863,13 +1863,13 @@ const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefsDOSChinese[] = {
 	{ 183,  64, 35, 15, 0x34 },
 	{ 144,  80, 35, 15, 0x22 },
 	{ 183,  80, 35, 15, 0x26 },
-	{ 145, 130, 43, 16, 0x00 },
-	{ 145, 146, 43, 16, 0x00 },
-	{ 145, 162, 43, 16, 0x00 },
-	{ 220, 130, 43, 16, 0x00 },
-	{ 220, 146, 43, 16, 0x00 },
-	{ 220, 162, 43, 16, 0x00 },
-	{ 190, 178, 43, 16, 0x00 },
+	{ 147, 130, 43, 16, 0x00 },
+	{ 147, 146, 43, 16, 0x00 },
+	{ 147, 162, 43, 16, 0x00 },
+	{ 219, 130, 43, 16, 0x00 },
+	{ 219, 146, 43, 16, 0x00 },
+	{ 219, 162, 43, 16, 0x00 },
+	{ 187, 178, 43, 16, 0x00 },
 	{ 144,  64, 17, 15, 0x0D },
 	{ 167,  64, 17, 15, 0x0C },
 	{ 190,  64, 35, 15, 0x19 },