[Scummvm-git-logs] scummvm master -> 2704a81a9607b6fb305615d20ee6d60687f717b0

[bluegr]

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:
72b4c652f0 BURIED: Cleanup the biochip toggling code
2704a81a96 BURIED: Close the biochip view after saving - FR #13178


Commit: 72b4c652f00970a2c1ac0c5220a3b7d8f91df952
    https://github.com/scummvm/scummvm/commit/72b4c652f00970a2c1ac0c5220a3b7d8f91df952
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-29T19:16:09+02:00

Commit Message:
BURIED: Cleanup the biochip toggling code

Changed paths:
    engines/buried/biochip_right.cpp
    engines/buried/biochip_right.h


diff --git a/engines/buried/biochip_right.cpp b/engines/buried/biochip_right.cpp
index 45212bc0c20..c6c42dbf3f5 100644
--- a/engines/buried/biochip_right.cpp
+++ b/engines/buried/biochip_right.cpp
@@ -223,6 +223,18 @@ void BioChipRightWindow::onPaint() {
 	}
 }
 
+void BioChipRightWindow::toggleBioChip() {
+	if (_status == 0) {
+		_status = 1;
+		showBioChipMainView();
+		invalidateWindow(false);
+	} else {
+		_status = 0;
+		destroyBioChipViewWindow();
+		invalidateWindow(false);
+	}
+}
+
 void BioChipRightWindow::onEnable(bool enable) {
 	if (enable)
 		_vm->removeMouseMessages(this);
@@ -341,42 +353,14 @@ void BioChipRightWindow::onLButtonUp(const Common::Point &point, uint flags) {
 		}
 		break;
 	case kItemBioChipFiles:
-		if (upperButton.contains(point)) {
-			if (_status == 0) {
-				_status = 1;
-				showBioChipMainView();
-				invalidateWindow(false);
-			} else {
-				_status = 0;
-				destroyBioChipViewWindow();
-				invalidateWindow(false);
-			}
-		}
-		break;
 	case kItemBioChipInterface:
 		if (upperButton.contains(point)) {
-			if (_status == 0) {
-				_status = 1;
-				showBioChipMainView();
-				invalidateWindow(false);
-			} else {
-				_status = 0;
-				destroyBioChipViewWindow();
-				invalidateWindow(false);
-			}
+			toggleBioChip();
 		}
 		break;
 	case kItemBioChipJump:
 		if (upperButton.contains(point)) {
-			if (_status == 0) {
-				_status = 1;
-				showBioChipMainView();
-				invalidateWindow(false);
-			} else {
-				_status = 0;
-				destroyBioChipViewWindow();
-				invalidateWindow(false);
-			}
+			toggleBioChip();
 		} else if (lowerButton.contains(point)) {
 			Location currentLocation;
 			if (((GameUIWindow *)_parent)->_sceneViewWindow->getCurrentSceneLocation(currentLocation)) {
diff --git a/engines/buried/biochip_right.h b/engines/buried/biochip_right.h
index 8a7c44fbcdf..70e05a8597c 100644
--- a/engines/buried/biochip_right.h
+++ b/engines/buried/biochip_right.h
@@ -56,6 +56,7 @@ public:
 	void disableEvidenceCapture();
 	void jumpInitiated(bool redraw);
 	void jumpEnded(bool redraw);
+	void toggleBioChip();
 
 	void onPaint();
 	void onEnable(bool enable);


Commit: 2704a81a9607b6fb305615d20ee6d60687f717b0
    https://github.com/scummvm/scummvm/commit/2704a81a9607b6fb305615d20ee6d60687f717b0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-12-29T19:16:10+02:00

Commit Message:
BURIED: Close the biochip view after saving - FR #13178

This improves the player experience, as it's a bit tedious to close the
biochip menu every time after saving

Changed paths:
    engines/buried/biochip_view.cpp
    engines/buried/gameui.cpp


diff --git a/engines/buried/biochip_view.cpp b/engines/buried/biochip_view.cpp
index 1ffbb1ad673..f10050588a5 100644
--- a/engines/buried/biochip_view.cpp
+++ b/engines/buried/biochip_view.cpp
@@ -588,8 +588,10 @@ void InterfaceBioChipViewWindow::onLButtonDown(const Common::Point &point, uint
 void InterfaceBioChipViewWindow::onLButtonUp(const Common::Point &point, uint flags) {
 	switch (_curRegion) {
 	case REGION_SAVE:
-		if (!_vm->isDemo())
+		if (!_vm->isDemo()) {
 			_vm->runSaveDialog();
+			((GameUIWindow *)getParent()->getParent()->getParent())->_bioChipRightWindow->destroyBioChipViewWindow();
+		}
 		break;
 	case REGION_RESTORE:
 		if (!_vm->isDemo()) {
diff --git a/engines/buried/gameui.cpp b/engines/buried/gameui.cpp
index f77a8533988..7166875d1e5 100644
--- a/engines/buried/gameui.cpp
+++ b/engines/buried/gameui.cpp
@@ -307,9 +307,6 @@ void GameUIWindow::onKeyUp(const Common::KeyState &key, uint flags) {
 		break;
 	case Common::KEYCODE_s:
 		if ((key.flags & Common::KBD_CTRL) && _sceneViewWindow->getGlobalFlags().bcCloakingEnabled != 1) {
-			_bioChipRightWindow->changeCurrentBioChip(kItemBioChipInterface);
-			_bioChipRightWindow->invalidateWindow(false);
-			_bioChipRightWindow->sendMessage(new LButtonUpMessage(Common::Point(50, 130), 0));
 			_vm->runSaveDialog();
 		} else if (_sceneViewWindow)
 			_sceneViewWindow->sendMessage(new KeyUpMessage(key, flags));