[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.91,1.92 resource.cpp,1.85,1.86

James Brown ender at users.sourceforge.net
Wed May 22 05:11:04 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10481

Modified Files:
	gfx.cpp resource.cpp 
Log Message:
Fix Zaks money. This may break Loom, I made the check fairly generic.



Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- gfx.cpp	19 May 2002 12:51:06 -0000	1.91
+++ gfx.cpp	22 May 2002 12:10:37 -0000	1.92
@@ -32,14 +32,16 @@
 		initScreens(0, 0, _realWidth, _realHeight); //ender
 	}
 
-	_vars[VAR_PERFORMANCE_1] = 0;	//_scummTimer;
+	if (!(_features & GF_SMALL_HEADER))	/* FIXME TEST: Enders Zak fix */
+		_vars[VAR_PERFORMANCE_1] = 0;	//_scummTimer;
 
 	for (i = 10; i != 0; i--) {
 		setDirtyRange(0, 0, _realHeight); //ender
 		drawDirtyScreenParts();
 	}
 
-	_vars[VAR_PERFORMANCE_2] = 0;	//_scummTimer;
+	if (!(_features & GF_SMALL_HEADER))	/* FIXME TEST: Enders Zak fix */
+		_vars[VAR_PERFORMANCE_2] = 0;	//_scummTimer;
 
 	if (_gameId == GID_DIG)
 		initScreens(0, 0, _realWidth, _realHeight);

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- resource.cpp	17 May 2002 21:58:59 -0000	1.85
+++ resource.cpp	22 May 2002 12:10:37 -0000	1.86
@@ -1,4 +1,4 @@
-/* ScummVM - Scumm Interpreter
+s/* ScummVM - Scumm Interpreter
  * Copyright (C) 2001  Ludvig Strigeus
  * Copyright (C) 2001/2002 The ScummVM project
  *
@@ -461,7 +461,7 @@
 
 	loadResource(type, i);
 
-	if (!(_features & GF_AFTER_V7))
+        if (!(_features & GF_AFTER_V7) && !(_features & GF_SMALL_HEADER))
 		if (type == rtRoom && i == _roomResource)
 			_vars[VAR_ROOM_FLAG] = 1;
 }





More information about the Scummvm-git-logs mailing list