[Scummvm-git-logs] scummvm master -> 5d75462967e6d7e172d4bc7db33d2dea4904a5ac

[criezy]

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

Summary:
6f5b13c0d1 SUPERNOVA: Fix typo in newspaper article English translation
1b92de6757 SUPERNOVA: Fix setting game speed with number keys in improved mode
5d75462967 SUPERNOVA: Fix telomat interaction in improved mode


Commit: 6f5b13c0d1368f2d8c2dfdb2ea0f217881189ba1
    https://github.com/scummvm/scummvm/commit/6f5b13c0d1368f2d8c2dfdb2ea0f217881189ba1
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2019-09-08T17:24:58+01:00

Commit Message:
SUPERNOVA: Fix typo in newspaper article English translation

Changed paths:
    devtools/create_supernova/img2-en.pbm
    devtools/create_supernova/img2-en.xcf


diff --git a/devtools/create_supernova/img2-en.pbm b/devtools/create_supernova/img2-en.pbm
index 01b9a69..02d5408 100644
Binary files a/devtools/create_supernova/img2-en.pbm and b/devtools/create_supernova/img2-en.pbm differ
diff --git a/devtools/create_supernova/img2-en.xcf b/devtools/create_supernova/img2-en.xcf
index b4ca6cd..7a136d9 100644
Binary files a/devtools/create_supernova/img2-en.xcf and b/devtools/create_supernova/img2-en.xcf differ


Commit: 1b92de67575530b54543e71e7832343c4b1a77da
    https://github.com/scummvm/scummvm/commit/1b92de67575530b54543e71e7832343c4b1a77da
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2019-09-08T17:24:58+01:00

Commit Message:
SUPERNOVA: Fix setting game speed with number keys in improved mode

Changed paths:
    engines/supernova/supernova.cpp


diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 8a72107..c79a6a2 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -357,6 +357,11 @@ void SupernovaEngine::setTextSpeed() {
 	int boxWidth = stringWidth > 110 ? stringWidth : 110;
 	int boxHeight = 27;
 
+	// Disable improved mode temporarilly so that Key 1-5 are received below
+	// instead of being mapped to action selection.
+	bool hasImprovedMode = _improved;
+	_improved = false;
+
 	_gm->animationOff();
 	_gm->saveTime();
 	saveScreen(boxX, boxY, boxWidth, boxHeight);
@@ -398,6 +403,8 @@ void SupernovaEngine::setTextSpeed() {
 	restoreScreen();
 	_gm->loadTime();
 	_gm->animationOn();
+
+	_improved = hasImprovedMode;
 }
 
 void SupernovaEngine::showHelpScreen1() {


Commit: 5d75462967e6d7e172d4bc7db33d2dea4904a5ac
    https://github.com/scummvm/scummvm/commit/5d75462967e6d7e172d4bc7db33d2dea4904a5ac
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2019-09-08T17:24:58+01:00

Commit Message:
SUPERNOVA: Fix telomat interaction in improved mode

Changed paths:
    engines/supernova/supernova1/state.cpp


diff --git a/engines/supernova/supernova1/state.cpp b/engines/supernova/supernova1/state.cpp
index 8130b2b..95e6a18 100644
--- a/engines/supernova/supernova1/state.cpp
+++ b/engines/supernova/supernova1/state.cpp
@@ -439,6 +439,7 @@ void GameManager1::telomat(int nr) {
 
 	static byte rows2[4] = {1, 1, 1, 1};
 
+	_guiEnabled = false;
 	_vm->renderBox(0, 0, 320, 200, kColorBlack);
 	_vm->renderText(kStringTelomat7, 100, 70, kColorGreen);
 	_vm->renderText(kStringTelomat8, 100, 81, kColorGreen);