diff options
author | Eric Fry | 2018-04-16 23:09:10 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | 02063f60d0eed3ba4131643adad3058f760542ff (patch) | |
tree | aaedcc133d73ea53aae9bb8e12cc7a840c0b5413 /engines/illusions/screen.cpp | |
parent | 5e919fd3084d12f1d9ff9c9921e5993b8ae318eb (diff) | |
download | scummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.tar.gz scummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.tar.bz2 scummvm-rg350-02063f60d0eed3ba4131643adad3058f760542ff.zip |
Getting it to compile after merging master
Diffstat (limited to 'engines/illusions/screen.cpp')
-rw-r--r-- | engines/illusions/screen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/illusions/screen.cpp b/engines/illusions/screen.cpp index 0b04c2a1d9..c234cde3ae 100644 --- a/engines/illusions/screen.cpp +++ b/engines/illusions/screen.cpp @@ -272,7 +272,7 @@ void ScreenPalette::shiftPalette(int16 fromIndex, int16 toIndex) { r = _mainPalette[3 * toIndex + 0]; g = _mainPalette[3 * toIndex + 1]; b = _mainPalette[3 * toIndex + 2]; - for (int16 i = toIndex + 1; i < fromIndex; +i) { + for (int16 i = toIndex + 1; i < fromIndex; +i) { //TODO fix this. +i byte *dst = &_mainPalette[3 * i]; byte *src = &_mainPalette[3 * (i + 1)]; dst[0] = src[0]; @@ -371,16 +371,15 @@ Screen::Screen(IllusionsEngine *vm, int16 width, int16 height, int bpp) _decompressQueue = new SpriteDecompressQueue(this); _drawQueue = new SpriteDrawQueue(this); if (bpp == 8) { - initGraphics(width, height, false); + initGraphics(width, height); } else { Graphics::PixelFormat pixelFormat16(2, 5, 6, 5, 0, 11, 5, 0, 0); - initGraphics(width, height, true, &pixelFormat16); + initGraphics(width, height, &pixelFormat16); } _backSurface = allocSurface(width, height); _isScreenOffsetActive = false; - } Screen::~Screen() { |