diff options
author | Travis Howell | 2007-06-05 09:14:59 +0000 |
---|---|---|
committer | Travis Howell | 2007-06-05 09:14:59 +0000 |
commit | 3547c13e49f14e07a054f77f4cc6f92daa71dd87 (patch) | |
tree | a0933ad8306a33d1884020949ee309e53218e2a3 /engines/agos | |
parent | de826820714a8fbae70677fa51644eef9e4aa7bf (diff) | |
download | scummvm-rg350-3547c13e49f14e07a054f77f4cc6f92daa71dd87.tar.gz scummvm-rg350-3547c13e49f14e07a054f77f4cc6f92daa71dd87.tar.bz2 scummvm-rg350-3547c13e49f14e07a054f77f4cc6f92daa71dd87.zip |
Updates, to keep Amiga demo of Elvira 1 working.
svn-id: r27102
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/agos.cpp | 2 | ||||
-rw-r--r-- | engines/agos/window.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index bbcd5e2dc7..37e8c16c21 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -1000,7 +1000,7 @@ int AGOSEngine::go() { } if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) { - loadMusic(0); + playMusic(0, 0); } if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformMacintosh) && diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index d712c01973..80c5859794 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -196,7 +196,9 @@ void AGOSEngine::restoreBlock(uint h, uint w, uint y, uint x) { dst += y * _dxSurfacePitch; src += y * _dxSurfacePitch; - const uint8 paletteMod = (getGameType() == GType_ELVIRA1 && y >= 133) ? 16 : 0; + uint8 paletteMod = 0; + if (getGameType() == GType_ELVIRA1 && !(getFeatures() & GF_DEMO) && y >= 133) + paletteMod = 16; while (y < h) { for (i = x; i < w; i++) |