aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-07-26 05:40:23 +0000
committerTravis Howell2004-07-26 05:40:23 +0000
commitdc6541dedbbf16f95cfc62a34d4b69a9e6e3344f (patch)
tree512afefcfdfb77df7eea8ed4cd348233c6b16870 /scumm
parent3a8f518b02e01580d292a6a65a71e1a0f7baa94a (diff)
downloadscummvm-rg350-dc6541dedbbf16f95cfc62a34d4b69a9e6e3344f.tar.gz
scummvm-rg350-dc6541dedbbf16f95cfc62a34d4b69a9e6e3344f.tar.bz2
scummvm-rg350-dc6541dedbbf16f95cfc62a34d4b69a9e6e3344f.zip
Fix darkness issues in Amiga verisons of FOA/MI2.
svn-id: r14333
Diffstat (limited to 'scumm')
-rw-r--r--scumm/palette.cpp4
-rw-r--r--scumm/scumm.cpp4
2 files changed, 3 insertions, 5 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index f9d7d945eb..135a1e59e7 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -541,10 +541,6 @@ void ScummEngine::darkenPalette(int redScale, int greenScale, int blueScale, int
palptr = getPalettePtr(_curPalIndex);
for (j = startColor; j <= endColor; j++) {
- // FIXME: Hack to fix Amiga palette adjustments
- if ((_features & GF_AMIGA && _version == 5) && (j >= 16 && j < 81))
- continue;
-
idx = (_heversion == 70) ? _HEV7ActorPalette[j] : j;
cptr = palptr + idx * 3;
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 2b54a7a1c6..d5212afaeb 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1329,7 +1329,9 @@ void ScummEngine::initScummVars() {
} else
VAR(VAR_SOUNDCARD) = 3;
}
- VAR(VAR_VIDEOMODE) = 0x13;
+ // Amiga versions of FOA and MI2 are only 32 colors.
+ if (!(_version == 5 && _features & GF_AMIGA))
+ VAR(VAR_VIDEOMODE) = 19;
if (_gameId == GID_LOOM && _features & GF_OLD_BUNDLE) {
// Set number of sound resources
if (!(_features & GF_MACINTOSH))