From 95c1f3de15c1769e9403beb61aac70ade8e45ccb Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 4 Dec 2002 22:34:43 +0000
Subject: removed obsolete getDefaultGUIColor and some FIXMEs

svn-id: r5840
---
 scumm/scumm.h     |  1 -
 scumm/scummvm.cpp | 24 ------------------------
 2 files changed, 25 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scumm.h b/scumm/scumm.h
index cb85ab6edf..d4341959f0 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1316,7 +1316,6 @@ public:
 
 	void go();
 
-	byte getDefaultGUIColor(int color);
 	void waitForTimer(int msec_delay);
 
 	void updateCursor();
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index ae6f4d8e1c..359828168a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -98,10 +98,6 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
 	_dynamicRoomOffsets = 0;
 	_shakeEnabled = 0;
 
-	// FIXME: remove when new savegame system is implemented
-	_randSeed1 = 0xA943DE33;
-	_randSeed2 = 0x37A9ED29;
-
 	if (_gameId == GID_ZAK256) {	// FmTowns is 320x240
 		_realWidth = 320;
 		_realHeight = 240;
@@ -1149,11 +1145,6 @@ void Scumm::processKbd()
 		_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
 	} 
 
-	// FIXME: Preparing to remove
-//	else if (_lastKeyHit == 321) { // F7, display new GUI
-//		saveloadDialog();
-//	}
-			
 	_mouseButStat = _lastKeyHit;
 }
 
@@ -1597,18 +1588,3 @@ void Scumm::go() {
 	launch();
 	mainRun();
 }
-
-
-byte Scumm::getDefaultGUIColor(int color)
-{
-	/* FIXME: strange IF line? */
-	if ((_features & GF_AFTER_V7) || (_features & GF_SMALL_HEADER))
-		return 0;
-	if (_features & GF_AFTER_V6) {
-		if (color == 8)
-			color = 1;
-		return readArray(110, 0, color);
-	} else {
-		return getStringAddress(21)[color];
-	}
-}
-- 
cgit v1.2.3