[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.71,1.72 scummvm.cpp,1.89,1.90

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5641

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
removed obsolete getDefaultGUIColor and some FIXMEs

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- scumm.h	4 Dec 2002 22:31:32 -0000	1.71
+++ scumm.h	4 Dec 2002 22:34:37 -0000	1.72
@@ -1316,7 +1316,6 @@
 
 	void go();
 
-	byte getDefaultGUIColor(int color);
 	void waitForTimer(int msec_delay);
 
 	void updateCursor();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- scummvm.cpp	4 Dec 2002 22:31:36 -0000	1.89
+++ scummvm.cpp	4 Dec 2002 22:34:43 -0000	1.90
@@ -98,10 +98,6 @@
 	_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 @@
 		_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
 	} 
 
-	// FIXME: Preparing to remove
-//	else if (_lastKeyHit == 321) { // F7, display new GUI
-//		saveloadDialog();
-//	}
-			
 	_mouseButStat = _lastKeyHit;
 }
 
@@ -1596,19 +1587,4 @@
 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];
-	}
 }