removed old GUI code

svn-id: r5271

3 files changed, 4 insertions, 46 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index cd37ae83ee..62022077b9 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -22,7 +22,6 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
-#include "gui/gui.h"
 #include "gui/newgui.h"
 #include "resource.h"
 #include "util.h"
@@ -168,7 +167,7 @@ void Scumm::drawDirtyScreenParts()
 	}
 
 	/* Handle shaking */
-	if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
+	if (_shakeEnabled && !_newgui->isActive()) {
 		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
 		_system->set_shake_pos(shake_positions[_shakeFrame]);
 	} else if (!_shakeEnabled &&_shakeFrame != 0) {
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 18d04b4ac5..1db38a5bc9 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -28,7 +28,6 @@
 #include "common/file.h"
 
 class GameDetector;
-class Gui;
 class NewGui;
 class Dialog;
 class Scumm;
@@ -395,7 +394,6 @@ public:
 
 
 	// GUI
-	Gui *_gui;
 	NewGui *_newgui;
 
 	Dialog *_pauseDialog;
@@ -1351,7 +1349,6 @@ public:
 
 	void go();
 
-	void setupGUIColors();
 	byte getDefaultGUIColor(int color);
 	void waitForTimer(int msec_delay);
 
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 9ab814888f..8006db19da 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -31,7 +31,6 @@
 #include "debug.h"
 #include "dialogs.h"
 #include "gameDetector.h"
-#include "gui/gui.h"
 #include "gui/newgui.h"
 #include "gui/message.h"
 #include "object.h"
@@ -101,9 +100,6 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
 		_realHeight = 200;
 	}
 
-	_gui = new Gui();
-	_gui->init(this);
-	
 	_newgui = g_gui;
 	_bundle = new Bundle();
 	_sound = new Sound(this);
@@ -177,8 +173,6 @@ Scumm::~Scumm ()
 	if (_saveLoadDialog)
 		delete _saveLoadDialog;
 
-	delete _gui;
-
 	delete _bundle;
 	delete _sound;
 	if (_imuse)
@@ -935,13 +929,11 @@ int Scumm::checkKeyHit()
 
 void Scumm::pauseGame(bool user)
 {
-	//_gui->pause();
 	pauseDialog();
 }
 
 void Scumm::setOptions()
 {
-	_gui->options();
 	//_newgui->optionsDialog();
 }
 
@@ -964,18 +956,7 @@ void Scumm::runDialog(Dialog *dialog)
 void Scumm::pauseDialog()
 {
 	if (!_pauseDialog) {
-#if 0
-	// HACK HACK
-		const char *message = "This demonstrates MessageDialog's abilities.\n"
-						      "For example it supports multi line text.\n"
-						      "\n"
-						      "Well, not much more right now, really :-)\n"
-						      "And there are still some bugs in it, too\n";
-						      	// <- FIXME: This is needed due to a bug...
-		_pauseDialog = new MessageDialog(_newgui, message);
-#else
 		_pauseDialog = new PauseDialog(_newgui, this);
-#endif
 	}
 
 	runDialog(_pauseDialog);
@@ -1065,7 +1046,6 @@ void Scumm::processKbd()
 		if (_features & GF_AFTER_V7)
 			runScript(_vars[VAR_UNK_SCRIPT], 0, 0, 0);
 
-		//_gui->saveLoadDialog();	// FIXME: Old Gui
 		saveloadDialog();		// Display NewGui
 
 		if (_features & GF_AFTER_V7)
@@ -1487,14 +1467,9 @@ void Scumm::mainRun()
 		new_time = _system->get_msecs();
 		waitForTimer(delta * 15 + last_time - new_time);
 		last_time = _system->get_msecs();
-		if (_gui->isActive()) {
-			_gui->loop();
-			delta = 5;
-		} else {
-			delta = scummLoop(delta);
-			if (delta < 1)	// Ensure we don't get into a loop
-				delta = 1;  // by not decreasing sleepers.
-		}
+		delta = scummLoop(delta);
+		if (delta < 1)	// Ensure we don't get into a loop
+			delta = 1;  // by not decreasing sleepers.
 	}
 }
 
@@ -1562,7 +1537,6 @@ void Scumm::launch()
 
 void Scumm::go() {
 	launch();
-	setupGUIColors();
 	mainRun();
 }
 
@@ -1581,18 +1555,6 @@ byte Scumm::getDefaultGUIColor(int color)
 	}
 }
 
-void Scumm::setupGUIColors() {
-
-	/* FIXME: strange IF line? */
-	if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) {
-		_gui->_bgcolor = getDefaultGUIColor(0);
-		_gui->_color = getDefaultGUIColor(1);
-		_gui->_textcolor = getDefaultGUIColor(2);
-		_gui->_textcolorhi = getDefaultGUIColor(6);
-		_gui->_shadowcolor = getDefaultGUIColor(8);
-	}
-}
-
 bool Scumm::checkFixedDisk() {
 	return true;
 }