SCI: putting SciGui::init into SciEngine, removing it from SciGui(32)

svn-id: r49854

6 files changed, 2 insertions, 18 deletions

diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index 7febbeba69..a450870079 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -86,9 +86,4 @@ SciGui::~SciGui() {
 	delete _coordAdjuster;
 }
 
-void SciGui::init(bool usesOldGfxFunctions) {
-	_ports->init(usesOldGfxFunctions, this, _paint16, _text16);
-	_paint16->init(_animate, _text16);
-}
-
 } // End of namespace Sci
diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h
index c3954286b3..26028e0cc5 100644
--- a/engines/sci/graphics/gui.h
+++ b/engines/sci/graphics/gui.h
@@ -49,8 +49,6 @@ public:
 	SciGui(EngineState *s, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor, GfxPorts *ports, AudioPlayer *audio);
 	virtual ~SciGui();
 
-	virtual void init(bool usesOldGfxFunctions);
-
 protected:
 	GfxCursor *_cursor;
 	EngineState *_s;
diff --git a/engines/sci/graphics/gui32.cpp b/engines/sci/graphics/gui32.cpp
index fb2da08ae5..c953ed7f70 100644
--- a/engines/sci/graphics/gui32.cpp
+++ b/engines/sci/graphics/gui32.cpp
@@ -66,9 +66,6 @@ SciGui32::~SciGui32() {
 	delete _coordAdjuster;
 }
 
-void SciGui32::init() {
-}
-
 void SciGui32::drawRobot(GuiResourceId robotId) {
 	Robot *test = new Robot(g_sci->getResMan(), _screen, robotId);
 	test->draw();
diff --git a/engines/sci/graphics/gui32.h b/engines/sci/graphics/gui32.h
index 2c73272566..2be37d0aaf 100644
--- a/engines/sci/graphics/gui32.h
+++ b/engines/sci/graphics/gui32.h
@@ -44,10 +44,6 @@ public:
 	SciGui32(SegManager *segMan, EventManager *event, GfxScreen *screen, GfxPalette *palette, GfxCache *cache, GfxCursor *cursor);
 	~SciGui32();
 
-	void init();
-
-	void textSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
-
 	void drawRobot(GuiResourceId robotId);
 
 protected:
diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index d230c1eb9f..b8d38910d1 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -54,11 +54,10 @@ GfxPorts::~GfxPorts() {
 	delete _menuPort;
 }
 
-void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16) {
+void GfxPorts::init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *text16) {
 	int16 offTop = 10;
 
 	_usesOldGfxFunctions = usesOldGfxFunctions;
-	_gui = gui;
 	_paint16 = paint16;
 	_text16 = text16;
 
diff --git a/engines/sci/graphics/ports.h b/engines/sci/graphics/ports.h
index c8ce6b3470..818f92f44f 100644
--- a/engines/sci/graphics/ports.h
+++ b/engines/sci/graphics/ports.h
@@ -45,7 +45,7 @@ public:
 	GfxPorts(SegManager *segMan, GfxScreen *screen);
 	~GfxPorts();
 
-	void init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16);
+	void init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *text16);
 
 	void kernelSetActive(uint16 portId);
 	Common::Rect kernelGetPicWindow(int16 &picTop, int16 &picLeft);
@@ -102,7 +102,6 @@ private:
 	typedef Common::List<Port *> PortList;
 
 	SegManager *_segMan;
-	SciGui *_gui;
 	GfxPaint16 *_paint16;
 	GfxScreen *_screen;
 	GfxText16 *_text16;