diff options
author | Paul Gilbert | 2015-07-13 19:38:14 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-07-13 19:38:14 -0400 |
commit | 03acc4ec275793e0f8256053801ecaad566bc74e (patch) | |
tree | 3804644f1197cacdb5be9bffcce2544b9bcc10ad | |
parent | 53388bf6e8274ce1bb4f53dd8c1bc29dc57447e8 (diff) | |
download | scummvm-rg350-03acc4ec275793e0f8256053801ecaad566bc74e.tar.gz scummvm-rg350-03acc4ec275793e0f8256053801ecaad566bc74e.tar.bz2 scummvm-rg350-03acc4ec275793e0f8256053801ecaad566bc74e.zip |
SHERLOCK: RT: Fix derived declaration of banishWindow
-rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index e6eebd8cf5..7d2b3cb649 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 76e72a0c24..05d6741396 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 |