diff options
| author | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
| commit | 95e56f2052956e80a6319b2916a8f899340effaf (patch) | |
| tree | f9525eb32e05f1a4746233fe3daf254d07cb83ab /engines/sci/graphics | |
| parent | 28e28a2fea9f6adf4967463024c609e6a01ac5b0 (diff) | |
| parent | 3a5fe4ca002a85f7c4549c8d36203553553c53f9 (diff) | |
| download | scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.gz scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.bz2 scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.zip | |
merged trunk into branch and corrected __PS2__ to __PLAYSTATION2__ in a couple files
svn-id: r49435
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 96bdb42007..6fe472f5fa 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -55,6 +55,7 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen, bool autoSetP _sysPalette.colors[255].g = 255; _sysPalette.colors[255].b = 255; + _sysPaletteChanged = false; if (autoSetPalette) { if (_resMan->getViewType() == kViewEga) setEGA(); @@ -63,7 +64,6 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen, bool autoSetP else kernelSetFromResource(999, true); } - _sysPaletteChanged = false; } GfxPalette::~GfxPalette() { |