6 files changed, 6 insertions, 18 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index a2c94b5878..19022e8b64 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1121,8 +1121,8 @@ bool Console::cmdUndither(int argc, const char **argv) {
 	}
 
 	bool flag = atoi(argv[1]) ? true : false;
-
-	return _engine->_gamestate->_gui->debugUndither(flag);
+	_engine->_gamestate->_gfxScreen->debugUnditherSetState(flag);
+	return false;
 }
 
 bool Console::cmdPicVisualize(int argc, const char **argv) {
@@ -1421,7 +1421,7 @@ bool Console::cmdShowMap(int argc, const char **argv) {
 	case 1:
 	case 2:
 	case 3:
-		return _engine->_gamestate->_gui->debugShowMap(map);
+		_engine->_gamestate->_gfxScreen->debugShowMap(map);
 		break;
 
 	default:
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp
index 741b5d7e82..785dd32392 100644
--- a/engines/sci/graphics/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -439,16 +439,6 @@ void SciGui::portraitShow(Common::String resourceName, Common::Point position, u
 void SciGui::portraitUnload(uint16 portraitId) {
 }
 
-bool SciGui::debugUndither(bool flag) {
-	_screen->unditherSetState(flag);
-	return false;
-}
-
-bool SciGui::debugShowMap(int mapNo) {
-	_screen->debugShowMap(mapNo);
-	return false;
-}
-
 bool SciGui::debugEGAdrawingVisualize(bool state) {
 	_paint16->setEGAdrawingVisualize(state);
 	return false;
diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h
index 569cc323e3..2bf7b8a92e 100644
--- a/engines/sci/graphics/gui.h
+++ b/engines/sci/graphics/gui.h
@@ -95,8 +95,6 @@ public:
 	virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
 	virtual void portraitUnload(uint16 portraitId);
 
-	virtual bool debugUndither(bool flag);
-	virtual bool debugShowMap(int mapNo);
 	virtual bool debugEGAdrawingVisualize(bool state);
 
 	// FIXME: Don't store EngineState
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 207c459687..211d91d67e 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -484,7 +484,7 @@ void GfxScreen::dither(bool addToFlag) {
 	}
 }
 
-void GfxScreen::unditherSetState(bool flag) {
+void GfxScreen::debugUnditherSetState(bool flag) {
 	_unditherState = flag;
 }
 
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 55fd0b4828..f5e64986ea 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -92,7 +92,7 @@ public:
 	void scale2x(byte *src, byte *dst, int16 srcWidth, int16 srcHeight);
 
 	void dither(bool addToFlag);
-	void unditherSetState(bool flag);
+	void debugUnditherSetState(bool flag);
 	int16 *unditherGetMemorial();
 
 	void debugShowMap(int mapNo);
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 3b6d0f8230..21b265f03d 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -221,7 +221,7 @@ Common::Error SciEngine::run() {
 
 	_gamestate->_soundCmd = new SoundCommandParser(_resMan, segMan, _kernel, _audio, soundVersion);
 
-	screen->unditherSetState(ConfMan.getBool("undither"));
+	screen->debugUnditherSetState(ConfMan.getBool("undither"));
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	if (game_init_sound(_gamestate, 0, soundVersion)) {