[Scummvm-cvs-logs] scummvm master -> 03acc4ec275793e0f8256053801ecaad566bc74e

[dreammaster]

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:
03acc4ec27 SHERLOCK: RT: Fix derived declaration of banishWindow


Commit: 03acc4ec275793e0f8256053801ecaad566bc74e
    https://github.com/scummvm/scummvm/commit/03acc4ec275793e0f8256053801ecaad566bc74e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-13T19:38:14-04:00

Commit Message:
SHERLOCK: RT: Fix derived declaration of banishWindow

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp
    engines/sherlock/tattoo/tattoo_user_interface.h



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index e6eebd8..7d2b3cb 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -841,7 +841,7 @@ void TattooUserInterface::drawDialogRect(Surface &s, const Common::Rect &r, bool
 	}
 }
 
-void TattooUserInterface::banishWindow() {
+void TattooUserInterface::banishWindow(bool slideUp) {
 	if (_widget != nullptr)
 		_widget->banishWindow();
 	_widget = nullptr;
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index 76e72a0..05d6741 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -219,8 +219,10 @@ public:
 
 	/**
 	 * Banish any active window
+	 * @remarks		Tattoo doesn't use sliding windows, but the parameter is in the base
+	 * UserInterface class as a convenience for Scalpel UI code
 	 */
-	virtual void banishWindow();
+	virtual void banishWindow(bool slideUp = true);
 };
 
 } // End of namespace Tattoo