aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-05-22 12:10:37 +0000
committerJames Brown2002-05-22 12:10:37 +0000
commit055f505533a23fc2a7da051597b312263d1a0c66 (patch)
treed952d822dc5d64692a50786468e6cb06ad06b1d9
parentc9f67e27b37395d5287852522e1be364d72dcace (diff)
downloadscummvm-rg350-055f505533a23fc2a7da051597b312263d1a0c66.tar.gz
scummvm-rg350-055f505533a23fc2a7da051597b312263d1a0c66.tar.bz2
scummvm-rg350-055f505533a23fc2a7da051597b312263d1a0c66.zip
Fix Zaks money. This may break Loom, I made the check fairly generic.
svn-id: r4369
-rw-r--r--gfx.cpp6
-rw-r--r--resource.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/gfx.cpp b/gfx.cpp
index dccf1e46b2..8c26fdb549 100644
--- a/gfx.cpp
+++ b/gfx.cpp
@@ -32,14 +32,16 @@ void Scumm::getGraphicsPerformance()
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);
diff --git a/resource.cpp b/resource.cpp
index d737282e0c..cc5861566e 100644
--- a/resource.cpp
+++ b/resource.cpp
@@ -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 @@ void Scumm::ensureResourceLoaded(int type, int i)
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;
}