[Scummvm-git-logs] scummvm master -> 72016e4ae35d76942e16f052e07cf0428bde7ba1

[mgerhardy]

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

Summary:
d88f6a6737 TWINE: improved getNextHolomapLocation() in a way that the current location is ordered correctly
11fbed8535 TWINE: reset projection state when entering holomap
53b1463f01 TWINE: fixed translation for the custom in-game options
72016e4ae3 TWINE: fixed return to launcher


Commit: d88f6a6737f6580567db58b27cd6d8aa2a345434
    https://github.com/scummvm/scummvm/commit/d88f6a6737f6580567db58b27cd6d8aa2a345434
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-24T13:12:46+02:00

Commit Message:
TWINE: improved getNextHolomapLocation() in a way that the current location is ordered correctly

Changed paths:
    engines/twine/holomap.cpp


diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index 96fde7b3c6..a2e1d3b04a 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -429,11 +429,11 @@ int32 Holomap::getNextHolomapLocation(int32 currentLocation, int32 dir) const {
 		} else {
 			i %= NUM_LOCATIONS;
 		}
-		if (_engine->_gameState->_holomapFlags[i] & HOLOMAP_ACTIVE) {
+		if (i == _engine->_scene->_currentSceneIdx || (_engine->_gameState->_holomapFlags[i] & HOLOMAP_ACTIVE) != 0u) {
 			return i;
 		}
 	}
-	return _engine->_scene->_currentSceneIdx;
+	return -1;
 }
 
 void Holomap::renderLocations(int xRot, int yRot, int zRot, bool lower) {


Commit: 11fbed8535589e0feb9633035ebd954629becb70
    https://github.com/scummvm/scummvm/commit/11fbed8535589e0feb9633035ebd954629becb70
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-24T13:12:46+02:00

Commit Message:
TWINE: reset projection state when entering holomap

Changed paths:
    engines/twine/holomap.cpp


diff --git a/engines/twine/holomap.cpp b/engines/twine/holomap.cpp
index a2e1d3b04a..84b3184f0e 100644
--- a/engines/twine/holomap.cpp
+++ b/engines/twine/holomap.cpp
@@ -446,18 +446,17 @@ void Holomap::renderLocations(int xRot, int yRot, int zRot, bool lower) {
 			const IVec3 &destPos = _engine->_renderer->getBaseRotationPosition(0, 0, loc.angle.z + 1000);
 			const IVec3 &destPos2 = _engine->_renderer->getBaseRotationPosition(0, 0, 1500);
 			_engine->_renderer->setBaseRotation(xRot, yRot, zRot, true);
-			// TODO: this call doesn't make much sense. the computed result is not used.
 			_engine->_renderer->setBaseRotationPos(0, 0, distance(zDistanceHolomap));
 			const IVec3 &destPos3 = _engine->_renderer->getBaseRotationPosition(destPos);
 			const IVec3 &destPos4 = _engine->_renderer->getBaseRotationPosition(destPos2);
+			bool visible;
 			if (lower) {
-				if (destPos3.z > destPos4.z) {
-					continue;
-				}
+				visible = destPos4.z <= destPos3.z;
 			} else {
-				if (destPos4.z > destPos3.z) {
-					continue;
-				}
+				visible = destPos3.z <= destPos4.z;
+			}
+			if (!visible) {
+				continue;
 			}
 			uint8 flags = _engine->_gameState->_holomapFlags[locationIdx] & HOLOMAP_ARROW;
 			if (locationIdx == _engine->_scene->_currentSceneIdx) {
@@ -501,6 +500,7 @@ void Holomap::processHolomap() {
 	const int32 betaLightTmp = _engine->_scene->_betaLight;
 
 	_engine->exitSceneryView();
+	_engine->_gameState->initEngineProjections();
 
 	_engine->_screens->fadeToBlack(_engine->_screens->_paletteRGBA);
 	_engine->_sound->stopSamples();


Commit: 53b1463f01fdf9d7e9a8d6dd1c14214f037b53d9
    https://github.com/scummvm/scummvm/commit/53b1463f01fdf9d7e9a8d6dd1c14214f037b53d9
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-24T13:12:46+02:00

Commit Message:
TWINE: fixed translation for the custom in-game options

Changed paths:
    engines/twine/parser/text.cpp


diff --git a/engines/twine/parser/text.cpp b/engines/twine/parser/text.cpp
index 752f02c749..3a56ab93a1 100644
--- a/engines/twine/parser/text.cpp
+++ b/engines/twine/parser/text.cpp
@@ -31,10 +31,10 @@ namespace TwinE {
 
 void TextData::initCustomTexts(TextBankId textBankId) {
 	if (textBankId == TextBankId::Options_and_menus) {
-		add(textBankId, TextEntry{_sc("High resolution on", "Options menu"), -1, TextId::kCustomHighResOptionOn});
-		add(textBankId, TextEntry{_sc("High resolution off", "Options menu"), -1, TextId::kCustomHighResOptionOff});
-		add(textBankId, TextEntry{_sc("Wall collision on", "Options menu"), -1, TextId::kCustomWallCollisionOn});
-		add(textBankId, TextEntry{_sc("Wall collision off", "Options menu"), -1, TextId::kCustomWallCollisionOff});
+		add(textBankId, TextEntry{_c("High resolution on", "Options menu"), -1, TextId::kCustomHighResOptionOn});
+		add(textBankId, TextEntry{_c("High resolution off", "Options menu"), -1, TextId::kCustomHighResOptionOff});
+		add(textBankId, TextEntry{_c("Wall collision on", "Options menu"), -1, TextId::kCustomWallCollisionOn});
+		add(textBankId, TextEntry{_c("Wall collision off", "Options menu"), -1, TextId::kCustomWallCollisionOff});
 	}
 }
 


Commit: 72016e4ae35d76942e16f052e07cf0428bde7ba1
    https://github.com/scummvm/scummvm/commit/72016e4ae35d76942e16f052e07cf0428bde7ba1
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-24T13:12:46+02:00

Commit Message:
TWINE: fixed return to launcher

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index c5a6041c01..cc4cd9097b 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -269,13 +269,12 @@ Common::Error TwinEEngine::run() {
 			}
 		}
 	}
-	while (!shouldQuit()) {
+	bool quitGame = false;
+	while (!quitGame && !shouldQuit()) {
 		readKeys();
 		switch (_state) {
 		case EngineState::QuitGame: {
-			Common::Event event;
-			event.type = Common::EVENT_QUIT;
-			_system->getEventManager()->pushEvent(event);
+			quitGame = true;
 			break;
 		}
 		case EngineState::LoadedGame: