diff options
| author | Travis Howell | 2006-09-19 12:46:34 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-09-19 12:46:34 +0000 |
| commit | 843397fd7b6745d0513ee6f8c3b25da52fe8d4d9 (patch) | |
| tree | fd046fddf7c65920e27730a7546758ca2345063b | |
| parent | ab2cb0b30ad15c2cd33c82989461bdcf44644bd2 (diff) | |
| download | scummvm-rg350-843397fd7b6745d0513ee6f8c3b25da52fe8d4d9.tar.gz scummvm-rg350-843397fd7b6745d0513ee6f8c3b25da52fe8d4d9.tar.bz2 scummvm-rg350-843397fd7b6745d0513ee6f8c3b25da52fe8d4d9.zip | |
Fix FF/Simon2 regression in last commit
svn-id: r23940
| -rw-r--r-- | engines/simon/vga.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index 8a7008dd05..bc06ab68fb 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -2144,12 +2144,7 @@ void SimonEngine::vc55_moveBox() { } void SimonEngine::vc56_delay() { - if (getGameType() == GType_SIMON2) { - uint16 num = vcReadVarOrWord() * _frameRate; - - addVgaEvent(num + _vgaBaseDelay, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum); - _vcPtr = (byte *)&_vc_get_out_of_code; - } else if (getGameType() == GType_WW) { + if (getGameType() == GType_WW) { byte *src = _curVgaFile2 + 32; byte *dst = getBackBuf(); @@ -2163,14 +2158,19 @@ void SimonEngine::vc56_delay() { _system->setPalette(palette, 0, 256); memcpy(dst, src, _screenHeight * _screenWidth); + } else { + uint16 num = vcReadVarOrWord() * _frameRate; + + addVgaEvent(num + _vgaBaseDelay, _vcPtr, _vgaCurSpriteId, _vgaCurZoneNum); + _vcPtr = (byte *)&_vc_get_out_of_code; } } void SimonEngine::vc57_blackPalette() { if (getGameType() == GType_WW) { - //uint8 palette[1024]; - //memset(palette, 0, sizeof(palette)); - //_system->setPalette(palette, 0, 256); + uint8 palette[1024]; + memset(palette, 0, sizeof(palette)); + _system->setPalette(palette, 0, 256); } } |