diff options
| author | Martin Kiewitz | 2009-10-24 19:47:53 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-24 19:47:53 +0000 |
| commit | c45efbe9abbb649d6bf47522f96f1553a3835b40 (patch) | |
| tree | 5478f51d26753e3d0c6a4db1b6ca5567c80b28e9 /engines/sci/gui | |
| parent | 8551e6cfe39530558ea1b9fd498fb7ec4285719b (diff) | |
| download | scummvm-rg350-c45efbe9abbb649d6bf47522f96f1553a3835b40.tar.gz scummvm-rg350-c45efbe9abbb649d6bf47522f96f1553a3835b40.tar.bz2 scummvm-rg350-c45efbe9abbb649d6bf47522f96f1553a3835b40.zip | |
SCI/newgui: dont react on paletteSet when playing an EGA game (fixes Xmas card EGA)
svn-id: r45363
Diffstat (limited to 'engines/sci/gui')
| -rw-r--r-- | engines/sci/gui/gui.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 9872351340..62a60faf20 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -457,6 +457,9 @@ int16 SciGui::picNotValid(int16 newPicNotValid) { void SciGui::paletteSet(GuiResourceId resourceId, uint16 flags) { + // we are also called on EGA games as well, this doesnt make sense. doing this would actually break the system EGA palette + if (!_s->resMan->isVGA()) + return; _palette->setFromResource(resourceId, flags); } |