diff options
| author | Filippos Karapetis | 2009-10-15 12:04:07 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-15 12:04:07 +0000 |
| commit | 6e18ee5b8831cf7908b52f91767f239631cbd9e3 (patch) | |
| tree | f29e3357ccef4b8f1538a0301dd213d5fa15e964 | |
| parent | 0d6ab8c73a1059885a6ecb93f530f690de84e22f (diff) | |
| download | scummvm-rg350-6e18ee5b8831cf7908b52f91767f239631cbd9e3.tar.gz scummvm-rg350-6e18ee5b8831cf7908b52f91767f239631cbd9e3.tar.bz2 scummvm-rg350-6e18ee5b8831cf7908b52f91767f239631cbd9e3.zip | |
Changed palette initialization depending on the findings of the resource manager. Fixes the palette in several SCI1 EGA games
svn-id: r45114
| -rw-r--r-- | engines/sci/gui/gui_palette.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/sci/gui/gui_palette.cpp b/engines/sci/gui/gui_palette.cpp index dd32c3940c..bc02f2332e 100644 --- a/engines/sci/gui/gui_palette.cpp +++ b/engines/sci/gui/gui_palette.cpp @@ -55,14 +55,12 @@ SciGuiPalette::SciGuiPalette(ResourceManager *resMan, SciGuiScreen *screen, bool _sysPalette.colors[255].b = 255; if (autoSetPalette) { - // Load default palette from resource 999 - if (!setFromResource(999, 2)) { - // if not found, we try to set amiga palette - if (!setAmiga()) { - // if that also doesnt work out, set EGA palette - setEGA(); - } - }; + if (_resMan->getViewType() == kViewEga) + setEGA(); + else if (_resMan->getViewType() == kViewAmiga) + setAmiga(); + else + setFromResource(999, 2); } } |