From 442fb847683aa789ae75dcf990040a13691293b6 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 30 May 2015 12:56:07 -0400 Subject: SHERLOCK: Make some of the scalpel user interface fields public --- engines/sherlock/scalpel/scalpel_user_interface.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h index 262cd291ed..dbc3945582 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.h +++ b/engines/sherlock/scalpel/scalpel_user_interface.h @@ -44,12 +44,9 @@ extern const char *const PRESS_KEY_TO_CONTINUE; class Settings; class ScalpelUserInterface: public UserInterface { - friend class Sherlock::Inventory; friend class Settings; friend class Talk; private: - ImageFile *_controlPanel; - ImageFile *_controls; char _keyPress; int _lookHelp; int _bgFound, _oldBgFound; @@ -63,7 +60,6 @@ private: Common::String _cAnimStr; Common::String _descStr; int _find; - int _oldUse; private: /** * Draws the image for a user interface button in the down/pressed state. @@ -158,6 +154,10 @@ private: * Print the previously selected object's decription */ void printObjectDesc(const Common::String &str, bool firstTime); +public: + ImageFile *_controlPanel; + ImageFile *_controls; + int _oldUse; public: ScalpelUserInterface(SherlockEngine *vm); virtual ~ScalpelUserInterface(); -- cgit v1.2.3