aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2016-01-10 12:38:10 +0100
committerWillem Jan Palenstijn2016-01-10 12:38:10 +0100
commit22796e559fd252fc77082200f2d32fec0df3ce3b (patch)
treee22a2e4f99239da6e9090e8cce8b53b8651f3abf
parent665dd630c724e8bbda5f28646ecfd0b3de4edd98 (diff)
downloadscummvm-rg350-22796e559fd252fc77082200f2d32fec0df3ce3b.tar.gz
scummvm-rg350-22796e559fd252fc77082200f2d32fec0df3ce3b.tar.bz2
scummvm-rg350-22796e559fd252fc77082200f2d32fec0df3ce3b.zip
SCI: Fix compilation when SCI32 is disabled
Thanks bSr43
-rw-r--r--engines/sci/sci.cpp2
-rw-r--r--engines/sci/sci.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 598368e428..e568562820 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -619,7 +619,6 @@ void SciEngine::initGraphics() {
_gfxPaint = 0;
_gfxPaint16 = 0;
_gfxPalette16 = 0;
- _gfxPalette32 = 0;
_gfxPorts = 0;
_gfxText16 = 0;
_gfxTransitions = 0;
@@ -629,6 +628,7 @@ void SciEngine::initGraphics() {
_robotDecoder = 0;
_gfxFrameout = 0;
_gfxPaint32 = 0;
+ _gfxPalette32 = 0;
#endif
if (hasMacIconBar())
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index c5528e412a..e49345c0d4 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -70,6 +70,7 @@ class GfxPaint;
class GfxPaint16;
class GfxPaint32;
class GfxPalette;
+class GfxPalette32;
class GfxPorts;
class GfxScreen;
class GfxText16;
@@ -79,7 +80,6 @@ class GfxTransitions;
#ifdef ENABLE_SCI32
class RobotDecoder;
class GfxFrameout;
-class GfxPalette32;
#endif
// our engine debug levels