[Scummvm-git-logs] scummvm master -> 39171a186f1a8bb5d60d1e249b6b3c61bcbe7a2a

[mgerhardy]

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:
5027ba67b2 TWINE: converted to bool
39171a186f TWINE: exit scenery view on showing text


Commit: 5027ba67b2f68c14841904492e5c44a500f31bc3
    https://github.com/scummvm/scummvm/commit/5027ba67b2f68c14841904492e5c44a500f31bc3
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-06-08T07:24:01+02:00

Commit Message:
TWINE: converted to bool

Changed paths:
    engines/twine/scene/scene.cpp


diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index d22747f51c..74d377fa49 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -665,7 +665,7 @@ void Scene::processActorZones(int32 actorIdx) {
 	int32 currentZ = actor->pos.z;
 
 	actor->zone = -1;
-	int32 tmpCellingGrid = 0;
+	bool tmpCellingGrid = false;
 
 	if (IS_HERO(actorIdx)) {
 		currentActorInZone = false;
@@ -704,7 +704,7 @@ void Scene::processActorZones(int32 actorIdx) {
 				break;
 			case ZoneType::kGrid:
 				if (currentlyFollowedActor == actorIdx) {
-					tmpCellingGrid = 1;
+					tmpCellingGrid = true;
 					if (_engine->_grid->useCellingGrid != zone->infoData.CeillingGrid.newGrid) {
 						if (zone->infoData.CeillingGrid.newGrid != -1) {
 							_engine->_grid->createGridMap();


Commit: 39171a186f1a8bb5d60d1e249b6b3c61bcbe7a2a
    https://github.com/scummvm/scummvm/commit/39171a186f1a8bb5d60d1e249b6b3c61bcbe7a2a
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-06-08T07:24:01+02:00

Commit Message:
TWINE: exit scenery view on showing text

Changed paths:
    engines/twine/scene/scene.cpp


diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 74d377fa49..2af8d2968c 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -726,6 +726,7 @@ void Scene::processActorZones(int32 actorIdx) {
 			case ZoneType::kText:
 				if (IS_HERO(actorIdx) && _engine->_movements->shouldTriggerZoneAction()) {
 					_engine->freezeTime();
+					_engine->exitSceneryView();
 					_engine->_text->setFontCrossColor(zone->infoData.DisplayText.textColor);
 					talkingActor = actorIdx;
 					_engine->_text->drawTextProgressive(zone->infoData.DisplayText.textIdx);