[Scummvm-git-logs] scummvm master -> 0e7c8ce60ee3e7a10c1dc1773d5a53036676ac72

[sev-]

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:
827e7306cf BURIED: Fix missing jump suit research points (bug 12881)
0e7c8ce60e BURIED: Fix missing agent research score (bug 12881)


Commit: 827e7306cfa5e35663400d4ce4e6ec820e12fb2d
    https://github.com/scummvm/scummvm/commit/827e7306cfa5e35663400d4ce4e6ec820e12fb2d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-09-07T23:31:49+02:00

Commit Message:
BURIED: Fix missing jump suit research points (bug 12881)

The positions of the previous and next button had been mixed up. The
previous button is left of the next button, not the other way around.

This meant you could only be awarded points when pressing the previous
button, and since you would then step away from the page that awards
point that did not work.

Since the buttons worked in other respects, the id for the previous and
next pages must also have been similarly mixed up. This too should be
fixed now.

Changed paths:
    engines/buried/biochip_view.cpp


diff --git a/engines/buried/biochip_view.cpp b/engines/buried/biochip_view.cpp
index 70858d5774..c80d26cb4b 100644
--- a/engines/buried/biochip_view.cpp
+++ b/engines/buried/biochip_view.cpp
@@ -696,8 +696,8 @@ FilesBioChipViewWindow::FilesBioChipViewWindow(BuriedEngine *vm, Window *parent)
 		FilesPage page;
 		page.pageID = fbcStream->readSint16LE();
 		page.returnPageIndex = fbcStream->readSint16LE();
-		page.nextButtonPageIndex = fbcStream->readSint16LE();
 		page.prevButtonPageIndex = fbcStream->readSint16LE();
+		page.nextButtonPageIndex = fbcStream->readSint16LE();
 
 		for (int i = 0; i < 6; i++) {
 			page.hotspots[i].left = fbcStream->readSint16LE();
@@ -731,8 +731,8 @@ void FilesBioChipViewWindow::onLButtonUp(const Common::Point &point, uint flags)
 	const FilesPage &page = _navData[_curPage];
 
 	Common::Rect returnButton(343, 157, 427, 185);
-	Common::Rect next(193, 25, 241, 43);
-	Common::Rect previous(253, 25, 301, 43);
+	Common::Rect previous(193, 25, 241, 43);
+	Common::Rect next(253, 25, 301, 43);
 
 	if (page.returnPageIndex >= 0 && returnButton.contains(point)) {
 		_curPage = page.returnPageIndex;


Commit: 0e7c8ce60ee3e7a10c1dc1773d5a53036676ac72
    https://github.com/scummvm/scummvm/commit/0e7c8ce60ee3e7a10c1dc1773d5a53036676ac72
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-09-07T23:31:49+02:00

Commit Message:
BURIED: Fix missing agent research score (bug 12881)

The Agent 3 information and profile research points were awarded when
pressing the "next" button, so they were never awarded. Award them when
hitting a hotspot instead.

Changed paths:
    engines/buried/biochip_view.cpp


diff --git a/engines/buried/biochip_view.cpp b/engines/buried/biochip_view.cpp
index c80d26cb4b..a57dc72264 100644
--- a/engines/buried/biochip_view.cpp
+++ b/engines/buried/biochip_view.cpp
@@ -746,10 +746,6 @@ void FilesBioChipViewWindow::onLButtonUp(const Common::Point &point, uint flags)
 
 		if (_curPage == 6)
 			((SceneViewWindow *)(_parent->getParent()))->getGlobalFlags().scoreResearchBCJumpsuit = 1;
-		else if (_curPage == 21)
-			((SceneViewWindow *)(_parent->getParent()))->getGlobalFlags().scoreResearchMichelle = 1;
-		else if (_curPage == 31)
-			((SceneViewWindow *)(_parent->getParent()))->getGlobalFlags().scoreResearchMichelleBkg = 1;
 
 		return;
 	}
@@ -764,6 +760,12 @@ void FilesBioChipViewWindow::onLButtonUp(const Common::Point &point, uint flags)
 		if (page.hotspots[i].pageIndex >= 0 && Common::Rect(page.hotspots[i].left, page.hotspots[i].top, page.hotspots[i].right, page.hotspots[i].bottom).contains(point)) {
 			_curPage = page.hotspots[i].pageIndex;
 			invalidateWindow(false);
+
+			if (_curPage == 21)
+				((SceneViewWindow *)(_parent->getParent()))->getGlobalFlags().scoreResearchMichelle = 1;
+			else if (_curPage == 31)
+				((SceneViewWindow *)(_parent->getParent()))->getGlobalFlags().scoreResearchMichelleBkg = 1;
+
 			return;
 		}
 	}