diff options
| author | Travis Howell | 2006-10-04 11:44:59 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-10-04 11:44:59 +0000 |
| commit | 8e4ffa4b7ab9438ad097d0fcbb7179547a808ad6 (patch) | |
| tree | 5f1e58a84e42b0b3a740af6ac0b0df0ea2aa0da5 /engines/agos | |
| parent | 7cfbf8b3e4c032b60a48285d7ba5495e6d9360fd (diff) | |
| download | scummvm-rg350-8e4ffa4b7ab9438ad097d0fcbb7179547a808ad6.tar.gz scummvm-rg350-8e4ffa4b7ab9438ad097d0fcbb7179547a808ad6.tar.bz2 scummvm-rg350-8e4ffa4b7ab9438ad097d0fcbb7179547a808ad6.zip | |
Fix palette regression
svn-id: r24110
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/game.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/vga.cpp | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp index 9abbde7c9f..f3926e633f 100644 --- a/engines/agos/game.cpp +++ b/engines/agos/game.cpp @@ -703,7 +703,7 @@ static AGOSGameDescription gameDescriptions[] = { "Floppy", ARRAYSIZE(ELVIRA2DOS_FR_GameFiles), ELVIRA2DOS_FR_GameFiles, - Common::EN_ANY, + Common::FR_FRA, Common::kPlatformPC, }, diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index e81c4e7424..c313d76171 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -1765,16 +1765,18 @@ void AGOSEngine::vc22_setSpritePalette() { palptr = &_displayPalette[(a * 64)]; offs = _curVgaFile1 + 6; } else { + num = 16; palSize = 32; palptr = _displayPalette; offs = _curVgaFile1 + READ_BE_UINT16(_curVgaFile1 + 6); - if (b >= 1000) { - b -= 1000; - num = 16; - } else { - num = 13; + if (getGameType() == GType_ELVIRA) { + if (b >= 1000) { + b -= 1000; + } else { + num = 13; + } } } |