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/sci.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/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 41fa144b06..b80456c09c 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -65,10 +65,9 @@ #ifdef ENABLE_SCI32 #include "sci/graphics/controls32.h" -#include "sci/graphics/frameout.h" #include "sci/graphics/palette32.h" -#include "sci/graphics/remap32.h" #include "sci/graphics/text32.h" +#include "sci/graphics/frameout.h" #include "sci/sound/audio32.h" #include "sci/video/robot_decoder.h" #endif @@ -700,7 +699,7 @@ void SciEngine::initGraphics() { if (getSciVersion() >= SCI_VERSION_2) { _gfxPalette32 = new GfxPalette32(_resMan, _gfxScreen); _gfxPalette16 = _gfxPalette32; - _gfxRemap32 = new GfxRemap32(); + _gfxRemap32 = new GfxRemap32(_gfxPalette32); } else { #endif _gfxPalette16 = new GfxPalette(_resMan, _gfxScreen); |