From 7fec58a57d9c45f7b899f67042af57b54ca80252 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 28 Mar 2015 22:31:18 -0400
Subject: SHERLOCK: Beginnings of inventory display

---
 engines/sherlock/user_interface.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'engines/sherlock/user_interface.h')

diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index d94b2fadc5..87fd4a5e99 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -31,6 +31,9 @@
 
 namespace Sherlock {
 
+#define CONTROLS_Y  138
+#define CONTROLS_Y1 151
+
 enum MenuMode {
 	STD_MODE		=  0,
 	LOOK_MODE		=  1,
@@ -47,9 +50,16 @@ enum MenuMode {
 	SETUP_MODE		= 12
 };
 
+extern const int MENU_POINTS[12][4];
+
+extern const int INVENTORY_POINTS[8][3];
+extern const char INVENTORY_COMMANDS[9];
+
 class SherlockEngine;
+class Inventory;
 
 class UserInterface {
+	friend class Inventory;
 private:
 	SherlockEngine *_vm;
 	ImageFile *_controlPanel;
@@ -77,6 +87,7 @@ private:
 	int _windowStyle;
 	int _find;
 	Common::String _muse;
+	int _oldUse;
 private:
 	void depressButton(int num);
 
@@ -106,8 +117,6 @@ private:
 	void environment();
 	void doControls();
 
-	void makeButton(const Common::Rect &bounds, int textX, const Common::String &str);
-
 	void checkUseAction(UseType &use, const Common::String &invName, const Common::String &msg,
 		int objNum, int giveMode);
 public:
@@ -132,8 +141,9 @@ public:
 	void printObjectDesc(const Common::String &str, bool firstTime);
 	void printObjectDesc();
 
-	void summonWindow(const Surface &bgSurface);
-	void banishWindow(bool flag);
+	void summonWindow(const Surface &bgSurface, bool slideUp = true);
+	void summonWindow(bool slideUp = true, int height = CONTROLS_Y);
+	void banishWindow(bool slideUp = true);
 };
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3