[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.237,1.238 scumm.cpp,1.116,1.117

[Travis Howell]

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

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

Shorter check


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- resource.cpp	11 Aug 2004 21:49:57 -0000	1.237
+++ resource.cpp	14 Aug 2004 03:16:32 -0000	1.238
@@ -799,8 +799,7 @@
 
 	loadResource(type, i);
 
-	if (_version == 5)
-		if (type == rtRoom && i == _roomResource)
+	if (_version == 5 && type == rtRoom && i == _roomResource)
 			VAR(VAR_ROOM_FLAG) = 1;
 }
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- scumm.cpp	8 Aug 2004 22:09:50 -0000	1.116
+++ scumm.cpp	14 Aug 2004 03:16:32 -0000	1.117
@@ -1189,9 +1189,8 @@
 		_actors[i].initActor(1);
 	
 		// this is from IDB
-		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) {
+		if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
 			_actors[i].setActorCostume(i);
-		}
 	}
 
 	if (_gameId == GID_MANIAC && _version == 1) {