diff options
| author | Martin Kiewitz | 2010-01-24 19:42:12 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-24 19:42:12 +0000 |
| commit | e51721f7b19849c52cc5e1c8e58c53f5ec96012d (patch) | |
| tree | 9eff34371f28d510b106915b0d10a1bbdea810fd /engines/sci | |
| parent | f2882cc2df2483218dfb42466807f9573541aec0 (diff) | |
| download | scummvm-rg350-e51721f7b19849c52cc5e1c8e58c53f5ec96012d.tar.gz scummvm-rg350-e51721f7b19849c52cc5e1c8e58c53f5ec96012d.tar.bz2 scummvm-rg350-e51721f7b19849c52cc5e1c8e58c53f5ec96012d.zip | |
SCI: handle intensity calls for amiga the same way as we handle palette animation (abort instead of process)
svn-id: r47514
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/graphics/gui.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index 7228ae925a..e60745a7a6 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -585,6 +585,10 @@ int16 SciGui::paletteFind(uint16 r, uint16 g, uint16 b) { } void SciGui::paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette) { + // we are also called on Amiga as well, but for colors above 32, so it doesnt make sense + if (!_s->resMan->isVGA()) + return; + _palette->setIntensity(fromColor, toColor, intensity, setPalette); } |