From c8665d06bc59b695cb6c444b1e3c24104b69dec4 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 16 Jun 2011 18:51:47 +0200
Subject: KYRA: (EOB) - fix some warnings and add some menu code

---
 engines/kyra/eobcommon.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines/kyra/eobcommon.h')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 9ead3c2408..5e34dc3791 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -71,8 +71,8 @@ struct EobChargenButtonDef {
 };
 
 struct EobGuiButtonDef {
-	uint8 keyCode;
-	uint8 keyCode2;
+	uint16 keyCode;
+	uint16 keyCode2;
 	uint16 flags;
 	uint16 x;
 	uint8 y;
@@ -547,7 +547,7 @@ protected:
 	virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {}
 	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; }
 
-	void drawScene(int update);
+	void drawScene(int refresh);
 	void drawSceneShapes(int start = 0);
 	void drawDecorations(int index);
 
@@ -707,7 +707,7 @@ protected:
 	const uint8 *_inventorySlotsY;
 	const uint8 **_compassShapes;
 	uint8 _charExchangeSwap;
-	bool _hpBarGraphs;
+	bool _configHpBarGraphs;
 
 	// text
 	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...);
@@ -957,6 +957,10 @@ protected:
 	const uint8 *_magicFlightObjectProperties;
 
 	// Menu
+	char **_menuStringsPrefsTemp;
+
+	bool _configMouse;
+
 	const char *const *_menuStringsMain;
 	const char *const *_menuStringsSaveLoad;
 	const char *const *_menuStringsOnOff;
-- 
cgit v1.2.3