SCI: SciGuiCursor class added, cleanup, OSystem removed from SciGui constructor

svn-id: r44730

1 files changed, 5 insertions, 9 deletions

diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index e84b199d16..4997d0ff03 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -32,18 +32,16 @@ namespace Sci {
 
 class SciGuiScreen;
 class SciGuiPalette;
+class SciGuiCursor;
 class SciGuiGfx;
 class SciGuiresources;
 class SciGuiWindowMgr;
 class SciGui {
 public:
-	SciGui(OSystem *system, EngineState *s, SciGuiScreen *screen, SciGuiPalette *palette);
+	SciGui(EngineState *s, SciGuiScreen *screen, SciGuiPalette *palette, SciGuiCursor *cursor);
 	SciGui();
 	virtual ~SciGui();
 
-	// FIXME: Don't store EngineState
-	virtual void resetEngineState(EngineState *s) { _s = s; }
-
 	virtual void init(bool usesOldGfxFunctions);
 
 	virtual void wait(int16 ticks);
@@ -86,16 +84,14 @@ public:
 	virtual void addToPicView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control);
 	virtual void setNowSeen(reg_t objectReference);
 
-	virtual void moveCursor(int16 x, int16 y, int16 scaleFactor = 1);
-	void moveCursor(Common::Point p, int16 scaleFactor = 1) { moveCursor(p.x, p.y, scaleFactor); }
-
-	SciGuiPalette *getPalette() { return _palette; }
+	virtual void setCursorPos(Common::Point pos);
+	virtual void moveCursor(Common::Point pos);
 
 private:
-	OSystem *_system;
 	EngineState *_s;
 	SciGuiScreen *_screen;
 	SciGuiPalette *_palette;
+	SciGuiCursor *_cursor;
 	SciGuiGfx *_gfx;
 	SciGuiresources *_resources;
 	SciGuiWindowMgr *_windowMgr;