From 8cec2ba8f9bc9c213d45d890ff3a19532206fe24 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Sat, 10 Feb 2018 12:26:50 -0600
Subject: SCI: Remove unnecessary two-phase GfxCursor initialisation

---
 engines/sci/graphics/cursor.cpp | 13 ++-----------
 engines/sci/graphics/cursor.h   |  4 +---
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'engines/sci/graphics')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 9c26d816a1..56177db9f3 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -40,8 +40,8 @@
 
 namespace Sci {
 
-GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen)
-	: _resMan(resMan), _palette(palette), _screen(screen) {
+GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen, GfxCoordAdjuster16 *coordAdjuster, EventManager *eventMan)
+	: _resMan(resMan), _palette(palette), _screen(screen), _coordAdjuster(coordAdjuster), _event(eventMan) {
 
 	_upscaledHires = _screen->getUpscaledHires();
 	_isVisible = true;
@@ -68,10 +68,6 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
 		_useSilverSQ4CDCursors = ConfMan.getBool("silver_cursors");
 	else
 		_useSilverSQ4CDCursors = false;
-
-	// _coordAdjuster and _event will be initialized later on
-	_coordAdjuster = NULL;
-	_event = NULL;
 }
 
 GfxCursor::~GfxCursor() {
@@ -79,11 +75,6 @@ GfxCursor::~GfxCursor() {
 	kernelClearZoomZone();
 }
 
-void GfxCursor::init(GfxCoordAdjuster16 *coordAdjuster, EventManager *event) {
-	_coordAdjuster = coordAdjuster;
-	_event = event;
-}
-
 void GfxCursor::kernelShow() {
 	CursorMan.showMouse(true);
 	_isVisible = true;
diff --git a/engines/sci/graphics/cursor.h b/engines/sci/graphics/cursor.h
index 8d9ce7c0ab..99ed5b49e1 100644
--- a/engines/sci/graphics/cursor.h
+++ b/engines/sci/graphics/cursor.h
@@ -54,11 +54,9 @@ struct SciCursorSetPositionWorkarounds {
 
 class GfxCursor {
 public:
-	GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen);
+	GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *screen, GfxCoordAdjuster16 *coordAdjuster, EventManager *eventMan);
 	~GfxCursor();
 
-	void init(GfxCoordAdjuster16 *coordAdjuster, EventManager *event);
-
 	void kernelShow();
 	void kernelHide();
 	bool isVisible();
-- 
cgit v1.2.3