[Scummvm-git-logs] scummvm master -> 8fe4fac0668bf4f721d7e6f0d3082862bcdcd97a

[sev-]

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:
8fe4fac066 BURIED: Fix several copy/paste errors from the original sources


Commit: 8fe4fac0668bf4f721d7e6f0d3082862bcdcd97a
    https://github.com/scummvm/scummvm/commit/8fe4fac0668bf4f721d7e6f0d3082862bcdcd97a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-25T13:49:53+01:00

Commit Message:
BURIED: Fix several copy/paste errors from the original sources

Changed paths:
    engines/buried/environ/mayan.cpp
    engines/buried/environ/scene_common.cpp
    engines/buried/navarrow.cpp


diff --git a/engines/buried/environ/mayan.cpp b/engines/buried/environ/mayan.cpp
index 98422b3078..4016c618a2 100644
--- a/engines/buried/environ/mayan.cpp
+++ b/engines/buried/environ/mayan.cpp
@@ -1036,8 +1036,7 @@ int WaterGodBridgeJump::preExitRoom(Window *viewWindow, const Location &newLocat
 
 int WaterGodBridgeJump::postExitRoom(Window *viewWindow, const Location &newLocation) {
 	if (newLocation.facing == _staticData.location.facing && newLocation.timeZone == _staticData.location.timeZone &&
-			newLocation.facing == _staticData.location.facing && newLocation.timeZone == _staticData.location.timeZone &&
-			newLocation.facing == _staticData.location.facing && newLocation.timeZone == _staticData.location.timeZone) {
+			newLocation.environment == _staticData.location.environment) {
 		if (_jumpMidCycle) {
 			int diff = (_finalFrameIndex - _playingStartingFrame) % (_framesPerCycle * 2);
 			int diffB = (_finalFrameIndex - _playingStartingFrame - _framesPerCycle) % _framesPerCycle;
diff --git a/engines/buried/environ/scene_common.cpp b/engines/buried/environ/scene_common.cpp
index 230754c03e..8ebc31c83f 100644
--- a/engines/buried/environ/scene_common.cpp
+++ b/engines/buried/environ/scene_common.cpp
@@ -80,7 +80,7 @@ int BasicDoor::mouseUp(Window *viewWindow, const Common::Point &pointLocation) {
 			_vm->_sound->playSoundEffect(_vm->getFilePath(_staticData.location.timeZone, _staticData.location.environment, _openingSoundID));
 
 		if (_clickable.contains(pointLocation))
-			((SceneViewWindow *)viewWindow)->moveToDestination(_destData);		
+			((SceneViewWindow *)viewWindow)->moveToDestination(_destData);
 	}
 
 	return SC_TRUE;
@@ -566,7 +566,7 @@ int InteractiveNewsNetwork::mouseUp(Window *viewWindow, const Common::Point &poi
 				}
 
 				// If we are in Agent 3's lair, and we clicked on the symbiotry talks, change the destination
-				if (_staticData.location.timeZone == 3 && _currentMovieFrame == 8 && _currentMovieFrame == 8 && oldMovieFrame != 7) {
+				if (_staticData.location.timeZone == 3 && _currentMovieFrame == 8 && oldMovieFrame != 7) {
 					_currentMovieFrame = 7;
 					((SceneViewWindow *)viewWindow)->getGlobalFlags().scoreResearchINNUpdate = 1;
 				}
@@ -642,7 +642,7 @@ int InteractiveNewsNetwork::mouseUp(Window *viewWindow, const Common::Point &poi
 					((SceneViewWindow *)viewWindow)->getGlobalFlags().scoreResearchINNLouvreReport = 1;
 					break;
 				}
-	
+
 				return SC_TRUE;
 			}
 		}
@@ -894,7 +894,7 @@ int ClickPlayVideoSwitch::specifyCursor(Window *viewWindow, const Common::Point
 ClickPlayVideo::ClickPlayVideo(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
 		int animID, int cursorID, int left, int top, int right, int bottom)
 		: SceneBase(vm, viewWindow, sceneStaticData, priorLocation) {
-	
+
 	_cursorID = cursorID;
 	_animID = animID;
 	_clickRegion = Common::Rect(left, top, right, bottom);
diff --git a/engines/buried/navarrow.cpp b/engines/buried/navarrow.cpp
index b7d8e59914..09f3e1a7c4 100644
--- a/engines/buried/navarrow.cpp
+++ b/engines/buried/navarrow.cpp
@@ -156,10 +156,10 @@ void NavArrowWindow::onLButtonDown(const Common::Point &point, uint flags) {
 
 				if (_vm->_gfx->checkPointAgainstMaskedBitmap(centerArrow, 39, 49, point, 255, 255, 255)) {
 					if (_arrowStatus[4] == BUTTON_ENABLED)
-						((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(4);
+						retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(4);
 				} else {
 					if (_arrowStatus[2] == BUTTON_ENABLED)
-						((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(2);
+						retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(2);
 				}
 
 				centerArrow->free();
@@ -171,10 +171,10 @@ void NavArrowWindow::onLButtonDown(const Common::Point &point, uint flags) {
 
 				if (_vm->_gfx->checkPointAgainstMaskedBitmap(centerArrow, 39, 49, point, 255, 255, 255)) {
 					if (_arrowStatus[4] == BUTTON_ENABLED)
-						((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(4);
+						retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(4);
 				} else {
 					if (_arrowStatus[3] == BUTTON_ENABLED)
-						((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(3);
+						retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(3);
 				}
 
 				centerArrow->free();
@@ -183,16 +183,16 @@ void NavArrowWindow::onLButtonDown(const Common::Point &point, uint flags) {
 		}
 	} else {
 		if (upButton.contains(point) && _arrowStatus[0] == BUTTON_ENABLED)
-			((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(0);
+			retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(0);
 
 		if (leftButton.contains(point) && _arrowStatus[1] == BUTTON_ENABLED)
-			((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(1);
+			retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(1);
 
 		if (rightButton.contains(point) && _arrowStatus[2] == BUTTON_ENABLED)
-			((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(2);
+			retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(2);
 
 		if (downButton.contains(point) && _arrowStatus[3] == BUTTON_ENABLED)
-			((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(3);
+			retVal = ((GameUIWindow *)_parent)->_sceneViewWindow->moveInDirection(3);
 	}
 
 	if (retVal) {