[Scummvm-cvs-logs] scummvm master -> 22796e559fd252fc77082200f2d32fec0df3ce3b

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
22796e559f SCI: Fix compilation when SCI32 is disabled


Commit: 22796e559fd252fc77082200f2d32fec0df3ce3b
    https://github.com/scummvm/scummvm/commit/22796e559fd252fc77082200f2d32fec0df3ce3b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-01-10T12:38:10+01:00

Commit Message:
SCI: Fix compilation when SCI32 is disabled

Thanks bSr43

Changed paths:
    engines/sci/sci.cpp
    engines/sci/sci.h



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 598368e..e568562 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 c5528e4..e49345c 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