diff options
| author | Willem Jan Palenstijn | 2016-06-30 23:59:22 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-07-01 00:18:07 +0200 |
| commit | c6c95938405b09204898c7a993ebdfe6ceafcb0e (patch) | |
| tree | 23aa51d8fb1054e3e3acd5cf6d9b3e73e945f07a /engines/sci/graphics/frameout.cpp | |
| parent | a40e43f7772f45dfa59de14d8f5349869c3f2d78 (diff) | |
| download | scummvm-rg350-c6c95938405b09204898c7a993ebdfe6ceafcb0e.tar.gz scummvm-rg350-c6c95938405b09204898c7a993ebdfe6ceafcb0e.tar.bz2 scummvm-rg350-c6c95938405b09204898c7a993ebdfe6ceafcb0e.zip | |
Revert "SCI32: Fix broken Remap implementation"
This reverts commit cfda8b9ecd8a6e3c003abe533ea2e2981d8ba984.
This is only to re-apply it immediately in a series of smaller commits.
Diffstat (limited to 'engines/sci/graphics/frameout.cpp')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index fd37020896..5771ab59ff 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -42,13 +42,15 @@ #include "sci/graphics/coordadjuster.h" #include "sci/graphics/compare.h" #include "sci/graphics/font.h" +#include "sci/graphics/view.h" #include "sci/graphics/screen.h" #include "sci/graphics/paint32.h" #include "sci/graphics/palette32.h" +#include "sci/graphics/picture.h" +#include "sci/graphics/remap.h" +#include "sci/graphics/text32.h" #include "sci/graphics/plane32.h" -#include "sci/graphics/remap32.h" #include "sci/graphics/screen_item32.h" -#include "sci/graphics/text32.h" #include "sci/graphics/frameout.h" #include "sci/video/robot_decoder.h" @@ -1005,7 +1007,7 @@ void GfxFrameout::mergeToShowList(const Common::Rect &drawRect, RectList &showLi } void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry *showStyle) { - Palette sourcePalette(_palette->getNextPalette()); + Palette sourcePalette(*_palette->getNextPalette()); alterVmap(sourcePalette, sourcePalette, -1, styleRanges); int16 prevRoom = g_sci->getEngineState()->variables[VAR_GLOBAL][12].toSint16(); @@ -1045,7 +1047,7 @@ void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry drawScreenItemList(screenItemLists[i]); } - Palette nextPalette(_palette->getNextPalette()); + Palette nextPalette(*_palette->getNextPalette()); if (prevRoom < 1000) { for (int i = 0; i < ARRAYSIZE(sourcePalette.colors); ++i) { |