[Scummvm-cvs-logs] scummvm master -> ed96e9482cc0b506002526832b9ffaa6627f26b5

[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:
ed96e9482c SHERLOCK: Make some of the scalpel user interface fields public


Commit: ed96e9482cc0b506002526832b9ffaa6627f26b5
    https://github.com/scummvm/scummvm/commit/ed96e9482cc0b506002526832b9ffaa6627f26b5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-05-30T12:56:07-04:00

Commit Message:
SHERLOCK: Make some of the scalpel user interface fields public

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.h



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index 262cd29..dbc3945 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.
@@ -159,6 +155,10 @@ private:
 	 */
 	void printObjectDesc(const Common::String &str, bool firstTime);
 public:
+	ImageFile *_controlPanel;
+        ImageFile *_controls;
+	int _oldUse;
+public:
 	ScalpelUserInterface(SherlockEngine *vm);
 	virtual ~ScalpelUserInterface();