LOL: - started on the ingame menu code (death menu, load menu and main menu)

- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code

svn-id: r41557

1 files changed, 6 insertions, 3 deletions

diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index f83620c8f9..3989062506 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -114,7 +114,7 @@ struct MenuItem {
 	uint16 labelId;
 	int16 labelX, labelY;
 
-	uint16 unk1F;
+	uint16 keyCode;
 };
 
 struct Menu {
@@ -161,7 +161,7 @@ public:
 	virtual void initMenuLayout(Menu &menu);
 	void initMenu(Menu &menu);
 
-	void processHighlights(Menu &menu, int mouseX, int mouseY);
+	void processHighlights(Menu &menu);
 
 	// utilities for thumbnail creation
 	virtual void createScreenThumbnail(Graphics::Surface &dst) = 0;
@@ -176,6 +176,9 @@ protected:
 	bool _displaySubMenu;
 	bool _cancelSubMenu;
 
+	virtual void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2, Screen::FontId font=Screen::FID_8_FNT);
+	virtual int getMenuCenterStringX(const char *str, int x1, int x2);
+
 	Button::Callback _redrawShadedButtonFunctor;
 	Button::Callback _redrawButtonFunctor;
 
@@ -201,7 +204,7 @@ protected:
 	void redrawHighlight(const Menu &menu);
 
 	Common::Array<int> _saveSlots;
-	void updateSaveList();
+	void updateSaveList(bool excludeQuickSaves = false);
 	int getNextSavegameSlot();
 
 	uint32 _lastScreenUpdate;