[Scummvm-git-logs] scummvm master -> a13e046e984d030386b03777ea525afb01281dce

[eriktorbjorn]

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:
a13e046e98 SHERLOCK: Cleanup


Commit: a13e046e984d030386b03777ea525afb01281dce
    https://github.com/scummvm/scummvm/commit/a13e046e984d030386b03777ea525afb01281dce
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-10T12:32:29+01:00

Commit Message:
SHERLOCK: Cleanup

The parameter to banishWindow() is true by default.

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp
    engines/sherlock/talk.cpp


diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index e6e2ac8c95..e478f97d53 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -841,7 +841,7 @@ void ScalpelUserInterface::doEnvControl() {
 				if (saves.promptForDescription(_selector)) {
 					saves.saveGame(_selector, saves._savegames[_selector]);
 
-					banishWindow(1);
+					banishWindow();
 					_windowBounds.top = CONTROLS_Y1;
 					_key = _oldKey = -1;
 					_keyPress = '\0';
@@ -995,7 +995,7 @@ void ScalpelUserInterface::doEnvControl() {
 				return;
 			} else {
 				screen.buttonPrint(Common::Point(184, CONTROLS_Y), COMMAND_HIGHLIGHTED, true, saves._fixedTextQuitGameNo);
-				banishWindow(1);
+				banishWindow();
 				_windowBounds.top = CONTROLS_Y1;
 				_key = -1;
 			}
@@ -1276,7 +1276,7 @@ void ScalpelUserInterface::doLookControl() {
 				Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]);
 				offsetButton3DO(pt, 0);
 				screen._backBuffer2.SHblitFrom((*_controls)[0], pt);
-				banishWindow(true);
+				banishWindow();
 
 				_windowBounds.top = CONTROLS_Y1;
 				_key = _oldKey = _hotkeyLook;
@@ -1288,7 +1288,7 @@ void ScalpelUserInterface::doLookControl() {
 				drawInterface();
 			} else {
 				events.setCursor(ARROW);
-				banishWindow(true);
+				banishWindow();
 				_windowBounds.top = CONTROLS_Y1;
 				_key = _oldKey = -1;
 				_temp = _oldTemp = 0;
@@ -1303,7 +1303,7 @@ void ScalpelUserInterface::doLookControl() {
 				Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 			inv.drawInventory(INVENTORY_DONT_DISPLAY);
-			banishWindow(true);
+			banishWindow();
 
 			// Restore the ui
 			screen._backBuffer2.SHblitFrom(tempSurface, Common::Point(0, CONTROLS_Y1));
@@ -1930,7 +1930,7 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
 					Common::Rect(pt.x, pt.y, pt.x + tempSurface.width(), pt.y + tempSurface.height()));
 				screen._backBuffer2.SHtransBlitFrom((*_controls)[0], pt);
 
-				banishWindow(1);
+				banishWindow();
 				events.setCursor(MAGNIFY);
 				_windowBounds.top = CONTROLS_Y1;
 				_key = _oldKey = _hotkeyLook;
@@ -1941,7 +1941,7 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
 				screen._backBuffer2.SHblitFrom(tempSurface, pt);
 			} else {
 				events.setCursor(ARROW);
-				banishWindow(true);
+				banishWindow();
 				_windowBounds.top = CONTROLS_Y1;
 				_key = _oldKey = -1;
 				_temp = _oldTemp = 0;
@@ -1957,7 +1957,7 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
 			inv.loadInv();
 			inv.putInv(SLAM_SECONDARY_BUFFER);
 			inv.freeInv();
-			banishWindow(1);
+			banishWindow();
 
 			_windowBounds.top = CONTROLS_Y1;
 			_key = _oldKey = _hotkeyInventory;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7809318b57..5f5227726d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -275,13 +275,13 @@ void Talk::talkTo(const Common::String filename) {
 			break;
 
 		case FILES_MODE:
-			ui.banishWindow(true);
+			ui.banishWindow();
 			ui._windowBounds.top = CONTROLS_Y1;
 			abortFlag = true;
 			break;
 
 		case SETUP_MODE:
-			ui.banishWindow(true);
+			ui.banishWindow();
 			ui._windowBounds.top = CONTROLS_Y1;
 			ui._temp = ui._oldTemp = ui._lookHelp = ui._invLookFlag = false;
 			ui._menuMode = STD_MODE;