[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.228,1.229 verbs.cpp,1.98,1.99

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8689/scumm

Modified Files:
	resource.cpp verbs.cpp 
Log Message:

Minor cleanup


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- resource.cpp	1 Jul 2004 04:45:56 -0000	1.228
+++ resource.cpp	17 Jul 2004 10:25:22 -0000	1.229
@@ -625,7 +625,7 @@
 
 	loadResource(type, i);
 
-	if ((_version <= 6 && _heversion <= 70) && !(_features & GF_SMALL_HEADER))
+	if (VAR_ROOM_FLAG != 0xFF)
 		if (type == rtRoom && i == _roomResource)
 			VAR(VAR_ROOM_FLAG) = 1;
 }

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- verbs.cpp	10 Jul 2004 11:46:15 -0000	1.98
+++ verbs.cpp	17 Jul 2004 10:25:22 -0000	1.99
@@ -379,8 +379,7 @@
 			return;
 		}
 		
-		if (_gameId != GID_FT)
-			restoreVerbBG(verb);
+		restoreVerbBG(verb);
 
 		_string[4].charset = vs->charset_nr;
 		_string[4].xpos = vs->curRect.left;
@@ -414,12 +413,15 @@
 		vs->curRect.bottom = _charset->_str.bottom;
 		vs->oldRect = _charset->_str;
 		_charset->_str.left = _charset->_str.right;
-	} else if (_gameId != GID_FT) {
+	} else {
 		restoreVerbBG(verb);
 	}
 }
 
 void ScummEngine::restoreVerbBG(int verb) {
+	if (_gameId == GID_FT)
+		return;
+
 	VerbSlot *vs;
 
 	vs = &_verbs[verb];