diff options
| author | Jonathan Gray | 2003-08-21 13:39:21 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-08-21 13:39:21 +0000 |
| commit | ce42f4d3dd461ced69470ea70e4f840c8abfb246 (patch) | |
| tree | 2cb607f30318011bcd8c5f52e20f04d88400d1b4 /scumm | |
| parent | 255c7ae5ff8c8f526de349246cdaf73506a85e81 (diff) | |
| download | scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.tar.gz scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.tar.bz2 scummvm-rg350-ce42f4d3dd461ced69470ea70e4f840c8abfb246.zip | |
patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree
svn-id: r9807
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index b298797be4..a796535281 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2158,10 +2158,12 @@ void Gdi::unkDecode11(byte *dst, const byte *src, int height) { #pragma mark - void Scumm::fadeIn(int effect) { - updatePalette(); switch (effect) { + case 0: + // seems to do nothing + break; case 1: case 2: case 3: @@ -2179,6 +2181,8 @@ void Scumm::fadeIn(int effect) { case 128: unkScreenEffect6(); break; + case 129: + break; case 130: case 131: case 132: @@ -2191,8 +2195,6 @@ void Scumm::fadeIn(int effect) { case 135: unkScreenEffect5(1); break; - case 129: - break; default: warning("Unknown screen effect, %d", effect); } |