diff options
| author | Torbjörn Andersson | 2010-11-01 11:25:11 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-11-01 11:25:11 +0000 |
| commit | 68469f45ceeb8592020e262d616c98327416120e (patch) | |
| tree | 8889b0ebccf8a1732236bda3112f260f6aca7ff4 /engines/sword2/palette.cpp | |
| parent | e48cdb378c89e17c5f213eb921c0841aca062bd6 (diff) | |
| download | scummvm-rg350-68469f45ceeb8592020e262d616c98327416120e.tar.gz scummvm-rg350-68469f45ceeb8592020e262d616c98327416120e.tar.bz2 scummvm-rg350-68469f45ceeb8592020e262d616c98327416120e.zip | |
SWORD2: Cleanup pause handling
Removed a bunch of pause-related code which I either can't remember why
it's there, or which doesn't seem to serve any useful purpose. Most
things I've tried seem to work as well or better than before.
svn-id: r53997
Diffstat (limited to 'engines/sword2/palette.cpp')
| -rw-r--r-- | engines/sword2/palette.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp index 84ebd142ca..dd1a2ba877 100644 --- a/engines/sword2/palette.cpp +++ b/engines/sword2/palette.cpp @@ -171,6 +171,9 @@ void Screen::setPalette(int16 startEntry, int16 noEntries, byte *colourTable, ui } void Screen::dimPalette(bool dim) { + if (getFadeStatus() != RDFADE_NONE) + return; + if (dim != _dimPalette) { _dimPalette = dim; setSystemPalette(_palette, 0, 256); |