[Scummvm-cvs-logs] scummvm master -> cb4c6e547d07c8188c528312f1f0a1526d57813d
criezy
criezy at scummvm.org
Mon Apr 11 20:58:52 CEST 2016
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:
cb4c6e547d DRASCULA: Fix regression in subtitle display in Spanish version
Commit: cb4c6e547d07c8188c528312f1f0a1526d57813d
https://github.com/scummvm/scummvm/commit/cb4c6e547d07c8188c528312f1f0a1526d57813d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-04-11T19:58:29+01:00
Commit Message:
DRASCULA: Fix regression in subtitle display in Spanish version
This code was committed by mistake in the previous commit.
Changed paths:
engines/drascula/drascula.cpp
engines/drascula/graphics.cpp
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 6852bdf..b821e7d 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -365,13 +365,13 @@ Common::Error DrasculaEngine::run() {
for (i = 0; i < 25; i++)
memcpy(crosshairCursor + i * 40, tableSurface + 225 + (56 + i) * 320, 40);
- loadPic(97, extraSurface);
- //if (_lang == kSpanish)
- // loadPic(974, extraSurface);
+ if (_lang == kSpanish)
+ loadPic(974, tableSurface);
if (currentChapter != 2) {
loadPic(99, cursorSurface);
loadPic(99, backSurface);
+ loadPic(97, extraSurface);
}
memset(iconName, 0, sizeof(iconName));
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 8a20561..4ed949c 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -241,7 +241,7 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) {
} // for
copyRect(letterX, letterY, screenX, screenY,
- CHAR_WIDTH, CHAR_HEIGHT, _lang == kSpanish ? extraSurface : tableSurface, screenSurface);
+ CHAR_WIDTH, CHAR_HEIGHT, tableSurface, screenSurface);
screenX = screenX + CHAR_WIDTH;
if (screenX > 317) {
More information about the Scummvm-git-logs
mailing list