[Scummvm-git-logs] scummvm master -> 0201155544ca969ce7ba1d8ae89e1aa9d6db7087

[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:
1f75b61242 KYRA: (EOB II/ZH) - add some translated strings
0201155544 SCUMM: (MI2) - fix assert triggering when pressing F5


Commit: 1f75b61242f80711bac394c955e6794aa99359fa
    https://github.com/scummvm/scummvm/commit/1f75b61242f80711bac394c955e6794aa99359fa
Author: athrxx (athrxx at scummvm.org)
Date: 2023-08-19T22:19:33+02:00

Commit Message:
KYRA: (EOB II/ZH) - add some translated strings

(thanks to kane159)

Changed paths:
    engines/kyra/resource/staticres_eob.cpp


diff --git a/engines/kyra/resource/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp
index 3f0c064126c..a64f41a21d3 100644
--- a/engines/kyra/resource/staticres_eob.cpp
+++ b/engines/kyra/resource/staticres_eob.cpp
@@ -1942,12 +1942,12 @@ void DarkMoonEngine::initStaticResource() {
 			"\x83""t""\x83""@""\x83""C""\x83\x8b\x82\xf0\x91""I""\x91\xf0",
 			"\r\r  ""\x82\xb5\x82\xce\x82\xe7\x82\xad\x82\xa8\x91\xd2\x82\xbf\x82\xad\x82\xbe\x82\xb3\x82\xa2\x81""E""\x81""E""\x81""E"
 		},
-		{// TODO: translate to Traditional Chinese
-			"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
-			" ""\xb9""C""\xc0\xb8""ID",
-			" It seems that you have already\r defeated Xanathar here. Do you\r wish to transfer the party that\r finished the game? If not, you\r will be able to select a save\r game from the save game dialog.",
-			"\xbf\xef\xbe\xdc\xa4""@""\xad\xd3\xa4\xe5\xa5\xf3",
-			"\r     ""\xbd\xd0\xb5y\xb5\xa5""..."
+		{// Thanks to kane159 for translating these strings to Traditional Chinese...
+			" \xb5""L""\xaa""k""\xa7\xe4\xa8\xec\xa5\xf4\xa6\xf3""EOB""\xa6""s""\xc0\xc9\xa4\xe5\xa5\xf3"". ""\xbd\xd0\xbd""T""\xab""O\r ""\xb1""z""\xb7""Q""\xc2\xe0\xb2\xbe\xaa\xba\xb6\xa4\xa5\xee\xa6""s""\xc0\xc9\xa9\xf1\xb8""m""\xa9\xf3"" ScummVM\r ""\xaa\xba\xa6""s""\xc0\xc9\xb8\xf4\xae""|. ""\xa6""p""\xaa""G""\xb1""z""\xa6\xb3\xbc\xc6\xad\xd3\xa6""s""\xc0\xc9\xb8\xf4\xae""|\r ""\xb1""z""\xbb\xdd\xad""n""\xab\xfe\xa8\xa9"" EOB ""\xa6""s""\xc0\xc9\xa4\xe5\xa5\xf3\xa8\xec\xb1""z""\xaa\xba""\r EOB II""\xa6""s""\xc0\xc9\xb8\xf4\xae""|. ""\xb1""z""\xad""n""\xa6""A""\xb8\xd5\xa4""@""\xa6\xb8\xb6\xdc""?",
+			" ""\xb9""C""\xc0\xb8"" ID",
+			"\r  ""\xac\xdd\xb0""_""\xa8\xd3\xb1""z""\xa4""w""\xb8""g""\xa5\xb4\xb3""q""\xa4""FXanathar. ""\xb1""z\r  ""\xb7""Q""\xad""n""\xc2\xe0\xb2\xbe\xa4""w""\xb3""q""\xc3\xf6\xaa\xba\xa6""s""\xc0\xc9\xb6\xdc""? ""\xad""Y""\xa4\xa3\xad""n,\r  ""\xb1""z""\xb1""N""\xa5""i""\xa5""H""\xb1""q""\xa6""s""\xc0\xc9\xaa\xba\xb9\xef\xb8\xdc\xa4\xa4\xbf\xef\xa8\xfa\xa4""@""\xad\xd3""\r  ""\xa6""s""\xc0\xc9"".",
+			"\xbf\xef\xbe\xdc\xa4\xe5\xa5\xf3",
+			"\r     ""\xbd\xd0\xb5""y""\xab\xe1""..."
 		}
 	};
 


Commit: 0201155544ca969ce7ba1d8ae89e1aa9d6db7087
    https://github.com/scummvm/scummvm/commit/0201155544ca969ce7ba1d8ae89e1aa9d6db7087
Author: athrxx (athrxx at scummvm.org)
Date: 2023-08-19T22:19:41+02:00

Commit Message:
SCUMM: (MI2) - fix assert triggering when pressing F5

This happens on screeens with an xstart offset (= a screen
that is wider than 320 pixels, after some scrolling) but only
when there is dialogue text on screen when pressing F5.
Can be tested right at the start on the bridge. Just right-
click the sign, then press F5...

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 5dc641b98c3..1bbf967fac7 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -1379,7 +1379,8 @@ void ScummEngine::saveSurfacesPreGUI() {
 					// Only draw non transparent pixels
 					if (_tempTextSurface[x + y * _screenWidth] != 0xFD) {
 						if (x < _virtscr[kMainVirtScreen].pitch && y < _virtscr[kMainVirtScreen].h)
-							_virtscr[kMainVirtScreen].setPixel(_virtscr[kMainVirtScreen].xstart + x, y, _tempTextSurface[x + y * _screenWidth]);
+							_virtscr[kMainVirtScreen].setPixel((_virtscr[kMainVirtScreen].xstart + x) % _virtscr[kMainVirtScreen].pitch,
+								y + (_virtscr[kMainVirtScreen].xstart + x) / _virtscr[kMainVirtScreen].pitch, _tempTextSurface[x + y * _screenWidth]);
 					}
 				}
 			}